release/7.0.0_cvs

19521 files changed, 19609 insertions, 19817 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 00346464c7b82..04d522c0e744c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/COPYRIGHT,v 1.8.4.1 2008/01/01 09:36:30 imp Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
diff --git a/LOCKS b/LOCKS
index 977f30b0a4ed5..4f68a8d7e0fe5 100644
--- a/LOCKS
+++ b/LOCKS
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $
 
 This file documents formal review/approval requirements that have been
 approved by core.
diff --git a/MAINTAINERS b/MAINTAINERS
index f221d2358c65f..f7f62cd1d6601 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
diff --git a/Makefile b/Makefile
index 77d68e52d62f2..231daadac15a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile,v 1.341.2.1 2007/11/22 01:33:08 delphij Exp $
 #
 # The user-driven targets are:
 #
diff --git a/Makefile.inc1 b/Makefile.inc1
index 487d11888dec0..5cb5c0d89acc1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/Makefile.inc1,v 1.588.2.2.2.2 2008/01/21 21:58:55 brueffer Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 979ecdfefd3df..a5dce4accb40c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.7.2.1 2008/01/30 18:12:35 brueffer Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
diff --git a/README b/README
index 674d93ebe0a94..1dc4d4bfc032f 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
-$FreeBSD$
+$FreeBSD: src/README,v 1.24 2006/06/07 03:33:48 trhodes Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
diff --git a/UPDATING b/UPDATING
index b8ef85c59bfb8..a82d6be4babcb 100644
--- a/UPDATING
+++ b/UPDATING
@@ -929,4 +929,4 @@ author a beer.
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD$
+$FreeBSD: src/UPDATING,v 1.507.2.3.2.4 2008/02/24 05:17:54 kensmith Exp $
diff --git a/bin/Makefile b/bin/Makefile
index 1b3ee7ae43bc6..97596df3ab4ff 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index ec24a486b9de6..c70f14ede3d3d 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/Makefile.inc,v 1.23 2006/03/17 18:54:20 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 672a4eeeeff50..aea110c9ddb3a 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cat/Makefile,v 1.7 2001/12/04 01:57:37 obrien Exp $
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 1f0f6b60a31cf..18767b33383a2 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.27 2006/12/23 09:25:23 ru Exp $
 .\"
 .Dd March 21, 2004
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 9acd68fec4f82..e9339513a8425 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
index 4457505380f33..8ac83ed8ea40c 100644
--- a/bin/chflags/Makefile
+++ b/bin/chflags/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chflags/Makefile,v 1.19 2005/01/27 13:23:05 delphij Exp $
 
 PROG=	chflags
 
diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index eb4f6e253e3a9..830d6143ba92c 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $
 .\"
 .Dd March 3, 2006
 .Dt CHFLAGS 1
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 273ba4cdc18f5..90e6f4f3bcf4e 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 5157f6568a6cb..ac01d2fb90c0a 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/chio/Makefile,v 1.12 2005/01/27 13:25:09 delphij Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 920c31e81648b..eb8e2ede1582a 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chio/chio.1,v 1.27 2005/01/16 16:41:55 ru Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index cdfcf829a0b17..082a7b34e96f4 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 8f10c9d9243a7..b0fa940750b81 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/defs.h,v 1.5 2005/01/10 08:39:20 imp Exp $	*/
 
 /*-
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 5b9b1e429dc21..47263c83ffad6 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/bin/chio/pathnames.h,v 1.3 2005/01/10 08:39:20 imp Exp $	*/
 
 /*-
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index 71006d00a5232..b6c1065b2e443 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/chmod/Makefile,v 1.10 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 37d64bb008bdd..0370ed482a23c 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.40 2006/12/22 07:28:38 ru Exp $
 .\"
 .Dd December 22, 2006
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index e967388980315..caabed1f5ae23 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.33 2005/01/10 08:39:20 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 9180efe26c3fe..21fe9d1024d2c 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/cp/Makefile,v 1.11 2002/07/15 12:08:21 sheldonh Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 96d8f61c67804..5ffe77b38f1b4 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $
 .\"
 .Dd October 27, 2006
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index fcc2b76684583..4fe4a5793980e 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $");
 
 /*
  * Cp copies source files to target files.
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index 94c416b048ec5..d6896401bac0b 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/cp/extern.h,v 1.21 2006/08/24 20:45:38 julian Exp $
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 7eea8fa0b83ff..18b605e5c89c1 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index d95197b128d40..405135c94cc14 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/csh/Makefile,v 1.40 2006/03/19 19:10:39 ru Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 915cb2307f996..1bd4ad809ec41 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.13 2005/01/10 08:39:21 imp Exp $
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 5fbf43c0b72bb..c3b24d19ca9d0 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.11 2005/07/28 12:40:23 keramida Exp $
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 76ee1ebd5d17f..45606cf6d6934 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.9 2005/01/10 08:39:21 imp Exp $
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 7ef24dcfe537b..9c839b0d0b699 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.7 2005/01/10 08:39:21 imp Exp $
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index 22c8f76b28fe0..efd34b0883ec8 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.8 2005/01/10 08:39:21 imp Exp $
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index ba1b161ad512f..f1980669f3fa9 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.9 2005/01/10 08:39:21 imp Exp $
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 196d4371ce28a..52670ded9384b 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -27,6 +27,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.7 2005/01/10 08:39:21 imp Exp $
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
diff --git a/bin/csh/config.h b/bin/csh/config.h
index 0971ffa3faa12..4fed856e86598 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config.h,v 1.15 2007/05/16 21:22:38 mp Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h
index 8c29053e31766..785466d48b014 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/config_p.h,v 1.14 2007/05/16 21:22:38 mp Exp $ */
 /*
  * config.h -- configure various defines for tcsh
  *
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
index 5eb251ace0eee..f91b3f438a1af 100644
--- a/bin/csh/host.defs
+++ b/bin/csh/host.defs
@@ -1,6 +1,6 @@
 newcode	:
 /* $Header: /src/pub/tcsh/host.defs,v 1.31 2001/06/10 02:19:11 christos Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/bin/csh/host.defs,v 1.3 2004/04/06 20:06:45 markm Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
diff --git a/bin/csh/iconv.h b/bin/csh/iconv.h
index 89e9d0db59ac8..33a4e6d16e958 100644
--- a/bin/csh/iconv.h
+++ b/bin/csh/iconv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/iconv.h,v 1.1 2006/02/19 06:40:29 ume Exp $
  */
 
 #ifndef _ICONV_H_
diff --git a/bin/csh/iconv_stub.c b/bin/csh/iconv_stub.c
index 6bbbbb02a01aa..a60c0ec3364fa 100644
--- a/bin/csh/iconv_stub.c
+++ b/bin/csh/iconv_stub.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.1 2006/02/19 06:40:29 ume Exp $
  */
 
 #include <dlfcn.h>
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 8a1dc85793307..d5ba10f545855 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index b57f4ab11215b..e6ac4b8625dd6 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/date/date.1,v 1.75 2007/06/02 20:15:59 remko Exp $
 .\"
 .Dd June 2, 2007
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index be296a1f3b341..d330c9d4cf1bd 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.47 2005/01/10 08:39:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index 76b8d5e16105a..fe2baee4effc8 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/extern.h,v 1.7 2004/04/06 20:06:45 markm Exp $
  */
 
 int	netsettime(time_t);
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index b8441068eadf6..641b55062605c 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.19 2006/08/20 06:31:24 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index 5f0123110ee32..82a6cea2ad2dc 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/date/vary.c,v 1.16 2004/08/09 13:43:39 yar Exp $");
 
 #include <err.h>
 #include <time.h>
diff --git a/bin/date/vary.h b/bin/date/vary.h
index b39306a2bb233..27eddf7e74fe0 100644
--- a/bin/date/vary.h
+++ b/bin/date/vary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/date/vary.h,v 1.4 1999/08/27 23:14:00 peter Exp $
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index eb8ec8527b170..c2ce2f0c676ab 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/dd/Makefile,v 1.19 2006/07/09 21:47:37 markm Exp $
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 161fbfcb0d488..4e519f9b13294 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.40 2004/08/15 19:10:05 rwatson Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index cd66258c29452..fc17369f6b372 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/conv.c,v 1.19 2004/04/06 20:06:45 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 9bfd10921823e..e29abb67bacf9 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/conv_tab.c,v 1.12 2004/04/06 20:06:45 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 31a5d3e84b793..349be3ee82e27 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.31 2005/07/28 18:28:11 keramida Exp $
 .\"
 .Dd August 15, 2004
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 0bb43f789b1ae..135fe4b5d8ac3 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index ad283fd516a17..cc9e79b115e38 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/dd.h,v 1.22 2004/08/15 19:10:05 rwatson Exp $
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 9c540ad36546c..4f4f3150d27e8 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/extern.h,v 1.15 2004/08/15 19:10:05 rwatson Exp $
  */
 
 void block(void);
diff --git a/bin/dd/gen.c b/bin/dd/gen.c
index 9c7571a9ab913..67f887f027d38 100644
--- a/bin/dd/gen.c
+++ b/bin/dd/gen.c
@@ -1,7 +1,7 @@
 /*-
  * This program is in the public domain
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/dd/gen.c,v 1.2 2005/01/10 08:39:21 imp Exp $
  */
 
 #include <stdio.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 4f538bc4bfbda..26f3e21637bb7 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/misc.c,v 1.27 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index a638597707ddb..fac9af59506e0 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/dd/position.c,v 1.23 2004/04/06 20:06:46 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/mtio.h>
diff --git a/bin/dd/ref.ascii b/bin/dd/ref.ascii
index 7ff13e5a80ed1..43f0c4b7cc407 100644
--- a/bin/dd/ref.ascii
+++ b/bin/dd/ref.ascii
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ascii,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 9c 09 86 7f  97 8d 8e 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 9d 85 08 87  18 19 92 8f 1c 1d 1e 1f  |................|
 00000020  80 81 82 83 84 0a 17 1b  88 89 8a 8b 8c 05 06 07  |................|
diff --git a/bin/dd/ref.ebcdic b/bin/dd/ref.ebcdic
index 605716552cab3..650e88c096439 100644
--- a/bin/dd/ref.ebcdic
+++ b/bin/dd/ref.ebcdic
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ebcdic,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.ibm b/bin/dd/ref.ibm
index 4836baf221aa5..f9f6339f81807 100644
--- a/bin/dd/ref.ibm
+++ b/bin/dd/ref.ibm
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ibm,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.lcase b/bin/dd/ref.lcase
index 9f95672964684..78348e89d4939 100644
--- a/bin/dd/ref.lcase
+++ b/bin/dd/ref.lcase
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.lcase,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/dd/ref.oldascii b/bin/dd/ref.oldascii
index bb1ad0a7242b0..1006223e6f697 100644
--- a/bin/dd/ref.oldascii
+++ b/bin/dd/ref.oldascii
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldascii,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 9c 09 86 7f  97 8d 8e 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 9d 85 08 87  18 19 92 8f 1c 1d 1e 1f  |................|
 00000020  80 81 82 83 84 0a 17 1b  88 89 8a 8b 8c 05 06 07  |................|
diff --git a/bin/dd/ref.oldebcdic b/bin/dd/ref.oldebcdic
index 4a7fde7e65b6b..d72bd11b78dd4 100644
--- a/bin/dd/ref.oldebcdic
+++ b/bin/dd/ref.oldebcdic
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldebcdic,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 4f 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@O.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.oldibm b/bin/dd/ref.oldibm
index 4836baf221aa5..b439939ed41e5 100644
--- a/bin/dd/ref.oldibm
+++ b/bin/dd/ref.oldibm
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.oldibm,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 37 2d 2e 2f  16 05 25 0b 0c 0d 0e 0f  |....7-./..%.....|
 00000010  10 11 12 13 3c 3d 32 26  18 19 3f 27 1c 1d 1e 1f  |....<=2&..?'....|
 00000020  40 5a 7f 7b 5b 6c 50 7d  4d 5d 5c 4e 6b 60 4b 61  |@Z.{[lP}M]\Nk`Ka|
diff --git a/bin/dd/ref.pareven b/bin/dd/ref.pareven
index c64e63e30660d..b6c3933e24db3 100644
--- a/bin/dd/ref.pareven
+++ b/bin/dd/ref.pareven
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.pareven,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  00 81 82 03 84 05 06 87  88 09 0a 8b 0c 8d 8e 0f  |................|
 00000010  90 11 12 93 14 95 96 17  18 99 9a 1b 9c 1d 1e 9f  |................|
 00000020  a0 21 22 a3 24 a5 a6 27  28 a9 aa 2b ac 2d 2e af  |.!".$..'(..+.-..|
diff --git a/bin/dd/ref.parnone b/bin/dd/ref.parnone
index fba31c1424481..bd3823f04c38b 100644
--- a/bin/dd/ref.parnone
+++ b/bin/dd/ref.parnone
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parnone,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/dd/ref.parodd b/bin/dd/ref.parodd
index f0bc449e36486..f53618bf14b41 100644
--- a/bin/dd/ref.parodd
+++ b/bin/dd/ref.parodd
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parodd,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  80 01 02 83 04 85 86 07  08 89 8a 0b 8c 0d 0e 8f  |................|
 00000010  10 91 92 13 94 15 16 97  98 19 1a 9b 1c 9d 9e 1f  |................|
 00000020  20 a1 a2 23 a4 25 26 a7  a8 29 2a ab 2c ad ae 2f  | ..#.%&..)*.,../|
diff --git a/bin/dd/ref.parset b/bin/dd/ref.parset
index baa1c57163a25..462805e350252 100644
--- a/bin/dd/ref.parset
+++ b/bin/dd/ref.parset
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.parset,v 1.1 2004/03/05 19:35:51 phk Exp $
 00000000  80 81 82 83 84 85 86 87  88 89 8a 8b 8c 8d 8e 8f  |................|
 00000010  90 91 92 93 94 95 96 97  98 99 9a 9b 9c 9d 9e 9f  |................|
 00000020  a0 a1 a2 a3 a4 a5 a6 a7  a8 a9 aa ab ac ad ae af  |................|
diff --git a/bin/dd/ref.swab b/bin/dd/ref.swab
index 79e57b79b738f..0836ca7950afe 100644
--- a/bin/dd/ref.swab
+++ b/bin/dd/ref.swab
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.swab,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  01 00 03 02 05 04 07 06  09 08 0b 0a 0d 0c 0f 0e  |................|
 00000010  11 10 13 12 15 14 17 16  19 18 1b 1a 1d 1c 1f 1e  |................|
 00000020  21 20 23 22 25 24 27 26  29 28 2b 2a 2d 2c 2f 2e  |! #"%$'&)(+*-,/.|
diff --git a/bin/dd/ref.ucase b/bin/dd/ref.ucase
index 70d8a903c3545..7d99f5f0bf373 100644
--- a/bin/dd/ref.ucase
+++ b/bin/dd/ref.ucase
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/dd/ref.ucase,v 1.1 2004/03/05 19:30:13 phk Exp $
 00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f  |................|
 00000010  10 11 12 13 14 15 16 17  18 19 1a 1b 1c 1d 1e 1f  |................|
 00000020  20 21 22 23 24 25 26 27  28 29 2a 2b 2c 2d 2e 2f  | !"#$%&'()*+,-./|
diff --git a/bin/df/Makefile b/bin/df/Makefile
index df6574ce2adbd..767c3f69434f4 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/bin/df/Makefile,v 1.18 2004/05/24 22:21:49 pjd Exp $
 
 MOUNT=	${.CURDIR}/../../sbin/mount
 .PATH: ${MOUNT}
diff --git a/bin/df/df.1 b/bin/df/df.1
index 8cdff7d9a8886..89c8c7a6133f1 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/df/df.1,v 1.40 2007/02/28 10:29:48 ru Exp $
 .\"
 .Dd April 22, 2004
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index f48c8c95e841d..0184cf89e3c43 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.71 2007/07/04 00:00:37 scf Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 724bd06f6a39f..575dac3e0f405 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/domainname/Makefile,v 1.7 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 0f9245077242d..e4afc7f55b2e2 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.19 2006/12/18 15:45:01 ru Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index da3e607c0e14e..18369f1a32b48 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -39,7 +39,7 @@ static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.19 2005/01/10 08:39:22 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index d00d4679d7ac8..bcb27de4d0274 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/echo/Makefile,v 1.8 2001/12/04 01:57:40 obrien Exp $
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 5f7123e9c28a8..efd05d6656324 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.19 2005/01/16 16:41:56 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 45d9d7e18c527..629e22f1e09d8 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.18 2005/01/10 08:39:22 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index e2deec6572bdf..0c1f383cb8dca 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index f81bb0ce1a14b..0a363d650692a 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/POSIX,v 1.8 2000/07/17 10:40:48 sheldonh Exp $
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
diff --git a/bin/ed/README b/bin/ed/README
index 478e7af07c701..1f50f106fdb55 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/bin/ed/README,v 1.7 1999/08/27 23:14:12 peter Exp $
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index db1f0e981bfbe..93c1b92441a83 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/buf.c,v 1.22 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 52e99998d67c9..22dd0d25f2a06 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.20 2004/04/06 20:06:47 markm Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 20fc8052cee7f..02e265ff27bcb 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.35 2005/01/16 16:41:56 ru Exp $
 .Dd July 3, 2004
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 2021232c04909..dbb73c6b8debc 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- * $FreeBSD$
+ * $FreeBSD: src/bin/ed/ed.h,v 1.20 2005/01/10 08:39:22 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 11dcc19fcc859..01594c5b21340 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/glbl.c,v 1.13 2002/06/30 05:13:53 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 85ba0de0812e9..7a0e7a20adcff 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/io.c,v 1.14 2003/01/01 18:48:39 schweikh Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 2273c951593a4..55dfbba7b62b6 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -35,7 +35,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.29 2006/08/17 23:00:33 imp Exp $");
 
 /*
  * CREDITS
diff --git a/bin/ed/re.c b/bin/ed/re.c
index f89ecf94cd6b5..43f67ae50a020 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 1c44328cc79c6..f774776ca6356 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/sub.c,v 1.15 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index aedfb698f131d..c6265ea518a56 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/Makefile,v 1.9 1999/08/27 23:14:17 peter Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 74c4826a269d9..e360c4fe86ddc 100644
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/README,v 1.7 1999/08/27 23:14:17 peter Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
index deab47555f7ad..2c57449fc3a77 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/ckscripts.sh,v 1.6 1999/08/27 23:14:18 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
index 1b8b3ee531827..2d1a06f14a7aa 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/bin/ed/test/mkscripts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-# $FreeBSD$
+# $FreeBSD: src/bin/ed/test/mkscripts.sh,v 1.6 1999/08/27 23:14:20 peter Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 6a8ca9e90137b..28374956b7233 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ed/undo.c,v 1.12 2002/06/30 05:13:53 obrien Exp $");
 
 #include "ed.h"
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 544853e10a257..7daa1c20d3836 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/expr/Makefile,v 1.18 2003/06/13 07:04:02 markm Exp $
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 3f8eabbdde666..7239c23256441 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.29 2007/03/04 19:52:07 ru Exp $
 .\"
 .Dd July 12, 2004
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 356bac294d62d..2b0e4f5b0994d 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -5,7 +5,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/expr/expr.y,v 1.25 2007/02/18 19:48:58 ceri Exp $
  */
 
 #include <sys/types.h>
diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
index b7b5e983a530e..f5d942796f50c 100644
--- a/bin/getfacl/Makefile
+++ b/bin/getfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/getfacl/Makefile,v 1.6 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	getfacl
 
diff --git a/bin/getfacl/getfacl.1 b/bin/getfacl/getfacl.1
index 913530935a337..22496192bb173 100644
--- a/bin/getfacl/getfacl.1
+++ b/bin/getfacl/getfacl.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.11 2006/09/17 17:40:06 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index 1ab86cde27302..85a365c4f0b17 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 3c7997f862fc5..95036b30e09cf 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/hostname/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index bfff27baa6c6e..f375390a4ae9c 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.21 2006/12/08 07:47:08 kientzle Exp $
 .\"
 .Dd December 7, 2006
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 7aaca9ccda70f..3df6542d3ce6e 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
index 33a6dfc3bff5c..b63400916250e 100644
--- a/bin/kenv/Makefile
+++ b/bin/kenv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $
 
 PROG=	kenv
 
diff --git a/bin/kenv/kenv.1 b/bin/kenv/kenv.1
index 29260f0bd670f..7ccd1fce22ca7 100644
--- a/bin/kenv/kenv.1
+++ b/bin/kenv/kenv.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $
 .\"
 .Dd September 13, 2005
 .Dt KENV 1
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index dc86ba8200a90..fb3617ca44d1b 100644
--- a/bin/kenv/kenv.c
+++ b/bin/kenv/kenv.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.8 2005/09/13 19:01:53 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 55ef16dfce2c9..47b2d5b934424 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/kill/Makefile,v 1.8 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index c666ef59416dd..856f74dd54b0f 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/kill/kill.1,v 1.21 2007/03/04 09:15:12 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index bb9982e33b51f..76da199e9f0ab 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.20 2005/01/10 08:39:23 imp Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index b541f8bd3be09..072ec41ac051d 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ln/Makefile,v 1.11 2001/12/04 01:57:44 obrien Exp $
 
 PROG=	ln
 MAN=	ln.1 symlink.7
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 4c17dc153e20b..2219c1e94c011 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $
 .\"
 .Dd February 14, 2006
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 76c743ee4a819..1ed1f6e626c4d 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index d2e8cbb25e4d2..726f583809ac5 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.30 2005/02/13 22:25:09 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 2af1203b1d384..7c835b253d485 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/bin/ls/Makefile,v 1.26 2004/05/25 14:53:47 pjd Exp $
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index badd108674656..f9d008655f9ad 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.18 2006/03/24 16:38:02 jhb Exp $");
 
 
 #include <sys/types.h>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index f290fbbe7e05c..f6e674bb7191d 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/extern.h,v 1.25 2006/03/24 16:38:02 jhb Exp $
  */
 
 int	 acccmp(const FTSENT *, const FTSENT *);
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 66d868759af61..086ec6f1a10c7 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $
 .\"
 .Dd October 12, 2006
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index e9a6e652dd77a..f796cd80cb92b 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index 4d12b22b2360b..8a7537c32b5c3 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 6578b93aff7a7..6fd48f67f7f1f 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 62fa75adf8077..ebed01d96e349 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index fadc6b294ef72..943526cce4564 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/mkdir/Makefile,v 1.9 2005/01/26 06:48:17 ssouhlal Exp $
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 0f8d812f1da9b..25d97b6960e16 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.23 2006/12/27 11:28:00 ru Exp $
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 5fa002fb70077..cf3f3254befbd 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 840578276d5a3..1530f6169c761 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/bin/mv/Makefile,v 1.8 2001/12/04 01:57:45 obrien Exp $
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 9e4d9ee0d4bda..c204777f6e1d3 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.29.2.1 2007/11/14 19:25:04 ru Exp $
 .\"
 .Dd May 12, 2007
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 54c035da69226..77fa26c2f356e 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index de76e6cf07545..9923ee714ac46 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pax/Makefile,v 1.12 2004/05/14 13:31:19 cognet Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 0946a8884c5f7..353ca303bada2 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index da275c2dacb0a..b44d79ce4f31e 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 1d01d4e5090a0..1e422ddfd5ecf 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/buf_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 358707d362c30..c07192e675199 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/cache.c,v 1.21 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 36d59ca7b12cb..9d0ddcba0df5b 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cache.h,v 1.9 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1
index 7ff1881229eb2..c7ecf66b3e7b0 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: cpio.1,v 1.16 2001/05/01 17:58:01 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/cpio.1,v 1.6 2005/02/09 18:02:29 ru Exp $
 .\"
 .Dd February 16, 1997
 .Dt CPIO 1
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 67602fa87455e..2e9434b73b614 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.24 2006/11/27 22:17:11 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 2f4c37cb688a9..66d3d0d583488 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/cpio.h,v 1.7 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index e7167928e2f91..f6168cc418767 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/extern.h,v 1.16 2005/01/12 03:25:55 brian Exp $
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index cda118041c671..d75c246bd98bf 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index f402c568ddfa0..2a5a8ff24b89d 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 4538977754e47..fe18dcee9abea 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/ftree.h,v 1.7 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index ce2041985a1d2..7db1d3b6829ed 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 1c9f63cfb61d3..96b97c3500bcc 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.5 2005/01/10 08:39:24 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 6f43940d1e47c..c366aa0eedcbb 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.31 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/options.h b/bin/pax/options.h
index 948e012671e8f..86351e859c968 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/options.h,v 1.6 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 83e07dd31fa68..07eb00a689cb5 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index 0eedd679caaec..3254583150532 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pat_rep.h,v 1.6 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 373ec9baa9dec..a4dbfbf3895b1 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.37 2006/09/17 17:40:06 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index cb19b99b175ee..e043aa2628b52 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index c80ae7e0e11dc..e4a6b1912d286 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/pax.h,v 1.18 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 87fba2ff0082b..6505129ef1730 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index eed4641a17d59..32c07b7df4aa1 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/sel_subs.h,v 1.6 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 4e96fea62313a..cd7c667442b91 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index ba59f913e7ab6..9d0c5d8d72dfd 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tables.h,v 1.10 2004/04/06 20:06:48 markm Exp $
  */
 
 /*
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index ff66ccbefa57f..955529bd49beb 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pax/tar.1,v 1.11 2005/02/13 22:25:09 ru Exp $
 .\"
 .Dd February 7, 2001
 .Dt TAR 1
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index ab5bd3b12ad54..833cfa0533858 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.25 2006/11/27 22:17:11 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 856e26c8336ae..ae767ba2a3e0d 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/pax/tar.h,v 1.7 2004/04/06 20:06:49 markm Exp $
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index b3d140eb41ccb..b6e22d5d88ad1 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pax/tty_subs.c,v 1.20 2004/04/06 20:06:49 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index 9be197933ee84..11af373553b78 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/ps/Makefile,v 1.27 2005/01/27 13:42:40 delphij Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 08b6d9bce630e..526ace98bf414 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 1e9fed8710f07..26ba3dc1868e3 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.34 2004/06/22 02:18:29 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index b7a887bcb88bd..a812876946c9a 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index f5e600b839597..b2fe0cffa92f4 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.21 2004/04/06 20:06:49 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 29dffb65d2d44..3ada4bd37bcc0 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index f3db636c38921..8d61e100fc489 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $
 .\"
 .Dd August 21, 2006
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 8013026732936..ddc982b47e7e0 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111.2.1 2007/11/15 15:56:59 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 03adc0a35c181..8018011064765 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/ps/ps.h,v 1.19 2004/06/23 23:48:09 gad Exp $
  */
 
 #include <sys/queue.h>
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4a8e66ac8320d..aa2f8e79cc9b2 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/pwd/Makefile,v 1.11 2002/02/11 18:38:54 mike Exp $
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 2b687a5e3b7fb..4363e31bde141 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.26 2005/01/16 16:41:58 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 4baf3aa9e3be5..4fb2a002424cf 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.25 2005/02/09 17:37:38 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 1c156a236d114..26744d32d1711 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rcp/Makefile,v 1.23 2004/11/03 18:01:18 ru Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index db69959234a5d..62e55b874f67d 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/rcp/extern.h,v 1.9 2004/04/06 20:06:50 markm Exp $
  */
 
 typedef struct {
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index f3c3a8edd3341..915abb1f53f32 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.22 2007/02/27 11:25:58 ru Exp $
 .\"
 .Dd October 16, 2002
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 62d7dafd33060..886f370c1ef9d 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.46 2007/05/22 04:21:00 cperciva Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 3296fe0cbe96c..c016c8d203c23 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rcp/util.c,v 1.17 2004/04/06 20:06:50 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile
index acf62c76cb3a5..ce3d8ae718f5f 100644
--- a/bin/realpath/Makefile
+++ b/bin/realpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/realpath/Makefile,v 1.1 2002/02/11 07:32:17 mike Exp $
 
 PROG=	realpath
 
diff --git a/bin/realpath/realpath.1 b/bin/realpath/realpath.1
index 3b395456ce1a9..fef2f00240de6 100644
--- a/bin/realpath/realpath.1
+++ b/bin/realpath/realpath.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index b0a2c9e353498..5fe90de3b5815 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $");
 
 #include <sys/param.h>
 
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 7058fa06c98d1..ff2f4a529004c 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rm/Makefile,v 1.18 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	rm
 
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 9df8458cbfc90..257fa02311901 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.43 2006/12/26 13:57:40 ru Exp $
 .\"
 .Dd December 26, 2006
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 25a984e7e5c4b..77aa83a9fdd34 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rm.c	8.5 (Berkeley) 4/18/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index bf65d1c1a5077..9782497d091c9 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmail/Makefile,v 1.22 2005/06/10 06:12:49 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index c2c7f301ce492..e596b0a84c08f 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/rmdir/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 688d1445e8ef6..8987d04acc391 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.15 2006/12/27 12:14:56 ru Exp $
 .\"
 .Dd March 21, 2004
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index f81aaab04d6b0..064461e42c7a2 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.20 2005/01/26 06:51:28 ssouhlal Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
index 3f6b78e54e111..eb060104491a0 100644
--- a/bin/setfacl/Makefile
+++ b/bin/setfacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/setfacl/Makefile,v 1.8 2004/06/13 19:22:53 obrien Exp $
 
 PROG=	setfacl
 SRCS=	file.c mask.c merge.c remove.c setfacl.c util.c
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
index 5996d55daf600..dbd80ef6ae8d8 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/file.c,v 1.5 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index b275893b1f549..fa34c6e1641de 100644
--- a/bin/setfacl/mask.c
+++ b/bin/setfacl/mask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.8 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index 9f1b5dd48f457..0225267ec7163 100644
--- a/bin/setfacl/merge.c
+++ b/bin/setfacl/merge.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.8 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index 23240554a341b..fe6352a3f92b0 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.6 2005/01/10 08:39:25 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 2e409a4b67cb8..8cf66a8c12890 100644
--- a/bin/setfacl/setfacl.1
+++ b/bin/setfacl/setfacl.1
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index b86dbb1eac755..8b92d206defff 100644
--- a/bin/setfacl/setfacl.c
+++ b/bin/setfacl/setfacl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/bin/setfacl/setfacl.h b/bin/setfacl/setfacl.h
index bdf052ba0a810..e8a83e859a2ef 100644
--- a/bin/setfacl/setfacl.h
+++ b/bin/setfacl/setfacl.h
@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.5 2005/01/10 08:39:25 imp Exp $
  */
 
 #ifndef _SETFACL_H
diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c
index 46b9abb6ff6b4..559409842e672 100644
--- a/bin/setfacl/util.c
+++ b/bin/setfacl/util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.6 2005/01/10 08:39:25 imp Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 9baa955ef0e6e..934f6229ac59e 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/Makefile,v 1.46 2006/04/17 17:55:11 schweikh Exp $
 
 PROG=	sh
 INSTALLFLAGS= -S
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index af2773a4b9732..cb7b88567afa4 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/TOUR,v 1.7 2006/04/16 11:54:01 schweikh Exp $
 
 NOTE -- This is the original TOUR paper distributed with ash and
 does not represent the current state of the shell.  It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 83cc9d48ef317..7983a3e949003 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.20 2005/09/02 22:43:28 stefanf Exp $");
 
 #include <stdlib.h>
 #include "shell.h"
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index a6bd23d79cafd..2cd73409a7693 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/alias.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index ed5773bdc399d..ac443960f32a8 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.h,v 1.11 2005/08/13 07:59:46 stefanf Exp $
  */
 
 extern char *arith_buf, *arith_startbuf;
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index 391cc1618cc23..f89c47372d7f4 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.21 2005/08/13 07:59:46 stefanf Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index f0ed3d5861774..0eb96ba8e7ecd 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $");
 
 #include <string.h>
 
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index c4bf8b64c377f..6fd425f5feeb4 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.14 2005/08/13 15:04:30 stefanf Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 83f233704fd2a..6f9eeee089ac5 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.15 2005/01/10 08:39:25 imp Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 457a4c7aefc8d..5a07a0d12ce64 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.14 2004/04/06 20:06:53 markm Exp $");
 
 /*
  * Echo command.
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index 75f83b54e526b..3c87e0d900059 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.19 2006/04/02 18:43:33 stefanf Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index d52c9b8132f90..667393957c9a9 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 0a2d48999e7ba..618236c810ba3 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/cd.h,v 1.7 2004/04/06 20:06:51 markm Exp $
  */
 
 char	*getpwd(void);
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 0c981a3eff925..1cdc7a72e08fe 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $");
 
 /*
  * Errors and exceptions.
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 4611821644ddb..608ecec01f6f0 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 7ceaa9484fb11..0cde2452e10a5 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 01c914acf8806..f2a1fc2db29d7 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/eval.h,v 1.11 2005/12/04 18:44:21 stefanf Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index cf78eb2955b5b..5a8438f017180 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.31 2007/01/18 22:31:22 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 9f81a6a43dfd4..d10fffca932e5 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/exec.h,v 1.15 2006/04/09 12:21:20 stefanf Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 93df92dcf7dad..2846833166793 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.51 2006/11/07 22:46:13 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 2b895193d57a5..eefdf5538b5c1 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/expand.h,v 1.12 2004/04/06 20:06:51 markm Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 2b92c60ce2170..94cf810d03f65 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index 95f6857dce4c0..53c3fb79543d9 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index 16f0c9b9a95fd..617270abf4977 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # Convert job names to process ids and then run /bin/kill.
 
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index 68802a06d9f81..e28639eb44a74 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # replaces the login builtin in the BSD shell
 login () exec login "$@"
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index 57ac1cec4cf40..845e30706941c 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -32,6 +32,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index bc1cd5c8fefe7..98b8d9fc0bb80 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index 9e31f2a20f8df..38b8e4b1ba5c0 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index 81bb53d35edfc..15b57c02f9706 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 0bea2b8a37c83..3579d9e7a05c2 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.29 2006/08/04 07:56:31 yar Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 1ec8343747800..83dd62fa65a78 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/init.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 void init(void);
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 81c1f0b77cc9e..553bc4d0524c6 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.23 2006/04/29 10:29:10 stefanf Exp $");
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 0d188c5850dcc..0dd8167a72ef2 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/input.h,v 1.9 2004/04/06 20:06:51 markm Exp $
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index be9acab565a48..50a064c75720a 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index c75c35355121b..21ff2c7526ae9 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index fe03a730bce2d..14140ece32cad 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.14 2005/08/13 08:26:58 stefanf Exp $");
 
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index f88324c628bdb..bc4c1de03b24d 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mail.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 void chkmail(int);
diff --git a/bin/sh/main.c b/bin/sh/main.c
index e77ff4e1a95d9..84565ffdcb28f 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.29 2006/10/07 16:51:16 stefanf Exp $");
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index 7f8c3940b6024..4c707e0dface5 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/main.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 115eea03df7bc..f0a98cb0afbc8 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.27 2005/10/28 10:45:19 stefanf Exp $");
 
 #include <sys/param.h>
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index 347544211f51b..28a7e758fd21a 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.10 2005/10/28 10:45:19 stefanf Exp $
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 4ca4fcdc6d8de..5fbecdefe1d76 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.35 2006/02/04 14:37:50 schweikh Exp $");
 
 /*
  * Miscellaneous builtins.
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index 7b77649de4154..87a18642f540f 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.16 2006/04/02 18:43:33 stefanf Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index b158b5f6f7450..5db3563d34e94 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mkinit.c,v 1.18 2005/08/13 08:38:02 stefanf Exp $");
 
 /*
  * This program scans all the source files for code to handle various
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 53086bd44ac81..ac95f25f85906 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.17 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * This program reads the nodetypes file and nodes.c.pat file.  It generates
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 6966ae058987b..3aa0ef8fb7766 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index bdc873e444073..6ac5cc16842f0 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.10 2005/01/10 08:39:25 imp Exp $
 
 # The following is a list of tokens.  The second column is nonzero if the
 # token marks the end of a list.  The third column is the name to print in
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index 5d96587cdba22..c755798977ea2 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.10 2004/04/06 20:06:51 markm Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 6eaacb35dc9b8..37bf6d77e2ae3 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mystring.c,v 1.13 2004/04/06 20:06:51 markm Exp $");
 
 /*
  * String functions.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 1b27a1b008a80..2998c6b843577 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mystring.h,v 1.8 2004/04/06 20:06:51 markm Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 10dab26d2ac8c..4bc1747af5a60 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.15 2004/04/06 20:06:51 markm Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index e1e1b04c3286a..84ab90e24f437 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/nodetypes,v 1.10 2005/01/10 08:39:25 imp Exp $
 
 # This file describes the nodes used in parse trees.  Unindented lines
 # contain a node type followed by a structure tag.  Subsequent indented
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 58c5c7bbc2d7c..25977ef1bbce3 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 3b827d16016df..6adf22a665db7 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/options.h,v 1.13 2004/04/06 20:06:51 markm Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index b59e11e0e8703..e43040643d939 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.20 2005/12/08 21:00:39 stefanf Exp $");
 
 /*
  * Shell output routines.  We use our own output routines because:
diff --git a/bin/sh/output.h b/bin/sh/output.h
index bafd8687b1590..dc02c57410d40 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/output.h,v 1.13 2004/04/06 20:06:51 markm Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index fb9abc9ff4c78..22a624de097e7 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 6b5687d9d71cc..f473dba5e15ac 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index bc18975c0e939..d0b442fdc4803 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index ad44c4eddd8c8..e2bb74f99b4d8 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/redir.h,v 1.10 2004/04/06 20:06:51 markm Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 426504f0d6341..3d0a7d9c3ba34 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.125.2.1 2007/12/05 14:29:07 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 58a25feb53cf7..80190ca567d71 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/shell.h,v 1.17 2004/04/06 20:06:51 markm Exp $
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index baae549c42954..9b2a08824f718 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.23 2006/04/14 13:59:03 schweikh Exp $");
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 83f84afcc8af8..6f8d398ccdf5e 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/show.h,v 1.11 2004/04/06 20:06:51 markm Exp $
  */
 
 void showtree(union node *);
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 16ef0aab6fe14..1c002b1ea2180 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.32 2006/04/17 17:55:11 schweikh Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index ccc1ffd4f4d16..35069cfd3d414 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/trap.h,v 1.12 2004/04/06 20:06:51 markm Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 6f7c578499ec9..8cce9c1df93b1 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index c1f994b8cb8d3..88d7e0a2bb6ed 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/var.h,v 1.14 2006/06/15 07:00:49 stefanf Exp $
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 4ff73308c45b6..c05223b94e123 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sleep/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index bc56dbf6471ba..f5215be1b4da3 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.22 2005/01/16 16:41:59 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index f38b183cb2bfe..0ca1b5a36f8b2 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.20 2005/08/07 09:11:38 stefanf Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index 82b15eb7fcae5..263322db07fdb 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/stty/Makefile,v 1.8 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 37617ce83a8d5..252a543396c79 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/cchar.c,v 1.14 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 8d0657cd0a9f0..2949b887415f6 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/extern.h,v 1.10 2004/04/06 20:06:53 markm Exp $
  */
 
 int	c_cchars(const void *, const void *);
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index c35a6fc4604db..932005da051d2 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/gfmt.c,v 1.20 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 413f4d58dfa9b..007f81654aefe 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.20 2004/11/06 13:56:18 ache Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index e72e2dfc3ea58..1236233e42b87 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/modes.c,v 1.13 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index cf24d4f46529a..5fa9ea0858bc2 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.20 2005/05/26 06:57:57 ache Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index f1f0107bdae75..f8f5219d1fd4f 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.33 2005/02/09 17:37:39 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index f6daaf076ad86..84a8389527bbc 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.23 2005/02/09 17:37:39 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 77b85225f6cb4..64810bf6b67a2 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/bin/stty/stty.h,v 1.9 2004/04/06 20:06:53 markm Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index 5a4f0cfa47d07..6f9c0c76cdf99 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/stty/util.c,v 1.11 2004/04/06 20:06:53 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 72c664f4afdd0..1e24647e9b8b4 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sync/Makefile,v 1.10 2001/12/04 01:57:46 obrien Exp $
 
 PROG=	sync
 MAN=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index cc53e1ae1eb2a..1b2a412f0579f 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sync/sync.8,v 1.16 2005/01/10 08:39:26 imp Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index d360245973dea..2d68997707f97 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sync/sync.c,v 1.16 2005/01/10 08:39:26 imp Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index 7c64b40347eff..11301f60d03cf 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/Makefile,v 1.10 2003/09/07 12:52:17 ru Exp $
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index 4fe3524876053..baeefb6f108e4 100644
--- a/bin/test/TEST.README
+++ b/bin/test/TEST.README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.README,v 1.5 2004/06/16 12:57:31 maxim Exp $
 
 OS/shell			syntax error	failed
 --------------------------------------------------------------------
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index afa1c91f158a2..f3e0237926d10 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.csh,v 1.6 1999/08/27 23:15:47 peter Exp $
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh
index bf7f3fdbd14be..754d1672868f2 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -28,7 +28,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD$
+# $FreeBSD: src/bin/test/TEST.sh,v 1.8 2005/01/10 08:39:26 imp Exp $
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
diff --git a/bin/test/test.1 b/bin/test/test.1
index 91b95c7314fd3..a75d6abceee61 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $
 .\"
 .Dd July 31, 2006
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index 35a0cf8d3e4a6..9cf4037600b71 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.53 2005/01/10 08:39:26 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/cddl/Makefile b/cddl/Makefile
index 801d9cffa0159..9aec2a3ba0501 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
 
 SUBDIR=	lib sbin usr.bin usr.sbin
 
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index bf5804e1978c2..7acd007caa0b3 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
 
 CFLAGS+= -D_SOLARIS_C_SOURCE
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 522dda7331f41..29991e984d3b7 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc
index d97f1abf584c7..e769637325905 100644
--- a/cddl/lib/Makefile.inc
+++ b/cddl/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
 
 SHLIBDIR?= /lib
 SHLIB_MAJOR?= 1
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index 2fd2262099dc2..ce6464479afea 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
 
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
 
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 57ced0609663b..bc189c4d501b7 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index ba033011ec75a..6831a9e6a9723 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
 
 .PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
 
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 5fc4a261683e6..ba21cd3415f44 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index a8f2c01f8e039..937e290944e34 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../compat/opensolaris/misc
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index f086b6d02b1d2..83d56e486babf 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $
 
 .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
 
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index f74307c5fd6a2..803fc0a0d5f24 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/sbin/Makefile.inc b/cddl/sbin/Makefile.inc
index c5111d5cb2860..91764fefae565 100644
--- a/cddl/sbin/Makefile.inc
+++ b/cddl/sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/Makefile.inc,v 1.1 2007/04/06 01:08:57 pjd Exp $
 
 BINDIR?=	/sbin
 
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index f6065c9ea3332..463f843f799bc 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index f2739c2baecd6..39b50d7d18500 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 439a2c9c78184..84bbb7d5c284e 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc
index 4cec6fe01a452..d0d49bbc2a29c 100644
--- a/cddl/usr.bin/Makefile.inc
+++ b/cddl/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1 2007/04/06 01:08:58 pjd Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 49502ab46cc85..b0c6fedc739d2 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 913e2ae35b7b5..052c9d061ad46 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/usr.sbin/Makefile.inc b/cddl/usr.sbin/Makefile.inc
index 282198ea8d8c4..1f96ca55498ed 100644
--- a/cddl/usr.sbin/Makefile.inc
+++ b/cddl/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/Makefile.inc,v 1.1 2007/04/06 01:08:58 pjd Exp $
 
 BINDIR?=	/usr/sbin
 
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 72b9b306a8b12..924b8897e3811 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
diff --git a/compat/opensolaris/include/fsshare.h b/compat/opensolaris/include/fsshare.h
index 11a8dbf0b04de..c668489ef1a6f 100644
--- a/compat/opensolaris/include/fsshare.h
+++ b/compat/opensolaris/include/fsshare.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/compat/opensolaris/include/fsshare.h,v 1.1 2007/04/06 01:08:58 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_FSSHARE_H_
diff --git a/compat/opensolaris/misc/deviceid.c b/compat/opensolaris/misc/deviceid.c
index f37b1d6d3563e..ba034e2f8af70 100644
--- a/compat/opensolaris/misc/deviceid.c
+++ b/compat/opensolaris/misc/deviceid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/compat/opensolaris/misc/deviceid.c,v 1.1 2007/05/06 01:39:38 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/compat/opensolaris/misc/fsshare.c b/compat/opensolaris/misc/fsshare.c
index ca82710a34113..f2f13855ceb6f 100644
--- a/compat/opensolaris/misc/fsshare.c
+++ b/compat/opensolaris/misc/fsshare.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $");
 
 #include <sys/param.h>
 #include <stdio.h>
diff --git a/compat/opensolaris/misc/mnttab.c b/compat/opensolaris/misc/mnttab.c
index c1971caf36415..9389ac0f39f27 100644
--- a/compat/opensolaris/misc/mnttab.c
+++ b/compat/opensolaris/misc/mnttab.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/compat/opensolaris/misc/zmount.c b/compat/opensolaris/misc/zmount.c
index d80a3b3be478c..3067792e4eb62 100644
--- a/compat/opensolaris/misc/zmount.c
+++ b/compat/opensolaris/misc/zmount.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/compat/opensolaris/misc/zmount.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/compat/opensolaris/misc/zone.c b/compat/opensolaris/misc/zone.c
index 1ce77cf5926ec..56dbb576de400 100644
--- a/compat/opensolaris/misc/zone.c
+++ b/compat/opensolaris/misc/zone.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/compat/opensolaris/misc/zone.c,v 1.1 2007/04/06 01:08:59 pjd Exp $
  */
 
 #include <stdlib.h>
diff --git a/contrib/amd/FREEBSD-Xlist b/contrib/amd/FREEBSD-Xlist
index 474cf53b7d695..dfadcf44bd342 100644
--- a/contrib/amd/FREEBSD-Xlist
+++ b/contrib/amd/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $
 *LSM.am-utils
 *Makefile.*
 *README.autofs
diff --git a/contrib/amd/FREEBSD-upgrade b/contrib/amd/FREEBSD-upgrade
index a8e6d531c7aef..cafb1f6af39dd 100644
--- a/contrib/amd/FREEBSD-upgrade
+++ b/contrib/amd/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $
 
 AMD (am-utils) 6.0.9
     originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index 54b02fd08307e..b2efa7cd3b668 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.22 2005/09/02 11:09:18 jcamou Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index f724bd833f121..fc6b3d5d91e86 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amd.c,v 1.8.2.6 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/amd.c,v 1.10 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/amq_subr.c b/contrib/amd/amd/amq_subr.c
index a5c7f247c68eb..49e733bc8ac50 100644
--- a/contrib/amd/amd/amq_subr.c
+++ b/contrib/amd/amd/amq_subr.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: amq_subr.c,v 1.6.2.6 2004/01/19 00:25:55 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/amq_subr.c,v 1.8 2004/07/06 13:16:44 mbr Exp $
  *
  */
 /*
diff --git a/contrib/amd/amd/get_args.c b/contrib/amd/amd/get_args.c
index e5c3edf09359e..a278309322c80 100644
--- a/contrib/amd/amd/get_args.c
+++ b/contrib/amd/amd/get_args.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: get_args.c,v 1.7.2.6 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/get_args.c,v 1.8 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/nfs_prot_svc.c b/contrib/amd/amd/nfs_prot_svc.c
index 8d67d1bc14cbd..58602a25061d1 100644
--- a/contrib/amd/amd/nfs_prot_svc.c
+++ b/contrib/amd/amd/nfs_prot_svc.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_svc.c,v 1.5.2.6 2004/01/21 04:04:58 ib42 Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/nfs_prot_svc.c,v 1.2 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/ops_pcfs.c b/contrib/amd/amd/ops_pcfs.c
index 5552c4302cd1b..224d386cc3093 100644
--- a/contrib/amd/amd/ops_pcfs.c
+++ b/contrib/amd/amd/ops_pcfs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: ops_pcfs.c,v 1.3.2.5 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/ops_pcfs.c,v 1.2 2004/07/06 13:44:14 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amd/srvr_nfs.c b/contrib/amd/amd/srvr_nfs.c
index 67d1724707fbc..749b3c0ea990c 100644
--- a/contrib/amd/amd/srvr_nfs.c
+++ b/contrib/amd/amd/srvr_nfs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: srvr_nfs.c,v 1.7.2.11 2004/01/06 03:15:16 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/amd/srvr_nfs.c,v 1.7 2004/07/06 13:16:44 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8
index cd023a10d92b2..e7088cecdba21 100644
--- a/contrib/amd/amq/amq.8
+++ b/contrib/amd/amq/amq.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c
index d9828ac742212..36e6ef4517ef7 100644
--- a/contrib/amd/amq/amq.c
+++ b/contrib/amd/amq/amq.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/amd/amq/amq.c,v 1.9 2004/07/06 13:16:44 mbr Exp $");
 
 /*
  * Automounter query tool
diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1
index 954bbab47d703..a316b7d5bf5ce 100644
--- a/contrib/amd/amq/pawd.1
+++ b/contrib/amd/amq/pawd.1
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: pawd.1,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.7 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd January 6, 1998
 .Dt PAWD 1
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
index 24bc9b37fe4e7..aa11ef5a140ff 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_freebsd2.h,v 1.3.2.4 2004/01/06 03:15:19 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h,v 1.7 2004/07/06 13:16:45 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
index 27c535db11fa0..1fdcc11375551 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.13 2004/07/06 13:16:45 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/conf/trap/trap_default.h b/contrib/amd/conf/trap/trap_default.h
index f671c419959e2..1ba1b5930305c 100644
--- a/contrib/amd/conf/trap/trap_default.h
+++ b/contrib/amd/conf/trap/trap_default.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/amd/conf/trap/trap_default.h,v 1.3 2004/07/06 14:14:26 mbr Exp $ */
 /* $srcdir/conf/trap/trap_default.h */
 #define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data)
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8
index b4ecb60ee42c7..89809812615bc 100644
--- a/contrib/amd/fixmount/fixmount.8
+++ b/contrib/amd/fixmount/fixmount.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: fixmount.8,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.13 2006/04/18 03:33:17 delphij Exp $
 .\"
 .Dd February 26, 1993
 .Dt FIXMOUNT 8
diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c
index 3e0078620a4a9..5be0aa596b8ad 100644
--- a/contrib/amd/fixmount/fixmount.c
+++ b/contrib/amd/fixmount/fixmount.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: fixmount.c,v 1.5.2.4 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/fixmount/fixmount.c,v 1.8 2004/07/06 13:16:46 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8
index 815ec7db4670e..e9ec09c56c944 100644
--- a/contrib/amd/fsinfo/fsinfo.8
+++ b/contrib/amd/fsinfo/fsinfo.8
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.12 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c
index 21f8038280075..6f5cc3530de86 100644
--- a/contrib/amd/fsinfo/fsinfo.c
+++ b/contrib/amd/fsinfo/fsinfo.c
@@ -38,7 +38,7 @@
  *
  *
  * $Id: fsinfo.c,v 1.5.2.7 2004/05/12 15:54:31 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/fsinfo/fsinfo.c,v 1.6 2004/07/06 13:16:46 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8
index 9ef049f49b3bb..113eae08448cc 100644
--- a/contrib/amd/hlfsd/hlfsd.8
+++ b/contrib/amd/hlfsd/hlfsd.8
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hlfsd.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/hlfsd/hlfsd.8,v 1.15 2005/06/16 20:21:02 ru Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c
index 17ee61f43b9b5..5c98f701c3946 100644
--- a/contrib/amd/hlfsd/hlfsd.c
+++ b/contrib/amd/hlfsd/hlfsd.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: hlfsd.c,v 1.7.2.9 2004/01/19 00:25:55 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.c,v 1.8 2004/07/06 13:16:46 mbr Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/hlfsd/hlfsd.h b/contrib/amd/hlfsd/hlfsd.h
index 2334d1b14d278..b238a66ffc24f 100644
--- a/contrib/amd/hlfsd/hlfsd.h
+++ b/contrib/amd/hlfsd/hlfsd.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.5 2007/04/06 15:51:35 kan Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/hlfsd/homedir.c b/contrib/amd/hlfsd/homedir.c
index eef883a8fd9e8..f1fc1e3328a52 100644
--- a/contrib/amd/hlfsd/homedir.c
+++ b/contrib/amd/hlfsd/homedir.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: homedir.c,v 1.5.2.11 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/hlfsd/homedir.c,v 1.7 2004/07/06 13:16:46 mbr Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@cs.columbia.edu>
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index 19d2a3bc415e2..d980361470191 100644
--- a/contrib/amd/include/am_defs.h
+++ b/contrib/amd/include/am_defs.h
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: am_defs.h,v 1.15.2.16 2004/05/12 15:54:31 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/include/am_defs.h,v 1.14 2004/07/06 13:16:46 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c
index e134c901ce621..05cd7758561b7 100644
--- a/contrib/amd/libamu/mount_fs.c
+++ b/contrib/amd/libamu/mount_fs.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: mount_fs.c,v 1.11.2.12 2004/01/06 03:15:24 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/libamu/mount_fs.c,v 1.7 2004/07/06 13:16:47 mbr Exp $
  *
  */
 
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8
index fef0e749ed43f..5f2b2202997df 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.8
+++ b/contrib/amd/mk-amd-map/mk-amd-map.8
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)mk-amd-map.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: mk-amd-map.8,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.8,v 1.7 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd June 28, 1993
 .Dt MK-AMD-MAP 8
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c
index d72850eeba946..6014dfe6a17b1 100644
--- a/contrib/amd/mk-amd-map/mk-amd-map.c
+++ b/contrib/amd/mk-amd-map/mk-amd-map.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: mk-amd-map.c,v 1.5.2.6 2004/01/06 03:15:25 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/mk-amd-map/mk-amd-map.c,v 1.10 2004/07/06 13:16:49 mbr Exp $
  */
 
 /*
diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5
index fe6858245891a..b49ac76c40397 100644
--- a/contrib/amd/scripts/amd.conf.5
+++ b/contrib/amd/scripts/amd.conf.5
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.conf.5,v 1.7.2.10 2004/01/21 04:04:58 ib42 Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.18 2005/07/28 13:03:19 keramida Exp $
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
diff --git a/contrib/amd/wire-test/wire-test.8 b/contrib/amd/wire-test/wire-test.8
index 2c6a37cead419..f214b5a2c7986 100644
--- a/contrib/amd/wire-test/wire-test.8
+++ b/contrib/amd/wire-test/wire-test.8
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: wire-test.8,v 1.3.2.5 2004/01/06 03:15:25 ezk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/amd/wire-test/wire-test.8,v 1.6 2005/06/16 20:21:03 ru Exp $
 .\"
 .Dd February 26, 1993
 .Dt WIRE-TEST 8
diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c
index 593cf45387868..2f5ee1603509e 100644
--- a/contrib/amd/wire-test/wire-test.c
+++ b/contrib/amd/wire-test/wire-test.c
@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: wire-test.c,v 1.5.2.4 2004/01/06 03:15:25 ezk Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/amd/wire-test/wire-test.c,v 1.8 2004/07/06 13:16:49 mbr Exp $
  *
  */
 
diff --git a/contrib/bc/FREEBSD-upgrade b/contrib/bc/FREEBSD-upgrade
index 0174d7bbbe922..ffbc18ec5c593 100644
--- a/contrib/bc/FREEBSD-upgrade
+++ b/contrib/bc/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bc/FREEBSD-upgrade,v 1.6 2004/02/17 01:04:18 ache Exp $
 
 bc 1.0.5a
 	originals can be found at: ftp://prep.ai.mit.edu/pub/gnu/
diff --git a/contrib/bc/bc/main.c b/contrib/bc/bc/main.c
index 8ac2981ad719e..d806b5467d074 100644
--- a/contrib/bc/bc/main.c
+++ b/contrib/bc/bc/main.c
@@ -26,7 +26,7 @@
                 Western Washington University
                 Bellingham, WA 98226-9062
 
-$FreeBSD$
+$FreeBSD: src/contrib/bc/bc/main.c,v 1.8 2006/01/24 06:38:35 brooks Exp $
        
 *************************************************************************/
 
diff --git a/contrib/bc/bc/scan.l b/contrib/bc/bc/scan.l
index 8910c66f4c8a2..88c9ae1099764 100644
--- a/contrib/bc/bc/scan.l
+++ b/contrib/bc/bc/scan.l
@@ -1,5 +1,5 @@
 %{
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/bc/bc/scan.l,v 1.6 2001/04/11 04:07:38 ache Exp $ */
 /* scan.l: the (f)lex description file for the scanner. */
 
 /*  This file is part of GNU bc.
diff --git a/contrib/bc/doc/bc.1 b/contrib/bc/doc/bc.1
index bb19594421f25..0b34d15b722cc 100644
--- a/contrib/bc/doc/bc.1
+++ b/contrib/bc/doc/bc.1
@@ -27,7 +27,7 @@
 .\" Western Washington University
 .\" Bellingham, WA 98226-9062
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bc/doc/bc.1,v 1.6 2001/07/12 07:35:06 ru Exp $
 .\"
 .TH bc 1 .\" "Command Manual" v1.06 "Sept 12, 2000"
 .SH NAME
diff --git a/contrib/bc/doc/dc.1 b/contrib/bc/doc/dc.1
index adaf5d0cc0581..d294d062b6ed4 100644
--- a/contrib/bc/doc/dc.1
+++ b/contrib/bc/doc/dc.1
@@ -20,7 +20,7 @@
 .\"   59 Temple Place, Suite 330
 .\"   Boston, MA 02111 USA
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/bc/doc/dc.1,v 1.4 2001/02/26 07:17:03 kris Exp $
 .\"
 .TH DC 1 "1997-03-25" "GNU Project"
 .ds dc \fIdc\fP
diff --git a/contrib/bind9/FREEBSD-Upgrade b/contrib/bind9/FREEBSD-Upgrade
index 75efb09f1e621..11957cd0a8389 100644
--- a/contrib/bind9/FREEBSD-Upgrade
+++ b/contrib/bind9/FREEBSD-Upgrade
@@ -117,4 +117,4 @@ C) Commit when everything builds cleanly and works properly.
 					-- des@FreeBSD.org
 					-- dougb@FreeBSD.org
 
-$FreeBSD$
+$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.9 2007/06/02 23:32:13 dougb Exp $
diff --git a/contrib/bind9/FREEBSD-Xlist b/contrib/bind9/FREEBSD-Xlist
index f4239557b3ae7..7f7d20605c214 100644
--- a/contrib/bind9/FREEBSD-Xlist
+++ b/contrib/bind9/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bind9/FREEBSD-Xlist,v 1.4 2005/12/29 04:41:09 dougb Exp $
 
 # Misc. stuff
 .cvsignore
diff --git a/contrib/bind9/lib/isc/alpha/include/isc/atomic.h b/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
index a4b9b15a02ea5..4c93ca911b2a6 100644
--- a/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
+++ b/contrib/bind9/lib/isc/alpha/include/isc/atomic.h
@@ -46,7 +46,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h,v 1.1.1.1 2007/06/02 23:21:43 dougb Exp $
  */
 
 #ifndef ISC_ATOMIC_H
diff --git a/contrib/bind9/lib/isc/arm/include/isc/atomic.h b/contrib/bind9/lib/isc/arm/include/isc/atomic.h
index 4c519ee815c55..106ebb0678d28 100644
--- a/contrib/bind9/lib/isc/arm/include/isc/atomic.h
+++ b/contrib/bind9/lib/isc/arm/include/isc/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.1.2.1 2007/12/07 08:31:17 dougb Exp $
  */
 
 #ifndef ISC_ATOMIC_H
diff --git a/contrib/bind9/lib/isc/include/isc/sha2.h b/contrib/bind9/lib/isc/include/isc/sha2.h
index e54c620600422..61bea5240f541 100644
--- a/contrib/bind9/lib/isc/include/isc/sha2.h
+++ b/contrib/bind9/lib/isc/include/isc/sha2.h
@@ -16,7 +16,7 @@
 
 /* $Id: sha2.h,v 1.2.2.6 2006/08/16 03:18:14 marka Exp $ */
 
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/bind9/lib/isc/include/isc/sha2.h,v 1.1.1.1 2007/06/02 23:21:44 dougb Exp $	*/
 /*	$KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $	*/
 
 /*
diff --git a/contrib/bind9/lib/isc/sha2.c b/contrib/bind9/lib/isc/sha2.c
index 7b41a28918a92..151e359798adc 100644
--- a/contrib/bind9/lib/isc/sha2.c
+++ b/contrib/bind9/lib/isc/sha2.c
@@ -16,7 +16,7 @@
 
 /* $Id: sha2.c,v 1.2.2.12 2006/08/16 03:18:14 marka Exp $ */
 
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/bind9/lib/isc/sha2.c,v 1.1.1.1 2007/06/02 23:21:43 dougb Exp $	*/
 /*	$KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $	*/
 
 /*
diff --git a/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h b/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
index 5c254cf403a3e..e9b43352950f6 100644
--- a/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
+++ b/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11
- * $FreeBSD$
+ * $FreeBSD: src/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h,v 1.1.1.1 2007/06/02 23:21:45 dougb Exp $
  */
 
 #ifndef ISC_ATOMIC_H
diff --git a/contrib/binutils/FREEBSD-Xlist b/contrib/binutils/FREEBSD-Xlist
index af18d97b09674..d0313c85a11c4 100644
--- a/contrib/binutils/FREEBSD-Xlist
+++ b/contrib/binutils/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-Xlist,v 1.5 2001/05/28 17:48:04 obrien Exp $
 .cvsignore
 mkdep
 *-hp*
diff --git a/contrib/binutils/FREEBSD-deletelist b/contrib/binutils/FREEBSD-deletelist
index 89020f423b82d..bef56a9577a47 100644
--- a/contrib/binutils/FREEBSD-deletelist
+++ b/contrib/binutils/FREEBSD-deletelist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-deletelist,v 1.6 2002/02/22 05:11:49 obrien Exp $
 CVS
 testsuite
 .cvsignore
diff --git a/contrib/binutils/FREEBSD-upgrade b/contrib/binutils/FREEBSD-upgrade
index ab7c24117f743..66212f92714f1 100644
--- a/contrib/binutils/FREEBSD-upgrade
+++ b/contrib/binutils/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/binutils/FREEBSD-upgrade,v 1.10 2002/03/13 07:16:00 obrien Exp $
 
 To get a copy of the Binutils source from the Sourceware CVS repository
 this command line was used:
diff --git a/contrib/binutils/bfd/elf.c b/contrib/binutils/bfd/elf.c
index 2b16f86cd45e9..3969528fa855e 100644
--- a/contrib/binutils/bfd/elf.c
+++ b/contrib/binutils/bfd/elf.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/bfd/elf.c,v 1.19 2004/06/16 06:02:14 obrien Exp $ */
 
 
 /*  SECTION
diff --git a/contrib/binutils/bfd/freebsd.h b/contrib/binutils/bfd/freebsd.h
index 5b0ede1acb56e..b845da863e6ee 100644
--- a/contrib/binutils/bfd/freebsd.h
+++ b/contrib/binutils/bfd/freebsd.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/binutils/bfd/freebsd.h,v 1.5 2004/06/16 06:13:06 obrien Exp $ */
 
 /* FreeBSD QMAGIC files have the header in the text. */
 #define	N_HEADER_IN_TEXT(x)	1
diff --git a/contrib/binutils/ld/Makefile.in b/contrib/binutils/ld/Makefile.in
index 020064b54c399..3cf8046916fee 100644
--- a/contrib/binutils/ld/Makefile.in
+++ b/contrib/binutils/ld/Makefile.in
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-# $FreeBSD$
+# $FreeBSD: src/contrib/binutils/ld/Makefile.in,v 1.15 2004/06/16 06:03:34 obrien Exp $
 
 
 SHELL = @SHELL@
diff --git a/contrib/binutils/ld/emultempl/elf32.em b/contrib/binutils/ld/emultempl/elf32.em
index 4a31b48f65986..fa89123ad60d6 100644
--- a/contrib/binutils/ld/emultempl/elf32.em
+++ b/contrib/binutils/ld/emultempl/elf32.em
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/binutils/ld/emultempl/elf32.em,v 1.14 2004/06/16 06:09:06 obrien Exp $
 
 
 # This shell script emits a C file. -*- C -*-
diff --git a/contrib/bsnmp/FREEBSD-Xlist b/contrib/bsnmp/FREEBSD-Xlist
index 8a5166240e54a..b318acd2c5590 100644
--- a/contrib/bsnmp/FREEBSD-Xlist
+++ b/contrib/bsnmp/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.5 2006/03/13 09:30:26 harti Exp $
 */Makefile.in
 */acinclude.m4
 */aclocal.m4
diff --git a/contrib/bsnmp/FREEBSD-upgrade b/contrib/bsnmp/FREEBSD-upgrade
index 4fb31fd9153ce..99dda121b277a 100644
--- a/contrib/bsnmp/FREEBSD-upgrade
+++ b/contrib/bsnmp/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bsnmp/FREEBSD-upgrade,v 1.2 2004/01/26 10:28:31 harti Exp $
 
 This is the Begemot micro-SNMP daemon. It is the base for the ILMI daemon
 for ngATM. Be careful to feed changes back to the maintainer
diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist
index 2725621ac2851..5f8d149d9df90 100644
--- a/contrib/bzip2/FREEBSD-Xlist
+++ b/contrib/bzip2/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/bzip2/FREEBSD-Xlist,v 1.1 2005/05/16 18:56:30 obrien Exp $
 *README.XML.STUFF
 *bz-common.xsl
 *bz-fo.xsl
diff --git a/contrib/bzip2/FREEBSD-upgrade b/contrib/bzip2/FREEBSD-upgrade
index 5d0b771ba2cd8..643941d100677 100644
--- a/contrib/bzip2/FREEBSD-upgrade
+++ b/contrib/bzip2/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $
 
 Julian Seward's bzip2
 	originals can be found at: 	http://www.bzip.org/downloads.html
diff --git a/contrib/bzip2/bzlib.c b/contrib/bzip2/bzlib.c
index ef0791e056388..8ef3e6c4fda2f 100644
--- a/contrib/bzip2/bzlib.c
+++ b/contrib/bzip2/bzlib.c
@@ -29,7 +29,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $");
 
 #include "bzlib_private.h"
 
diff --git a/contrib/com_err/com_err.3 b/contrib/com_err/com_err.3
index e6eeea13b8525..7f6685e4a63c4 100644
--- a/contrib/com_err/com_err.3
+++ b/contrib/com_err/com_err.3
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/com_err/com_err.3,v 1.1 1999/09/04 09:48:58 markm Exp $
 .\"
 .TH COM_ERR 3 "22 Nov 1988" SIPB
 .SH NAME
diff --git a/contrib/com_err/com_err.c b/contrib/com_err/com_err.c
index f00c602646bb3..fe4c09bcef655 100644
--- a/contrib/com_err/com_err.c
+++ b/contrib/com_err/com_err.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_err.c,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/contrib/com_err/com_err.h b/contrib/com_err/com_err.h
index 6c1faa4bd5bd8..eeef78e90950a 100644
--- a/contrib/com_err/com_err.h
+++ b/contrib/com_err/com_err.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_err.h,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 /* $Id: com_err.h,v 1.9 2001/05/11 20:03:36 assar Exp $ */
 
 /* MIT compatible com_err library */
diff --git a/contrib/com_err/com_right.h b/contrib/com_err/com_right.h
index 09e95fa0251c3..b9325c0b829ac 100644
--- a/contrib/com_err/com_right.h
+++ b/contrib/com_err/com_right.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: com_right.h,v 1.11 2000/07/31 01:11:08 assar Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/com_right.h,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #ifndef __COM_RIGHT_H__
 #define __COM_RIGHT_H__
diff --git a/contrib/com_err/compile_et.1 b/contrib/com_err/compile_et.1
index bdc608ba6ddbf..adcf0ea3c5849 100644
--- a/contrib/com_err/compile_et.1
+++ b/contrib/com_err/compile_et.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/com_err/compile_et.1,v 1.5 2006/09/17 18:52:27 ru Exp $
 .\"
 .Dd November 22, 1988
 .Os
diff --git a/contrib/com_err/compile_et.c b/contrib/com_err/compile_et.c
index 59d9de996d630..8cb8183c9ee85 100644
--- a/contrib/com_err/compile_et.c
+++ b/contrib/com_err/compile_et.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/compile_et.c,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #undef ROKEN_RENAME
 #include "compile_et.h"
diff --git a/contrib/com_err/compile_et.h b/contrib/com_err/compile_et.h
index 35e4863989ff7..0d56bfaa5c28f 100644
--- a/contrib/com_err/compile_et.h
+++ b/contrib/com_err/compile_et.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: compile_et.h,v 1.6 2000/07/01 20:21:48 assar Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/compile_et.h,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #ifndef __COMPILE_ET_H__
 #define __COMPILE_ET_H__
diff --git a/contrib/com_err/getarg.c b/contrib/com_err/getarg.c
index 80f76ab4a5ec6..d2de05ac91e2a 100644
--- a/contrib/com_err/getarg.c
+++ b/contrib/com_err/getarg.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/com_err/getarg.c,v 1.2 2003/01/08 17:05:52 peter Exp $
  */
 
 #if 0
diff --git a/contrib/com_err/lex.l b/contrib/com_err/lex.l
index b5f8db1e1e436..27e5b441f7368 100644
--- a/contrib/com_err/lex.l
+++ b/contrib/com_err/lex.l
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/lex.l,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 /*
  * This is to handle the definition of this symbol in some AIX
diff --git a/contrib/com_err/parse.y b/contrib/com_err/parse.y
index 960bcfa8f1e49..40e3b4e0adbc4 100644
--- a/contrib/com_err/parse.y
+++ b/contrib/com_err/parse.y
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/com_err/parse.y,v 1.3 2004/04/03 21:17:01 nectar Exp $ */
 
 #include "compile_et.h"
 #include "lex.h"
diff --git a/contrib/cpio/FREEBSD-upgrade b/contrib/cpio/FREEBSD-upgrade
index a3e31a0592ecd..b2d1a9ae11838 100644
--- a/contrib/cpio/FREEBSD-upgrade
+++ b/contrib/cpio/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cpio/FREEBSD-upgrade,v 1.5 2005/10/01 06:41:34 tjr Exp $
 
 GNU cpio:
 
diff --git a/contrib/cpio/lib/argp.h b/contrib/cpio/lib/argp.h
index 57635e89a1d95..33bd64418d752 100644
--- a/contrib/cpio/lib/argp.h
+++ b/contrib/cpio/lib/argp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/lib/argp.h,v 1.2 2005/10/17 12:20:05 tjr Exp $ */
 
 /* Hierarchial argument parsing, layered over getopt.
    Copyright (C) 1995-1999,2003,2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/copyin.c b/contrib/cpio/src/copyin.c
index 3e0a7373b94dc..414865020c0c2 100644
--- a/contrib/cpio/src/copyin.c
+++ b/contrib/cpio/src/copyin.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/copyin.c,v 1.4 2006/01/11 08:01:31 cperciva Exp $ */
 
 /* copyin.c - extract or list a cpio archive
    Copyright (C) 1990,1991,1992,2001,2002,2003,2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/copyout.c b/contrib/cpio/src/copyout.c
index 63cb0e225839e..4a54d10a8b22c 100644
--- a/contrib/cpio/src/copyout.c
+++ b/contrib/cpio/src/copyout.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/copyout.c,v 1.3 2006/01/11 08:01:31 cperciva Exp $ */
 
 /* copyout.c - create a cpio archive
    Copyright (C) 1990, 1991, 1992, 2001, 2003, 2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/copypass.c b/contrib/cpio/src/copypass.c
index 640f24e3aec23..945c9ca9de998 100644
--- a/contrib/cpio/src/copypass.c
+++ b/contrib/cpio/src/copypass.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/copypass.c,v 1.4 2006/01/11 08:01:31 cperciva Exp $ */
 
 /* copypass.c - cpio copy pass sub-function.
    Copyright (C) 1990, 1991, 1992, 2001, 2003, 2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/main.c b/contrib/cpio/src/main.c
index f6895205225c8..fcc3c589670ac 100644
--- a/contrib/cpio/src/main.c
+++ b/contrib/cpio/src/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/main.c,v 1.3 2006/01/11 08:01:31 cperciva Exp $ */
 
 /* main.c - main program and argument processing for cpio.
    Copyright (C) 1990, 1991, 1992, 2001, 2003, 2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/tar.c b/contrib/cpio/src/tar.c
index 75db5478ace42..4bfff7b7168ce 100644
--- a/contrib/cpio/src/tar.c
+++ b/contrib/cpio/src/tar.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/tar.c,v 1.2 2005/10/01 05:42:44 tjr Exp $ */
 
 /* tar.c - read in write tar headers for cpio
    Copyright (C) 1992, 2001, 2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/userspec.c b/contrib/cpio/src/userspec.c
index 7f7bed805c5c1..70110593cd1d8 100644
--- a/contrib/cpio/src/userspec.c
+++ b/contrib/cpio/src/userspec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/userspec.c,v 1.2 2005/10/01 04:56:09 tjr Exp $ */
 
 /* userspec.c -- Parse a user and group string.
    Copyright (C) 1989, 1990, 1991, 1992, 2001, 2004 Free Software Foundation, Inc.
diff --git a/contrib/cpio/src/util.c b/contrib/cpio/src/util.c
index 6788e9654e600..f70aae99a7798 100644
--- a/contrib/cpio/src/util.c
+++ b/contrib/cpio/src/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cpio/src/util.c,v 1.2 2005/10/01 05:52:40 tjr Exp $ */
 
 /* util.c - Several utility routines for cpio.
    Copyright (C) 1990, 1991, 1992, 2001, 2004 Free Software Foundation, Inc.
diff --git a/contrib/csup/GNUmakefile b/contrib/csup/GNUmakefile
index 7aceccdbd37be..24128852e0ac0 100644
--- a/contrib/csup/GNUmakefile
+++ b/contrib/csup/GNUmakefile
@@ -2,7 +2,7 @@
 # be used elsewhere because it assumes that the target system doesn't
 # support BSD extended file flags.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $
 #
 
 PREFIX?=/usr/local
diff --git a/contrib/csup/Makefile b/contrib/csup/Makefile
index b672c5ddefcb2..1101ffc4d485f 100644
--- a/contrib/csup/Makefile
+++ b/contrib/csup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/csup/Makefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $
 
 PREFIX?=	/usr/local
 BINDIR?=	${PREFIX}/bin
diff --git a/contrib/csup/README b/contrib/csup/README
index 879c4811792e4..2e914993a1007 100644
--- a/contrib/csup/README
+++ b/contrib/csup/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/csup/README,v 1.1.1.1 2006/03/03 04:11:25 mux Exp $
 
 Authors
 -------
diff --git a/contrib/csup/TODO b/contrib/csup/TODO
index 66988e1780b03..7d8a3f4b941b7 100644
--- a/contrib/csup/TODO
+++ b/contrib/csup/TODO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/csup/TODO,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $
 
 BUGS:
 
diff --git a/contrib/csup/config.c b/contrib/csup/config.c
index 5b71e7408522a..a840a7ef5ddb9 100644
--- a/contrib/csup/config.c
+++ b/contrib/csup/config.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/config.c,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/csup/config.h b/contrib/csup/config.h
index 78b699547adb8..114bc8d26f9df 100644
--- a/contrib/csup/config.h
+++ b/contrib/csup/config.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/config.h,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $
  */
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
diff --git a/contrib/csup/csup.1 b/contrib/csup/csup.1
index f8c7c13f135c6..4295ec3432408 100644
--- a/contrib/csup/csup.1
+++ b/contrib/csup/csup.1
@@ -22,7 +22,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/csup/csup.1,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $
 .\"
 .Dd February 1, 2006
 .Os FreeBSD
diff --git a/contrib/csup/detailer.c b/contrib/csup/detailer.c
index bf2ddb74a502c..5f83850eff6a8 100644
--- a/contrib/csup/detailer.c
+++ b/contrib/csup/detailer.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/detailer.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/detailer.h b/contrib/csup/detailer.h
index fe82b27f68120..1a5a58118b919 100644
--- a/contrib/csup/detailer.h
+++ b/contrib/csup/detailer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/detailer.h,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $
  */
 #ifndef _DETAILER_H_
 #define _DETAILER_H_
diff --git a/contrib/csup/diff.c b/contrib/csup/diff.c
index ea53c367901f7..5abe6647d8431 100644
--- a/contrib/csup/diff.c
+++ b/contrib/csup/diff.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/diff.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/diff.h b/contrib/csup/diff.h
index cbd9e50054a9f..a792bc825f2ea 100644
--- a/contrib/csup/diff.h
+++ b/contrib/csup/diff.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/diff.h,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $
  */
 #ifndef _DIFF_H_
 #define _DIFF_H_
diff --git a/contrib/csup/fattr.c b/contrib/csup/fattr.c
index b29d73dcf64e2..f32507da433c2 100644
--- a/contrib/csup/fattr.c
+++ b/contrib/csup/fattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fattr.c,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $
  */
 
 #include <sys/time.h>
diff --git a/contrib/csup/fattr.h b/contrib/csup/fattr.h
index 6015fbb3b43ab..1f39e0100d7d0 100644
--- a/contrib/csup/fattr.h
+++ b/contrib/csup/fattr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fattr.h,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $
  */
 #ifndef _FATTR_H_
 #define _FATTR_H_
diff --git a/contrib/csup/fixups.c b/contrib/csup/fixups.c
index b105a8f7d48f9..80c4ecf9a6fe6 100644
--- a/contrib/csup/fixups.c
+++ b/contrib/csup/fixups.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fixups.c,v 1.1.1.1 2006/03/03 04:11:27 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/fixups.h b/contrib/csup/fixups.h
index 0dddc905d1a00..c2ef291d9e088 100644
--- a/contrib/csup/fixups.h
+++ b/contrib/csup/fixups.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/fixups.h,v 1.1.1.1 2006/03/03 04:11:27 mux Exp $
  */
 #ifndef _FIXUPS_H_
 #define _FIXUPS_H_
diff --git a/contrib/csup/globtree.c b/contrib/csup/globtree.c
index 74ac2c162ab12..69e85ef8daa0b 100644
--- a/contrib/csup/globtree.c
+++ b/contrib/csup/globtree.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/globtree.c,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/csup/globtree.h b/contrib/csup/globtree.h
index 43882e3a8f9aa..f4312b929f4e2 100644
--- a/contrib/csup/globtree.h
+++ b/contrib/csup/globtree.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/globtree.h,v 1.1.1.1 2006/03/03 04:11:27 mux Exp $
  */
 #ifndef _GLOBTREE_H_
 #define	_GLOBTREE_H_
diff --git a/contrib/csup/idcache.c b/contrib/csup/idcache.c
index 47a3e712c1473..99860fe329327 100644
--- a/contrib/csup/idcache.c
+++ b/contrib/csup/idcache.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/idcache.c,v 1.1.1.1 2006/03/14 03:51:12 mux Exp $
  */
 #include <sys/types.h>
 
diff --git a/contrib/csup/idcache.h b/contrib/csup/idcache.h
index 558af0ce115f8..887b64385ac3b 100644
--- a/contrib/csup/idcache.h
+++ b/contrib/csup/idcache.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/idcache.h,v 1.1.1.1 2006/03/14 03:51:12 mux Exp $
  */
 #ifndef _IDCACHE_H_
 #define _IDCACHE_H_
diff --git a/contrib/csup/keyword.c b/contrib/csup/keyword.c
index dab44f0851e0b..0b09ce092701f 100644
--- a/contrib/csup/keyword.c
+++ b/contrib/csup/keyword.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/keyword.c,v 1.1.1.1 2006/03/03 04:11:27 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/keyword.h b/contrib/csup/keyword.h
index 3f152c11ea45d..bceeb9d09cadc 100644
--- a/contrib/csup/keyword.h
+++ b/contrib/csup/keyword.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/keyword.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _KEYWORD_H_
 #define _KEYWORD_H_
diff --git a/contrib/csup/lister.c b/contrib/csup/lister.c
index 98a9c8368d854..4a86d5d46123a 100644
--- a/contrib/csup/lister.c
+++ b/contrib/csup/lister.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/lister.c,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/lister.h b/contrib/csup/lister.h
index a0a9bbe3556b2..888981006fce2 100644
--- a/contrib/csup/lister.h
+++ b/contrib/csup/lister.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/lister.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _LISTER_H_
 #define _LISTER_H_
diff --git a/contrib/csup/main.c b/contrib/csup/main.c
index 74150393bc0b0..bbbbc80f39873 100644
--- a/contrib/csup/main.c
+++ b/contrib/csup/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/main.c,v 1.1.1.2 2006/03/14 03:51:11 mux Exp $
  */
 
 #include <sys/file.h>
diff --git a/contrib/csup/misc.c b/contrib/csup/misc.c
index 97a02aba8368c..e6115b169a4ce 100644
--- a/contrib/csup/misc.c
+++ b/contrib/csup/misc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/misc.c,v 1.1.1.3 2006/03/14 03:51:11 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/csup/misc.h b/contrib/csup/misc.h
index f0d03520d8715..62241a2acc37f 100644
--- a/contrib/csup/misc.h
+++ b/contrib/csup/misc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/misc.h,v 1.1.1.2 2006/03/14 03:51:11 mux Exp $
  */
 #ifndef _MISC_H_
 #define _MISC_H_
diff --git a/contrib/csup/mux.c b/contrib/csup/mux.c
index b663b5411b6fb..a139b588b3508 100644
--- a/contrib/csup/mux.c
+++ b/contrib/csup/mux.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/mux.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 
 #include <sys/param.h>
diff --git a/contrib/csup/mux.h b/contrib/csup/mux.h
index ff36083c3573b..c8d049e876f87 100644
--- a/contrib/csup/mux.h
+++ b/contrib/csup/mux.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/mux.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _MUX_H_
 #define _MUX_H_
diff --git a/contrib/csup/parse.y b/contrib/csup/parse.y
index 3dcd617421a90..4d911209e7f18 100644
--- a/contrib/csup/parse.y
+++ b/contrib/csup/parse.y
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/parse.y,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/csup/pathcomp.c b/contrib/csup/pathcomp.c
index 380d042985429..b61f8fe6b700c 100644
--- a/contrib/csup/pathcomp.c
+++ b/contrib/csup/pathcomp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/pathcomp.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/pathcomp.h b/contrib/csup/pathcomp.h
index 3cea41052f58e..0c52b8e3270aa 100644
--- a/contrib/csup/pathcomp.h
+++ b/contrib/csup/pathcomp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/pathcomp.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _PATHCOMP_H
 #define _PATHCOMP_H
diff --git a/contrib/csup/proto.c b/contrib/csup/proto.c
index 0a8985856baac..123d908e74ccf 100644
--- a/contrib/csup/proto.c
+++ b/contrib/csup/proto.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/proto.c,v 1.1.1.2 2006/03/14 03:51:11 mux Exp $
  */
 
 #include <sys/param.h>
diff --git a/contrib/csup/proto.h b/contrib/csup/proto.h
index ea9c01230232d..8e87033f11bc6 100644
--- a/contrib/csup/proto.h
+++ b/contrib/csup/proto.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/proto.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _PROTO_H_
 #define _PROTO_H_
diff --git a/contrib/csup/queue.h b/contrib/csup/queue.h
index aa9cac165fb44..afea2f4b937c0 100644
--- a/contrib/csup/queue.h
+++ b/contrib/csup/queue.h
@@ -27,9 +27,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/queue.h,v 1.1.1.3 2007/05/19 13:55:01 mux Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/queue.h,v 1.1.1.3 2007/05/19 13:55:01 mux Exp $
  */
 
 #ifndef _QUEUE_H_
diff --git a/contrib/csup/status.c b/contrib/csup/status.c
index 32b6821a2fb89..b673f0a609d3c 100644
--- a/contrib/csup/status.c
+++ b/contrib/csup/status.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/status.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/status.h b/contrib/csup/status.h
index 86efdda0e38c9..001462efcb97f 100644
--- a/contrib/csup/status.h
+++ b/contrib/csup/status.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/status.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _STATUS_H_
 #define _STATUS_H_
diff --git a/contrib/csup/stream.c b/contrib/csup/stream.c
index 34aa71e3273fe..d97359504a7e8 100644
--- a/contrib/csup/stream.c
+++ b/contrib/csup/stream.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/stream.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/csup/stream.h b/contrib/csup/stream.h
index 062fd34e3fa49..beab6a8354f3d 100644
--- a/contrib/csup/stream.h
+++ b/contrib/csup/stream.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/stream.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _STREAM_H_
 #define _STREAM_H_
diff --git a/contrib/csup/threads.c b/contrib/csup/threads.c
index 46a98606f282b..4adeb8d4cf7de 100644
--- a/contrib/csup/threads.c
+++ b/contrib/csup/threads.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/threads.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/csup/threads.h b/contrib/csup/threads.h
index 66153ce5589d8..2c81040c3aee3 100644
--- a/contrib/csup/threads.h
+++ b/contrib/csup/threads.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/threads.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _THREADS_H_
 #define _THREADS_H_
diff --git a/contrib/csup/token.h b/contrib/csup/token.h
index 0dc3ec03fbef8..9d732769f742a 100644
--- a/contrib/csup/token.h
+++ b/contrib/csup/token.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/token.h,v 1.1.1.2 2006/03/14 03:51:10 mux Exp $
  */
 #ifndef _TOKEN_H_
 #define _TOKEN_H_
diff --git a/contrib/csup/token.l b/contrib/csup/token.l
index 267e61feff89b..916a17cf01902 100644
--- a/contrib/csup/token.l
+++ b/contrib/csup/token.l
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/token.l,v 1.1.1.2 2006/03/14 03:51:10 mux Exp $
  */
 
 #include <err.h>
diff --git a/contrib/csup/updater.c b/contrib/csup/updater.c
index df74d52963655..ae71d6b581963 100644
--- a/contrib/csup/updater.c
+++ b/contrib/csup/updater.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/updater.c,v 1.1.1.2 2006/03/14 03:51:10 mux Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/csup/updater.h b/contrib/csup/updater.h
index 9ec9ed7c09452..a251c94b18c32 100644
--- a/contrib/csup/updater.h
+++ b/contrib/csup/updater.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/csup/updater.h,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
  */
 #ifndef _UPDATER_H_
 #define _UPDATER_H
diff --git a/contrib/cvs/FREEBSD-Xlist b/contrib/cvs/FREEBSD-Xlist
index 535030f7f7d6a..c599c32261632 100644
--- a/contrib/cvs/FREEBSD-Xlist
+++ b/contrib/cvs/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.1 2004/06/09 20:14:53 des Exp $
 
 */*.com
 */*.dep
diff --git a/contrib/cvs/FREEBSD-upgrade b/contrib/cvs/FREEBSD-upgrade
index d884b289228bb..5cef883e3ead5 100644
--- a/contrib/cvs/FREEBSD-upgrade
+++ b/contrib/cvs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
diff --git a/contrib/cvs/contrib/sccs2rcs.in b/contrib/cvs/contrib/sccs2rcs.in
index b00ca88373c22..5606bcda2fc4a 100755
--- a/contrib/cvs/contrib/sccs2rcs.in
+++ b/contrib/cvs/contrib/sccs2rcs.in
@@ -48,7 +48,7 @@
 #      -Allan G. Schrum schrum@ofsoptics.com agschrum@mindspring.com
 # Fri Sep 26 10:40:40 EDT 2003
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/cvs/contrib/sccs2rcs.in,v 1.5 2004/04/15 01:17:25 peter Exp $
 
 
 #we'll assume the user set up the path correctly
diff --git a/contrib/cvs/diff/diff3.c b/contrib/cvs/diff/diff3.c
index 109e66ee021c1..7cc66c1b11d06 100644
--- a/contrib/cvs/diff/diff3.c
+++ b/contrib/cvs/diff/diff3.c
@@ -13,7 +13,7 @@
 
    */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/diff/diff3.c,v 1.6 2004/04/15 01:17:26 peter Exp $
  */
 
 /* Written by Randy Smith */
diff --git a/contrib/cvs/lib/md5.h b/contrib/cvs/lib/md5.h
index 3b5ba05891f27..f9d886b61a8cc 100644
--- a/contrib/cvs/lib/md5.h
+++ b/contrib/cvs/lib/md5.h
@@ -1,7 +1,7 @@
 /* See md5.c for explanation and copyright information.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/lib/md5.h,v 1.2 1999/12/11 15:10:02 peter Exp $
  */
 
 #ifndef MD5_H
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index f58a31a6d0eb3..6dbe0d0790b53 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.22 2005/07/28 13:53:45 keramida Exp $
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
diff --git a/contrib/cvs/man/cvsbug.8 b/contrib/cvs/man/cvsbug.8
index 460ca4640d951..3f38ed57af7ff 100644
--- a/contrib/cvs/man/cvsbug.8
+++ b/contrib/cvs/man/cvsbug.8
@@ -17,7 +17,7 @@
 .\"    General Public License for more details.
 .\"
 .\" ---------------------------------------------------------------------------
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/cvs/man/cvsbug.8,v 1.3 2000/10/02 06:43:55 peter Exp $
 .nh
 .TH CVSBUG 8 xVERSIONx "February 1993"
 .SH NAME
diff --git a/contrib/cvs/src/buffer.c b/contrib/cvs/src/buffer.c
index d53a5c6d61bf5..452c59130b1fd 100644
--- a/contrib/cvs/src/buffer.c
+++ b/contrib/cvs/src/buffer.c
@@ -1,6 +1,6 @@
 /* Code for the buffer data structure.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/cvs/src/buffer.c,v 1.5 2004/04/15 01:17:26 peter Exp $ */
 
 #include <assert.h>
 #include "cvs.h"
diff --git a/contrib/cvs/src/checkout.c b/contrib/cvs/src/checkout.c
index 57933ee02ad6e..4efd1755cc12f 100644
--- a/contrib/cvs/src/checkout.c
+++ b/contrib/cvs/src/checkout.c
@@ -34,7 +34,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/checkout.c,v 1.5 2004/04/15 01:17:26 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c
index aae404a584887..ec3353e51db13 100644
--- a/contrib/cvs/src/client.c
+++ b/contrib/cvs/src/client.c
@@ -11,7 +11,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/client.c,v 1.12 2004/06/10 19:12:50 peter Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/cvs/src/commit.c b/contrib/cvs/src/commit.c
index 1edb95d94c917..2d4958dfe6fd1 100644
--- a/contrib/cvs/src/commit.c
+++ b/contrib/cvs/src/commit.c
@@ -12,7 +12,7 @@
  *
  * The call is: cvs commit [options] files...
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/commit.c,v 1.15 2004/06/10 19:12:50 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/cvs.h b/contrib/cvs/src/cvs.h
index c47cdcf335f25..8138ebe199b8b 100644
--- a/contrib/cvs/src/cvs.h
+++ b/contrib/cvs/src/cvs.h
@@ -9,7 +9,7 @@
 /*
  * basic information used in all source files
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/cvs.h,v 1.20 2004/06/10 19:12:50 peter Exp $
  */
 
 
diff --git a/contrib/cvs/src/diff.c b/contrib/cvs/src/diff.c
index 7faaae86297ba..395237c4ba26d 100644
--- a/contrib/cvs/src/diff.c
+++ b/contrib/cvs/src/diff.c
@@ -13,7 +13,7 @@
  * Without any file arguments, runs diff against all the currently modified
  * files.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/diff.c,v 1.21 2004/04/15 01:31:28 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/entries.c b/contrib/cvs/src/entries.c
index 1ab7c7e5a5d9e..8f6359499c8f7 100644
--- a/contrib/cvs/src/entries.c
+++ b/contrib/cvs/src/entries.c
@@ -12,7 +12,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/entries.c,v 1.4 2004/04/15 01:41:05 peter Exp $
  */
 #include "cvs.h"
 #include "getline.h"
diff --git a/contrib/cvs/src/filesubr.c b/contrib/cvs/src/filesubr.c
index b9f9bd5765b11..a2a92685a7117 100644
--- a/contrib/cvs/src/filesubr.c
+++ b/contrib/cvs/src/filesubr.c
@@ -18,7 +18,7 @@
    file system semantics.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.12 2004/06/10 19:12:50 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/import.c b/contrib/cvs/src/import.c
index b962ebc1257ea..f7b536432fa23 100644
--- a/contrib/cvs/src/import.c
+++ b/contrib/cvs/src/import.c
@@ -15,7 +15,7 @@
  *
  * Additional arguments specify more Vendor Release Tags.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/import.c,v 1.12 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/lock.c b/contrib/cvs/src/lock.c
index 36cbf7d3f46fa..8159e9613bed9 100644
--- a/contrib/cvs/src/lock.c
+++ b/contrib/cvs/src/lock.c
@@ -9,7 +9,7 @@
  * 
  * Lock file support for CVS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/lock.c,v 1.13 2004/04/15 01:17:27 peter Exp $
  */
 
 /* The node Concurrency in doc/cvs.texinfo has a brief introduction to
diff --git a/contrib/cvs/src/log.c b/contrib/cvs/src/log.c
index f8447ba49c6ce..a26179bff1f29 100644
--- a/contrib/cvs/src/log.c
+++ b/contrib/cvs/src/log.c
@@ -11,7 +11,7 @@
  * argument, prints the log information for all the files in the directory
  * (recursive by default).
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/log.c,v 1.3 2006/12/12 03:20:36 obrien Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/login.c b/contrib/cvs/src/login.c
index 86705eab973a6..21a4aa2c53e4d 100644
--- a/contrib/cvs/src/login.c
+++ b/contrib/cvs/src/login.c
@@ -6,7 +6,7 @@
  * 
  * Allow user to log in for an authenticating server.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/login.c,v 1.9 2005/04/22 17:58:25 simon Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/logmsg.c b/contrib/cvs/src/logmsg.c
index fbbcc3c4061db..08dde145519e9 100644
--- a/contrib/cvs/src/logmsg.c
+++ b/contrib/cvs/src/logmsg.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/logmsg.c,v 1.12 2004/04/15 01:17:27 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/main.c b/contrib/cvs/src/main.c
index 932dbd2af7312..33b268d071955 100644
--- a/contrib/cvs/src/main.c
+++ b/contrib/cvs/src/main.c
@@ -10,7 +10,7 @@
  * Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
  * the shell-script CVS system that this is based on.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/main.c,v 1.25 2004/07/06 08:10:38 des Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/mkmodules.c b/contrib/cvs/src/mkmodules.c
index 0c913872f0a9b..0be25c44885a5 100644
--- a/contrib/cvs/src/mkmodules.c
+++ b/contrib/cvs/src/mkmodules.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS kit.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/mkmodules.c,v 1.13 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/parseinfo.c b/contrib/cvs/src/parseinfo.c
index 5e34add5ea116..680359035b9de 100644
--- a/contrib/cvs/src/parseinfo.c
+++ b/contrib/cvs/src/parseinfo.c
@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3.22.1 2008/01/07 09:07:34 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/patch.c b/contrib/cvs/src/patch.c
index 7d99f29a602c3..4511587d2b5a9 100644
--- a/contrib/cvs/src/patch.c
+++ b/contrib/cvs/src/patch.c
@@ -11,7 +11,7 @@
  * current head of a module, or between two releases.  Can specify the
  * release as either a date or a revision number.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/patch.c,v 1.2 2005/04/22 17:58:25 simon Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/rcs.c b/contrib/cvs/src/rcs.c
index 1d3c1fdbbfacf..dfb9f62dcbfef 100644
--- a/contrib/cvs/src/rcs.c
+++ b/contrib/cvs/src/rcs.c
@@ -7,7 +7,7 @@
  * The routines contained in this file do all the rcs file parsing and
  * manipulation
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.28 2005/04/22 17:58:25 simon Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h
index d40d1781b755c..6e5be6d8c147a 100644
--- a/contrib/cvs/src/rcs.h
+++ b/contrib/cvs/src/rcs.h
@@ -7,7 +7,7 @@
  * 
  * RCS source control definitions needed by rcs.c and friends
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcs.h,v 1.11 2004/07/06 08:10:38 des Exp $
  */
 
 /* Strings which indicate a conflict if they occur at the start of a line.  */
diff --git a/contrib/cvs/src/rcscmds.c b/contrib/cvs/src/rcscmds.c
index df91ff8498c3e..ebaa4165a1935 100644
--- a/contrib/cvs/src/rcscmds.c
+++ b/contrib/cvs/src/rcscmds.c
@@ -8,7 +8,7 @@
  * The functions in this file provide an interface for performing 
  * operations directly on RCS files. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/rcscmds.c,v 1.10 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/recurse.c b/contrib/cvs/src/recurse.c
index 20a0f9b41da8c..2f4e50c7914f3 100644
--- a/contrib/cvs/src/recurse.c
+++ b/contrib/cvs/src/recurse.c
@@ -6,7 +6,7 @@
  * 
  * General recursion handler
  * 
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/recurse.c,v 1.12 2004/04/15 01:17:27 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/server.c b/contrib/cvs/src/server.c
index e186c34becca6..2f8591dc91cc3 100644
--- a/contrib/cvs/src/server.c
+++ b/contrib/cvs/src/server.c
@@ -9,7 +9,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/server.c,v 1.24 2004/06/10 19:12:50 peter Exp $
  */
 
 #include <assert.h>
diff --git a/contrib/cvs/src/tag.c b/contrib/cvs/src/tag.c
index 903f3579078d9..af47f934b5d7c 100644
--- a/contrib/cvs/src/tag.c
+++ b/contrib/cvs/src/tag.c
@@ -11,7 +11,7 @@
  * Tag uses the checked out revision in the current directory, rtag uses
  * the modules database, if necessary.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/tag.c,v 1.2 2004/08/05 17:47:35 des Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/update.c b/contrib/cvs/src/update.c
index 0ddf3bc41b3f0..fb5761ceceba8 100644
--- a/contrib/cvs/src/update.c
+++ b/contrib/cvs/src/update.c
@@ -32,7 +32,7 @@
  * directories added to the repository are automatically created and updated
  * as well.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.c,v 1.14 2004/06/10 19:12:50 peter Exp $
  */
 
 #include "cvs.h"
diff --git a/contrib/cvs/src/update.h b/contrib/cvs/src/update.h
index c886b4c8f1b7d..849e942655c33 100644
--- a/contrib/cvs/src/update.h
+++ b/contrib/cvs/src/update.h
@@ -11,7 +11,7 @@
    GNU General Public License for more details.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/cvs/src/update.h,v 1.3 2004/04/15 01:17:28 peter Exp $
  */
 
 int do_update PROTO((int argc, char *argv[], char *xoptions, char *xtag,
diff --git a/contrib/diff/FREEBSD-Xlist b/contrib/diff/FREEBSD-Xlist
index 64e22743e7afd..d2b2fc50839cd 100644
--- a/contrib/diff/FREEBSD-Xlist
+++ b/contrib/diff/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.2 2007/07/19 06:57:44 delphij Exp $
 
 INSTALL
 Makefile.am
diff --git a/contrib/diff/FREEBSD-upgrade b/contrib/diff/FREEBSD-upgrade
index 61ad0c9435bf9..23a81a7ee6b2f 100644
--- a/contrib/diff/FREEBSD-upgrade
+++ b/contrib/diff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/diff/FREEBSD-upgrade,v 1.3 2007/06/15 07:36:39 delphij Exp $
 Import of GNU diff 2.8.7
 
 Original source available as ftp://alpha.gnu.org/pub/gnu/diffutils/diffutils-2.8.7.tar.gz
diff --git a/contrib/diff/config.h b/contrib/diff/config.h
index ce405203c2b2d..5a40ca2960e26 100644
--- a/contrib/diff/config.h
+++ b/contrib/diff/config.h
@@ -1,7 +1,7 @@
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/config.h,v 1.4 2007/06/15 07:08:19 delphij Exp $ */
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 /* #undef CLOSEDIR_VOID */
diff --git a/contrib/expat/FREEBSD-upgrade b/contrib/expat/FREEBSD-upgrade
index 8fd9a57804ff7..025df2f9a8b0b 100644
--- a/contrib/expat/FREEBSD-upgrade
+++ b/contrib/expat/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/expat/FREEBSD-upgrade,v 1.1.1.1 2002/10/02 07:16:04 phk Exp $
 
 eXpat from www.libexpat.org
 
diff --git a/contrib/file/FREEBSD-upgrade b/contrib/file/FREEBSD-upgrade
index 735c996f20e2d..b75f79970c05e 100644
--- a/contrib/file/FREEBSD-upgrade
+++ b/contrib/file/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.7.4.1 2008/02/06 18:26:35 obrien Exp $
 
 Christos Zoulas `file'
 	originals can be found at: ftp://ftp.astron.com/pub/file/
diff --git a/contrib/gcc/FREEBSD-Xlist b/contrib/gcc/FREEBSD-Xlist
index 96080bc59e23a..336210a137845 100644
--- a/contrib/gcc/FREEBSD-Xlist
+++ b/contrib/gcc/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/gcc/FREEBSD-Xlist,v 1.3 2004/02/17 03:22:34 ache Exp $
 *.brik
 *FAQ
 *contrib
diff --git a/contrib/gcc/FREEBSD-deletelist b/contrib/gcc/FREEBSD-deletelist
index f5bc81750db97..a058b972f45f0 100644
--- a/contrib/gcc/FREEBSD-deletelist
+++ b/contrib/gcc/FREEBSD-deletelist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gcc/FREEBSD-deletelist,v 1.5 2004/02/17 03:22:34 ache Exp $
 CVS
 .cvsignore
 ABOUT*NLS
diff --git a/contrib/gcc/FREEBSD-libiberty b/contrib/gcc/FREEBSD-libiberty
index 1b8c24940c4b6..e6683dc7c1ab6 100644
--- a/contrib/gcc/FREEBSD-libiberty
+++ b/contrib/gcc/FREEBSD-libiberty
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/contrib/gcc/FREEBSD-libiberty,v 1.2 2002/05/10 05:21:15 obrien Exp $
 
 for F in \
 	choose-temp.c	\
diff --git a/contrib/gcc/FREEBSD-upgrade b/contrib/gcc/FREEBSD-upgrade
index 922f8eb4d0d0d..b8378da44bdd0 100644
--- a/contrib/gcc/FREEBSD-upgrade
+++ b/contrib/gcc/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gcc/FREEBSD-upgrade,v 1.3 2002/05/10 05:21:15 obrien Exp $
 
 tar -xvjf gcc-3.0.2.tar.bz2 -X FREEBSD-Xlist
 
diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c
index 5c466154fdc98..acffc671a42fe 100644
--- a/contrib/gcc/c-decl.c
+++ b/contrib/gcc/c-decl.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.15 2007/05/19 02:12:19 kan Exp $ */
 
 /* Process declarations and symbol lookup for C front end.
    Also constructs types; the standard scalar types at initialization,
diff --git a/contrib/gcc/c-format.c b/contrib/gcc/c-format.c
index cc3f9be7ae407..b20fac5de7b19 100644
--- a/contrib/gcc/c-format.c
+++ b/contrib/gcc/c-format.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.11 2007/05/19 02:16:45 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/c-opts.c b/contrib/gcc/c-opts.c
index d27959f2c9e61..1cd5a4640cabd 100644
--- a/contrib/gcc/c-opts.c
+++ b/contrib/gcc/c-opts.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/c-opts.c,v 1.4 2007/05/19 02:12:19 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt
index 8769657540974..0526896893adf 100644
--- a/contrib/gcc/c.opt
+++ b/contrib/gcc/c.opt
@@ -20,7 +20,7 @@
 
 ; See the GCC internals manual for a description of this file's format.
 
-; $FreeBSD$
+; $FreeBSD: src/contrib/gcc/c.opt,v 1.4 2007/05/19 02:12:19 kan Exp $
 ; Please try to keep this file in ASCII collating order.
 
 Language
diff --git a/contrib/gcc/config/freebsd-spec.h b/contrib/gcc/config/freebsd-spec.h
index e7995e8dd6436..9bb69bf4e53e4 100644
--- a/contrib/gcc/config/freebsd-spec.h
+++ b/contrib/gcc/config/freebsd-spec.h
@@ -18,7 +18,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.23 2007/05/19 02:30:20 kan Exp $ */
 
 /* Common FreeBSD configuration. 
    All FreeBSD architectures should include this file, which will specify
diff --git a/contrib/gcc/config/freebsd.h b/contrib/gcc/config/freebsd.h
index 9a5eef57772da..1e451701e30b1 100644
--- a/contrib/gcc/config/freebsd.h
+++ b/contrib/gcc/config/freebsd.h
@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA.  */
    Further work by David O'Brien <obrien@FreeBSD.org> and
    Loren J. Rittle <ljrittle@acm.org>.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.41 2007/05/19 02:30:20 kan Exp $ */
 
 /* In case we need to know.  */
 #define USING_CONFIG_FREEBSD 1
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index b23455cfb2752..7808aed8ac112 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.73 2007/05/19 02:30:20 kan Exp $ */
 
 #undef  CC1_SPEC
 #define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
diff --git a/contrib/gcc/config/i386/freebsd64.h b/contrib/gcc/config/i386/freebsd64.h
index 0c416022b0131..45bdb0bf9a857 100644
--- a/contrib/gcc/config/i386/freebsd64.h
+++ b/contrib/gcc/config/i386/freebsd64.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */
 
 
 #undef  TARGET_VERSION
diff --git a/contrib/gcc/config/i386/i386.c b/contrib/gcc/config/i386/i386.c
index feab422cc3832..61581dbb26d76 100644
--- a/contrib/gcc/config/i386/i386.c
+++ b/contrib/gcc/config/i386/i386.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.25 2007/08/14 03:04:42 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/config/i386/x86-64.h b/contrib/gcc/config/i386/x86-64.h
index f288208a160bb..b2e6b7248b75a 100644
--- a/contrib/gcc/config/i386/x86-64.h
+++ b/contrib/gcc/config/i386/x86-64.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/i386/x86-64.h,v 1.5 2007/05/19 02:12:20 kan Exp $ */
 
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START "#"
diff --git a/contrib/gcc/config/sparc/freebsd.h b/contrib/gcc/config/sparc/freebsd.h
index 2b9ec09a7677a..29177be538f0c 100644
--- a/contrib/gcc/config/sparc/freebsd.h
+++ b/contrib/gcc/config/sparc/freebsd.h
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */
 
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS \
diff --git a/contrib/gcc/cp/ptree.c b/contrib/gcc/cp/ptree.c
index 1de4d2c10f9e4..7d20e6090b444 100644
--- a/contrib/gcc/cp/ptree.c
+++ b/contrib/gcc/cp/ptree.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/cp/ptree.c,v 1.9 2007/05/19 02:12:20 kan Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/function.c b/contrib/gcc/function.c
index 7549ec421f070..819928c8f81e6 100644
--- a/contrib/gcc/function.c
+++ b/contrib/gcc/function.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/function.c,v 1.25 2007/08/14 03:04:42 kan Exp $ */
 
 /* This file handles the generation of rtl code from tree structure
    at the level of the function as a whole.
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c
index ddf2f49205e6a..0d0f84cc190b8 100644
--- a/contrib/gcc/gcc.c
+++ b/contrib/gcc/gcc.c
@@ -23,7 +23,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 This paragraph is here to try to keep Sun CC from dying.
 The number of chars here seems crucial!!!!  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.43 2007/05/28 23:02:56 kan Exp $ */
 
 /* This program is the user interface to the C compiler and possibly to
 other compilers.  It is used because compilation is a complicated procedure
diff --git a/contrib/gcc/opts.c b/contrib/gcc/opts.c
index 3de5627174e71..effd08d78a22a 100644
--- a/contrib/gcc/opts.c
+++ b/contrib/gcc/opts.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */
 
 #include "config.h"
 #include "system.h"
diff --git a/contrib/gcc/toplev.c b/contrib/gcc/toplev.c
index 49458c89e7669..cdfc66e48cf0d 100644
--- a/contrib/gcc/toplev.c
+++ b/contrib/gcc/toplev.c
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.27 2007/05/19 02:12:19 kan Exp $ */
 
 /* This is the top level of cc1/c++.
    It parses command args, opens files, invokes the various passes
diff --git a/contrib/gcc/version.c b/contrib/gcc/version.c
index 0da50b1c7b9f4..0897deb022c41 100644
--- a/contrib/gcc/version.c
+++ b/contrib/gcc/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gcc/version.c,v 1.16 2007/08/14 03:04:42 kan Exp $ */
 #include "version.h"
 
 /* This is the trailing component of the string reported as the
diff --git a/contrib/gdb/FREEBSD-Xlist b/contrib/gdb/FREEBSD-Xlist
index 26d286a4fe930..b68918d03a43a 100644
--- a/contrib/gdb/FREEBSD-Xlist
+++ b/contrib/gdb/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.7 2006/08/23 03:30:33 marcel Exp $
 gdb-6.1.1/bfd/*
 gdb-6.1.1/config/*
 gdb-6.1.1/etc/*
diff --git a/contrib/gdb/FREEBSD-upgrade b/contrib/gdb/FREEBSD-upgrade
index ac98f9c8f7fce..c0e4feca4cbb9 100644
--- a/contrib/gdb/FREEBSD-upgrade
+++ b/contrib/gdb/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gdb/FREEBSD-upgrade,v 1.3 2004/06/25 05:04:09 marcel Exp $
 
 To strip down a new version of gdb for import, extract the files like this:
 
diff --git a/contrib/gdtoa/gdtoaimp.h b/contrib/gdtoa/gdtoaimp.h
index d11a6f54fcc1e..ad8e111c57e9c 100644
--- a/contrib/gdtoa/gdtoaimp.h
+++ b/contrib/gdtoa/gdtoaimp.h
@@ -26,7 +26,7 @@ THIS SOFTWARE.
 
 ****************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.8 2007/01/03 04:59:33 das Exp $ */
 
 /* This is a variation on dtoa.c that converts arbitary binary
    floating-point formats to and from decimal notation.  It uses
diff --git a/contrib/gnu-sort/FREEBSD-upgrade b/contrib/gnu-sort/FREEBSD-upgrade
index 5cb5371d0b1fb..113295b75b6d8 100644
--- a/contrib/gnu-sort/FREEBSD-upgrade
+++ b/contrib/gnu-sort/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gnu-sort/FREEBSD-upgrade,v 1.4 2004/07/06 00:33:52 ache Exp $
 
 GNU Sort
 	originals can be found at:      ftp://ftp.gnu.org/gnu/coreutils/
diff --git a/contrib/gnu-sort/lib/hard-locale.c b/contrib/gnu-sort/lib/hard-locale.c
index 45b7d05dded01..3b2d4cd3e2d2c 100644
--- a/contrib/gnu-sort/lib/hard-locale.c
+++ b/contrib/gnu-sort/lib/hard-locale.c
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/lib/hard-locale.c,v 1.5 2004/08/12 05:46:04 tjr Exp $ */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/contrib/gnu-sort/lib/version-etc.c b/contrib/gnu-sort/lib/version-etc.c
index ccc135be8cb84..7c29e680e0a84 100644
--- a/contrib/gnu-sort/lib/version-etc.c
+++ b/contrib/gnu-sort/lib/version-etc.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/lib/version-etc.c,v 1.4 2004/08/27 03:52:29 kientzle Exp $ */
 
 /* Written by Jim Meyering. */
 
diff --git a/contrib/gnu-sort/src/sort.c b/contrib/gnu-sort/src/sort.c
index 0b9d33fcf4c6d..2c42d2ec9f785 100644
--- a/contrib/gnu-sort/src/sort.c
+++ b/contrib/gnu-sort/src/sort.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/gnu-sort/src/sort.c,v 1.4 2004/08/12 05:46:04 tjr Exp $ */
 /* sort - sort lines of text (with all kinds of options).
    Copyright (C) 88, 1991-2004 Free Software Foundation, Inc.
 
diff --git a/contrib/gperf/FREEBSD-Xlist b/contrib/gperf/FREEBSD-Xlist
index 393d55c838d25..1e73580c2ce9c 100644
--- a/contrib/gperf/FREEBSD-Xlist
+++ b/contrib/gperf/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/gperf/FREEBSD-Xlist,v 1.2 2004/02/17 01:51:07 ache Exp $
 */*.dvi
 */*.html
 */*.info
diff --git a/contrib/groff/FREEBSD-Xlist b/contrib/groff/FREEBSD-Xlist
index 4549878106eab..4ef31c9a836d3 100644
--- a/contrib/groff/FREEBSD-Xlist
+++ b/contrib/groff/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/groff/FREEBSD-Xlist,v 1.4 2004/02/25 03:10:14 ache Exp $
 */arch
 */src/libs/snprintf
diff --git a/contrib/groff/FREEBSD-upgrade b/contrib/groff/FREEBSD-upgrade
index bf4fe11a124c0..f23d862054544 100644
--- a/contrib/groff/FREEBSD-upgrade
+++ b/contrib/groff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/groff/FREEBSD-upgrade,v 1.6 2005/10/20 11:18:24 ru Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/groff/src/devices/grotty/grotty.man b/contrib/groff/src/devices/grotty/grotty.man
index d626376a2859f..e5ae7439214bc 100644
--- a/contrib/groff/src/devices/grotty/grotty.man
+++ b/contrib/groff/src/devices/grotty/grotty.man
@@ -1,5 +1,5 @@
 .ig
-$FreeBSD$
+$FreeBSD: src/contrib/groff/src/devices/grotty/grotty.man,v 1.9 2005/10/20 10:53:14 ru Exp $
 Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
diff --git a/contrib/groff/src/libs/libgroff/cmap.cpp b/contrib/groff/src/libs/libgroff/cmap.cpp
index 91a42f30243dd..caa29c3f97f02 100644
--- a/contrib/groff/src/libs/libgroff/cmap.cpp
+++ b/contrib/groff/src/libs/libgroff/cmap.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/cmap.cpp,v 1.3 2005/10/20 10:53:14 ru Exp $ */
 
 #include <ctype.h>
 #ifdef __FreeBSD__
diff --git a/contrib/groff/src/libs/libgroff/cset.cpp b/contrib/groff/src/libs/libgroff/cset.cpp
index 6d79d7ee58392..9c1174ec401d6 100644
--- a/contrib/groff/src/libs/libgroff/cset.cpp
+++ b/contrib/groff/src/libs/libgroff/cset.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/cset.cpp,v 1.3 2005/10/20 10:53:14 ru Exp $ */
 
 #include <ctype.h>
 #ifdef __FreeBSD__
diff --git a/contrib/groff/src/libs/libgroff/invalid.cpp b/contrib/groff/src/libs/libgroff/invalid.cpp
index ac0c71dfe31d5..7d5d122d11716 100644
--- a/contrib/groff/src/libs/libgroff/invalid.cpp
+++ b/contrib/groff/src/libs/libgroff/invalid.cpp
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/groff/src/libs/libgroff/invalid.cpp,v 1.3 2005/10/20 10:53:14 ru Exp $ */
 
 #include "lib.h"
 
diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/contrib/groff/src/preproc/eqn/neqn.sh
index 5390bba6c9ad7..9ca8b8f8dccc1 100644
--- a/contrib/groff/src/preproc/eqn/neqn.sh
+++ b/contrib/groff/src/preproc/eqn/neqn.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Provision of this shell script should not be taken to imply that use of
 # GNU eqn with groff -Tascii|-Tlatin1|-Tkoi8-r|-Tutf8|-Tcp1047 is supported.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/src/preproc/eqn/neqn.sh,v 1.11 2005/10/20 10:53:14 ru Exp $
 
 # Default device.
 case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man
index 23f3fab671368..273cbe9e8b9f8 100644
--- a/contrib/groff/src/roff/groff/groff.man
+++ b/contrib/groff/src/roff/groff/groff.man
@@ -15,7 +15,7 @@ Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the Free Documentation License is included as a file called
 FDL in the main directory of the groff source package.
 
-$FreeBSD$
+$FreeBSD: src/contrib/groff/src/roff/groff/groff.man,v 1.10 2005/10/20 10:53:14 ru Exp $
 
 ..
 .
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man
index f1692295f5960..844f55788dcaa 100644
--- a/contrib/groff/src/roff/nroff/nroff.man
+++ b/contrib/groff/src/roff/nroff/nroff.man
@@ -16,7 +16,7 @@ versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
 
-	$FreeBSD$
+	$FreeBSD: src/contrib/groff/src/roff/nroff/nroff.man,v 1.12 2005/10/20 10:53:15 ru Exp $
 
 ..
 .
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index 4342019831fbb..8d7953f32b93f 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Emulate nroff with groff.
-# $FreeBSD$
+# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.18 2005/10/20 10:53:15 ru Exp $
 
 prog="$0"
 # Default device.
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index e23db463a68c1..20677da6bc327 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -1,5 +1,5 @@
 .\" Startup file for eqn.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/eqnrc,v 1.6 2003/09/08 17:46:32 ru Exp $
 .EQ
 sdefine << %{ < back 20 < }%
 sdefine >> %{ > back 20 > }%
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 5defe8abc11ce..8a93b4b008117 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -1,5 +1,5 @@
 .\" Startup file for troff.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.17 2005/10/20 10:53:15 ru Exp $
 .
 .\" This is tested by pic.
 .nr 0p 0
diff --git a/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac
index 58f8fdbb5f318..9a8460c524a1f 100644
--- a/contrib/groff/tmac/tty-char.tmac
+++ b/contrib/groff/tmac/tty-char.tmac
@@ -1,5 +1,5 @@
 .\" tty-char.tmac
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/tty-char.tmac,v 1.3 2005/10/20 10:53:15 ru Exp $
 .\"
 .\" This file defines standard troff characters and some groff characters for
 .\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
diff --git a/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac
index 6e6a8562eb061..04961ec835e67 100644
--- a/contrib/groff/tmac/tty.tmac
+++ b/contrib/groff/tmac/tty.tmac
@@ -1,5 +1,5 @@
 .\" tty.tmac
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/groff/tmac/tty.tmac,v 1.3 2005/10/20 10:53:15 ru Exp $
 .\"
 .nr _C \n(.C
 .cp 0
diff --git a/contrib/hostapd/FREEBSD-Xlist b/contrib/hostapd/FREEBSD-Xlist
index 1f544522a1b5a..8306cc9339cd8 100644
--- a/contrib/hostapd/FREEBSD-Xlist
+++ b/contrib/hostapd/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.3 2007/07/09 16:24:41 sam Exp $
 .cvsignore
 driver.c
 driver_bsd.c
diff --git a/contrib/hostapd/FREEBSD-upgrade b/contrib/hostapd/FREEBSD-upgrade
index 08922051fe55a..37fb19b789837 100644
--- a/contrib/hostapd/FREEBSD-upgrade
+++ b/contrib/hostapd/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $
 
 WPA/802.1x Authenticator
 	originals can be found at: http://hostap.epitest.fi/releases/
diff --git a/contrib/hostapd/eap.c b/contrib/hostapd/eap.c
index 3f623cab4b056..534945f67340f 100644
--- a/contrib/hostapd/eap.c
+++ b/contrib/hostapd/eap.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/eap.c,v 1.4 2007/07/09 16:20:41 sam Exp $
  */
 
 #include "includes.h"
diff --git a/contrib/hostapd/eap.h b/contrib/hostapd/eap.h
index 8fb1ec389e35e..80da93d8c0eed 100644
--- a/contrib/hostapd/eap.h
+++ b/contrib/hostapd/eap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/hostapd/eap.h,v 1.4 2007/07/09 16:20:41 sam Exp $ */
 
 /*
  * hostapd / EAP Standalone Authenticator state machine (RFC 4137)
diff --git a/contrib/hostapd/eapol_sm.c b/contrib/hostapd/eapol_sm.c
index 18f25763cef8e..d22ba7c86af00 100644
--- a/contrib/hostapd/eapol_sm.c
+++ b/contrib/hostapd/eapol_sm.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/eapol_sm.c,v 1.5 2007/07/09 16:20:41 sam Exp $
  */
 
 #include "includes.h"
diff --git a/contrib/hostapd/ieee802_1x.c b/contrib/hostapd/ieee802_1x.c
index 7cde06522848b..5a78e024da5f0 100644
--- a/contrib/hostapd/ieee802_1x.c
+++ b/contrib/hostapd/ieee802_1x.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.5 2007/07/09 16:20:41 sam Exp $
  */
 
 #include "includes.h"
diff --git a/contrib/hostapd/ieee802_1x.h b/contrib/hostapd/ieee802_1x.h
index 776d9df8089fe..dc56549d546c9 100644
--- a/contrib/hostapd/ieee802_1x.h
+++ b/contrib/hostapd/ieee802_1x.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/hostapd/ieee802_1x.h,v 1.4 2007/07/09 16:20:41 sam Exp $ */
 
 /*
  * hostapd / IEEE 802.1X Authenticator
diff --git a/contrib/hostapd/wpa.c b/contrib/hostapd/wpa.c
index 7d40b9a829e49..2478b70114319 100644
--- a/contrib/hostapd/wpa.c
+++ b/contrib/hostapd/wpa.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.5 2007/07/09 16:20:41 sam Exp $
  */
 
 #include "includes.h"
diff --git a/contrib/ipfilter/.cvsignore b/contrib/ipfilter/.cvsignore
deleted file mode 100644
index 616828f4144d5..0000000000000
--- a/contrib/ipfilter/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-ipf
-sparcv7
-sparcv9
-h
-ipf-darren
-bugs
-ipftest
-patches
-state
-cbits
-CVS
-old
-new
-netinet
-import
-bak
-streams
-cvs.diff
-threads
-glibc
-hp
-windows
-ipnat
-opt_inet6.h
-ippool
-ipmon
-ip_rules.c
-ip_rules.h
diff --git a/contrib/ipfilter/BSD/.cvsignore b/contrib/ipfilter/BSD/.cvsignore
deleted file mode 100644
index c149a0043f450..0000000000000
--- a/contrib/ipfilter/BSD/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-ipf
-ipfs
-ipfstat
-ipftest
-ipmon
-ipnat
-ipresend
-ipsend
-iptest
-vnode_if.h
-if_ipl
-i386
-amiga
-FreeBSD*
-BSDOS*
-NetBSD*
-OpenBSD*
-*_lex_var.h
-*_y.c
-*_l.c
-*_y.h
-ip_rules.*
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
index 1495801352162..3d7d8438cc786 100755
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sun Feb 13 14:32:01 2000
 --- ip6_input.c	Wed Apr 26 22:31:34 2000
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
index 2e1d7e80673f5..db3f0e521bf64 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sat Jul 15 07:14:34 2000
 --- ip6_input.c	Thu Oct 19 17:14:37 2000
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
index 2e1d7e80673f5..0432d2990a1bf 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
+++ b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 *** ip6_input.c.orig	Sat Jul 15 07:14:34 2000
 --- ip6_input.c	Thu Oct 19 17:14:37 2000
diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/contrib/ipfilter/INST.FreeBSD-2.2
index d668c39f7b586..21a41daddc0de 100644
--- a/contrib/ipfilter/INST.FreeBSD-2.2
+++ b/contrib/ipfilter/INST.FreeBSD-2.2
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/INST.FreeBSD-2.2,v 1.2 2005/04/25 18:20:08 darrenr Exp $
 .\"
 
 To build a kernel for use with the loadable kernel module, follow these
diff --git a/contrib/ipfilter/INSTALL.xBSD b/contrib/ipfilter/INSTALL.xBSD
index 2f933ffc7018a..bbf9320d2dbd9 100644
--- a/contrib/ipfilter/INSTALL.xBSD
+++ b/contrib/ipfilter/INSTALL.xBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/INSTALL.xBSD,v 1.3 2000/07/19 23:10:29 darrenr Exp $
 
 To build a kernel for use with the loadable kernel module, follow these
 steps:
diff --git a/contrib/ipfilter/Makefile b/contrib/ipfilter/Makefile
index 334cd45121887..c853e90613a2f 100644
--- a/contrib/ipfilter/Makefile
+++ b/contrib/ipfilter/Makefile
@@ -5,7 +5,7 @@
 # provided that this notice is preserved and due credit is given
 # to the original author and the contributors.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7.2.1 2007/10/31 05:00:34 darrenr Exp $
 # Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
 #
 SHELL=/bin/sh
diff --git a/contrib/ipfilter/bpf-ipf.h b/contrib/ipfilter/bpf-ipf.h
index dc2b660e2eee9..4576b76dac753 100644
--- a/contrib/ipfilter/bpf-ipf.h
+++ b/contrib/ipfilter/bpf-ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/bpf-ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index d75570e292673..96b897c9ff2a4 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.6 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/ip_fil.c b/contrib/ipfilter/ip_fil.c
index a3efa871b2518..50597e59a6442 100644
--- a/contrib/ipfilter/ip_fil.c
+++ b/contrib/ipfilter/ip_fil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5.2.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/ip_msnrpc_pxy.c b/contrib/ipfilter/ip_msnrpc_pxy.c
index 40bc084cbb5dd..adbf977fa24f8 100644
--- a/contrib/ipfilter/ip_msnrpc_pxy.c
+++ b/contrib/ipfilter/ip_msnrpc_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_msnrpc_pxy.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed
diff --git a/contrib/ipfilter/ipf.h b/contrib/ipfilter/ipf.h
index ae05ca75a9068..ed7b6362c7e78 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipf.h,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/.cvsignore b/contrib/ipfilter/iplang/.cvsignore
deleted file mode 100644
index 68b5b4e4e9853..0000000000000
--- a/contrib/ipfilter/iplang/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-y.tab.h
-y.output
-lex.yy.c
-y.tab.c
-y.tab.o
-lex.yy.o
-iplang_y.output
-iplang_y.tab.c
-iplang_y.tab.h
diff --git a/contrib/ipfilter/iplang/iplang.h b/contrib/ipfilter/iplang/iplang.h
index 2b2d1db5a6e2e..cc91e52f97e2d 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/contrib/ipfilter/iplang/iplang.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index f356d0fb44651..4244ed22f4670 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang_l.l,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 %{
 /*
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 773f27f2c17e5..479ff7e3332f8 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.9 2007/06/04 02:54:31 darrenr Exp $	*/
 
 %{
 /*
@@ -7,7 +7,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * Id: iplang_y.y,v 2.9.2.4 2006/03/17 12:11:29 darrenr Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.9 2007/06/04 02:54:31 darrenr Exp $
  */
 
 #include <stdio.h>
diff --git a/contrib/ipfilter/ipmon.h b/contrib/ipfilter/ipmon.h
index afee1f4fb3f70..07249be7df782 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/contrib/ipfilter/ipmon.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.4 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/Celler/ip_compat.h b/contrib/ipfilter/ipsd/Celler/ip_compat.h
index 57937763a5a97..63d82019aa93e 100644
--- a/contrib/ipfilter/ipsd/Celler/ip_compat.h
+++ b/contrib/ipfilter/ipsd/Celler/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/Celler/ip_compat.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/contrib/ipfilter/ipsd/ipsd.c
index ad3dfe20db999..56d45889509d7 100644
--- a/contrib/ipfilter/ipsd/ipsd.c
+++ b/contrib/ipfilter/ipsd/ipsd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsd.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/contrib/ipfilter/ipsd/ipsd.h
index f898c9995c353..24a96eb5109a8 100644
--- a/contrib/ipfilter/ipsd/ipsd.h
+++ b/contrib/ipfilter/ipsd/ipsd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsd.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/contrib/ipfilter/ipsd/ipsdr.c
index 5a907061c6311..99255bea36113 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/contrib/ipfilter/ipsd/ipsdr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/ipsdr.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsd/linux.h b/contrib/ipfilter/ipsd/linux.h
index 88eb67aa4cbbf..5159688c2a8d7 100644
--- a/contrib/ipfilter/ipsd/linux.h
+++ b/contrib/ipfilter/ipsd/linux.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/linux.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c
index a724ba5dbfebb..b7ca9ce839a6b 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/contrib/ipfilter/ipsd/sbpf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.3 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/sdlpi.c b/contrib/ipfilter/ipsd/sdlpi.c
index b7515f1dbac06..783ca86eb7042 100644
--- a/contrib/ipfilter/ipsd/sdlpi.c
+++ b/contrib/ipfilter/ipsd/sdlpi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/sdlpi.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/slinux.c b/contrib/ipfilter/ipsd/slinux.c
index c0847951cd66d..2f3e164e507d4 100644
--- a/contrib/ipfilter/ipsd/slinux.c
+++ b/contrib/ipfilter/ipsd/slinux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/slinux.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsd/snit.c b/contrib/ipfilter/ipsd/snit.c
index 0d5a52a1cee4e..bca508115d7a2 100644
--- a/contrib/ipfilter/ipsd/snit.c
+++ b/contrib/ipfilter/ipsd/snit.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsd/snit.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/.OLD/ip_compat.h b/contrib/ipfilter/ipsend/.OLD/ip_compat.h
index b5b8f0741c253..a433eda796319 100644
--- a/contrib/ipfilter/ipsend/.OLD/ip_compat.h
+++ b/contrib/ipfilter/ipsend/.OLD/ip_compat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/.OLD/ip_compat.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1995 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/.cvsignore b/contrib/ipfilter/ipsend/.cvsignore
deleted file mode 100644
index b7aea24eb8816..0000000000000
--- a/contrib/ipfilter/ipsend/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ipsend
-ipresend
-iptest
diff --git a/contrib/ipfilter/ipsend/44arp.c b/contrib/ipfilter/ipsend/44arp.c
index 6ee4f1b58f871..5f524b6feab5f 100644
--- a/contrib/ipfilter/ipsend/44arp.c
+++ b/contrib/ipfilter/ipsend/44arp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.3 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * Based upon 4.4BSD's /usr/sbin/arp
diff --git a/contrib/ipfilter/ipsend/arp.c b/contrib/ipfilter/ipsend/arp.c
index 8670bda76b46e..19573b2d5b2f0 100644
--- a/contrib/ipfilter/ipsend/arp.c
+++ b/contrib/ipfilter/ipsend/arp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/arp.c,v 1.4 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * arp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/contrib/ipfilter/ipsend/dlcommon.c
index c6b6e8a4858fd..ed0b5802fc634 100644
--- a/contrib/ipfilter/ipsend/dlcommon.c
+++ b/contrib/ipfilter/ipsend/dlcommon.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/dlcommon.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Common (shared) DLPI test routines.
diff --git a/contrib/ipfilter/ipsend/dltest.h b/contrib/ipfilter/ipsend/dltest.h
index 086782c1fbb74..aa28c3b6b168b 100644
--- a/contrib/ipfilter/ipsend/dltest.h
+++ b/contrib/ipfilter/ipsend/dltest.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/dltest.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * Common DLPI Test Suite header file
diff --git a/contrib/ipfilter/ipsend/hpux.c b/contrib/ipfilter/ipsend/hpux.c
index 9cc72995f26b3..6d3ca855a824c 100644
--- a/contrib/ipfilter/ipsend/hpux.c
+++ b/contrib/ipfilter/ipsend/hpux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/hpux.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*
  * (C)opyright 1997-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/in_var.h b/contrib/ipfilter/ipsend/in_var.h
index 3523f77051fc7..3cbd2a4ed321e 100644
--- a/contrib/ipfilter/ipsend/in_var.h
+++ b/contrib/ipfilter/ipsend/in_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/in_var.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*	@(#)in_var.h 1.3 88/08/19 SMI; from UCB 7.1 6/5/86	*/
 
diff --git a/contrib/ipfilter/ipsend/ip.c b/contrib/ipfilter/ipsend/ip.c
index 26a7a892bed3f..04b77e27fbedc 100644
--- a/contrib/ipfilter/ipsend/ip.c
+++ b/contrib/ipfilter/ipsend/ip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ip.c,v 1.4 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * ip.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ip_var.h b/contrib/ipfilter/ipsend/ip_var.h
index ab9813ec828ed..c720ea92d30ce 100644
--- a/contrib/ipfilter/ipsend/ip_var.h
+++ b/contrib/ipfilter/ipsend/ip_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ip_var.h,v 1.2 2005/04/25 18:20:10 darrenr Exp $	*/
 
 /*	@(#)ip_var.h 1.11 88/08/19 SMI; from UCB 7.1 6/5/86	*/
 
diff --git a/contrib/ipfilter/ipsend/ipresend.1 b/contrib/ipfilter/ipsend/ipresend.1
index 6761a183caea0..497855a960c2c 100644
--- a/contrib/ipfilter/ipsend/ipresend.1
+++ b/contrib/ipfilter/ipsend/ipresend.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/ipresend.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 .TH IPRESEND 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/contrib/ipfilter/ipsend/ipresend.c
index 050aecf2093c5..3aa673ca15ee5 100644
--- a/contrib/ipfilter/ipsend/ipresend.c
+++ b/contrib/ipfilter/ipsend/ipresend.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipresend.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * ipresend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/contrib/ipfilter/ipsend/ipsend.1
index 7f0a8e39538ae..000f672600519 100644
--- a/contrib/ipfilter/ipsend/ipsend.1
+++ b/contrib/ipfilter/ipsend/ipsend.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.1,v 1.2 2005/04/25 18:20:10 darrenr Exp $
 .\"
 .TH IPSEND 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/contrib/ipfilter/ipsend/ipsend.5
index cd5842cbba18f..6686b40b882af 100644
--- a/contrib/ipfilter/ipsend/ipsend.5
+++ b/contrib/ipfilter/ipsend/ipsend.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.5,v 1.4 2005/04/25 18:20:10 darrenr Exp $
 .TH IPSEND 5
 .SH NAME
 ipsend \- IP packet description language
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c
index 06191ec054b97..46655c8eb1d43 100644
--- a/contrib/ipfilter/ipsend/ipsend.c
+++ b/contrib/ipfilter/ipsend/ipsend.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.14 2006/08/16 12:23:01 guido Exp $ */
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/contrib/ipfilter/ipsend/ipsend.h
index 91cfa6c085ed0..94ec7ba508e7d 100644
--- a/contrib/ipfilter/ipsend/ipsend.h
+++ b/contrib/ipfilter/ipsend/ipsend.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipsend.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * ipsend.h (C) 1997-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/contrib/ipfilter/ipsend/ipsopt.c
index 10f132e6da9a0..d22a2a7a44105 100644
--- a/contrib/ipfilter/ipsend/ipsopt.c
+++ b/contrib/ipfilter/ipsend/ipsopt.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/ipsopt.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/contrib/ipfilter/ipsend/iptest.1
index 8f25f4abf2564..a5956289552ba 100644
--- a/contrib/ipfilter/ipsend/iptest.1
+++ b/contrib/ipfilter/ipsend/iptest.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/ipsend/iptest.1,v 1.4 2005/04/25 18:20:11 darrenr Exp $
 .\"
 .TH IPTEST 1
 .SH NAME
diff --git a/contrib/ipfilter/ipsend/iptest.c b/contrib/ipfilter/ipsend/iptest.c
index cc2ceb8ae2a15..412411d211d89 100644
--- a/contrib/ipfilter/ipsend/iptest.c
+++ b/contrib/ipfilter/ipsend/iptest.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptest.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * ipsend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 0dd96b8313209..dc339db082702 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/contrib/ipfilter/ipsend/iptests.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/larp.c b/contrib/ipfilter/ipsend/larp.c
index ccb70cc293680..38708a44d2d7b 100644
--- a/contrib/ipfilter/ipsend/larp.c
+++ b/contrib/ipfilter/ipsend/larp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/larp.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * larp.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/linux.h b/contrib/ipfilter/ipsend/linux.h
index a36d1bfb6a6a5..449a95a0079b8 100644
--- a/contrib/ipfilter/ipsend/linux.h
+++ b/contrib/ipfilter/ipsend/linux.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/linux.h,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/contrib/ipfilter/ipsend/lsock.c b/contrib/ipfilter/ipsend/lsock.c
index a76bbbb15221b..9a1696a43682b 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/contrib/ipfilter/ipsend/lsock.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.4 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * lsock.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/resend.c b/contrib/ipfilter/ipsend/resend.c
index b988e9b20d941..e7ec2f7bfa55e 100644
--- a/contrib/ipfilter/ipsend/resend.c
+++ b/contrib/ipfilter/ipsend/resend.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * resend.c (C) 1995-1998 Darren Reed
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index b8778c6691671..8c8063e3e4d70 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/contrib/ipfilter/ipsend/sbpf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sbpf.c,v 1.8 2006/08/16 12:23:01 guido Exp $ */
 /*
  * (C)opyright 1995-1998 Darren Reed. (from tcplog)
  *
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/contrib/ipfilter/ipsend/sdlpi.c
index f48fd06bbc347..826a8f22cf7c0 100644
--- a/contrib/ipfilter/ipsend/sdlpi.c
+++ b/contrib/ipfilter/ipsend/sdlpi.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sdlpi.c,v 1.4 2007/06/04 02:54:31 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sirix.c b/contrib/ipfilter/ipsend/sirix.c
index 5057c4f2c871a..4bebe3cb0478e 100644
--- a/contrib/ipfilter/ipsend/sirix.c
+++ b/contrib/ipfilter/ipsend/sirix.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sirix.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/slinux.c b/contrib/ipfilter/ipsend/slinux.c
index 7e37b3087f978..bf674d36aef3d 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/contrib/ipfilter/ipsend/slinux.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/slinux.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/snit.c b/contrib/ipfilter/ipsend/snit.c
index 0ef7e54448416..56872152b7fad 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/contrib/ipfilter/ipsend/snit.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/snit.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index 9a2cfc3fb6673..8685e8b996302 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18.2.1 2007/10/31 05:00:35 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/contrib/ipfilter/ipsend/sockraw.c
index c9232273ee867..a4156469ad02d 100644
--- a/contrib/ipfilter/ipsend/sockraw.c
+++ b/contrib/ipfilter/ipsend/sockraw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/sockraw.c,v 1.2 2005/04/25 18:20:11 darrenr Exp $	*/
 
 /*
  * (C)opyright 2000 Darren Reed.
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/contrib/ipfilter/ipsend/tcpip.h
index 34178931a9785..ab4ae39bec60b 100644
--- a/contrib/ipfilter/ipsend/tcpip.h
+++ b/contrib/ipfilter/ipsend/tcpip.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/tcpip.h,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
diff --git a/contrib/ipfilter/ipt.h b/contrib/ipfilter/ipt.h
index f3074a8dc9b92..1d1d3505430ef 100644
--- a/contrib/ipfilter/ipt.h
+++ b/contrib/ipfilter/ipt.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipt.h,v 1.4 2006/08/16 12:23:01 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/kmem.h b/contrib/ipfilter/kmem.h
index c0864b4fd911f..44273cbf4a62d 100644
--- a/contrib/ipfilter/kmem.h
+++ b/contrib/ipfilter/kmem.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/kmem.h,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/l4check/l4check.c b/contrib/ipfilter/l4check/l4check.c
index fd2753ea22be5..602325ff33673 100644
--- a/contrib/ipfilter/l4check/l4check.c
+++ b/contrib/ipfilter/l4check/l4check.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2.10.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * (C)Copyright March, 2000 - Darren Reed.
diff --git a/contrib/ipfilter/lib/addicmp.c b/contrib/ipfilter/lib/addicmp.c
index ef9abfed3c9c0..97ce3461b7cb9 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/contrib/ipfilter/lib/addicmp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addicmp.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index 79155e7e4c573..576716d1d2fa6 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/contrib/ipfilter/lib/addipopt.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/addipopt.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/contrib/ipfilter/lib/bcopywrap.c
index b2e8427a7b379..44d6e7da4e8c7 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/contrib/ipfilter/lib/bcopywrap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/bcopywrap.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/binprint.c b/contrib/ipfilter/lib/binprint.c
index fcb47ed37e5b4..59aebb86cf305 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/contrib/ipfilter/lib/binprint.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/binprint.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/buildopts.c b/contrib/ipfilter/lib/buildopts.c
index bdd0538fdd14d..ac43d5ab54d33 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/contrib/ipfilter/lib/buildopts.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/buildopts.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/checkrev.c b/contrib/ipfilter/lib/checkrev.c
index 9e584cc48d891..aa9b6d01ff26d 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/contrib/ipfilter/lib/checkrev.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/checkrev.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count4bits.c b/contrib/ipfilter/lib/count4bits.c
index 38e574290c692..2fdb90ed909ed 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/contrib/ipfilter/lib/count4bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/count4bits.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/count6bits.c b/contrib/ipfilter/lib/count6bits.c
index 15538c36c19c6..ddba348957408 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/contrib/ipfilter/lib/count6bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/count6bits.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/debug.c b/contrib/ipfilter/lib/debug.c
index 3181e78e1e10e..0fa4393175a12 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/contrib/ipfilter/lib/debug.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/debug.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.c b/contrib/ipfilter/lib/facpri.c
index b89e0f8e01272..0c41ae6b0fa92 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/contrib/ipfilter/lib/facpri.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/facpri.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/facpri.h b/contrib/ipfilter/lib/facpri.h
index ca53e051f90d1..6bbd876c52cce 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/contrib/ipfilter/lib/facpri.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/facpri.h,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/fill6bits.c b/contrib/ipfilter/lib/fill6bits.c
index c0faf6ae5f209..ba95c1b5e236a 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/contrib/ipfilter/lib/fill6bits.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/fill6bits.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/flags.c b/contrib/ipfilter/lib/flags.c
index 200484c2231cd..867af0fb89342 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/contrib/ipfilter/lib/flags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/flags.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index be536c1e755d1..9172e8809ab9f 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/contrib/ipfilter/lib/gethost.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/gethost.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c
index 7246fbb837142..491bff654d2f4 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/contrib/ipfilter/lib/getifname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getifname.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getnattype.c b/contrib/ipfilter/lib/getnattype.c
index 2fb5d174e4a26..2e74744b67b7f 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/contrib/ipfilter/lib/getnattype.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getnattype.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getport.c b/contrib/ipfilter/lib/getport.c
index 69e897c660c33..8ef0fe9308524 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/contrib/ipfilter/lib/getport.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getport.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getportproto.c b/contrib/ipfilter/lib/getportproto.c
index 23e5fb18a6a5d..2a693ccd394de 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/contrib/ipfilter/lib/getportproto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getportproto.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getproto.c b/contrib/ipfilter/lib/getproto.c
index 33f6f47ac1b95..bd03ee66abecd 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/contrib/ipfilter/lib/getproto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getproto.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/getsumd.c b/contrib/ipfilter/lib/getsumd.c
index fdad461673e31..a8474d7c68898 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/contrib/ipfilter/lib/getsumd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/getsumd.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/hostname.c b/contrib/ipfilter/lib/hostname.c
index e8fde98e5efad..d7251c4295d9e 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/contrib/ipfilter/lib/hostname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/hostname.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/icmpcode.c b/contrib/ipfilter/lib/icmpcode.c
index d558bebf7de69..adb880903eb0d 100644
--- a/contrib/ipfilter/lib/icmpcode.c
+++ b/contrib/ipfilter/lib/icmpcode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/icmpcode.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/inet_addr.c b/contrib/ipfilter/lib/inet_addr.c
index c7ae44375a5e2..100ca8b9caf1a 100644
--- a/contrib/ipfilter/lib/inet_addr.c
+++ b/contrib/ipfilter/lib/inet_addr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/inet_addr.c,v 1.3 2005/12/30 11:52:23 guido Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1990, 1993
diff --git a/contrib/ipfilter/lib/initparse.c b/contrib/ipfilter/lib/initparse.c
index 6fdfc8a9a1612..b7025a7b2a769 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/contrib/ipfilter/lib/initparse.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/initparse.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ionames.c b/contrib/ipfilter/lib/ionames.c
index d2fc977754522..36f1be435e9d3 100644
--- a/contrib/ipfilter/lib/ionames.c
+++ b/contrib/ipfilter/lib/ionames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ionames.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c
index 6508a266271ce..d28a719dc8f97 100644
--- a/contrib/ipfilter/lib/ipf_dotuning.c
+++ b/contrib/ipfilter/lib/ipf_dotuning.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipf_dotuning.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/contrib/ipfilter/lib/ipft_ef.c
index 2d50f076bfbef..f5cc9f1f725b9 100644
--- a/contrib/ipfilter/lib/ipft_ef.c
+++ b/contrib/ipfilter/lib/ipft_ef.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_ef.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/contrib/ipfilter/lib/ipft_hx.c
index d295c21a7d9f6..d4c535df1e5af 100644
--- a/contrib/ipfilter/lib/ipft_hx.c
+++ b/contrib/ipfilter/lib/ipft_hx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_hx.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/contrib/ipfilter/lib/ipft_pc.c
index 0f31a10efd3b8..2082b8eb0ffd2 100644
--- a/contrib/ipfilter/lib/ipft_pc.c
+++ b/contrib/ipfilter/lib/ipft_pc.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_pc.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/contrib/ipfilter/lib/ipft_sn.c
index 2beb6eed704fc..c3f336e32f890 100644
--- a/contrib/ipfilter/lib/ipft_sn.c
+++ b/contrib/ipfilter/lib/ipft_sn.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_sn.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_td.c b/contrib/ipfilter/lib/ipft_td.c
index d571ada7b56eb..e50a743e1bc38 100644
--- a/contrib/ipfilter/lib/ipft_td.c
+++ b/contrib/ipfilter/lib/ipft_td.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_td.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c
index f4475e3c84267..3b6e5225faf3d 100644
--- a/contrib/ipfilter/lib/ipft_tx.c
+++ b/contrib/ipfilter/lib/ipft_tx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.6.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/contrib/ipfilter/lib/ipoptsec.c
index 66a55c80dbb74..58904c6afa97e 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/contrib/ipfilter/lib/ipoptsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipoptsec.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c
index 26da2d0139f76..4674521c89e96 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/contrib/ipfilter/lib/kmem.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmem.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmem.h b/contrib/ipfilter/lib/kmem.h
index bcfde06d045d8..a680d0c3dba8d 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/contrib/ipfilter/lib/kmem.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmem.h,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/contrib/ipfilter/lib/kmemcpywrap.c
index 87474915334e2..54e9bfb482853 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/contrib/ipfilter/lib/kmemcpywrap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kmemcpywrap.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/kvatoname.c b/contrib/ipfilter/lib/kvatoname.c
index c8c0d8fff6217..76aac8a16e399 100644
--- a/contrib/ipfilter/lib/kvatoname.c
+++ b/contrib/ipfilter/lib/kvatoname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/kvatoname.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hash.c b/contrib/ipfilter/lib/load_hash.c
index 7683470b47e86..5f796a5d73df9 100644
--- a/contrib/ipfilter/lib/load_hash.c
+++ b/contrib/ipfilter/lib/load_hash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_hash.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/contrib/ipfilter/lib/load_hashnode.c
index 3c3416d95a14a..f168d99b85950 100644
--- a/contrib/ipfilter/lib/load_hashnode.c
+++ b/contrib/ipfilter/lib/load_hashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_hashnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_pool.c b/contrib/ipfilter/lib/load_pool.c
index 08baae767db93..4dcb90bdd76c3 100644
--- a/contrib/ipfilter/lib/load_pool.c
+++ b/contrib/ipfilter/lib/load_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_pool.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/contrib/ipfilter/lib/load_poolnode.c
index 110a8b9c3e5bf..66c5a2669acf2 100644
--- a/contrib/ipfilter/lib/load_poolnode.c
+++ b/contrib/ipfilter/lib/load_poolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/load_poolnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/contrib/ipfilter/lib/mutex_emul.c
index 3983f04c62578..4c03773b446d9 100644
--- a/contrib/ipfilter/lib/mutex_emul.c
+++ b/contrib/ipfilter/lib/mutex_emul.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/mutex_emul.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/nametokva.c b/contrib/ipfilter/lib/nametokva.c
index deee4399b9463..13f748dfd762c 100644
--- a/contrib/ipfilter/lib/nametokva.c
+++ b/contrib/ipfilter/lib/nametokva.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/nametokva.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/contrib/ipfilter/lib/nat_setgroupmap.c
index 08b1a0a4475bc..fde81b6ad7d31 100644
--- a/contrib/ipfilter/lib/nat_setgroupmap.c
+++ b/contrib/ipfilter/lib/nat_setgroupmap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/nat_setgroupmap.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/ntomask.c b/contrib/ipfilter/lib/ntomask.c
index ba91a65b526c9..7df583c0ab186 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/contrib/ipfilter/lib/ntomask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ntomask.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optname.c b/contrib/ipfilter/lib/optname.c
index f41cab11ea17a..7d3a398f768c0 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/contrib/ipfilter/lib/optname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optname.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprint.c b/contrib/ipfilter/lib/optprint.c
index 81a3287cf6729..17bb81a9b001c 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/contrib/ipfilter/lib/optprint.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optprint.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optprintv6.c b/contrib/ipfilter/lib/optprintv6.c
index f6ea6eca905ec..12fc9142a38c7 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/contrib/ipfilter/lib/optprintv6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optprintv6.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/optvalue.c b/contrib/ipfilter/lib/optvalue.c
index aa1ef2e7648f6..642cfcd50cddf 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/contrib/ipfilter/lib/optvalue.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/optvalue.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/portname.c b/contrib/ipfilter/lib/portname.c
index f0c8625e6a778..1e00335d175a0 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/contrib/ipfilter/lib/portname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/portname.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/print_toif.c b/contrib/ipfilter/lib/print_toif.c
index 94a4618dbae2b..44e89d5ba825b 100644
--- a/contrib/ipfilter/lib/print_toif.c
+++ b/contrib/ipfilter/lib/print_toif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/print_toif.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index a2e292406614b..6085bfcdce188 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/contrib/ipfilter/lib/printactivenat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printactivenat.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c
index 87a12cd494fcf..00f1a954d34a1 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/contrib/ipfilter/lib/printaps.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printaps.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printbuf.c b/contrib/ipfilter/lib/printbuf.c
index b2e209a013259..6a27f43591980 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/contrib/ipfilter/lib/printbuf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printbuf.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfr.c b/contrib/ipfilter/lib/printfr.c
index 587d8cb01a48b..b5f493cfb3525 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/contrib/ipfilter/lib/printfr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printfr.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/contrib/ipfilter/lib/printfraginfo.c
index d9317e87480dd..e4c32a9323fed 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/contrib/ipfilter/lib/printfraginfo.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printfraginfo.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2004-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhash.c b/contrib/ipfilter/lib/printhash.c
index 975b60eabcd58..0892b2e32e299 100644
--- a/contrib/ipfilter/lib/printhash.c
+++ b/contrib/ipfilter/lib/printhash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhash.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhashnode.c b/contrib/ipfilter/lib/printhashnode.c
index ed83c397b4c5a..8502f3bb23d48 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/contrib/ipfilter/lib/printhashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhashnode.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmap.c b/contrib/ipfilter/lib/printhostmap.c
index 0c9242f91eefb..403fea92a056a 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/contrib/ipfilter/lib/printhostmap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhostmap.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 44703c4c46365..edaa3ce73d82d 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/contrib/ipfilter/lib/printhostmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printhostmask.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printifname.c b/contrib/ipfilter/lib/printifname.c
index 2f7d912cf3e0a..73fd43b467f51 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/contrib/ipfilter/lib/printifname.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printifname.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printip.c b/contrib/ipfilter/lib/printip.c
index 8c008afa9d24f..c3c8bf7270a2c 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/contrib/ipfilter/lib/printip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printip.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printlog.c b/contrib/ipfilter/lib/printlog.c
index 82c0400759eb2..60cdc1ded90b0 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/contrib/ipfilter/lib/printlog.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printlog.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printmask.c b/contrib/ipfilter/lib/printmask.c
index 9230dc0026a53..65dbcafb9f5e9 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/contrib/ipfilter/lib/printmask.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printmask.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 62942ce4d4eae..a74396b0a93e4 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/contrib/ipfilter/lib/printnat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.4.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket.c b/contrib/ipfilter/lib/printpacket.c
index 25a4d5a8f7dae..bb37c71b74329 100644
--- a/contrib/ipfilter/lib/printpacket.c
+++ b/contrib/ipfilter/lib/printpacket.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpacket.c,v 1.4.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpacket6.c b/contrib/ipfilter/lib/printpacket6.c
index ca3b42133a3e1..3a0d7f20e4d59 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/contrib/ipfilter/lib/printpacket6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpacket6.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpool.c b/contrib/ipfilter/lib/printpool.c
index 4ab85fac8c35b..a2e0468e8d467 100644
--- a/contrib/ipfilter/lib/printpool.c
+++ b/contrib/ipfilter/lib/printpool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpool.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index 3327b8a5a43ab..4d13abbbb81c6 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/contrib/ipfilter/lib/printpoolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printpoolnode.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printportcmp.c b/contrib/ipfilter/lib/printportcmp.c
index 6a1a461b6206b..7075ea2e471ab 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/contrib/ipfilter/lib/printportcmp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printportcmp.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printsbuf.c b/contrib/ipfilter/lib/printsbuf.c
index f6c633c13fd61..4a179fbe86f1b 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/contrib/ipfilter/lib/printsbuf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printsbuf.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c
index a8777b2b59f24..0deee2cdea58e 100644
--- a/contrib/ipfilter/lib/printstate.c
+++ b/contrib/ipfilter/lib/printstate.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.5.2.1 2007/10/31 05:00:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/printtunable.c b/contrib/ipfilter/lib/printtunable.c
index aa7ae5d0e578f..702c19d124ad6 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/contrib/ipfilter/lib/printtunable.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printtunable.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hash.c b/contrib/ipfilter/lib/remove_hash.c
index 297db4827d730..675dd7a7911e6 100644
--- a/contrib/ipfilter/lib/remove_hash.c
+++ b/contrib/ipfilter/lib/remove_hash.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_hash.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/contrib/ipfilter/lib/remove_hashnode.c
index 47a19dcaa62fd..2c8da5ac42717 100644
--- a/contrib/ipfilter/lib/remove_hashnode.c
+++ b/contrib/ipfilter/lib/remove_hashnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_hashnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_pool.c b/contrib/ipfilter/lib/remove_pool.c
index 1e7fe5f16cdfe..3b68bb28f6900 100644
--- a/contrib/ipfilter/lib/remove_pool.c
+++ b/contrib/ipfilter/lib/remove_pool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_pool.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/contrib/ipfilter/lib/remove_poolnode.c
index c80ff7093c674..a56418896c597 100644
--- a/contrib/ipfilter/lib/remove_poolnode.c
+++ b/contrib/ipfilter/lib/remove_poolnode.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/remove_poolnode.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/resetlexer.c b/contrib/ipfilter/lib/resetlexer.c
index 8ea83f101a233..035e700230eea 100644
--- a/contrib/ipfilter/lib/resetlexer.c
+++ b/contrib/ipfilter/lib/resetlexer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/resetlexer.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/contrib/ipfilter/lib/rwlock_emul.c
index 1ee2475700828..0ee910256a276 100644
--- a/contrib/ipfilter/lib/rwlock_emul.c
+++ b/contrib/ipfilter/lib/rwlock_emul.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/rwlock_emul.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/contrib/ipfilter/lib/tcp_flags.c
index 0b602e66ab30a..10945543abcb9 100644
--- a/contrib/ipfilter/lib/tcp_flags.c
+++ b/contrib/ipfilter/lib/tcp_flags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcp_flags.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpflags.c b/contrib/ipfilter/lib/tcpflags.c
index f01d7dc31573d..5052fe81c667e 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/contrib/ipfilter/lib/tcpflags.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcpflags.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/contrib/ipfilter/lib/tcpoptnames.c
index 25e3b275a7612..cc5b161b4d49d 100644
--- a/contrib/ipfilter/lib/tcpoptnames.c
+++ b/contrib/ipfilter/lib/tcpoptnames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/tcpoptnames.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2002 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6ionames.c b/contrib/ipfilter/lib/v6ionames.c
index b57b301e67bc8..b0b3db0449f32 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/contrib/ipfilter/lib/v6ionames.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/v6ionames.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003-2005 by Darren Reed.
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/contrib/ipfilter/lib/v6optvalue.c
index a60d076bfbb70..7bfca83132ea4 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/contrib/ipfilter/lib/v6optvalue.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/v6optvalue.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2003 by Darren Reed.
diff --git a/contrib/ipfilter/lib/var.c b/contrib/ipfilter/lib/var.c
index 4a62d7aed2e74..c1ab0dd792f01 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/contrib/ipfilter/lib/var.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/var.c,v 1.3 2007/06/04 02:54:32 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/ipfilter/lib/verbose.c b/contrib/ipfilter/lib/verbose.c
index f1b4516a96cdf..3f736ef642d95 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/contrib/ipfilter/lib/verbose.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/verbose.c,v 1.4 2007/06/04 02:54:33 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2001 by Darren Reed.
diff --git a/contrib/ipfilter/man/Makefile b/contrib/ipfilter/man/Makefile
index 0b8f2a14c5a31..833a7e1323661 100644
--- a/contrib/ipfilter/man/Makefile
+++ b/contrib/ipfilter/man/Makefile
@@ -3,7 +3,7 @@
 #
 # See the IPFILTER.LICENCE file for details on licencing.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/man/Makefile,v 1.2 2006/02/27 11:22:20 darrenr Exp $
 #
 
 all:
diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index dfef858d5dd88..381c8b3574581 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/contrib/ipfilter/man/ipf.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.4,v 1.7 2005/04/25 18:20:14 darrenr Exp $
 .TH IPF 4
 .SH NAME
 ipf \- packet filtering kernel interface
diff --git a/contrib/ipfilter/man/ipf.5 b/contrib/ipfilter/man/ipf.5
index 8bdaedcba2294..382448ee4b861 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/contrib/ipfilter/man/ipf.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.5,v 1.10 2005/12/30 11:52:25 guido Exp $
 .TH IPF 5
 .SH NAME
 ipf, ipf.conf, ipf6.conf \- IP packet filter rule syntax
diff --git a/contrib/ipfilter/man/ipf.8 b/contrib/ipfilter/man/ipf.8
index 678010f73d268..e6debcb9084cf 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/contrib/ipfilter/man/ipf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.8 2007/06/04 02:54:34 darrenr Exp $
 .TH IPF 8
 .SH NAME
 ipf \- alters packet filtering lists for IP packet input and output
diff --git a/contrib/ipfilter/man/ipfilter.4 b/contrib/ipfilter/man/ipfilter.4
index 09eb4db8f1afa..731db249296c2 100644
--- a/contrib/ipfilter/man/ipfilter.4
+++ b/contrib/ipfilter/man/ipfilter.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipfilter.4,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IP\ FILTER 4
 .SH NAME
diff --git a/contrib/ipfilter/man/ipfilter.5 b/contrib/ipfilter/man/ipfilter.5
index 97e504df15fa3..e1f5446444ab7 100644
--- a/contrib/ipfilter/man/ipfilter.5
+++ b/contrib/ipfilter/man/ipfilter.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfilter.5,v 1.4 2002/03/19 11:48:16 darrenr Exp $
 .TH IPFILTER 1
 .SH NAME
 IP Filter
diff --git a/contrib/ipfilter/man/ipfs.8 b/contrib/ipfilter/man/ipfs.8
index 01d0c707d60ce..38007a729aa61 100644
--- a/contrib/ipfilter/man/ipfs.8
+++ b/contrib/ipfilter/man/ipfs.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipfs.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPFS 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ipfstat.8 b/contrib/ipfilter/man/ipfstat.8
index 44ba8ba0d4300..ccc0dfeeba410 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/contrib/ipfilter/man/ipfstat.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.11 2007/06/04 02:54:34 darrenr Exp $
 .TH ipfstat 8
 .SH NAME
 ipfstat \- reports on packet filter statistics and filter list
diff --git a/contrib/ipfilter/man/ipftest.1 b/contrib/ipfilter/man/ipftest.1
index 402195f318e1b..0c79bd473f1bc 100644
--- a/contrib/ipfilter/man/ipftest.1
+++ b/contrib/ipfilter/man/ipftest.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipftest.1,v 1.7 2005/12/30 11:52:25 guido Exp $
 .TH ipftest 1
 .SH NAME
 ipftest \- test packet filter rules with arbitrary input.
diff --git a/contrib/ipfilter/man/ipl.4 b/contrib/ipfilter/man/ipl.4
index da1d9e61ce0fc..626212adb1bf9 100644
--- a/contrib/ipfilter/man/ipl.4
+++ b/contrib/ipfilter/man/ipl.4
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipl.4,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPL 4
 .SH NAME
diff --git a/contrib/ipfilter/man/ipmon.5 b/contrib/ipfilter/man/ipmon.5
index 081fc0856bc1a..fbb9c9918433b 100644
--- a/contrib/ipfilter/man/ipmon.5
+++ b/contrib/ipfilter/man/ipmon.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipmon.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPMON 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8
index 1082e06ec262f..ef2c23309ebf9 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/contrib/ipfilter/man/ipmon.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.18 2007/06/04 02:54:34 darrenr Exp $
 .TH ipmon 8
 .SH NAME
 ipmon \- monitors /dev/ipl for logged packets
diff --git a/contrib/ipfilter/man/ipnat.4 b/contrib/ipfilter/man/ipnat.4
index 095e4e5e1904b..94d1a727364f0 100644
--- a/contrib/ipfilter/man/ipnat.4
+++ b/contrib/ipfilter/man/ipnat.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/ipfilter/man/ipnat.4,v 1.5 2000/10/26 12:47:40 darrenr Exp $
 .TH IPNAT 4
 .SH NAME
 ipnat \- Network Address Translation kernel interface
diff --git a/contrib/ipfilter/man/ipnat.5 b/contrib/ipfilter/man/ipnat.5
index 6d3f9bcff457d..b80a3346aae1f 100644
--- a/contrib/ipfilter/man/ipnat.5
+++ b/contrib/ipfilter/man/ipnat.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipnat.5,v 1.3 2005/12/30 11:52:25 guido Exp $
 .\"
 .TH IPNAT 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipnat.8 b/contrib/ipfilter/man/ipnat.8
index 192c1e74ccd90..5f76c5195f2e6 100644
--- a/contrib/ipfilter/man/ipnat.8
+++ b/contrib/ipfilter/man/ipnat.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipnat.8,v 1.3 2005/12/30 11:52:25 guido Exp $
 .\"
 .TH IPNAT 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ippool.5 b/contrib/ipfilter/man/ippool.5
index 367eb8d6f2bb7..86f12863bccfc 100644
--- a/contrib/ipfilter/man/ippool.5
+++ b/contrib/ipfilter/man/ippool.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ippool.5,v 1.2.10.1 2007/10/31 05:00:36 darrenr Exp $
 .\"
 .TH IPPOOL 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ippool.8 b/contrib/ipfilter/man/ippool.8
index 986812a140773..05fbe4546619d 100644
--- a/contrib/ipfilter/man/ippool.8
+++ b/contrib/ipfilter/man/ippool.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ippool.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPPOOL 8
 .SH NAME
diff --git a/contrib/ipfilter/man/ipscan.5 b/contrib/ipfilter/man/ipscan.5
index 91bf9b0f5ebe4..32c63710390c7 100644
--- a/contrib/ipfilter/man/ipscan.5
+++ b/contrib/ipfilter/man/ipscan.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipscan.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPSCAN 5
 .SH NAME
diff --git a/contrib/ipfilter/man/ipscan.8 b/contrib/ipfilter/man/ipscan.8
index 513dc94a8050c..e5af001c85e1b 100644
--- a/contrib/ipfilter/man/ipscan.8
+++ b/contrib/ipfilter/man/ipscan.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/ipscan.8,v 1.2 2005/04/25 18:20:14 darrenr Exp $
 .\"
 .TH IPSCAN 8
 .SH NAME
diff --git a/contrib/ipfilter/man/mkfilters.1 b/contrib/ipfilter/man/mkfilters.1
index b9e1ddd8872af..d9dad23a97bd5 100644
--- a/contrib/ipfilter/man/mkfilters.1
+++ b/contrib/ipfilter/man/mkfilters.1
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/ipfilter/man/mkfilters.1,v 1.3 2006/02/27 11:22:20 darrenr Exp $
 .\"
 .TH MKFILTERS 1
 .SH NAME
diff --git a/contrib/ipfilter/md5.c b/contrib/ipfilter/md5.c
index 63dd4b4157455..c1a6e3d54e715 100644
--- a/contrib/ipfilter/md5.c
+++ b/contrib/ipfilter/md5.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/md5.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 
 
diff --git a/contrib/ipfilter/md5.h b/contrib/ipfilter/md5.h
index 914df74355a05..e86229a6bf8e9 100644
--- a/contrib/ipfilter/md5.h
+++ b/contrib/ipfilter/md5.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/md5.h,v 1.2.10.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  ***********************************************************************
diff --git a/contrib/ipfilter/mlf_ipl.c b/contrib/ipfilter/mlf_ipl.c
index ca79596e3844c..e6271dc490356 100644
--- a/contrib/ipfilter/mlf_ipl.c
+++ b/contrib/ipfilter/mlf_ipl.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlf_ipl.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlf_rule.c b/contrib/ipfilter/mlf_rule.c
index 8b7b9d3a94091..5692ec9aed8de 100644
--- a/contrib/ipfilter/mlf_rule.c
+++ b/contrib/ipfilter/mlf_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlf_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/mlfk_rule.c b/contrib/ipfilter/mlfk_rule.c
index 5f7aed89a7dd2..fd22275c1df4c 100644
--- a/contrib/ipfilter/mlfk_rule.c
+++ b/contrib/ipfilter/mlfk_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlfk_rule.c,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/mlh_rule.c b/contrib/ipfilter/mlh_rule.c
index dd350dfb7b4fa..a869aab12ac11 100644
--- a/contrib/ipfilter/mlh_rule.c
+++ b/contrib/ipfilter/mlh_rule.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/mlh_rule.c,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
diff --git a/contrib/ipfilter/net/.cvsignore b/contrib/ipfilter/net/.cvsignore
deleted file mode 100644
index 19f86f493ab11..0000000000000
--- a/contrib/ipfilter/net/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-done
diff --git a/contrib/ipfilter/opts.h b/contrib/ipfilter/opts.h
index fa53c8f5fe90f..04ba428725a51 100644
--- a/contrib/ipfilter/opts.h
+++ b/contrib/ipfilter/opts.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/opts.h,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
diff --git a/contrib/ipfilter/pcap-bpf.h b/contrib/ipfilter/pcap-bpf.h
index 51002a3c2beae..2ad4d3ccaf8f7 100644
--- a/contrib/ipfilter/pcap-bpf.h
+++ b/contrib/ipfilter/pcap-bpf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/pcap-bpf.h,v 1.1 2005/05/16 16:22:55 darrenr Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/contrib/ipfilter/pcap-ipf.h b/contrib/ipfilter/pcap-ipf.h
index 71250ad613897..211ad52c34ca0 100644
--- a/contrib/ipfilter/pcap-ipf.h
+++ b/contrib/ipfilter/pcap-ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/pcap-ipf.h,v 1.2 2005/04/25 18:20:08 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/radix.c b/contrib/ipfilter/radix.c
index 8c67562553e29..0e8ba878b856c 100644
--- a/contrib/ipfilter/radix.c
+++ b/contrib/ipfilter/radix.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/radix.c,v 1.4.2.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/radix_ipf.h b/contrib/ipfilter/radix_ipf.h
index 11e4ba761aae2..62bf26a916452 100644
--- a/contrib/ipfilter/radix_ipf.h
+++ b/contrib/ipfilter/radix_ipf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/radix_ipf.h,v 1.4.2.1 2007/10/31 05:00:34 darrenr Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1993
diff --git a/contrib/ipfilter/rules/.cvsignore b/contrib/ipfilter/rules/.cvsignore
deleted file mode 100644
index 3e757656cf36e..0000000000000
--- a/contrib/ipfilter/rules/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-new
diff --git a/contrib/ipfilter/samples/.cvsignore b/contrib/ipfilter/samples/.cvsignore
deleted file mode 100644
index 4d38251c2f4f9..0000000000000
--- a/contrib/ipfilter/samples/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-userauth
-proxy
-relay
-trans_relay
diff --git a/contrib/ipfilter/samples/proxy.c b/contrib/ipfilter/samples/proxy.c
index 471cc736506a9..3a757c23744bf 100644
--- a/contrib/ipfilter/samples/proxy.c
+++ b/contrib/ipfilter/samples/proxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/proxy.c,v 1.4 2006/08/16 12:23:02 guido Exp $	*/
 
 /*
  * Sample transparent proxy program.
diff --git a/contrib/ipfilter/samples/relay.c b/contrib/ipfilter/samples/relay.c
index ac5c60243b8f8..23b721655d1fa 100644
--- a/contrib/ipfilter/samples/relay.c
+++ b/contrib/ipfilter/samples/relay.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/relay.c,v 1.4 2005/12/30 11:52:25 guido Exp $	*/
 
 /*
  * Sample program to be used as a transparent proxy.
diff --git a/contrib/ipfilter/samples/userauth.c b/contrib/ipfilter/samples/userauth.c
index 620bd7220057e..94ec70fff07fa 100644
--- a/contrib/ipfilter/samples/userauth.c
+++ b/contrib/ipfilter/samples/userauth.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/samples/userauth.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $	*/
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/ipfilter/snoop.h b/contrib/ipfilter/snoop.h
index 3cb54b99cc3fb..f476cb0b393b7 100644
--- a/contrib/ipfilter/snoop.h
+++ b/contrib/ipfilter/snoop.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/snoop.h,v 1.3 2005/12/30 11:52:22 guido Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
diff --git a/contrib/ipfilter/test/.cvsignore b/contrib/ipfilter/test/.cvsignore
deleted file mode 100644
index 5825abcde9c7e..0000000000000
--- a/contrib/ipfilter/test/.cvsignore
+++ /dev/null
@@ -1,87 +0,0 @@
-results
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-i1
-i2
-i3
-i4
-i5
-i6
-i7
-i8
-i9
-i10
-i11
-f1
-f2
-f3
-f4
-f5
-f6
-f7
-f8
-f9
-f10
-f11
-f12
-f13
-f14
-n1
-n2
-n3
-n4
-n5
-n6
-n7
-f15
-f16
-ipv6.1
-ipv6.2
-l1
-ni1
-ni2
-ni3
-ni4
-f17
-in1
-in2
-in3
-in4
-p1
-p2
-i12
-ip1
-p3
-i13
-ni5
-ni6
-i14
-in5
-ipv6.3
-n8
-n9
-n10
-n11
-ni7
-ni8
-ni9
-ni10
-ni11
-ni12
-n12
-in6
-i15
-ni13
-ni14
-ni15
-ni16
diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest
index 1c8ac5bca2c33..146702a93416a 100755
--- a/contrib/ipfilter/test/logtest
+++ b/contrib/ipfilter/test/logtest
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/contrib/ipfilter/test/logtest,v 1.4 2005/04/25 18:20:15 darrenr Exp $
 format=$2
 mkdir -p results
 if [ -f /usr/ucb/touch ] ; then
diff --git a/contrib/ipfilter/tools/ipf.c b/contrib/ipfilter/tools/ipf.c
index fe9fec2581ec5..34a196d4f3f25 100644
--- a/contrib/ipfilter/tools/ipf.c
+++ b/contrib/ipfilter/tools/ipf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipf.c,v 1.6 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipf_y.y b/contrib/ipfilter/tools/ipf_y.y
index 2ce4291f2ec8d..2017c9e81b8a3 100644
--- a/contrib/ipfilter/tools/ipf_y.y
+++ b/contrib/ipfilter/tools/ipf_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipf_y.y,v 1.6.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/contrib/ipfilter/tools/ipfcomp.c
index 1e26de5966c39..e5f9eaef32241 100644
--- a/contrib/ipfilter/tools/ipfcomp.c
+++ b/contrib/ipfilter/tools/ipfcomp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfcomp.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2005 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfs.c b/contrib/ipfilter/tools/ipfs.c
index eab650a7ee36d..96d6a8a7bd42e 100644
--- a/contrib/ipfilter/tools/ipfs.c
+++ b/contrib/ipfilter/tools/ipfs.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfs.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipfstat.c b/contrib/ipfilter/tools/ipfstat.c
index 3c5bfdd50ac48..4e0e3d1dd7061 100644
--- a/contrib/ipfilter/tools/ipfstat.c
+++ b/contrib/ipfilter/tools/ipfstat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipftest.c b/contrib/ipfilter/tools/ipftest.c
index 963ed197cb9c5..197735dbc3599 100644
--- a/contrib/ipfilter/tools/ipftest.c
+++ b/contrib/ipfilter/tools/ipftest.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipftest.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
index ceaed82cb4b3a..104ceb338415e 100644
--- a/contrib/ipfilter/tools/ipmon.c
+++ b/contrib/ipfilter/tools/ipmon.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipmon.c,v 1.7.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/contrib/ipfilter/tools/ipmon_y.y
index 98042d8802226..5732fe935f910 100644
--- a/contrib/ipfilter/tools/ipmon_y.y
+++ b/contrib/ipfilter/tools/ipmon_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipmon_y.y,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2004 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat.c b/contrib/ipfilter/tools/ipnat.c
index 28e29ec74199e..5ba3523125031 100644
--- a/contrib/ipfilter/tools/ipnat.c
+++ b/contrib/ipfilter/tools/ipnat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipnat.c,v 1.5.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y
index cce717d8ee056..19ab5a80e4fd7 100644
--- a/contrib/ipfilter/tools/ipnat_y.y
+++ b/contrib/ipfilter/tools/ipnat_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipnat_y.y,v 1.5.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c
index 8b70960507364..323957266010b 100644
--- a/contrib/ipfilter/tools/ippool.c
+++ b/contrib/ipfilter/tools/ippool.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ippool.c,v 1.4 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ippool_y.y b/contrib/ipfilter/tools/ippool_y.y
index 24f683bd1c19e..46b45c8be970f 100644
--- a/contrib/ipfilter/tools/ippool_y.y
+++ b/contrib/ipfilter/tools/ippool_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ippool_y.y,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/contrib/ipfilter/tools/ipscan_y.y
index 5dbefd6ab5ae2..813496cab2bf9 100644
--- a/contrib/ipfilter/tools/ipscan_y.y
+++ b/contrib/ipfilter/tools/ipscan_y.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipscan_y.y,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2004 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/contrib/ipfilter/tools/ipsyncm.c
index 600d39ad0d6cc..46e351a4b1fbd 100644
--- a/contrib/ipfilter/tools/ipsyncm.c
+++ b/contrib/ipfilter/tools/ipsyncm.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipsyncm.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/contrib/ipfilter/tools/ipsyncs.c
index 887eeab310c6f..d58a72de145e8 100644
--- a/contrib/ipfilter/tools/ipsyncs.c
+++ b/contrib/ipfilter/tools/ipsyncs.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/ipsyncs.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2001-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lex_var.h b/contrib/ipfilter/tools/lex_var.h
index 78c5efc4263de..6fa0c5e4cf100 100644
--- a/contrib/ipfilter/tools/lex_var.h
+++ b/contrib/ipfilter/tools/lex_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lex_var.h,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.c b/contrib/ipfilter/tools/lexer.c
index 989643c966b52..c164937596a77 100644
--- a/contrib/ipfilter/tools/lexer.c
+++ b/contrib/ipfilter/tools/lexer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lexer.c,v 1.4.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2006 by Darren Reed.
diff --git a/contrib/ipfilter/tools/lexer.h b/contrib/ipfilter/tools/lexer.h
index d973ea42ae35e..8d5458ec5162a 100644
--- a/contrib/ipfilter/tools/lexer.h
+++ b/contrib/ipfilter/tools/lexer.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/contrib/ipfilter/tools/lexer.h,v 1.3 2007/06/04 02:54:34 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2004 by Darren Reed.
diff --git a/contrib/less/command.c b/contrib/less/command.c
index e42d9ce764c8b..cce5669afa9f3 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/command.c,v 1.8.2.1 2007/12/04 22:37:28 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c
index 08a9721ab2d58..1f14df4b28c6c 100644
--- a/contrib/less/forwback.c
+++ b/contrib/less/forwback.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/forwback.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/less.h b/contrib/less/less.h
index f2ea445102f67..1591f96008d08 100644
--- a/contrib/less/less.h
+++ b/contrib/less/less.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/less.h,v 1.8.2.1 2007/12/04 22:37:28 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/line.c b/contrib/less/line.c
index 944e02d869635..7a0e04a5a5948 100644
--- a/contrib/less/line.c
+++ b/contrib/less/line.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/line.c,v 1.5.2.1 2007/12/04 22:37:28 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/main.c b/contrib/less/main.c
index e139a62d0cf42..cc92474df0294 100644
--- a/contrib/less/main.c
+++ b/contrib/less/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/main.c,v 1.12 2007/09/04 13:54:09 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c
index 4f9689567e587..198cdf73fd111 100644
--- a/contrib/less/prompt.c
+++ b/contrib/less/prompt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/prompt.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index 3c123b9bf1024..07cb22795564e 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/screen.c,v 1.8.2.1 2007/12/04 22:37:28 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/search.c b/contrib/less/search.c
index 4fb169c39d7ed..c9d6997b40d9b 100644
--- a/contrib/less/search.c
+++ b/contrib/less/search.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/search.c,v 1.9.2.1 2007/12/04 22:37:28 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
diff --git a/contrib/less/signal.c b/contrib/less/signal.c
index def985dba7e5d..c5468608840b2 100644
--- a/contrib/less/signal.c
+++ b/contrib/less/signal.c
@@ -8,7 +8,7 @@
  * contact the author, see the README file.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/less/signal.c,v 1.6 2007/10/08 16:17:42 delphij Exp $ */
 
 /*
  * Routines dealing with signals.
diff --git a/contrib/libf2c/FREEBSD-upgrade b/contrib/libf2c/FREEBSD-upgrade
index e919f546f5529..448db9023401b 100644
--- a/contrib/libf2c/FREEBSD-upgrade
+++ b/contrib/libf2c/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/libf2c/FREEBSD-upgrade,v 1.4 1999/11/01 07:25:20 obrien Exp $
 
 For the import of lib{f,g}2c, files were pruned by:
 
diff --git a/contrib/libpcap/.cvsignore b/contrib/libpcap/.cvsignore
deleted file mode 100644
index 138c28814a089..0000000000000
--- a/contrib/libpcap/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-config.log
-config.cache
-config.status
-config.h
-.devel
-stamp-h
-stamp-h.in
-Makefile
-scanner.c
-grammar.c
-tokdefs.h
-version.c
-version.h
diff --git a/contrib/libpcap/FREEBSD-upgrade b/contrib/libpcap/FREEBSD-upgrade
index eea75c2951c44..43ca2cb85fe31 100644
--- a/contrib/libpcap/FREEBSD-upgrade
+++ b/contrib/libpcap/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/libpcap/FREEBSD-upgrade,v 1.6 2006/09/04 19:54:49 sam Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index b2d822221c3ef..07ec9a412f2d0 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.16.2.1 2007/10/19 03:03:56 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index 9363a425987d4..e45c6b327862e 100644
--- a/contrib/libpcap/gencode.h
+++ b/contrib/libpcap/gencode.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.h,v 1.9.2.1 2007/10/19 03:03:56 mlaier Exp $
  * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.60.2.11 2007/06/11 09:52:04 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index 9d9b2023ec238..db5c439b310f1 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/grammar.y,v 1.11.2.1 2007/10/19 03:03:56 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 791c281c6f501..3a59dc066b07b 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -21,7 +21,7 @@
  * Name to id translation routines used by the scanner.
  * These functions are not time critical.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nametoaddr.c,v 1.12.10.1 2007/10/19 03:03:56 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libpcap/nlpid.h b/contrib/libpcap/nlpid.h
index 7ea2963f108df..e5ff50c4333ea 100644
--- a/contrib/libpcap/nlpid.h
+++ b/contrib/libpcap/nlpid.h
@@ -15,7 +15,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nlpid.h,v 1.3 2004/03/31 09:13:37 bms Exp $
  * @(#) $Header: /tcpdump/master/libpcap/nlpid.h,v 1.2 2002/12/06 00:01:34 hannes Exp $ (Juniper)
  */
 
diff --git a/contrib/libpcap/pcap-bpf.c b/contrib/libpcap/pcap-bpf.c
index 91bfdcb283cdb..2024bc9653273 100644
--- a/contrib/libpcap/pcap-bpf.c
+++ b/contrib/libpcap/pcap-bpf.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.3.2.1 2007/10/19 03:03:56 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h
index fbab8e9cac343..1fe190eed15db 100644
--- a/contrib/libpcap/pcap-int.h
+++ b/contrib/libpcap/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-int.h,v 1.12.2.1 2007/10/19 03:03:56 mlaier Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.11 2007/06/22 06:43:58 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index bbd06b0f58a80..f5780e1739247 100644
--- a/contrib/libpcap/pcap-namedb.h
+++ b/contrib/libpcap/pcap-namedb.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-namedb.h,v 1.6 2005/07/11 03:43:25 sam Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.10 2005/03/17 07:02:32 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap.3 b/contrib/libpcap/pcap.3
index 14b936883b2d1..75c2766e1b321 100644
--- a/contrib/libpcap/pcap.3
+++ b/contrib/libpcap/pcap.3
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libpcap/pcap.3,v 1.15.2.1 2007/10/19 03:03:56 mlaier Exp $
 .\"
 .TH PCAP 3 "27 February 2004"
 .SH NAME
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index c81f81e8afc67..c93e826c7ec7d 100644
--- a/contrib/libpcap/pcap.h
+++ b/contrib/libpcap/pcap.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.12.2.2 2007/10/20 20:25:49 mlaier Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.7 2007/06/11 09:52:05 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index ff8ae63aa41c8..da7dbbce53050 100644
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/scanner.l,v 1.13.2.1 2007/10/19 03:03:56 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libreadline/FREEBSD-upgrade b/contrib/libreadline/FREEBSD-upgrade
index 1e35444b98a30..7601f870641ac 100644
--- a/contrib/libreadline/FREEBSD-upgrade
+++ b/contrib/libreadline/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $
 #
 # Official patch 001 imported as v5_2_p1
 # Official patch 002 imported as v5_2_p2
diff --git a/contrib/libreadline/complete.c b/contrib/libreadline/complete.c
index 3606d5097f086..1f322b865bb01 100644
--- a/contrib/libreadline/complete.c
+++ b/contrib/libreadline/complete.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */
 /* complete.c -- filename completion for readline. */
 
 /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c
index 399cd4b8097cd..68741bf283335 100644
--- a/contrib/libreadline/display.c
+++ b/contrib/libreadline/display.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */
 /* display.c -- readline redisplay facility. */
 
 /* Copyright (C) 1987-2006 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/doc/readline.3 b/contrib/libreadline/doc/readline.3
index d359cb6789502..379e9ce73f615 100644
--- a/contrib/libreadline/doc/readline.3
+++ b/contrib/libreadline/doc/readline.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libreadline/doc/readline.3,v 1.12 2006/12/31 09:22:31 ache Exp $
 .\"
 .\" MAN PAGE COMMENTS to
 .\"
diff --git a/contrib/libreadline/readline.h b/contrib/libreadline/readline.h
index fab2f7f36f754..b7197ea9b719c 100644
--- a/contrib/libreadline/readline.h
+++ b/contrib/libreadline/readline.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.18 2006/12/31 09:22:31 ache Exp $ */
 /* Readline.h -- the names of functions callable from within readline. */
 
 /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/rlconf.h b/contrib/libreadline/rlconf.h
index 041abba8a6454..3b8a0723df78e 100644
--- a/contrib/libreadline/rlconf.h
+++ b/contrib/libreadline/rlconf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/rlconf.h,v 1.8 2006/12/31 09:22:31 ache Exp $ */
 /* rlconf.h -- readline configuration definitions */
 
 /* Copyright (C) 1994 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/shell.c b/contrib/libreadline/shell.c
index 58ecd8e1b8a7e..4bedfb3336043 100644
--- a/contrib/libreadline/shell.c
+++ b/contrib/libreadline/shell.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/shell.c,v 1.10 2006/03/27 23:11:32 ache Exp $ */
 /* shell.c -- readline utility functions that are normally provided by
 	      bash when readline is linked as part of the shell. */
 
diff --git a/contrib/libreadline/terminal.c b/contrib/libreadline/terminal.c
index bbc1fa490960e..be781402b7f04 100644
--- a/contrib/libreadline/terminal.c
+++ b/contrib/libreadline/terminal.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/terminal.c,v 1.10 2006/12/31 09:22:31 ache Exp $ */
 /* terminal.c -- controlling the terminal with termcap. */
 
 /* Copyright (C) 1996-2006 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/util.c b/contrib/libreadline/util.c
index 83974e3cd8607..0fc88e8dda5fa 100644
--- a/contrib/libreadline/util.c
+++ b/contrib/libreadline/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/util.c,v 1.11 2006/03/27 23:11:32 ache Exp $ */
 /* util.c -- readline utility functions */
 
 /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
diff --git a/contrib/libreadline/vi_mode.c b/contrib/libreadline/vi_mode.c
index d0f01b151417b..902cec8a4772c 100644
--- a/contrib/libreadline/vi_mode.c
+++ b/contrib/libreadline/vi_mode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.6 2006/12/31 09:22:31 ache Exp $ */
 /* vi_mode.c -- A vi emulation mode for Bash.
    Derived from code written by Jeff Sparkes (jsparkes@bnr.ca).  */
 
diff --git a/contrib/lukemftpd/src/ftpd.c b/contrib/lukemftpd/src/ftpd.c
index 50a88545fe1dd..3786dca1bb42e 100644
--- a/contrib/lukemftpd/src/ftpd.c
+++ b/contrib/lukemftpd/src/ftpd.c
@@ -107,7 +107,7 @@ static char sccsid[] = "@(#)ftpd.c	8.5 (Berkeley) 4/28/95";
 #else
 __RCSID("$NetBSD: ftpd.c,v 1.176 2006/05/09 20:18:06 mrg Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.5 2006/08/31 17:08:21 obrien Exp $");
 #endif /* not lint */
 
 /*
diff --git a/contrib/lukemftpd/src/ftpd.conf.5 b/contrib/lukemftpd/src/ftpd.conf.5
index be73c48c15371..1b3341c87b5df 100644
--- a/contrib/lukemftpd/src/ftpd.conf.5
+++ b/contrib/lukemftpd/src/ftpd.conf.5
@@ -1,5 +1,5 @@
 .\"	$NetBSD: ftpd.conf.5,v 1.32 2005/09/11 23:31:46 wiz Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/lukemftpd/src/ftpd.conf.5,v 1.5 2006/08/31 17:11:46 obrien Exp $
 .\"
 .\" Copyright (c) 1997-2001, 2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/contrib/ncurses/FREEBSD-Xlist b/contrib/ncurses/FREEBSD-Xlist
index a0ee58e5a0ea3..860a894c75f70 100644
--- a/contrib/ncurses/FREEBSD-Xlist
+++ b/contrib/ncurses/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ncurses/FREEBSD-Xlist,v 1.1 2007/01/20 08:24:05 rafan Exp $
 
 Ada95
 c++
diff --git a/contrib/ncurses/FREEBSD-upgrade b/contrib/ncurses/FREEBSD-upgrade
index 6fea602ac79f4..4fe9c377ec8f2 100644
--- a/contrib/ncurses/FREEBSD-upgrade
+++ b/contrib/ncurses/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ncurses/FREEBSD-upgrade,v 1.1 2007/01/20 08:24:05 rafan Exp $
 
 ncurses
 
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c
index cf95464b4ab16..5e2a6ecc01535 100644
--- a/contrib/ncurses/ncurses/tinfo/comp_scan.c
+++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996 on                 *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/comp_scan.c,v 1.7 2007/01/20 07:39:15 rafan Exp $ */
 
 /*
  *	comp_scan.c --- Lexical scanner for terminfo compiler.
diff --git a/contrib/ncurses/ncurses/tinfo/lib_baudrate.c b/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
index 15ba3bbc8c276..4fdb7b554f839 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
@@ -31,7 +31,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c,v 1.2 2005/07/15 07:41:26 phk Exp $ */
 
 /*
  *	lib_baudrate.c
diff --git a/contrib/ncurses/ncurses/tinfo/lib_raw.c b/contrib/ncurses/ncurses/tinfo/lib_raw.c
index 1f6d90a5c1a8d..2353a21664158 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_raw.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_raw.c
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey 1998 on                                        *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/lib_raw.c,v 1.7 2007/01/20 07:39:15 rafan Exp $ */
 
 /*
  *	raw.c
diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
index 66d8701a890b5..5ce6b35da9e6a 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
@@ -36,7 +36,7 @@
  * (but it has changed a lot)                                               *
  ****************************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/ncurses/ncurses/tinfo/lib_termcap.c,v 1.12 2007/01/20 07:39:15 rafan Exp $ */
 
 #define __INTERNAL_CAPS_VISIBLE
 #include <curses.priv.h>
diff --git a/contrib/netcat/FREEBSD-Xlist b/contrib/netcat/FREEBSD-Xlist
index b69f5e4de3715..a13fc8b711d62 100644
--- a/contrib/netcat/FREEBSD-Xlist
+++ b/contrib/netcat/FREEBSD-Xlist
@@ -1,3 +1,3 @@
-$FreeBSD$
+$FreeBSD: src/contrib/netcat/FREEBSD-Xlist,v 1.1 2005/02/06 15:26:44 delphij Exp $
 
 Makefile
diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade
index 5cba52bd65b22..7076e61d8ac66 100644
--- a/contrib/netcat/FREEBSD-upgrade
+++ b/contrib/netcat/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $
 
 1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
 2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1
index 20885a8b9ea15..62b5fcdf35d36 100644
--- a/contrib/netcat/nc.1
+++ b/contrib/netcat/nc.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.7 2007/03/28 01:57:03 delphij Exp $
 .\"
 .Dd May 21, 2006
 .Dt NC 1
diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c
index bbf79191caaea..f0e3a3ffab321 100644
--- a/contrib/netcat/netcat.c
+++ b/contrib/netcat/netcat.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/netcat/netcat.c,v 1.6 2007/07/01 12:08:04 gnn Exp $
  */
 
 /*
diff --git a/contrib/ngatm/FREEBSD-Xlist b/contrib/ngatm/FREEBSD-Xlist
index 32e28ddb55fb4..6646b935d09c3 100644
--- a/contrib/ngatm/FREEBSD-Xlist
+++ b/contrib/ngatm/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/contrib/ngatm/FREEBSD-Xlist,v 1.1 2004/08/11 12:19:32 harti Exp $
 */VERSION
 */README
 */Makefile.in
diff --git a/contrib/ngatm/FREEBSD-upgrade b/contrib/ngatm/FREEBSD-upgrade
index 4557bf72bad28..610aedb32b6ec 100644
--- a/contrib/ngatm/FREEBSD-upgrade
+++ b/contrib/ngatm/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/ngatm/FREEBSD-upgrade,v 1.1 2003/10/22 09:28:49 harti Exp $
 
 This is the user part of the NgATM stuff. Be careful to feed changes
 back to the maintainer <harti@freebsd.org>, because the code here is
diff --git a/contrib/ntp/FREEBSD-upgrade b/contrib/ntp/FREEBSD-upgrade
index feea467046436..7921072262a98 100644
--- a/contrib/ntp/FREEBSD-upgrade
+++ b/contrib/ntp/FREEBSD-upgrade
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/ntp/FREEBSD-upgrade,v 1.5 2004/07/20 15:25:19 roberto Exp $
 
 NTP 4.2.0
 	originals can be found on ftp://ftp.udel.edu/pub/ntp/ntp4/
diff --git a/contrib/ntp/libntp/random.c b/contrib/ntp/libntp/random.c
index 713685799c9c1..7005c1f23d24a 100644
--- a/contrib/ntp/libntp/random.c
+++ b/contrib/ntp/libntp/random.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ntp/libntp/random.c,v 1.1.1.1 2001/08/29 14:35:11 roberto Exp $
  *
  */
 
diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c
index cbcc837556760..05d00e3d5cbe3 100644
--- a/contrib/ntp/ntpd/ntp_control.c
+++ b/contrib/ntp/ntpd/ntp_control.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/ntp/ntpd/ntp_control.c,v 1.9 2004/07/20 15:51:00 roberto Exp $
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/contrib/nvi/cl/cl_screen.c b/contrib/nvi/cl/cl_screen.c
index bfb9199352d91..70eb4ba1c90bf 100644
--- a/contrib/nvi/cl/cl_screen.c
+++ b/contrib/nvi/cl/cl_screen.c
@@ -6,7 +6,7 @@
  *
  * See the LICENSE file for redistribution information.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.4 2007/06/06 11:14:30 rafan Exp $
  */
 
 #include "config.h"
diff --git a/contrib/nvi/common/exf.c b/contrib/nvi/common/exf.c
index e332f4700e718..b4c5beac4b441 100644
--- a/contrib/nvi/common/exf.c
+++ b/contrib/nvi/common/exf.c
@@ -15,7 +15,7 @@
 static const char sccsid[] = "@(#)exf.c	10.49 (Berkeley) 10/10/96";
 #endif
 static const char rcsid[] = 
-  "$FreeBSD$";
+  "$FreeBSD: src/contrib/nvi/common/exf.c,v 1.5 2001/10/26 08:25:32 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/contrib/nvi/docs/USD.doc/vi.man/vi.1 b/contrib/nvi/docs/USD.doc/vi.man/vi.1
index 4d8c08db54ff7..3c57fb4b35484 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/vi.1
+++ b/contrib/nvi/docs/USD.doc/vi.man/vi.1
@@ -9,7 +9,7 @@
 .\" See the LICENSE file for redistribution information.
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/nvi/docs/USD.doc/vi.man/vi.1,v 1.5 2001/01/03 18:32:10 ben Exp $
 .\"
 .TH VI 1 "October 10, 1996"
 .UC
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref b/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
index 12a483f1edb1f..8a8eb06f7e24c 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
+++ b/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
@@ -10,7 +10,7 @@
 .\"
 .\"     @(#)vi.ref	8.88 (Berkeley) 10/19/96
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/nvi/docs/USD.doc/vi.ref/vi.ref,v 1.2 2005/08/17 15:56:04 cperciva Exp $
 .\"
 .so ref.so
 .tp
diff --git a/contrib/nvi/ex/ex.c b/contrib/nvi/ex/ex.c
index ecdae4b869343..714b23a3932ad 100644
--- a/contrib/nvi/ex/ex.c
+++ b/contrib/nvi/ex/ex.c
@@ -7,7 +7,7 @@
  * See the LICENSE file for redistribution information.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/nvi/ex/ex.c,v 1.2 1999/09/14 14:34:58 ru Exp $ */
 
 #include "config.h"
 
diff --git a/contrib/nvi/perl_api/perl.xs b/contrib/nvi/perl_api/perl.xs
index 3b89ea44cc921..45b93ba1db64f 100644
--- a/contrib/nvi/perl_api/perl.xs
+++ b/contrib/nvi/perl_api/perl.xs
@@ -10,7 +10,7 @@
  *
  * See the LICENSE file for redistribution information.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/nvi/perl_api/perl.xs,v 1.3 2000/12/01 12:11:24 sheldonh Exp $
  */
 
 #include "config.h"
diff --git a/contrib/nvi/vi/vs_line.c b/contrib/nvi/vi/vs_line.c
index 495e75e8f1b69..abcd6e3799159 100644
--- a/contrib/nvi/vi/vs_line.c
+++ b/contrib/nvi/vi/vs_line.c
@@ -14,7 +14,7 @@
 static const char sccsid[] = "@(#)vs_line.c	10.19 (Berkeley) 9/26/96";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/contrib/nvi/vi/vs_line.c,v 1.5 2002/01/31 14:23:49 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/contrib/nvi/vi/vs_refresh.c b/contrib/nvi/vi/vs_refresh.c
index f69d3820db7f5..9671317ba8adc 100644
--- a/contrib/nvi/vi/vs_refresh.c
+++ b/contrib/nvi/vi/vs_refresh.c
@@ -14,7 +14,7 @@
 static const char sccsid[] = "@(#)vs_refresh.c	10.44 (Berkeley) 10/13/96";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/contrib/nvi/vi/vs_refresh.c,v 1.3 2001/07/19 11:02:11 dd Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/contrib/one-true-awk/FREEBSD-upgrade b/contrib/one-true-awk/FREEBSD-upgrade
index 34f5192b99f11..b2c22246c6ae6 100644
--- a/contrib/one-true-awk/FREEBSD-upgrade
+++ b/contrib/one-true-awk/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $
 
 Import of the 2005/04/24 version of the "one true awk", as described
 in "The AWK Programming Language", by Al Aho, Brian Kernighan, and
diff --git a/contrib/openbsm/FREEBSD-upgrade b/contrib/openbsm/FREEBSD-upgrade
index e1776753355e9..ee2661c906e5b 100644
--- a/contrib/openbsm/FREEBSD-upgrade
+++ b/contrib/openbsm/FREEBSD-upgrade
@@ -53,4 +53,4 @@ the version in contrib/openbsm/bsm, so buildworld tests before committing
 are necessary, and the commits to various parts of the system must be
 made in close succession.
 
-$FreeBSD$
+$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.7 2006/09/02 09:56:28 rwatson Exp $
diff --git a/contrib/openbsm/config/config.h b/contrib/openbsm/config/config.h
index ac6c6ab2f0b39..155c00849bf6b 100644
--- a/contrib/openbsm/config/config.h
+++ b/contrib/openbsm/config/config.h
@@ -1,6 +1,6 @@
 /* config/config.h.  Generated from config.h.in by configure.  */
 /* config/config.h.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/openbsm/config/config.h,v 1.6.2.1 2007/11/04 12:49:59 rwatson Exp $ */
 
 /* Define to 1 if you have the `alarm' function. */
 #define HAVE_ALARM 1
diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class
index 068d2fcc2d7f4..97e3c140d041a 100644
--- a/contrib/openbsm/etc/audit_class
+++ b/contrib/openbsm/etc/audit_class
@@ -1,6 +1,6 @@
 #
 # $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#5 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_class,v 1.2.4.1 2007/11/04 12:49:59 rwatson Exp $
 #
 0x00000000:no:invalid class
 0x00000001:fr:file read
diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control
index a711019f39ac5..232d97e144d99 100644
--- a/contrib/openbsm/etc/audit_control
+++ b/contrib/openbsm/etc/audit_control
@@ -1,6 +1,6 @@
 #
 # $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#5 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_control,v 1.4 2006/09/25 11:53:06 rwatson Exp $
 #
 dir:/var/audit
 flags:lo
diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event
index 2b1182497a835..36d7b27c62131 100644
--- a/contrib/openbsm/etc/audit_event
+++ b/contrib/openbsm/etc/audit_event
@@ -1,6 +1,6 @@
 #
 # $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#26 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.8.2.1 2007/11/04 12:49:59 rwatson Exp $
 #
 # The mapping between event identifiers and values is also hard-codedd in
 # audit_kevents.h and audit_uevents.h, so changes must occur in both places,
diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user
index 0cce4f1974397..0e860a1c614a0 100644
--- a/contrib/openbsm/etc/audit_user
+++ b/contrib/openbsm/etc/audit_user
@@ -1,5 +1,5 @@
 #
 # $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#3 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_user,v 1.2 2006/03/26 01:44:35 rwatson Exp $
 #
 root:lo:no
diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn
index c5a31590fc8dc..a6384c4dea849 100644
--- a/contrib/openbsm/etc/audit_warn
+++ b/contrib/openbsm/etc/audit_warn
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 # $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $
-# $FreeBSD$
+# $FreeBSD: src/contrib/openbsm/etc/audit_warn,v 1.2 2006/03/26 01:44:35 rwatson Exp $
 #
 logger -p security.warning "audit warning: $@"
diff --git a/contrib/opie/ftpcmd.y b/contrib/opie/ftpcmd.y
index abcffdc69568c..1002be1437396 100644
--- a/contrib/opie/ftpcmd.y
+++ b/contrib/opie/ftpcmd.y
@@ -23,7 +23,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Modified at NRL for OPIE 2.0.
 	Originally from BSD.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/ftpcmd.y,v 1.4 2002/03/21 23:42:52 markm Exp $
 */
 /*
  * Copyright (c) 1985, 1988 Regents of the University of California.
diff --git a/contrib/opie/libopie/challenge.c b/contrib/opie/libopie/challenge.c
index fc836aa6cc5db..f2fcca95125c9 100644
--- a/contrib/opie/libopie/challenge.c
+++ b/contrib/opie/libopie/challenge.c
@@ -21,7 +21,7 @@ License Agreement applies to this software.
 	Modified by cmetz for OPIE 2.2. Use FUNCTION declaration et al.
         Created at NRL for OPIE 2.2 from opiesubr2.c
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/challenge.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 
 */
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/generator.c b/contrib/opie/libopie/generator.c
index d4888f990e3bc..4a7fbdf5e4a66 100644
--- a/contrib/opie/libopie/generator.c
+++ b/contrib/opie/libopie/generator.c
@@ -29,7 +29,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 		Bug fixes.
 	Created at NRL for OPIE 2.2.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/generator.c,v 1.5 2002/03/21 23:42:52 markm Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/hash.c b/contrib/opie/libopie/hash.c
index babcbfae3aa97..cffe2aa9218c8 100644
--- a/contrib/opie/libopie/hash.c
+++ b/contrib/opie/libopie/hash.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
               they killed thread-safety.
         Created by cmetz for OPIE 2.3 using the old hash.c as a guide.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/hash.c,v 1.6 2002/03/21 23:42:52 markm Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/hashlen.c b/contrib/opie/libopie/hashlen.c
index 29d855deaa3b8..cff9748edc72f 100644
--- a/contrib/opie/libopie/hashlen.c
+++ b/contrib/opie/libopie/hashlen.c
@@ -11,7 +11,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Modified by cmetz for OPIE 2.4. Use struct opie_otpkey, isolate variables.
 	Created by cmetz for OPIE 2.3.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/hashlen.c,v 1.6 2002/03/21 23:42:52 markm Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/insecure.c b/contrib/opie/libopie/insecure.c
index bc61c5457ea39..e3de96999754f 100644
--- a/contrib/opie/libopie/insecure.c
+++ b/contrib/opie/libopie/insecure.c
@@ -28,7 +28,7 @@ License Agreement applies to this software.
         Created at NRL for OPIE 2.2 from opiesubr.c. Fixed pointer
              assignment that should have been a comparison.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 
 */
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/lock.c b/contrib/opie/libopie/lock.c
index 865d270bb5271..e1022f7dde95e 100644
--- a/contrib/opie/libopie/lock.c
+++ b/contrib/opie/libopie/lock.c
@@ -29,7 +29,7 @@ License Agreement applies to this software.
             Avoid NULL.
         Created at NRL for OPIE 2.2 from opiesubr2.c
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/lock.c,v 1.3 2002/03/21 23:42:52 markm Exp $
 */
 #include "opie_cfg.h"
 #if HAVE_STRING_H
diff --git a/contrib/opie/libopie/newseed.c b/contrib/opie/libopie/newseed.c
index 2965b0efc6a7f..38683d60f0d8d 100644
--- a/contrib/opie/libopie/newseed.c
+++ b/contrib/opie/libopie/newseed.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Modified by cmetz for OPIE 2.31. Added time.h.
 	Created by cmetz for OPIE 2.22.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/newseed.c,v 1.5 2003/01/22 10:55:36 des Exp $
 */
 
 #include "opie_cfg.h"
diff --git a/contrib/opie/libopie/readrec.c b/contrib/opie/libopie/readrec.c
index f56af7ffb73d2..b09dcb16be283 100644
--- a/contrib/opie/libopie/readrec.c
+++ b/contrib/opie/libopie/readrec.c
@@ -15,7 +15,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
                 records. Set read flag.
 	Created by cmetz for OPIE 2.3.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/readrec.c,v 1.2 2005/07/29 09:59:24 ache Exp $
 */
 #include "opie_cfg.h"
 
diff --git a/contrib/opie/libopie/writerec.c b/contrib/opie/libopie/writerec.c
index 3d88b34c228b9..bc7faad1a6ca4 100644
--- a/contrib/opie/libopie/writerec.c
+++ b/contrib/opie/libopie/writerec.c
@@ -14,7 +14,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 		support. Fixed passwd bug.
 	Created by cmetz for OPIE 2.3 from passwd.c.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/libopie/writerec.c,v 1.2 2005/07/29 09:59:24 ache Exp $
 */
 #include "opie_cfg.h"
 
diff --git a/contrib/opie/opie.4 b/contrib/opie/opie.4
index 3ac19324a39d1..c86ee03646670 100644
--- a/contrib/opie/opie.4
+++ b/contrib/opie/opie.4
@@ -21,7 +21,7 @@
 .\"	Definition of "seed" written by Neil Haller of Bellcore
 .\"	Written at NRL for OPIE 2.0.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opie.4,v 1.8 2002/03/21 23:42:52 markm Exp $
 .\"
 .TH OPIE 4 "January 10, 1995"
 .SH NAME
diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h
index be508c77f73d9..a3fe84f28b4c1 100644
--- a/contrib/opie/opie.h
+++ b/contrib/opie/opie.h
@@ -37,7 +37,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(skey.h).
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opie.h,v 1.8 2002/03/21 23:42:52 markm Exp $
 */
 #ifndef _OPIE_H
 #define _OPIE_H 1
diff --git a/contrib/opie/opie_cfg.h b/contrib/opie/opie_cfg.h
index bd000ae60a330..1ae098acf094e 100644
--- a/contrib/opie/opie_cfg.h
+++ b/contrib/opie/opie_cfg.h
@@ -48,7 +48,7 @@ License Agreement applies to this software.
 		Gutted for autoconf. Split up for autoconf.
 	Written at NRL for OPIE 2.0.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opie_cfg.h,v 1.5 2002/03/21 23:42:52 markm Exp $
 */
 
 #ifndef _OPIE_CFG_H
diff --git a/contrib/opie/opieaccess.5 b/contrib/opie/opieaccess.5
index 41b1ec0e03b76..f0c7d9e86dfe4 100644
--- a/contrib/opie/opieaccess.5
+++ b/contrib/opie/opieaccess.5
@@ -13,7 +13,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)opieaccess.5	2.0 (NRL) 1/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/opie/opieaccess.5,v 1.3 2002/03/21 23:42:52 markm Exp $
 .\"
 .lt 6.0i
 .TH OPIEACCESS 5 "January 10, 1995"
diff --git a/contrib/opie/opieftpd.c b/contrib/opie/opieftpd.c
index eb6015f4130e1..943d9c5c88d7a 100644
--- a/contrib/opie/opieftpd.c
+++ b/contrib/opie/opieftpd.c
@@ -48,7 +48,7 @@ License Agreement applies to this software.
 
 	        There is some really, really ugly code in here.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opieftpd.c,v 1.5 2002/03/21 23:42:52 markm Exp $
 */
 /*
  * Copyright (c) 1985, 1988, 1990 Regents of the University of California.
diff --git a/contrib/opie/opieinfo.1 b/contrib/opie/opieinfo.1
index 41cdebe8dec47..b5fc7ad82b761 100644
--- a/contrib/opie/opieinfo.1
+++ b/contrib/opie/opieinfo.1
@@ -19,7 +19,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinfo.1).
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opieinfo.1,v 1.5 2002/03/21 23:42:52 markm Exp $
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff --git a/contrib/opie/opieinfo.c b/contrib/opie/opieinfo.c
index 09f9784241d82..04a0b8887528d 100644
--- a/contrib/opie/opieinfo.c
+++ b/contrib/opie/opieinfo.c
@@ -30,7 +30,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(keyinfo)
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opieinfo.c,v 1.4 2002/03/21 23:42:52 markm Exp $
 
 */
 
diff --git a/contrib/opie/opiekey.1 b/contrib/opie/opiekey.1
index 1f6e35ec02ff4..609af9beb68ce 100644
--- a/contrib/opie/opiekey.1
+++ b/contrib/opie/opiekey.1
@@ -25,7 +25,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(key.1).
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opiekey.1,v 1.6 2002/03/21 23:42:52 markm Exp $
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff --git a/contrib/opie/opiekey.c b/contrib/opie/opiekey.c
index 20ba658710ee9..48bb250d7b893 100644
--- a/contrib/opie/opiekey.c
+++ b/contrib/opie/opiekey.c
@@ -37,7 +37,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(skey.c).
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/opiekey.c,v 1.4 2002/03/21 23:42:52 markm Exp $
 
 */
 #include "opie_cfg.h"
diff --git a/contrib/opie/opiekeys.5 b/contrib/opie/opiekeys.5
index 26f08ed06ff8a..72b492b133fc6 100644
--- a/contrib/opie/opiekeys.5
+++ b/contrib/opie/opiekeys.5
@@ -14,7 +14,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)opiekeys.5	2.0 (NRL) 1/10/95
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opiekeys.5,v 1.4 2000/04/10 11:18:48 kris Exp $
 .\"
 .lt 6.0i
 .TH OPIEKEYS 5 "January 10, 1995"
diff --git a/contrib/opie/opiepasswd.1 b/contrib/opie/opiepasswd.1
index 5ce6cb010b4fe..3333923c2e479 100644
--- a/contrib/opie/opiepasswd.1
+++ b/contrib/opie/opiepasswd.1
@@ -22,7 +22,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinit.1).
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/opie/opiepasswd.1,v 1.5 2002/03/21 23:42:52 markm Exp $
 .ll 6i 
 .pl 10.5i 
 .lt 6.0i
diff --git a/contrib/opie/opiepasswd.c b/contrib/opie/opiepasswd.c
index cd4ff018c3a01..d9fb487e234af 100644
--- a/contrib/opie/opiepasswd.c
+++ b/contrib/opie/opiepasswd.c
@@ -44,7 +44,7 @@ License Agreement applies to this software.
 	Written at Bellcore for the S/Key Version 1 software distribution
 		(skeyinit.c).
 
- $FreeBSD$
+ $FreeBSD: src/contrib/opie/opiepasswd.c,v 1.4 2006/03/22 16:00:42 cperciva Exp $
 */
 #include "opie_cfg.h"
 
diff --git a/contrib/opie/popen.c b/contrib/opie/popen.c
index 99aad17025a6f..833ee798059a7 100644
--- a/contrib/opie/popen.c
+++ b/contrib/opie/popen.c
@@ -23,7 +23,7 @@ License Agreement applies to this software.
 	Modified at NRL for OPIE 2.0.
 	Originally from BSD.
 
-$FreeBSD$
+$FreeBSD: src/contrib/opie/popen.c,v 1.2 2003/07/13 05:59:50 kris Exp $
 */
 /*
  * Copyright (c) 1988, 1993, 1994
diff --git a/contrib/pf/authpf/authpf.8 b/contrib/pf/authpf/authpf.8
index bd4ff402d7def..c297827dc83ed 100644
--- a/contrib/pf/authpf/authpf.8
+++ b/contrib/pf/authpf/authpf.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/authpf/authpf.8,v 1.3 2007/07/03 12:30:00 mlaier Exp $
 .\" $OpenBSD: authpf.8,v 1.43 2007/02/24 17:21:04 beck Exp $
 .\"
 .\" Copyright (c) 1998-2007 Bob Beck (beck@openbsd.org>.  All rights reserved.
diff --git a/contrib/pf/authpf/authpf.c b/contrib/pf/authpf/authpf.c
index 56d7728a330ca..fdeb50b486bea 100644
--- a/contrib/pf/authpf/authpf.c
+++ b/contrib/pf/authpf/authpf.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.8 2007/07/03 12:30:01 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.8 b/contrib/pf/ftp-proxy/ftp-proxy.8
index 69c848e196255..acc74319c12ec 100644
--- a/contrib/pf/ftp-proxy/ftp-proxy.8
+++ b/contrib/pf/ftp-proxy/ftp-proxy.8
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.8,v 1.5 2007/07/03 12:30:01 mlaier Exp $
 .\"
 .Dd November 28, 2004
 .Dt FTP-PROXY 8
diff --git a/contrib/pf/ftp-proxy/ftp-proxy.c b/contrib/pf/ftp-proxy/ftp-proxy.c
index 06c848795b8dc..adaca368b976f 100644
--- a/contrib/pf/ftp-proxy/ftp-proxy.c
+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.c,v 1.7 2007/07/03 12:30:01 mlaier Exp $");
 
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/contrib/pf/man/pf.4 b/contrib/pf/man/pf.4
index 16e74abdf9d4c..1fe7735a6b09d 100644
--- a/contrib/pf/man/pf.4
+++ b/contrib/pf/man/pf.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pf.4,v 1.9 2007/07/03 12:30:01 mlaier Exp $
 .\"
 .Dd February 7, 2005
 .Dt PF 4
diff --git a/contrib/pf/man/pf.conf.5 b/contrib/pf/man/pf.conf.5
index d0bcd9c35f227..3e2100f39e729 100644
--- a/contrib/pf/man/pf.conf.5
+++ b/contrib/pf/man/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.14 2007/07/03 12:30:01 mlaier Exp $
 .\"	$OpenBSD: pf.conf.5,v 1.376 2006/12/01 07:23:26 camield Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
diff --git a/contrib/pf/man/pf.os.5 b/contrib/pf/man/pf.os.5
index ac2b7a88486d3..ce9bc55dcff48 100644
--- a/contrib/pf/man/pf.os.5
+++ b/contrib/pf/man/pf.os.5
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pf.os.5,v 1.3 2007/07/03 12:30:01 mlaier Exp $
 .\"
 .Dd August 18, 2003
 .Dt PF.OS 5
diff --git a/contrib/pf/man/pflog.4 b/contrib/pf/man/pflog.4
index 7ab96e977f151..21bf1d395855a 100644
--- a/contrib/pf/man/pflog.4
+++ b/contrib/pf/man/pflog.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pflog.4,v 1.6 2007/07/03 12:30:01 mlaier Exp $
 .\"
 .Dd December 10, 2001
 .Dt PFLOG 4
diff --git a/contrib/pf/man/pfsync.4 b/contrib/pf/man/pfsync.4
index 63adca9401ba1..9bec797684349 100644
--- a/contrib/pf/man/pfsync.4
+++ b/contrib/pf/man/pfsync.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/man/pfsync.4,v 1.10 2007/07/03 12:30:01 mlaier Exp $
 .\"
 .Dd June 6, 2006
 .Dt PFSYNC 4
diff --git a/contrib/pf/pfctl/parse.y b/contrib/pf/pfctl/parse.y
index 3f8993b386f5d..35bd0db18a37b 100644
--- a/contrib/pf/pfctl/parse.y
+++ b/contrib/pf/pfctl/parse.y
@@ -28,7 +28,7 @@
  */
 %{
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.8 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pf_print_state.c b/contrib/pf/pfctl/pf_print_state.c
index b3a693a5986a8..826b730c23e85 100644
--- a/contrib/pf/pfctl/pf_print_state.c
+++ b/contrib/pf/pfctl/pf_print_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pf_print_state.c,v 1.4 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/pf/pfctl/pfctl.8 b/contrib/pf/pfctl/pfctl.8
index 24be6e51c4873..fd4e7dc6555ce 100644
--- a/contrib/pf/pfctl/pfctl.8
+++ b/contrib/pf/pfctl/pfctl.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/pfctl/pfctl.8,v 1.3 2007/07/03 12:30:02 mlaier Exp $
 .\"
 .Dd November 20, 2002
 .Dt PFCTL 8
diff --git a/contrib/pf/pfctl/pfctl.c b/contrib/pf/pfctl/pfctl.c
index 21995f6468de6..b8874760844a8 100644
--- a/contrib/pf/pfctl/pfctl.c
+++ b/contrib/pf/pfctl/pfctl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl.c,v 1.7 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl.h b/contrib/pf/pfctl/pfctl.h
index 98a1bef2a28b8..05d59eb346d3e 100644
--- a/contrib/pf/pfctl/pfctl.h
+++ b/contrib/pf/pfctl/pfctl.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pf/pfctl/pfctl.h,v 1.7 2007/07/03 12:30:02 mlaier Exp $
  */
 
 #ifndef _PFCTL_H_
diff --git a/contrib/pf/pfctl/pfctl_altq.c b/contrib/pf/pfctl/pfctl_altq.c
index 3f2efeee30aa0..9104f5a743abe 100644
--- a/contrib/pf/pfctl/pfctl_altq.c
+++ b/contrib/pf/pfctl/pfctl_altq.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.9 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_optimize.c b/contrib/pf/pfctl/pfctl_optimize.c
index 44c04779d61e8..ec6f166ba7fed 100644
--- a/contrib/pf/pfctl/pfctl_optimize.c
+++ b/contrib/pf/pfctl/pfctl_optimize.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_optimize.c,v 1.3 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.c b/contrib/pf/pfctl/pfctl_parser.c
index 9f232bdb78326..54318aa4cf1fe 100644
--- a/contrib/pf/pfctl/pfctl_parser.c
+++ b/contrib/pf/pfctl/pfctl_parser.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_parser.c,v 1.8 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_parser.h b/contrib/pf/pfctl/pfctl_parser.h
index 4885203a532bd..fa8e7b63d7491 100644
--- a/contrib/pf/pfctl/pfctl_parser.h
+++ b/contrib/pf/pfctl/pfctl_parser.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pf/pfctl/pfctl_parser.h,v 1.7 2007/07/03 12:30:02 mlaier Exp $
  */
 
 #ifndef _PFCTL_PARSER_H_
diff --git a/contrib/pf/pfctl/pfctl_qstats.c b/contrib/pf/pfctl/pfctl_qstats.c
index 28535c2410fb8..3eb2987fec026 100644
--- a/contrib/pf/pfctl/pfctl_qstats.c
+++ b/contrib/pf/pfctl/pfctl_qstats.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pfctl/pfctl_table.c b/contrib/pf/pfctl/pfctl_table.c
index 3d54466a44933..46b0d769686e5 100644
--- a/contrib/pf/pfctl/pfctl_table.c
+++ b/contrib/pf/pfctl/pfctl_table.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_table.c,v 1.8 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pflogd.8 b/contrib/pf/pflogd/pflogd.8
index 22643fc920fb6..d7cb23ead4f09 100644
--- a/contrib/pf/pflogd/pflogd.8
+++ b/contrib/pf/pflogd/pflogd.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pf/pflogd/pflogd.8,v 1.3 2007/07/03 12:30:02 mlaier Exp $
 .\"
 .Dd July 9, 2001
 .Dt PFLOGD 8
diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c
index 74e35693c63a1..67619da019c92 100644
--- a/contrib/pf/pflogd/pflogd.c
+++ b/contrib/pf/pflogd/pflogd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.12.2.1 2007/10/19 03:04:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/contrib/pf/pflogd/pidfile.c b/contrib/pf/pflogd/pidfile.c
index db6007f1f339e..0d7885cc96561 100644
--- a/contrib/pf/pflogd/pidfile.c
+++ b/contrib/pf/pflogd/pidfile.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
diff --git a/contrib/pf/pflogd/pidfile.h b/contrib/pf/pflogd/pidfile.h
index 7281dcca24c0d..35901a366839d 100644
--- a/contrib/pf/pflogd/pidfile.h
+++ b/contrib/pf/pflogd/pidfile.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
 
 int pidfile(const char *);
diff --git a/contrib/pf/pflogd/privsep.c b/contrib/pf/pflogd/privsep.c
index a07d1414fd44b..9e451de3808b2 100644
--- a/contrib/pf/pflogd/privsep.c
+++ b/contrib/pf/pflogd/privsep.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/privsep.c,v 1.4 2007/07/03 12:30:02 mlaier Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/contrib/pf/tftp-proxy/filter.c b/contrib/pf/tftp-proxy/filter.c
index e5a769a62a548..63edf04f0ce94 100644
--- a/contrib/pf/tftp-proxy/filter.c
+++ b/contrib/pf/tftp-proxy/filter.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: filter.c,v 1.1 2005/12/28 19:07:07 jcs Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/contrib/pf/tftp-proxy/filter.c,v 1.2 2007/07/03 12:30:03 mlaier Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
diff --git a/contrib/pnpinfo/pnpinfo.8 b/contrib/pnpinfo/pnpinfo.8
index f6257d552a994..d2a7ca600c6e8 100644
--- a/contrib/pnpinfo/pnpinfo.8
+++ b/contrib/pnpinfo/pnpinfo.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/pnpinfo/pnpinfo.8,v 1.7 2006/09/17 18:52:28 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt PNPINFO 8
diff --git a/contrib/pnpinfo/pnpinfo.c b/contrib/pnpinfo/pnpinfo.c
index 790cfd8028dcb..04dc58fdec40b 100644
--- a/contrib/pnpinfo/pnpinfo.c
+++ b/contrib/pnpinfo/pnpinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.10 2006/08/22 07:51:09 ru Exp $");
 
 #include <sys/time.h>
 
diff --git a/contrib/pnpinfo/pnpinfo.h b/contrib/pnpinfo/pnpinfo.h
index abe14271d9d9b..6cb8dc3939bab 100644
--- a/contrib/pnpinfo/pnpinfo.h
+++ b/contrib/pnpinfo/pnpinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/pnpinfo/pnpinfo.h,v 1.2 1999/09/05 17:27:05 peter Exp $
  */
 
 
diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index 948f2b880b7ef..15513d5ad3a2c 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33.2.1 2007/11/11 17:06:40 gshapiro Exp $
 
 sendmail 8.14.2
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4
index dc1d8ba65614e..eef2e346c8b67 100644
--- a/contrib/sendmail/cf/m4/cfhead.m4
+++ b/contrib/sendmail/cf/m4/cfhead.m4
@@ -9,7 +9,7 @@
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.17 2004/08/01 01:16:14 gshapiro Exp $
 #
 
 ######################################################################
diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh
index e7b0cd101fced..3eee645842e5e 100644
--- a/contrib/sendmail/cf/sh/makeinfo.sh
+++ b/contrib/sendmail/cf/sh/makeinfo.sh
@@ -13,7 +13,7 @@
 #
 #	$Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/contrib/sendmail/cf/sh/makeinfo.sh,v 1.7 2002/06/11 21:16:35 gshapiro Exp $
 #
 
 usewhoami=0
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8
index 7811451c5c309..c0d819bc8f582 100644
--- a/contrib/sendmail/mail.local/mail.local.8
+++ b/contrib/sendmail/mail.local/mail.local.8
@@ -161,4 +161,4 @@ appeared in
 Version 7 AT&T UNIX 
 as the program
 .BR mail .
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/mail.local/mail.local.8,v 1.13 2004/08/01 01:16:15 gshapiro Exp $
diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c
index cba40a72df39f..5c7770c6b8c1a 100644
--- a/contrib/sendmail/mail.local/mail.local.c
+++ b/contrib/sendmail/mail.local/mail.local.c
@@ -8,7 +8,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/mail.local/mail.local.c,v 1.27 2007/04/09 01:44:16 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c
index 5cdc9bb14213b..10770848545f9 100644
--- a/contrib/sendmail/rmail/rmail.c
+++ b/contrib/sendmail/rmail/rmail.c
@@ -8,7 +8,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/rmail/rmail.c,v 1.13 2002/08/28 18:12:09 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8
index f0ed01c0a8cb8..4a877d587824f 100644
--- a/contrib/sendmail/smrsh/smrsh.8
+++ b/contrib/sendmail/smrsh/smrsh.8
@@ -95,4 +95,4 @@ to change the default program directory
 
 .SH SEE ALSO
 sendmail(8)
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/smrsh/smrsh.8,v 1.13 2005/02/14 02:39:14 gshapiro Exp $
diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c
index 69234b7bb9131..633de8cd27614 100644
--- a/contrib/sendmail/smrsh/smrsh.c
+++ b/contrib/sendmail/smrsh/smrsh.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/smrsh/smrsh.c,v 1.19 2005/02/14 02:39:14 gshapiro Exp $
  */
 
 #include <sm/gen.h>
diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index e892cef72fe0a..2500f0d5014a2 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/conf.c,v 1.31.2.1 2007/11/11 17:06:42 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index 99ed47dfe188f..a373423f91746 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -12,7 +12,7 @@
  *
  *	$Id: conf.h,v 8.574 2006/11/29 00:36:06 ca Exp $
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/contrib/sendmail/src/conf.h,v 1.25 2007/04/09 01:44:16 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c
index 89b0736d67b15..1c55ef9be41ca 100644
--- a/contrib/sendmail/src/err.c
+++ b/contrib/sendmail/src/err.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/err.c,v 1.14 2007/04/09 01:44:16 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c
index 7e223dba1d838..0a74e422968a7 100644
--- a/contrib/sendmail/src/headers.c
+++ b/contrib/sendmail/src/headers.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/headers.c,v 1.24.2.1 2007/11/11 17:06:43 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1
index 6b2136f6e3eff..34d00ab880d13 100644
--- a/contrib/sendmail/src/mailq.1
+++ b/contrib/sendmail/src/mailq.1
@@ -133,4 +133,4 @@ The
 .B mailq
 command appeared in 
 4.0BSD.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/src/mailq.1,v 1.15 2007/04/09 01:44:16 gshapiro Exp $
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c
index ef977440c8ed4..221f861af9011 100644
--- a/contrib/sendmail/src/mci.c
+++ b/contrib/sendmail/src/mci.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/sendmail/src/mci.c,v 1.23 2007/04/09 01:44:16 gshapiro Exp $
  */
 
 #include <sendmail.h>
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c
index 7c7f288b85993..8a61c921bee29 100644
--- a/contrib/sendmail/src/savemail.c
+++ b/contrib/sendmail/src/savemail.c
@@ -9,7 +9,7 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/contrib/sendmail/src/savemail.c,v 1.20 2007/04/09 01:44:16 gshapiro Exp $
  *
  */
 
diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8
index 540d55480ae12..50de683cd6efd 100644
--- a/contrib/sendmail/src/sendmail.8
+++ b/contrib/sendmail/src/sendmail.8
@@ -746,4 +746,4 @@ The
 .B sendmail
 command appeared in
 4.2BSD.
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/sendmail/src/sendmail.8,v 1.13.18.1 2007/11/11 17:06:43 gshapiro Exp $
diff --git a/contrib/smbfs/FREEBSD-upgrade b/contrib/smbfs/FREEBSD-upgrade
index 6fad7c6d729ec..ce75fcb7cf32e 100644
--- a/contrib/smbfs/FREEBSD-upgrade
+++ b/contrib/smbfs/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/smbfs/FREEBSD-upgrade,v 1.1 2001/12/14 11:11:31 sheldonh Exp $
 
 The smbfs distribution was written with FreeBSD in mind, so the only
 change required before an import is:
diff --git a/contrib/smbfs/examples/dot.nsmbrc b/contrib/smbfs/examples/dot.nsmbrc
index d92d8e44e593c..fa2c4ec433348 100644
--- a/contrib/smbfs/examples/dot.nsmbrc
+++ b/contrib/smbfs/examples/dot.nsmbrc
@@ -1,5 +1,5 @@
 # $Id: dot.nsmbrc,v 1.7 2002/04/10 04:21:11 bp Exp $
-# $FreeBSD$
+# $FreeBSD: src/contrib/smbfs/examples/dot.nsmbrc,v 1.2 2004/07/17 14:38:42 bp Exp $
 #
 # Example for .nsmbrc file
 #
diff --git a/contrib/smbfs/include/netsmb/nb_lib.h b/contrib/smbfs/include/netsmb/nb_lib.h
index 13498cfb6ca68..257d6e9ec7630 100644
--- a/contrib/smbfs/include/netsmb/nb_lib.h
+++ b/contrib/smbfs/include/netsmb/nb_lib.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: nb_lib.h,v 1.2 2000/07/17 01:49:27 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/include/netsmb/nb_lib.h,v 1.2 2005/10/02 08:32:48 bp Exp $
  */
 #ifndef _NETSMB_NB_LIB_H_
 #define	_NETSMB_NB_LIB_H_
diff --git a/contrib/smbfs/include/netsmb/smb_lib.h b/contrib/smbfs/include/netsmb/smb_lib.h
index 04e8279abf39e..913d4081b6b83 100644
--- a/contrib/smbfs/include/netsmb/smb_lib.h
+++ b/contrib/smbfs/include/netsmb/smb_lib.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: smb_lib.h,v 1.24 2001/12/20 15:19:43 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/include/netsmb/smb_lib.h,v 1.3 2005/10/02 08:32:48 bp Exp $
  */
 #ifndef _NETSMB_SMB_LIB_H_
 #define _NETSMB_SMB_LIB_H_
diff --git a/contrib/smbfs/lib/smb/ctx.c b/contrib/smbfs/lib/smb/ctx.c
index 0709b6b9a9b53..98c08829b12e0 100644
--- a/contrib/smbfs/lib/smb/ctx.c
+++ b/contrib/smbfs/lib/smb/ctx.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ctx.c,v 1.24 2002/04/13 14:35:28 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/ctx.c,v 1.7 2005/10/02 08:32:48 bp Exp $
  */
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/contrib/smbfs/lib/smb/file.c b/contrib/smbfs/lib/smb/file.c
index 2ac3300155c7b..2ed78d2e83aad 100644
--- a/contrib/smbfs/lib/smb/file.c
+++ b/contrib/smbfs/lib/smb/file.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: file.c,v 1.2 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/file.c,v 1.2 2004/07/28 05:33:58 kan Exp $
  */
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/contrib/smbfs/lib/smb/kiconv.c b/contrib/smbfs/lib/smb/kiconv.c
index d84d9091fd366..7395a9dc7dac0 100644
--- a/contrib/smbfs/lib/smb/kiconv.c
+++ b/contrib/smbfs/lib/smb/kiconv.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.4 2005/08/24 12:38:26 imura Exp $
  */
 
 #include <sys/types.h>
diff --git a/contrib/smbfs/lib/smb/mbuf.c b/contrib/smbfs/lib/smb/mbuf.c
index 729b5c53d11e3..9a7ce79978228 100644
--- a/contrib/smbfs/lib/smb/mbuf.c
+++ b/contrib/smbfs/lib/smb/mbuf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.3 2005/09/19 08:07:18 imura Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/contrib/smbfs/lib/smb/nb.c b/contrib/smbfs/lib/smb/nb.c
index 652a05717a08a..128e28be5d014 100644
--- a/contrib/smbfs/lib/smb/nb.c
+++ b/contrib/smbfs/lib/smb/nb.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: nb.c,v 1.4 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nb.c,v 1.2 2005/10/02 08:32:48 bp Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nb_name.c b/contrib/smbfs/lib/smb/nb_name.c
index ad34489c1cc3b..f6ede46f0c3f4 100644
--- a/contrib/smbfs/lib/smb/nb_name.c
+++ b/contrib/smbfs/lib/smb/nb_name.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.2 2005/09/19 08:07:18 imura Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/contrib/smbfs/lib/smb/nb_net.c b/contrib/smbfs/lib/smb/nb_net.c
index 41fc3846116f7..832802d998d37 100644
--- a/contrib/smbfs/lib/smb/nb_net.c
+++ b/contrib/smbfs/lib/smb/nb_net.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: nb_net.c,v 1.4 2001/02/16 02:46:12 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nb_net.c,v 1.4 2005/10/02 08:32:48 bp Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nbns_rq.c b/contrib/smbfs/lib/smb/nbns_rq.c
index 9d55b2569d484..2d6f2f377016c 100644
--- a/contrib/smbfs/lib/smb/nbns_rq.c
+++ b/contrib/smbfs/lib/smb/nbns_rq.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: nbns_rq.c,v 1.5 2001/02/17 03:07:24 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/nbns_rq.c,v 1.2 2005/10/02 08:32:48 bp Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c
index 32744288a8c12..b36f0cab325e6 100644
--- a/contrib/smbfs/lib/smb/nls.c
+++ b/contrib/smbfs/lib/smb/nls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nls.c,v 1.2 2004/10/19 17:39:15 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/iconv.h>
diff --git a/contrib/smbfs/lib/smb/rap.c b/contrib/smbfs/lib/smb/rap.c
index 19e803df9cce3..ab8e676b69431 100644
--- a/contrib/smbfs/lib/smb/rap.c
+++ b/contrib/smbfs/lib/smb/rap.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.5 2005/09/19 08:07:18 imura Exp $
  *
  * This is very simple implementation of RAP protocol.
  */
diff --git a/contrib/smbfs/lib/smb/rcfile.c b/contrib/smbfs/lib/smb/rcfile.c
index 5f92c8a311f4a..5b8eb41415c76 100644
--- a/contrib/smbfs/lib/smb/rcfile.c
+++ b/contrib/smbfs/lib/smb/rcfile.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/rcfile.c,v 1.2 2004/10/19 17:44:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/contrib/smbfs/lib/smb/rq.c b/contrib/smbfs/lib/smb/rq.c
index 7ecbb36406eef..5bb33aca90015 100644
--- a/contrib/smbfs/lib/smb/rq.c
+++ b/contrib/smbfs/lib/smb/rq.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rq.c,v 1.7 2001/04/16 04:33:01 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.3 2004/10/19 17:44:31 obrien Exp $
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.8 b/contrib/smbfs/mount_smbfs/mount_smbfs.8
index aec889c04ce33..00b865292b60b 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.8
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.8
@@ -1,5 +1,5 @@
 .\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.6 2007/06/16 07:01:15 danfe Exp $
 .Dd March 10, 2000
 .Dt MOUNT_SMBFS 8
 .Os
diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.c b/contrib/smbfs/mount_smbfs/mount_smbfs.c
index fdcdd1a1b20d8..fc8dddedc5710 100644
--- a/contrib/smbfs/mount_smbfs/mount_smbfs.c
+++ b/contrib/smbfs/mount_smbfs/mount_smbfs.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.7 2005/11/16 12:33:04 ru Exp $
  */
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/contrib/smbfs/smbutil/common.h b/contrib/smbfs/smbutil/common.h
index 00843943600ca..869d6225dbeb1 100644
--- a/contrib/smbfs/smbutil/common.h
+++ b/contrib/smbfs/smbutil/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/smbfs/smbutil/common.h,v 1.3 2003/08/23 13:05:13 tjr Exp $ */
 
 #define iprintf(ident,args...)	do { printf("%-" # ident "s", ""); \
 				printf(args);}while(0)
diff --git a/contrib/smbfs/smbutil/dumptree.c b/contrib/smbfs/smbutil/dumptree.c
index 74a97f3a114ba..6e247f416fdd0 100644
--- a/contrib/smbfs/smbutil/dumptree.c
+++ b/contrib/smbfs/smbutil/dumptree.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/smbfs/smbutil/dumptree.c,v 1.2 2005/07/28 22:35:38 imura Exp $ */
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/contrib/smbfs/smbutil/print.c b/contrib/smbfs/smbutil/print.c
index d87ec78587c6a..3cffa9a3ac7b9 100644
--- a/contrib/smbfs/smbutil/print.c
+++ b/contrib/smbfs/smbutil/print.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/print.c,v 1.2 2006/08/11 12:35:22 keramida Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/contrib/smbfs/smbutil/view.c b/contrib/smbfs/smbutil/view.c
index 87f5e0cc7fc6d..e7ace57a155f8 100644
--- a/contrib/smbfs/smbutil/view.c
+++ b/contrib/smbfs/smbutil/view.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/view.c,v 1.3 2006/08/11 12:35:22 keramida Exp $");
 
 #include <sys/endian.h>
 #include <sys/param.h>
diff --git a/contrib/tcp_wrappers/Makefile b/contrib/tcp_wrappers/Makefile
index 10ede819e4de4..bc3cddbcd7d78 100644
--- a/contrib/tcp_wrappers/Makefile
+++ b/contrib/tcp_wrappers/Makefile
@@ -1,5 +1,5 @@
 # @(#) Makefile 1.23 97/03/21 19:27:20
-# $FreeBSD$
+# $FreeBSD: src/contrib/tcp_wrappers/Makefile,v 1.2 2000/02/03 10:26:57 shin Exp $
 
 what:
 	@echo
diff --git a/contrib/tcp_wrappers/fix_options.c b/contrib/tcp_wrappers/fix_options.c
index 4983a55a47a1c..0a5ce2cbeaafa 100644
--- a/contrib/tcp_wrappers/fix_options.c
+++ b/contrib/tcp_wrappers/fix_options.c
@@ -4,7 +4,7 @@
   *
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/fix_options.c,v 1.2 2000/02/03 10:26:57 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/hosts_access.5 b/contrib/tcp_wrappers/hosts_access.5
index 27ab2ae648b6d..7c67a4e5208ba 100644
--- a/contrib/tcp_wrappers/hosts_access.5
+++ b/contrib/tcp_wrappers/hosts_access.5
@@ -396,4 +396,4 @@ Eindhoven University of Technology
 Den Dolech 2, P.O. Box 513, 
 5600 MB Eindhoven, The Netherlands
 \" @(#) hosts_access.5 1.20 95/01/30 19:51:46
-\" $FreeBSD$
+\" $FreeBSD: src/contrib/tcp_wrappers/hosts_access.5,v 1.3 2000/02/03 10:26:57 shin Exp $
diff --git a/contrib/tcp_wrappers/hosts_access.c b/contrib/tcp_wrappers/hosts_access.c
index 8220e6497065e..da274f8f7fe21 100644
--- a/contrib/tcp_wrappers/hosts_access.c
+++ b/contrib/tcp_wrappers/hosts_access.c
@@ -16,7 +16,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/hosts_access.c,v 1.5 2005/05/13 16:31:08 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/inetcf.c b/contrib/tcp_wrappers/inetcf.c
index 1ace3527fc7c6..49910d862e14e 100644
--- a/contrib/tcp_wrappers/inetcf.c
+++ b/contrib/tcp_wrappers/inetcf.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcp_wrappers/inetcf.c,v 1.3 2003/01/08 07:02:07 peter Exp $ */
  /*
   * Routines to parse an inetd.conf or tlid.conf file. This would be a great
   * job for a PERL script.
diff --git a/contrib/tcp_wrappers/misc.c b/contrib/tcp_wrappers/misc.c
index 8f04f870e1b4f..4f80679166cb5 100644
--- a/contrib/tcp_wrappers/misc.c
+++ b/contrib/tcp_wrappers/misc.c
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/misc.c,v 1.2 2000/02/03 10:26:58 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c
index 97d3127039244..ca93ce09282a7 100644
--- a/contrib/tcp_wrappers/options.c
+++ b/contrib/tcp_wrappers/options.c
@@ -27,7 +27,7 @@
   * such options should clear the "dry_run" flag to inform the caller of this
   * course of action.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/options.c,v 1.2 2001/01/14 23:00:59 dwmalone Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/refuse.c b/contrib/tcp_wrappers/refuse.c
index fd04e08ae9bf3..af5ee6d7c8b5b 100644
--- a/contrib/tcp_wrappers/refuse.c
+++ b/contrib/tcp_wrappers/refuse.c
@@ -6,7 +6,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/refuse.c,v 1.2 2000/02/03 10:26:58 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/rfc931.c b/contrib/tcp_wrappers/rfc931.c
index e7fb3d1d12942..03dde995a97ab 100644
--- a/contrib/tcp_wrappers/rfc931.c
+++ b/contrib/tcp_wrappers/rfc931.c
@@ -8,7 +8,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/rfc931.c,v 1.3 2000/07/14 15:07:37 dwmalone Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/scaffold.c b/contrib/tcp_wrappers/scaffold.c
index 8da9df0c68611..b01b52a3a1ed0 100644
--- a/contrib/tcp_wrappers/scaffold.c
+++ b/contrib/tcp_wrappers/scaffold.c
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/scaffold.c,v 1.3 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/scaffold.h b/contrib/tcp_wrappers/scaffold.h
index ea568b7225077..044af6db3743f 100644
--- a/contrib/tcp_wrappers/scaffold.h
+++ b/contrib/tcp_wrappers/scaffold.h
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/scaffold.h,v 1.2 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifdef INET6
diff --git a/contrib/tcp_wrappers/socket.c b/contrib/tcp_wrappers/socket.c
index ed959ac8fb90e..792d471731c22 100644
--- a/contrib/tcp_wrappers/socket.c
+++ b/contrib/tcp_wrappers/socket.c
@@ -14,7 +14,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.8 2005/05/13 16:31:08 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.c b/contrib/tcp_wrappers/tcpd.c
index 55c6853c18811..8d0696c947c8d 100644
--- a/contrib/tcp_wrappers/tcpd.c
+++ b/contrib/tcp_wrappers/tcpd.c
@@ -9,7 +9,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpd.c,v 1.2 2000/02/03 10:26:59 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpd.h b/contrib/tcp_wrappers/tcpd.h
index fec20a262baf1..07ef87ef1d822 100644
--- a/contrib/tcp_wrappers/tcpd.h
+++ b/contrib/tcp_wrappers/tcpd.h
@@ -3,7 +3,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpd.h,v 1.2 2000/02/03 10:26:59 shin Exp $
   */
 
 /* Structure to describe one communications endpoint. */
diff --git a/contrib/tcp_wrappers/tcpdchk.c b/contrib/tcp_wrappers/tcpdchk.c
index 99ec495253008..73351d5cda62f 100644
--- a/contrib/tcp_wrappers/tcpdchk.c
+++ b/contrib/tcp_wrappers/tcpdchk.c
@@ -13,7 +13,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpdchk.c,v 1.4 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tcpdmatch.c b/contrib/tcp_wrappers/tcpdmatch.c
index 94f3e70096064..f6e49ca00d624 100644
--- a/contrib/tcp_wrappers/tcpdmatch.c
+++ b/contrib/tcp_wrappers/tcpdmatch.c
@@ -12,7 +12,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tcpdmatch.c,v 1.3 2000/07/14 17:15:33 ume Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/tli.c b/contrib/tcp_wrappers/tli.c
index 36d6f7eff398c..1efd807c8f71b 100644
--- a/contrib/tcp_wrappers/tli.c
+++ b/contrib/tcp_wrappers/tli.c
@@ -13,7 +13,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/tli.c,v 1.2 2000/02/03 10:27:00 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/update.c b/contrib/tcp_wrappers/update.c
index b612d5e02466b..8ba12653c2cc0 100644
--- a/contrib/tcp_wrappers/update.c
+++ b/contrib/tcp_wrappers/update.c
@@ -12,7 +12,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/update.c,v 1.2 2000/02/03 10:27:00 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcp_wrappers/workarounds.c b/contrib/tcp_wrappers/workarounds.c
index 1ad2c6471ef32..e1aa5c504c45d 100644
--- a/contrib/tcp_wrappers/workarounds.c
+++ b/contrib/tcp_wrappers/workarounds.c
@@ -6,7 +6,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD$
+  * $FreeBSD: src/contrib/tcp_wrappers/workarounds.c,v 1.2 2000/02/03 10:27:01 shin Exp $
   */
 
 #ifndef lint
diff --git a/contrib/tcpdump/.cvsignore b/contrib/tcpdump/.cvsignore
deleted file mode 100644
index 791f14cdb7cf8..0000000000000
--- a/contrib/tcpdump/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-version.c
-Makefile
-Makefile-devel.in
-config.status
-config.log
-config.cache
-config.h
-.devel
-stamp-h
-stamp-h.in
-tcpdump
-autom4te.cache
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index db9a93cff287e..aeb78870fb88c 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/contrib/tcpdump/addrtoname.c
@@ -21,7 +21,7 @@
  *  Internet, ethernet, port, and protocol string to address
  *  and address to string conversion routines
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/addrtoname.c,v 1.15.2.1 2007/10/19 03:03:57 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h
index 1555b4d69f4b3..731307ffba447 100644
--- a/contrib/tcpdump/ethertype.h
+++ b/contrib/tcpdump/ethertype.h
@@ -20,7 +20,7 @@
  *
  *
  * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24.2.1 2005/07/10 14:51:10 hannes Exp $ (LBL)
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ethertype.h,v 1.10 2006/09/04 20:25:03 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/ieee802_11.h b/contrib/tcpdump/ieee802_11.h
index d98f97954078e..dda937e8f804f 100644
--- a/contrib/tcpdump/ieee802_11.h
+++ b/contrib/tcpdump/ieee802_11.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11.h,v 1.2.2.1 2007/10/19 03:03:58 mlaier Exp $ */
 /* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.9.4.3 2007/07/22 20:01:16 guy Exp $ (LBL) */
 /*
  * Copyright (c) 2001
diff --git a/contrib/tcpdump/ieee802_11_radio.h b/contrib/tcpdump/ieee802_11_radio.h
index 82eb97bf6b684..37f7c57f3e954 100644
--- a/contrib/tcpdump/ieee802_11_radio.h
+++ b/contrib/tcpdump/ieee802_11_radio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/ieee802_11_radio.h,v 1.2.2.1 2007/10/19 03:03:58 mlaier Exp $ */
 /* $NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp $ */
 /* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.1.2.1 2006/06/13 22:24:45 guy Exp $ */
 
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index 302d2eab19bb0..38bdc2118e065 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/interface.h,v 1.12.2.1 2007/10/19 03:03:58 mlaier Exp $
  * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.244.2.21 2007/03/28 07:45:46 hannes Exp $ (LBL)
  */
 
diff --git a/contrib/tcpdump/ipproto.h b/contrib/tcpdump/ipproto.h
index 1800db4580da2..11966e3c17197 100644
--- a/contrib/tcpdump/ipproto.h
+++ b/contrib/tcpdump/ipproto.h
@@ -34,7 +34,7 @@
  *
  * From:
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ipproto.h,v 1.1.1.4 2006/09/04 20:03:46 sam Exp $
  */
 
 extern struct tok ipproto_values[];
diff --git a/contrib/tcpdump/nfs.h b/contrib/tcpdump/nfs.h
index 82c8dd3f1f954..3d7ba2d1ef1a1 100644
--- a/contrib/tcpdump/nfs.h
+++ b/contrib/tcpdump/nfs.h
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/nfs.h,v 1.4 2004/03/31 14:57:24 bms Exp $
  *	@(#)nfsproto.h	8.2 (Berkeley) 3/30/95
  */
 
diff --git a/contrib/tcpdump/nfsfh.h b/contrib/tcpdump/nfsfh.h
index 8a337ba156ec8..c4b67931efd32 100644
--- a/contrib/tcpdump/nfsfh.h
+++ b/contrib/tcpdump/nfsfh.h
@@ -39,7 +39,7 @@
  * Jeffrey C. Mogul
  * Digital Equipment Corporation
  * Western Research Laboratory
- *	$FreeBSD$
+ *	$FreeBSD: src/contrib/tcpdump/nfsfh.h,v 1.8 2004/03/31 14:57:24 bms Exp $
  *	$NetBSD: nfsfh.h,v 1.1.1.2 1997/10/03 17:25:13 christos Exp $
  */
 
diff --git a/contrib/tcpdump/parsenfsfh.c b/contrib/tcpdump/parsenfsfh.c
index 4aa8191d77bfb..353922492f9ae 100644
--- a/contrib/tcpdump/parsenfsfh.c
+++ b/contrib/tcpdump/parsenfsfh.c
@@ -39,7 +39,7 @@
  * Digital Equipment Corporation
  * Western Research Laboratory
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/parsenfsfh.c,v 1.9.10.1 2007/10/19 03:03:58 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/pmap_prot.h b/contrib/tcpdump/pmap_prot.h
index 17cb92ff9a78b..5cc11cc8533f2 100644
--- a/contrib/tcpdump/pmap_prot.h
+++ b/contrib/tcpdump/pmap_prot.h
@@ -29,7 +29,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/pmap_prot.h,v 1.1.1.2 2005/07/11 03:53:37 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/ppp.h b/contrib/tcpdump/ppp.h
index 9c4b473ef53be..c7909d0110fa6 100644
--- a/contrib/tcpdump/ppp.h
+++ b/contrib/tcpdump/ppp.h
@@ -15,7 +15,7 @@
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/ppp.h,v 1.8 2006/09/04 20:25:04 sam Exp $
  */
 #define PPP_HDRLEN	4	/* length of PPP header */
 
diff --git a/contrib/tcpdump/print-802_11.c b/contrib/tcpdump/print-802_11.c
index 1046fda8526ec..b0a5c43eb2997 100644
--- a/contrib/tcpdump/print-802_11.c
+++ b/contrib/tcpdump/print-802_11.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.2.2.1 2007/10/19 03:03:58 mlaier Exp $ */
 /*
  * Copyright (c) 2001
  *	Fortress Technologies, Inc.  All rights reserved.
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index 3dc289466a846..bd8c350e77e9a 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/contrib/tcpdump/print-arp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-arp.c,v 1.10 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-atalk.c b/contrib/tcpdump/print-atalk.c
index 1d575a67177da..3b1498942b147 100644
--- a/contrib/tcpdump/print-atalk.c
+++ b/contrib/tcpdump/print-atalk.c
@@ -20,7 +20,7 @@
  *
  * Format and print AppleTalk packets.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-atalk.c,v 1.13 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index 03ca34b603ac0..51e59925fe2e8 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/contrib/tcpdump/print-atm.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-atm.c,v 1.12.2.1 2007/10/19 03:03:58 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index b7e2cda8c4b60..b345c2994fb79 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/contrib/tcpdump/print-bootp.c
@@ -20,7 +20,7 @@
  *
  * Format and print bootp packets.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-bootp.c,v 1.11.10.1 2007/10/19 03:03:58 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c
index 827d1be080610..344bfd7c077b8 100644
--- a/contrib/tcpdump/print-domain.c
+++ b/contrib/tcpdump/print-domain.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-domain.c,v 1.12.10.1 2007/10/19 03:03:58 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index d8911d3180d41..c8a4c98482093 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/contrib/tcpdump/print-ether.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ether.c,v 1.17.2.1 2007/10/19 03:03:58 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-fddi.c b/contrib/tcpdump/print-fddi.c
index 49e2b005e93c6..7cadf9536594e 100644
--- a/contrib/tcpdump/print-fddi.c
+++ b/contrib/tcpdump/print-fddi.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-fddi.c,v 1.11.2.1 2007/10/19 03:03:58 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c
index abc3cd7ec7deb..921e1c0bec5e1 100644
--- a/contrib/tcpdump/print-fr.c
+++ b/contrib/tcpdump/print-fr.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-fr.c,v 1.7.2.1 2007/10/19 03:03:58 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index 09a7a89800382..8084c2e51b395 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/contrib/tcpdump/print-icmp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-icmp.c,v 1.11.10.1 2007/10/19 03:03:58 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index 48d54dde76fd6..dcfdb7839b699 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/contrib/tcpdump/print-ip.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ip.c,v 1.14.2.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c
index 4928734dc95ad..215d78a38c3eb 100644
--- a/contrib/tcpdump/print-ip6.c
+++ b/contrib/tcpdump/print-ip6.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ip6.c,v 1.8.2.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c
index 6459b31bc3688..3916b219823ac 100644
--- a/contrib/tcpdump/print-ipx.c
+++ b/contrib/tcpdump/print-ipx.c
@@ -21,7 +21,7 @@
  * Format and print Novell IPX packets.
  * Contributed by Brad Parker (brad@fcr.com).
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ipx.c,v 1.10 2006/09/04 20:25:04 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index 2ea3a3dd6e43f..05203bd2eb057 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/contrib/tcpdump/print-isoclns.c
@@ -23,7 +23,7 @@
  * Extensively modified by Hannes Gredler (hannes@juniper.net) for more
  * complete IS-IS & CLNP support.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-isoclns.c,v 1.16.2.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-llc.c b/contrib/tcpdump/print-llc.c
index 8ffd289159b3d..b516a20f3a916 100644
--- a/contrib/tcpdump/print-llc.c
+++ b/contrib/tcpdump/print-llc.c
@@ -21,7 +21,7 @@
  * Code by Matt Thomas, Digital Equipment Corporation
  *	with an awful lot of hacking by Jeffrey Mogul, DECWRL
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-llc.c,v 1.12.2.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index e47f0f619f16e..7649f5028eb08 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/contrib/tcpdump/print-nfs.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-nfs.c,v 1.12.10.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index 9e8ccfa4f3d03..883fdf3f64ebf 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/contrib/tcpdump/print-ntp.c
@@ -22,7 +22,7 @@
  *	By Jeffrey Mogul/DECWRL
  *	loosely based on print-bootp.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ntp.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index b525600aaf7c6..067b53414999e 100644
--- a/contrib/tcpdump/print-null.c
+++ b/contrib/tcpdump/print-null.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-null.c,v 1.12.2.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-pim.c b/contrib/tcpdump/print-pim.c
index d539809933a28..e93ead0e942b7 100644
--- a/contrib/tcpdump/print-pim.c
+++ b/contrib/tcpdump/print-pim.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-pim.c,v 1.9.2.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index e25930b971027..a31e1b679614c 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -21,7 +21,7 @@
  * Extensively modified by Motonori Shindo (mshindo@mshindo.net) for more
  * complete PPP support.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-ppp.c,v 1.16.10.1 2007/10/19 03:03:59 mlaier Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index 97389d8c3779d..13ee3cf41d324 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/contrib/tcpdump/print-sl.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-sl.c,v 1.9 2005/05/29 19:09:27 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
index 420ec360f38e9..8728f2358a841 100644
--- a/contrib/tcpdump/print-sunrpc.c
+++ b/contrib/tcpdump/print-sunrpc.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-sunrpc.c,v 1.11 2005/07/11 04:14:02 sam Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c
index 8a5f4f55657d2..294ab740a0703 100644
--- a/contrib/tcpdump/print-token.c
+++ b/contrib/tcpdump/print-token.c
@@ -23,7 +23,7 @@
  * Further tweaked to more closely resemble print-fddi.c
  *	Guy Harris <guy@alum.mit.edu>
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-token.c,v 1.8.2.1 2007/10/19 03:04:00 mlaier Exp $
  */
 #ifndef lint
 static const char rcsid[] _U_ =
diff --git a/contrib/tcpdump/print-udp.c b/contrib/tcpdump/print-udp.c
index d530d6a08a9a9..f21aa25909561 100644
--- a/contrib/tcpdump/print-udp.c
+++ b/contrib/tcpdump/print-udp.c
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/print-udp.c,v 1.9.10.1 2007/10/19 03:04:00 mlaier Exp $
  */
 
 #ifndef lint
diff --git a/contrib/tcpdump/rpc_auth.h b/contrib/tcpdump/rpc_auth.h
index 2b8ddc10164bc..6f99f6dd8a101 100644
--- a/contrib/tcpdump/rpc_auth.h
+++ b/contrib/tcpdump/rpc_auth.h
@@ -29,7 +29,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/rpc_auth.h,v 1.1.1.2 2005/07/11 03:54:15 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/rpc_msg.h b/contrib/tcpdump/rpc_msg.h
index 01185de1ca150..94953a1fb9173 100644
--- a/contrib/tcpdump/rpc_msg.h
+++ b/contrib/tcpdump/rpc_msg.h
@@ -29,7 +29,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/rpc_msg.h,v 1.1.1.2 2005/07/11 03:54:15 sam Exp $
  */
 
 /*
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h
index 4e599c3cfebc9..bffd2e2c614d2 100644
--- a/contrib/tcpdump/tcpdump-stdinc.h
+++ b/contrib/tcpdump/tcpdump-stdinc.h
@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/tcpdump-stdinc.h,v 1.4.2.1 2007/10/19 03:04:00 mlaier Exp $
  * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12.2.5 2006/06/23 02:07:27 hannes Exp $ (LBL)
  */
 
diff --git a/contrib/tcpdump/tcpdump.1 b/contrib/tcpdump/tcpdump.1
index 8b70af2c83f28..7902ed637fce7 100644
--- a/contrib/tcpdump/tcpdump.1
+++ b/contrib/tcpdump/tcpdump.1
@@ -22,7 +22,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/tcpdump/tcpdump.1,v 1.17.2.1 2007/10/19 03:04:00 mlaier Exp $
 .\"
 .TH TCPDUMP 1  "18 April 2005"
 .SH NAME
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index e45ab23bdf693..5263705dcfbad 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -33,7 +33,7 @@ static const char rcsid[] _U_ =
     "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.13 2007/09/12 19:48:51 guy Exp $ (LBL)";
 #endif
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.11.2.2 2007/11/25 19:28:38 mlaier Exp $ */
 
 /*
  * tcpdump - monitor tcp/ip traffic on an ethernet.
diff --git a/contrib/tcpdump/tests/.cvsignore b/contrib/tcpdump/tests/.cvsignore
deleted file mode 100644
index f097c8a945c71..0000000000000
--- a/contrib/tcpdump/tests/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.new
-*.pcap
-02-sunrise-sunset-esp.pcap
-08-sunrise-sunset-aes.pcap
-08-sunrise-sunset-esp.pcap
-08-sunrise-sunset-esp2.pcap
-isakmp-delete-segfault.pcap
-isakmp-identification-segfault.pcap
-isakmp-pointer-loop.pcap
-run1.pcap
-run2.pcap
diff --git a/contrib/tcpdump/token.h b/contrib/tcpdump/token.h
index e466c843630f0..4765cd28b7d87 100644
--- a/contrib/tcpdump/token.h
+++ b/contrib/tcpdump/token.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/tcpdump/token.h,v 1.4 2004/03/31 14:57:24 bms Exp $
  */
 
 #define TOKEN_HDRLEN		14
diff --git a/contrib/tcsh/FREEBSD-Xlist b/contrib/tcsh/FREEBSD-Xlist
index b6e5636aa567a..8019925d88fca 100644
--- a/contrib/tcsh/FREEBSD-Xlist
+++ b/contrib/tcsh/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcsh/FREEBSD-Xlist,v 1.4 2007/03/11 22:41:19 mp Exp $
 */BUGS
 */config/a*
 */config/bs2000
diff --git a/contrib/tcsh/FREEBSD-upgrade b/contrib/tcsh/FREEBSD-upgrade
index 7bfdaf8a20914..680aec5b6e836 100644
--- a/contrib/tcsh/FREEBSD-upgrade
+++ b/contrib/tcsh/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/tcsh/FREEBSD-upgrade,v 1.2 2007/03/11 22:41:19 mp Exp $
 
 Christos Zoulas `tcsh'
 	originals can be found at: ftp://ftp.astron.com/pub/tcsh/
diff --git a/contrib/telnet/arpa/telnet.h b/contrib/telnet/arpa/telnet.h
index c937f03eacded..b152601861610 100644
--- a/contrib/telnet/arpa/telnet.h
+++ b/contrib/telnet/arpa/telnet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/arpa/telnet.h,v 1.9 2003/01/18 06:10:21 billf Exp $
  */
 
 #ifndef _ARPA_TELNET_H_
diff --git a/contrib/telnet/libtelnet/auth-proto.h b/contrib/telnet/libtelnet/auth-proto.h
index 6d3ba7f074932..dace1797f63e5 100644
--- a/contrib/telnet/libtelnet/auth-proto.h
+++ b/contrib/telnet/libtelnet/auth-proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)auth-proto.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/auth-proto.h,v 1.7 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/auth.c b/contrib/telnet/libtelnet/auth.c
index 46426559e0883..a39588ed5ad9c 100644
--- a/contrib/telnet/libtelnet/auth.c
+++ b/contrib/telnet/libtelnet/auth.c
@@ -38,7 +38,7 @@ static const char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $");
 
 
 /*
diff --git a/contrib/telnet/libtelnet/auth.h b/contrib/telnet/libtelnet/auth.h
index a8ee04831d678..edd47083d3502 100644
--- a/contrib/telnet/libtelnet/auth.h
+++ b/contrib/telnet/libtelnet/auth.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)auth.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/auth.h,v 1.3 2001/11/30 21:06:34 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/enc-proto.h b/contrib/telnet/libtelnet/enc-proto.h
index 46663c7789e21..3f6626be3e480 100644
--- a/contrib/telnet/libtelnet/enc-proto.h
+++ b/contrib/telnet/libtelnet/enc-proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)enc-proto.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/enc-proto.h,v 1.7 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c
index 2f7fe6e744024..f727c2e75587d 100644
--- a/contrib/telnet/libtelnet/enc_des.c
+++ b/contrib/telnet/libtelnet/enc_des.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $");
 
 #ifdef	ENCRYPTION
 # ifdef	AUTHENTICATION
diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c
index 8bdf672ab3bae..7227006ceb525 100644
--- a/contrib/telnet/libtelnet/encrypt.c
+++ b/contrib/telnet/libtelnet/encrypt.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/encrypt.c,v 1.9 2002/06/26 17:06:14 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/encrypt.h b/contrib/telnet/libtelnet/encrypt.h
index eda8d57e03286..afe05eb505682 100644
--- a/contrib/telnet/libtelnet/encrypt.h
+++ b/contrib/telnet/libtelnet/encrypt.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)encrypt.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/encrypt.h,v 1.6 2001/11/30 21:06:34 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/genget.c b/contrib/telnet/libtelnet/genget.c
index e24bb44584551..f740c7a45dfc0 100644
--- a/contrib/telnet/libtelnet/genget.c
+++ b/contrib/telnet/libtelnet/genget.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/genget.c,v 1.7 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/getent.c b/contrib/telnet/libtelnet/getent.c
index d6e8d9c884752..8f4a3978fe4f4 100644
--- a/contrib/telnet/libtelnet/getent.c
+++ b/contrib/telnet/libtelnet/getent.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/getent.c,v 1.7 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c
index 2380c27daa5e2..c941fdeb127d8 100644
--- a/contrib/telnet/libtelnet/kerberos.c
+++ b/contrib/telnet/libtelnet/kerberos.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/kerberos.c,v 1.8 2003/01/29 18:14:28 nectar Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/kerberos5.c b/contrib/telnet/libtelnet/kerberos5.c
index ab7b2dce47b81..7c6bd7f225555 100644
--- a/contrib/telnet/libtelnet/kerberos5.c
+++ b/contrib/telnet/libtelnet/kerberos5.c
@@ -53,7 +53,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/kerberos5.c,v 1.7 2003/03/06 13:41:53 nectar Exp $");
 
 #ifdef	KRB5
 
diff --git a/contrib/telnet/libtelnet/key-proto.h b/contrib/telnet/libtelnet/key-proto.h
index 2f3f3466daa5d..ba80d42bcf5ed 100644
--- a/contrib/telnet/libtelnet/key-proto.h
+++ b/contrib/telnet/libtelnet/key-proto.h
@@ -52,7 +52,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/key-proto.h,v 1.2 2001/11/30 21:06:34 markm Exp $
  */
 
 #ifndef	__KEY_PROTO__
diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c
index e0530f6e63c39..95ef529c18825 100644
--- a/contrib/telnet/libtelnet/krb4encpwd.c
+++ b/contrib/telnet/libtelnet/krb4encpwd.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/krb4encpwd.c,v 1.7 2001/11/30 22:28:07 markm Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/misc-proto.h b/contrib/telnet/libtelnet/misc-proto.h
index aea753c3ff93c..c3f0a838379af 100644
--- a/contrib/telnet/libtelnet/misc-proto.h
+++ b/contrib/telnet/libtelnet/misc-proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)misc-proto.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/misc-proto.h,v 1.4 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/libtelnet/misc.c b/contrib/telnet/libtelnet/misc.c
index 97299ad53b77d..ac958849ad74e 100644
--- a/contrib/telnet/libtelnet/misc.c
+++ b/contrib/telnet/libtelnet/misc.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/misc.c,v 1.8 2002/06/26 17:05:08 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/pk.c b/contrib/telnet/libtelnet/pk.c
index 044e9b9e8ffac..b7a0773d01ef8 100644
--- a/contrib/telnet/libtelnet/pk.c
+++ b/contrib/telnet/libtelnet/pk.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.10 2002/08/22 06:19:07 nsayer Exp $");
 
 /* public key routines */
 /* functions:
diff --git a/contrib/telnet/libtelnet/pk.h b/contrib/telnet/libtelnet/pk.h
index 555d8ebdeb78c..7827c001bca76 100644
--- a/contrib/telnet/libtelnet/pk.h
+++ b/contrib/telnet/libtelnet/pk.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/libtelnet/pk.h,v 1.6 2001/11/30 21:06:34 markm Exp $
  */
 
 /* header for the des routines that we will use */
diff --git a/contrib/telnet/libtelnet/read_password.c b/contrib/telnet/libtelnet/read_password.c
index badf21417dcc5..d479589ae6f38 100644
--- a/contrib/telnet/libtelnet/read_password.c
+++ b/contrib/telnet/libtelnet/read_password.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/read_password.c,v 1.5 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 #if 0
diff --git a/contrib/telnet/libtelnet/rsaencpwd.c b/contrib/telnet/libtelnet/rsaencpwd.c
index fba0c6b61735a..aad79b8ec608b 100644
--- a/contrib/telnet/libtelnet/rsaencpwd.c
+++ b/contrib/telnet/libtelnet/rsaencpwd.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/rsaencpwd.c,v 1.3 2001/11/30 21:06:34 markm Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)rsaencpwd.c	8.3 (Berkeley) 5/30/95";
diff --git a/contrib/telnet/libtelnet/sra.c b/contrib/telnet/libtelnet/sra.c
index 194048532b4e5..8104aaee08cd7 100644
--- a/contrib/telnet/libtelnet/sra.c
+++ b/contrib/telnet/libtelnet/sra.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/sra.c,v 1.16 2002/05/06 09:48:02 markm Exp $");
 
 #ifdef	SRA
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnet/authenc.c b/contrib/telnet/telnet/authenc.c
index 85f389b2e55db..8d1ab6348d16c 100644
--- a/contrib/telnet/telnet/authenc.c
+++ b/contrib/telnet/telnet/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $");
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c
index a64d763b64ac5..c69b54c53aa82 100644
--- a/contrib/telnet/telnet/commands.c
+++ b/contrib/telnet/telnet/commands.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/commands.c,v 1.35 2005/02/28 12:46:52 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/un.h>
diff --git a/contrib/telnet/telnet/defines.h b/contrib/telnet/telnet/defines.h
index 840666deacb6a..d49cb2d0a07c3 100644
--- a/contrib/telnet/telnet/defines.h
+++ b/contrib/telnet/telnet/defines.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defines.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/defines.h,v 1.2 2001/11/30 21:06:35 markm Exp $
  */
 
 #define	settimer(x)	clocks.x = clocks.system++
diff --git a/contrib/telnet/telnet/externs.h b/contrib/telnet/telnet/externs.h
index 73743c025ed88..0f5d4d44c9503 100644
--- a/contrib/telnet/telnet/externs.h
+++ b/contrib/telnet/telnet/externs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)externs.h	8.3 (Berkeley) 5/30/95
- *	$FreeBSD$
+ *	$FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.11 2007/07/01 12:08:04 gnn Exp $
  */
 
 #ifndef	BSD
diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c
index f6eb1ffb08ef1..fd01a30aa63da 100644
--- a/contrib/telnet/telnet/main.c
+++ b/contrib/telnet/telnet/main.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/main.c,v 1.20 2005/01/09 10:24:45 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/network.c b/contrib/telnet/telnet/network.c
index bb75d6309f90e..e93345fa68011 100644
--- a/contrib/telnet/telnet/network.c
+++ b/contrib/telnet/telnet/network.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/contrib/telnet/telnet/ring.c b/contrib/telnet/telnet/ring.c
index 6c2b7efc5a511..07061338865b6 100644
--- a/contrib/telnet/telnet/ring.c
+++ b/contrib/telnet/telnet/ring.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
 
 /*
  * This defines a structure for a ring buffer.
diff --git a/contrib/telnet/telnet/ring.h b/contrib/telnet/telnet/ring.h
index 516b7a5d806a8..6b8d11d2c603c 100644
--- a/contrib/telnet/telnet/ring.h
+++ b/contrib/telnet/telnet/ring.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ring.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnet/ring.h,v 1.4 2001/11/30 22:28:07 markm Exp $
  */
 
 #if defined(P)
diff --git a/contrib/telnet/telnet/sys_bsd.c b/contrib/telnet/telnet/sys_bsd.c
index 45ef1e2aa3cdf..cd6f8545066b5 100644
--- a/contrib/telnet/telnet/sys_bsd.c
+++ b/contrib/telnet/telnet/sys_bsd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $");
 
 /*
  * The following routines try to encapsulate what is system dependent
diff --git a/contrib/telnet/telnet/telnet.1 b/contrib/telnet/telnet/telnet.1
index 0acfe78931ece..6c663d65d05f9 100644
--- a/contrib/telnet/telnet/telnet.1
+++ b/contrib/telnet/telnet/telnet.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.6 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/telnet/telnet/telnet.1,v 1.20 2006/09/29 22:51:29 ru Exp $
 .\"
 .Dd September 18, 2006
 .Dt TELNET 1
diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c
index 28237bdf9d077..c62cc4d0a413a 100644
--- a/contrib/telnet/telnet/telnet.c
+++ b/contrib/telnet/telnet/telnet.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/telnet.c,v 1.16 2005/03/28 14:45:12 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/contrib/telnet/telnet/terminal.c b/contrib/telnet/telnet/terminal.c
index 3dda1c5bf8865..c1c88daa74b05 100644
--- a/contrib/telnet/telnet/terminal.c
+++ b/contrib/telnet/telnet/terminal.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
 
 #include <arpa/telnet.h>
 #include <sys/types.h>
diff --git a/contrib/telnet/telnet/utilities.c b/contrib/telnet/telnet/utilities.c
index b0cfe37bbabd8..d5fa43a9d9fbd 100644
--- a/contrib/telnet/telnet/utilities.c
+++ b/contrib/telnet/telnet/utilities.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $");
 
 #define	TELOPTS
 #define	TELCMDS
diff --git a/contrib/telnet/telnetd/authenc.c b/contrib/telnet/telnetd/authenc.c
index 9377b522c9722..7c42dd9596926 100644
--- a/contrib/telnet/telnetd/authenc.c
+++ b/contrib/telnet/telnetd/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $");
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/contrib/telnet/telnetd/defs.h b/contrib/telnet/telnetd/defs.h
index d727f367c0450..31ef2fb0a958a 100644
--- a/contrib/telnet/telnetd/defs.h
+++ b/contrib/telnet/telnetd/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/defs.h,v 1.2 2001/08/29 14:16:15 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/telnetd/ext.h b/contrib/telnet/telnetd/ext.h
index 448ba68b92fd0..4e45206b8155c 100644
--- a/contrib/telnet/telnetd/ext.h
+++ b/contrib/telnet/telnetd/ext.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/ext.h,v 1.11 2001/11/30 22:28:07 markm Exp $
  */
 
 /*
diff --git a/contrib/telnet/telnetd/global.c b/contrib/telnet/telnetd/global.c
index 2ed82d0b6aeea..eefd1294c7329 100644
--- a/contrib/telnet/telnetd/global.c
+++ b/contrib/telnet/telnetd/global.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $");
 
 /*
  * Allocate global variables.  We do this
diff --git a/contrib/telnet/telnetd/pathnames.h b/contrib/telnet/telnetd/pathnames.h
index ed8ee887a39e5..43fce7e400064 100644
--- a/contrib/telnet/telnetd/pathnames.h
+++ b/contrib/telnet/telnetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/pathnames.h,v 1.3 2001/08/20 12:28:40 markm Exp $
  */
 
 #if BSD > 43
diff --git a/contrib/telnet/telnetd/slc.c b/contrib/telnet/telnetd/slc.c
index ad034418d3133..a3b6cd6143504 100644
--- a/contrib/telnet/telnetd/slc.c
+++ b/contrib/telnet/telnetd/slc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)slc.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $");
 
 #include "telnetd.h"
 
diff --git a/contrib/telnet/telnetd/state.c b/contrib/telnet/telnetd/state.c
index 9db4516096a01..64cdddaa0add8 100644
--- a/contrib/telnet/telnetd/state.c
+++ b/contrib/telnet/telnetd/state.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $");
 
 #include <stdarg.h>
 #include "telnetd.h"
diff --git a/contrib/telnet/telnetd/sys_term.c b/contrib/telnet/telnetd/sys_term.c
index 151c5b45215d3..bbdd14b581f8e 100644
--- a/contrib/telnet/telnetd/sys_term.c
+++ b/contrib/telnet/telnetd/sys_term.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_term.c	8.4+1 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/tty.h>
diff --git a/contrib/telnet/telnetd/telnetd.8 b/contrib/telnet/telnetd/telnetd.8
index 15ac8a95ea2cc..08c0e5b06a5bd 100644
--- a/contrib/telnet/telnetd/telnetd.8
+++ b/contrib/telnet/telnetd/telnetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.4 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/telnet/telnetd/telnetd.8,v 1.21 2005/01/21 21:57:05 ru Exp $
 .\"
 .Dd January 9, 2005
 .Dt TELNETD 8
diff --git a/contrib/telnet/telnetd/telnetd.c b/contrib/telnet/telnetd/telnetd.c
index a790c8969a80b..2e9be91ed8a05 100644
--- a/contrib/telnet/telnetd/telnetd.c
+++ b/contrib/telnet/telnetd/telnetd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.29 2006/09/26 21:46:11 ru Exp $");
 
 #include "telnetd.h"
 #include "pathnames.h"
diff --git a/contrib/telnet/telnetd/telnetd.h b/contrib/telnet/telnetd/telnetd.h
index 5bfc572f518d3..e99a7c93efd14 100644
--- a/contrib/telnet/telnetd/telnetd.h
+++ b/contrib/telnet/telnetd/telnetd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnetd.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/contrib/telnet/telnetd/telnetd.h,v 1.2 2001/11/30 21:06:38 markm Exp $
  */
 
 
diff --git a/contrib/telnet/telnetd/termstat.c b/contrib/telnet/telnetd/termstat.c
index 88425206da56b..533eb1554576a 100644
--- a/contrib/telnet/telnetd/termstat.c
+++ b/contrib/telnet/telnetd/termstat.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/termstat.c,v 1.13 2004/07/28 05:37:18 kan Exp $");
 
 #include "telnetd.h"
 
diff --git a/contrib/telnet/telnetd/utility.c b/contrib/telnet/telnetd/utility.c
index 54e23270be181..c360834b84b1d 100644
--- a/contrib/telnet/telnetd/utility.c
+++ b/contrib/telnet/telnetd/utility.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utility.c	8.4 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $");
 
 #ifdef __FreeBSD__
 #include <locale.h>
diff --git a/contrib/texinfo/FREEBSD-Xlist b/contrib/texinfo/FREEBSD-Xlist
index 702690cc397c1..d1c91f38a3d24 100644
--- a/contrib/texinfo/FREEBSD-Xlist
+++ b/contrib/texinfo/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-Xlist,v 1.6 2005/05/23 10:55:29 ru Exp $
 */ABOUT-NLS
 */INSTALL.generic
 */Makefile.am
diff --git a/contrib/texinfo/FREEBSD-upgrade b/contrib/texinfo/FREEBSD-upgrade
index 888c727d5ec5c..0d27e2270fbd2 100644
--- a/contrib/texinfo/FREEBSD-upgrade
+++ b/contrib/texinfo/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: src/contrib/texinfo/FREEBSD-upgrade,v 1.7 2006/07/08 07:32:41 cperciva Exp $
 
 GNU Texinfo 4.8
 	originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
diff --git a/contrib/texinfo/config.h b/contrib/texinfo/config.h
index ad0a116dfa6d2..e673c4190e73d 100644
--- a/contrib/texinfo/config.h
+++ b/contrib/texinfo/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/config.h,v 1.7 2005/05/23 10:52:06 ru Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/contrib/texinfo/util/install-info.c b/contrib/texinfo/util/install-info.c
index 50ed3d46f9445..55ccbc336af56 100644
--- a/contrib/texinfo/util/install-info.c
+++ b/contrib/texinfo/util/install-info.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/texinfo/util/install-info.c,v 1.16 2005/05/23 10:50:48 ru Exp $ */
 /* install-info -- create Info directory entry(ies) for an Info file.
    $Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp $
 
diff --git a/contrib/top/commands.c b/contrib/top/commands.c
index 83f966d5e21b9..e0968b5e03efd 100644
--- a/contrib/top/commands.c
+++ b/contrib/top/commands.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/commands.c,v 1.15 2007/05/04 15:42:58 rafan Exp $
  */
 
 /*
diff --git a/contrib/top/display.c b/contrib/top/display.c
index 9de8952006449..bdc167988228f 100644
--- a/contrib/top/display.c
+++ b/contrib/top/display.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $
  */
 
 /*
diff --git a/contrib/top/machine.h b/contrib/top/machine.h
index 10c69ca4e3f0c..d2f11e7d9d460 100644
--- a/contrib/top/machine.h
+++ b/contrib/top/machine.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $
  */
 
 /*
diff --git a/contrib/top/screen.c b/contrib/top/screen.c
index 348304cc2836f..a3f19a36201ca 100644
--- a/contrib/top/screen.c
+++ b/contrib/top/screen.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/screen.c,v 1.3 2000/09/16 19:36:18 peter Exp $
  */
 
 /*  This file contains the routines that interface to termcap and stty/gtty.
diff --git a/contrib/top/sigconv.awk b/contrib/top/sigconv.awk
index 8e065fa1a3550..86cf67b8809fe 100644
--- a/contrib/top/sigconv.awk
+++ b/contrib/top/sigconv.awk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/top/sigconv.awk,v 1.2 2006/12/01 07:01:18 keramida Exp $
 
 BEGIN		{
 		    nsig = 0;
diff --git a/contrib/top/top.X b/contrib/top/top.X
index acddde8acec2e..d164f807a40e9 100644
--- a/contrib/top/top.X
+++ b/contrib/top/top.X
@@ -1,6 +1,6 @@
 .\" NOTE:  changes to the manual page for "top" should be made in the
 .\"        file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $
 .nr N %topn%
 .nr D %delay%
 .TH TOP 1 Local
diff --git a/contrib/top/top.c b/contrib/top/top.c
index eac2ecca46653..0b7236455d48c 100644
--- a/contrib/top/top.c
+++ b/contrib/top/top.c
@@ -13,7 +13,7 @@ char *copyright =
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $
  */
 
 /*
diff --git a/contrib/top/top.h b/contrib/top/top.h
index 2b32d1007fd39..4f8cd944b0607 100644
--- a/contrib/top/top.h
+++ b/contrib/top/top.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $
  */
 /*
  *  Top - a top users display for Berkeley Unix
diff --git a/contrib/top/username.c b/contrib/top/username.c
index 23591866eb83e..2cc45ed1db66d 100644
--- a/contrib/top/username.c
+++ b/contrib/top/username.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/username.c,v 1.3 2002/06/09 19:29:55 mike Exp $
  */
 
 /*
diff --git a/contrib/top/utils.c b/contrib/top/utils.c
index 906170ad67a33..93a4ae7820772 100644
--- a/contrib/top/utils.c
+++ b/contrib/top/utils.c
@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/top/utils.c,v 1.4 2002/01/24 17:58:42 dwmalone Exp $
  */
 
 /*
diff --git a/contrib/traceroute/FREEBSD-upgrade b/contrib/traceroute/FREEBSD-upgrade
index bc4918eb146f2..b0b42ef8ddea0 100644
--- a/contrib/traceroute/FREEBSD-upgrade
+++ b/contrib/traceroute/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.3 2002/07/28 02:26:31 fenner Exp $
 
 This directory contains virgin copies of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
diff --git a/contrib/traceroute/VERSION b/contrib/traceroute/VERSION
index 26e2f76091975..b2ba46879efe8 100644
--- a/contrib/traceroute/VERSION
+++ b/contrib/traceroute/VERSION
@@ -1,2 +1,2 @@
 1.4a12+FreeBSD
-$FreeBSD$
+$FreeBSD: src/contrib/traceroute/VERSION,v 1.3 2002/07/28 02:26:31 fenner Exp $
diff --git a/contrib/traceroute/findsaddr-socket.c b/contrib/traceroute/findsaddr-socket.c
index 00af84366c52f..7a3d5d3e31e69 100644
--- a/contrib/traceroute/findsaddr-socket.c
+++ b/contrib/traceroute/findsaddr-socket.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.3 2004/07/28 14:21:25 mux Exp $
  */
 
 /* XXX Yes this is WAY too complicated */
diff --git a/contrib/traceroute/traceroute.8 b/contrib/traceroute/traceroute.8
index de3b7de12b2c7..fe900e058e555 100644
--- a/contrib/traceroute/traceroute.8
+++ b/contrib/traceroute/traceroute.8
@@ -14,7 +14,7 @@
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	$Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $
 .\"
 .TH TRACEROUTE 8 "21 September 2000"
 .UC 6
diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c
index 5a9e8d26dc89f..53f560c629db3 100644
--- a/contrib/traceroute/traceroute.c
+++ b/contrib/traceroute/traceroute.c
@@ -28,7 +28,7 @@ static const char rcsid[] =
     "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
 #endif
 static const char rcsid[] =
-    "$FreeBSD$";
+    "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $";
 #endif
 
 /*
diff --git a/contrib/wpa_supplicant/FREEBSD-Xlist b/contrib/wpa_supplicant/FREEBSD-Xlist
index d9522be08a916..7ddca71c1d68b 100644
--- a/contrib/wpa_supplicant/FREEBSD-Xlist
+++ b/contrib/wpa_supplicant/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.4 2007/07/11 15:59:42 sam Exp $
 .cvsignore
 README-Windows.txt
 driver_atmel.c
diff --git a/contrib/wpa_supplicant/FREEBSD-upgrade b/contrib/wpa_supplicant/FREEBSD-upgrade
index 88a4b1848017e..ee03bcb206f89 100644
--- a/contrib/wpa_supplicant/FREEBSD-upgrade
+++ b/contrib/wpa_supplicant/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.2 2007/07/11 15:59:42 sam Exp $
 
 WPA Supplicant
 	originals can be found at: http://hostap.epitest.fi/releases/
diff --git a/contrib/wpa_supplicant/common.h b/contrib/wpa_supplicant/common.h
index ae70600fa8c1d..f7b64e3ed579e 100644
--- a/contrib/wpa_supplicant/common.h
+++ b/contrib/wpa_supplicant/common.h
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/wpa_supplicant/common.h,v 1.4 2007/07/11 15:58:51 sam Exp $
  */
 
 #ifndef COMMON_H
diff --git a/contrib/wpa_supplicant/events.c b/contrib/wpa_supplicant/events.c
index 89bb9b90a6685..ac374b84994c8 100644
--- a/contrib/wpa_supplicant/events.c
+++ b/contrib/wpa_supplicant/events.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/wpa_supplicant/events.c,v 1.3 2007/07/11 15:58:51 sam Exp $
  */
 
 #include "includes.h"
diff --git a/contrib/wpa_supplicant/wpa_ctrl.c b/contrib/wpa_supplicant/wpa_ctrl.c
index 8e621b0617158..be1be30647704 100644
--- a/contrib/wpa_supplicant/wpa_ctrl.c
+++ b/contrib/wpa_supplicant/wpa_ctrl.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/wpa_supplicant/wpa_ctrl.c,v 1.5 2007/07/11 15:58:51 sam Exp $
  */
 
 #include "includes.h"
diff --git a/contrib/wpa_supplicant/wpa_supplicant.c b/contrib/wpa_supplicant/wpa_supplicant.c
index 09ca35a52c5e5..e56df254989ea 100644
--- a/contrib/wpa_supplicant/wpa_supplicant.c
+++ b/contrib/wpa_supplicant/wpa_supplicant.c
@@ -15,7 +15,7 @@
  * %wpa_supplicant interfaces. In addition, this file contains number of
  * functions for managing network connections.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/wpa_supplicant/wpa_supplicant.c,v 1.4 2007/07/11 15:58:51 sam Exp $
  */
 
 #include "includes.h"
diff --git a/crypto/README b/crypto/README
index a3c5ccf50a1c4..d385e8b8aa75f 100644
--- a/crypto/README
+++ b/crypto/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/README,v 1.6 2001/02/10 04:47:47 kris Exp $
 
 This directory is for the EXACT same use as src/contrib, except it
 holds crypto sources.  In other words, this holds raw sources obtained
diff --git a/crypto/heimdal/FREEBSD-Xlist b/crypto/heimdal/FREEBSD-Xlist
index 6695918969909..793b485480bdd 100644
--- a/crypto/heimdal/FREEBSD-Xlist
+++ b/crypto/heimdal/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/heimdal/FREEBSD-Xlist,v 1.2 2005/02/24 22:17:13 nectar Exp $
 TODO*
 *.info*
 *.cat[0-9]
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h
index cf6a6f3548da9..69805faf5bc1b 100644
--- a/crypto/heimdal/admin/ktutil_locl.h
+++ b/crypto/heimdal/admin/ktutil_locl.h
@@ -33,7 +33,7 @@
 
 /* 
  * $Id: ktutil_locl.h,v 1.18 2002/09/10 20:03:45 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/admin/ktutil_locl.h,v 1.7 2002/09/16 21:07:08 nectar Exp $
  */
 
 #ifndef __KTUTIL_LOCL_H__
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
index f371ca1e1edff..d6d88b727c6dd 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
+++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: ftp_locl.h,v 1.37 2002/09/10 20:03:46 joda Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h,v 1.6 2002/09/16 21:07:10 nectar Exp $ */
 
 #ifndef __FTP_LOCL_H__
 #define __FTP_LOCL_H__
diff --git a/crypto/heimdal/appl/rcp/extern.h b/crypto/heimdal/appl/rcp/extern.h
index a98456d305e2e..6ec00c4105083 100644
--- a/crypto/heimdal/appl/rcp/extern.h
+++ b/crypto/heimdal/appl/rcp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/appl/rcp/extern.h,v 1.1.1.1 2001/02/13 16:44:17 assar Exp $
  */
 
 typedef struct {
diff --git a/crypto/heimdal/appl/rcp/util.c b/crypto/heimdal/appl/rcp/util.c
index 3621d307a4251..619a40f68050c 100644
--- a/crypto/heimdal/appl/rcp/util.c
+++ b/crypto/heimdal/appl/rcp/util.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/crypto/heimdal/appl/rcp/util.c,v 1.1.1.2 2002/02/19 15:46:05 nectar Exp $";
 #endif /* not lint */
 #endif
 
diff --git a/crypto/heimdal/appl/su/Makefile.am b/crypto/heimdal/appl/su/Makefile.am
index 357152e7cedc8..5c3aaa2e60c14 100644
--- a/crypto/heimdal/appl/su/Makefile.am
+++ b/crypto/heimdal/appl/su/Makefile.am
@@ -1,5 +1,5 @@
 # $Id: Makefile.am,v 1.7 2001/08/28 08:31:22 assar Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/heimdal/appl/su/Makefile.am,v 1.2.10.1 2007/10/29 21:39:03 peter Exp $
 
 include $(top_srcdir)/Makefile.am.common
 
diff --git a/crypto/heimdal/appl/su/su.c b/crypto/heimdal/appl/su/su.c
index 757f39d53feed..3333d521dadff 100644
--- a/crypto/heimdal/appl/su/su.c
+++ b/crypto/heimdal/appl/su/su.c
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/appl/su/su.c,v 1.2.10.1 2007/10/29 21:39:03 peter Exp $
  */
 
 #include <config.h>
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h
index 0b36127db0d58..55b0112062de1 100644
--- a/crypto/heimdal/kadmin/kadmin_locl.h
+++ b/crypto/heimdal/kadmin/kadmin_locl.h
@@ -33,7 +33,7 @@
 
 /* 
  * $Id: kadmin_locl.h,v 1.41 2002/09/10 20:04:45 joda Exp $
- * $FreeBSD$
+ * $FreeBSD: src/crypto/heimdal/kadmin/kadmin_locl.h,v 1.7 2002/09/16 21:07:10 nectar Exp $
  */
 
 #ifndef __ADMIN_LOCL_H__
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h
index 96db9248bebb2..dd7f88622909c 100644
--- a/crypto/heimdal/kdc/headers.h
+++ b/crypto/heimdal/kdc/headers.h
@@ -33,7 +33,7 @@
 
 /* 
  * $Id: headers.h,v 1.15 2002/09/10 20:04:46 joda Exp $ 
- * $FreeBSD$ 
+ * $FreeBSD: src/crypto/heimdal/kdc/headers.h,v 1.7 2002/09/16 21:07:11 nectar Exp $ 
  */
 
 #ifndef __HEADERS_H__
diff --git a/crypto/heimdal/lib/gssapi/gssapi_locl.h b/crypto/heimdal/lib/gssapi/gssapi_locl.h
index 5b2274fc9adde..c7dd8491ca3e3 100644
--- a/crypto/heimdal/lib/gssapi/gssapi_locl.h
+++ b/crypto/heimdal/lib/gssapi/gssapi_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: gssapi_locl.h,v 1.24.2.5 2003/09/18 22:01:52 lha Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/gssapi/gssapi_locl.h,v 1.2 2006/01/02 11:28:42 dfr Exp $ */
 
 #ifndef GSSAPI_LOCL_H
 #define GSSAPI_LOCL_H
diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/crypto/heimdal/lib/hdb/hdb_locl.h
index c4f1ea2d30f10..e1834683a572b 100644
--- a/crypto/heimdal/lib/hdb/hdb_locl.h
+++ b/crypto/heimdal/lib/hdb/hdb_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: hdb_locl.h,v 1.18.4.1 2003/09/10 22:04:39 lha Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/hdb/hdb_locl.h,v 1.8 2004/04/03 21:31:09 nectar Exp $ */
 
 #ifndef __HDB_LOCL_H__
 #define __HDB_LOCL_H__
diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c
index d1c1c9d3d79ff..50165e6ce5794 100644
--- a/crypto/heimdal/lib/krb5/crypto.c
+++ b/crypto/heimdal/lib/krb5/crypto.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 RCSID("$Id: crypto.c,v 1.73.2.4 2004/03/06 16:38:00 lha Exp $");
-/* RCSID("$FreeBSD$"); */
+/* RCSID("$FreeBSD: src/crypto/heimdal/lib/krb5/crypto.c,v 1.10 2004/04/03 21:31:09 nectar Exp $"); */
 
 #undef CRYPTO_DEBUG
 #ifdef CRYPTO_DEBUG
diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/crypto/heimdal/lib/krb5/krb5_locl.h
index be7997e28c903..f4258ab01b86c 100644
--- a/crypto/heimdal/lib/krb5/krb5_locl.h
+++ b/crypto/heimdal/lib/krb5/krb5_locl.h
@@ -32,7 +32,7 @@
  */
 
 /* $Id: krb5_locl.h,v 1.71 2002/09/10 20:10:45 joda Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/heimdal/lib/krb5/krb5_locl.h,v 1.9 2002/09/16 21:07:11 nectar Exp $ */
 
 #ifndef __KRB5_LOCL_H__
 #define __KRB5_LOCL_H__
diff --git a/crypto/openssh/FREEBSD-Xlist b/crypto/openssh/FREEBSD-Xlist
index 6d8ac040866f5..5064ba5271e02 100644
--- a/crypto/openssh/FREEBSD-Xlist
+++ b/crypto/openssh/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-Xlist,v 1.3 2004/02/26 10:37:34 des Exp $
 *.0
 */.cvsignore
 .cvsignore
diff --git a/crypto/openssh/FREEBSD-tricks b/crypto/openssh/FREEBSD-tricks
index fc0e1e768f3d9..0c8356c4ce8b4 100644
--- a/crypto/openssh/FREEBSD-tricks
+++ b/crypto/openssh/FREEBSD-tricks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.6 2005/09/03 06:42:11 des Exp $
 
 # Shell code to remove FreeBSD tags before merging
 grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index f379622bc832b..c7d27d921572d 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -134,4 +134,4 @@ Suzanne Vega, and a Sanford's #69 Deluxe Marker.
 
 					-- des@FreeBSD.org
 
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.12 2006/10/02 12:39:28 des Exp $
diff --git a/crypto/openssh/audit-bsm.c b/crypto/openssh/audit-bsm.c
index 224296a03cd01..871c7d11cec6a 100644
--- a/crypto/openssh/audit-bsm.c
+++ b/crypto/openssh/audit-bsm.c
@@ -35,7 +35,7 @@
 /* #pragma ident	"@(#)bsmaudit.c	1.1	01/09/17 SMI" */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/audit-bsm.c,v 1.3 2006/11/10 16:52:40 des Exp $");
 #if defined(USE_BSM_AUDIT)
 
 #include <sys/types.h>
diff --git a/crypto/openssh/auth-chall.c b/crypto/openssh/auth-chall.c
index 532ef678db7a2..0b990aa55884d 100644
--- a/crypto/openssh/auth-chall.c
+++ b/crypto/openssh/auth-chall.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth-chall.c,v 1.11 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index 114b250b9eed6..1ece9513200d8 100644
--- a/crypto/openssh/auth-krb5.c
+++ b/crypto/openssh/auth-krb5.c
@@ -29,7 +29,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.22 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 #include <pwd.h>
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
index 2ee3979805ccd..d8af682d461c8 100644
--- a/crypto/openssh/auth-pam.c
+++ b/crypto/openssh/auth-pam.c
@@ -47,7 +47,7 @@
 
 /* Based on $xFreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth-pam.c,v 1.19 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/crypto/openssh/auth-pam.h b/crypto/openssh/auth-pam.h
index afdc66e819c55..c1da77f3751b6 100644
--- a/crypto/openssh/auth-pam.h
+++ b/crypto/openssh/auth-pam.h
@@ -1,5 +1,5 @@
 /* $Id: auth-pam.h,v 1.27 2004/09/11 12:17:26 dtucker Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/auth-pam.h,v 1.12 2005/09/03 07:04:22 des Exp $ */
 
 /*
  * Copyright (c) 2000 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c
index a83659150e4de..e0815ece7a6fd 100644
--- a/crypto/openssh/auth-passwd.c
+++ b/crypto/openssh/auth-passwd.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth-passwd.c,v 1.21 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c
index 426b0525e3b46..00b647d90bc1c 100644
--- a/crypto/openssh/auth-skey.c
+++ b/crypto/openssh/auth-skey.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth-skey.c,v 1.17 2006/09/30 13:38:04 des Exp $");
 
 #ifdef SKEY
 
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c
index 2b6e09a0b5084..66f5496803455 100644
--- a/crypto/openssh/auth.c
+++ b/crypto/openssh/auth.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.20 2006/11/10 16:52:41 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/crypto/openssh/auth.h b/crypto/openssh/auth.h
index 0f562a7cf0ff9..0a3b148b691c1 100644
--- a/crypto/openssh/auth.h
+++ b/crypto/openssh/auth.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: auth.h,v 1.58 2006/08/18 09:15:20 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/auth.h,v 1.17 2006/09/30 13:38:04 des Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c
index a8a07d9f20229..fced4afe2e8cf 100644
--- a/crypto/openssh/auth1.c
+++ b/crypto/openssh/auth1.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth1.c,v 1.34 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c
index 12e55dc3b9a4b..7a3799bf7ba0e 100644
--- a/crypto/openssh/auth2-chall.c
+++ b/crypto/openssh/auth2-chall.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2-chall.c,v 1.12 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/auth2-kbdint.c b/crypto/openssh/auth2-kbdint.c
index 296830066f4a9..5f3682860f25c 100644
--- a/crypto/openssh/auth2-kbdint.c
+++ b/crypto/openssh/auth2-kbdint.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2-kbdint.c,v 1.5 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c
index 8261e356ef856..2d72e3a59bc37 100644
--- a/crypto/openssh/auth2.c
+++ b/crypto/openssh/auth2.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.28 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c
index 58ae8e37cbdbb..3294acd83289e 100644
--- a/crypto/openssh/bufaux.c
+++ b/crypto/openssh/bufaux.c
@@ -38,7 +38,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/bufaux.c,v 1.19 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/compat.c b/crypto/openssh/compat.c
index aac2d3f51cf2b..34cd386f3311a 100644
--- a/crypto/openssh/compat.c
+++ b/crypto/openssh/compat.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/compat.c,v 1.14 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h
index e3c246016d95b..47e0563ee4c85 100644
--- a/crypto/openssh/includes.h
+++ b/crypto/openssh/includes.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: includes.h,v 1.54 2006/07/22 20:48:23 stevesk Exp $ */
-/* $FreeBSD$	*/
+/* $FreeBSD: src/crypto/openssh/includes.h,v 1.22 2006/09/30 13:38:04 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h
index 963f9295d1dc2..4b184952ff6f4 100644
--- a/crypto/openssh/log.h
+++ b/crypto/openssh/log.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: log.h,v 1.15 2006/08/18 09:13:25 deraadt Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/log.h,v 1.8 2006/09/30 13:38:04 des Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c
index 1d5907ae7d7a6..a1f6012a7b13e 100644
--- a/crypto/openssh/loginrec.c
+++ b/crypto/openssh/loginrec.c
@@ -146,7 +146,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.14 2006/09/30 13:38:04 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
index 8702a91e9001a..67c4fd63027f4 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.22 2006/11/10 16:52:41 des Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/crypto/openssh/monitor.h b/crypto/openssh/monitor.h
index e2a803e830e78..7bfe1e9ac32d4 100644
--- a/crypto/openssh/monitor.h
+++ b/crypto/openssh/monitor.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: monitor.h,v 1.14 2006/03/25 22:22:43 djm Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/monitor.h,v 1.8 2006/09/30 13:38:05 des Exp $ */
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/monitor_wrap.c b/crypto/openssh/monitor_wrap.c
index f98bdcc1d7e30..5172efc1fa9a4 100644
--- a/crypto/openssh/monitor_wrap.c
+++ b/crypto/openssh/monitor_wrap.c
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/monitor_wrap.c,v 1.13 2006/09/30 13:38:05 des Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/crypto/openssh/monitor_wrap.h b/crypto/openssh/monitor_wrap.h
index ffd6b79756ae3..cad48c5da6652 100644
--- a/crypto/openssh/monitor_wrap.h
+++ b/crypto/openssh/monitor_wrap.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: monitor_wrap.h,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/monitor_wrap.h,v 1.10 2006/09/30 13:38:05 des Exp $ */
 
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h
index 707af00ba13d0..4fea8cc08c1aa 100644
--- a/crypto/openssh/myproposal.h
+++ b/crypto/openssh/myproposal.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: myproposal.h,v 1.21 2006/03/25 22:22:43 djm Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/myproposal.h,v 1.9 2006/09/30 13:38:05 des Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h
index 1a6c75bf02b0b..a66077b3506bf 100644
--- a/crypto/openssh/openbsd-compat/fake-rfc2553.h
+++ b/crypto/openssh/openbsd-compat/fake-rfc2553.h
@@ -1,5 +1,5 @@
 /* $Id: fake-rfc2553.h,v 1.13 2006/07/24 03:51:52 djm Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/openbsd-compat/fake-rfc2553.h,v 1.8 2006/09/30 13:38:06 des Exp $ */
 
 /*
  * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 1fde2c5e0d4c7..5404c48b13015 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.28 2006/09/30 13:38:05 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 5ffa7ce132a38..6d40432eec9b5 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.49 2006/09/30 13:38:05 des Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h
index 105daeb7962f9..2f9deb141ab6d 100644
--- a/crypto/openssh/servconf.h
+++ b/crypto/openssh/servconf.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: servconf.h,v 1.79 2006/08/14 12:40:25 dtucker Exp $ */
-/* $FreeBSD$	*/
+/* $FreeBSD: src/crypto/openssh/servconf.h,v 1.20 2006/09/30 13:38:05 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index a752e72f6c80b..8ea9b1407f510 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -34,7 +34,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.50 2006/11/10 16:52:41 des Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 29a4e5a645360..9649a23611992 100644
--- a/crypto/openssh/ssh-agent.c
+++ b/crypto/openssh/ssh-agent.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/ssh-agent.c,v 1.28 2006/11/10 16:52:41 des Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1
index b04616a382d28..e21e568a7e04c 100644
--- a/crypto/openssh/ssh.1
+++ b/crypto/openssh/ssh.1
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh.1,v 1.265 2006/10/28 18:08:10 otto Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.35 2006/11/10 16:52:41 des Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index 67844a9df81e5..2b27ec31f5dc1 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -41,7 +41,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/ssh.c,v 1.32 2006/11/10 16:52:41 des Exp $");
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 07e4086bbbbb0..430d54f50b8cc 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/crypto/openssh/ssh_config,v 1.32 2006/11/10 16:52:41 des Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index dd22cccc9b2dc..0d68bcc414e8b 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh_config.5,v 1.97 2006/07/27 08:00:50 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.23 2007/05/24 22:04:07 des Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index f189228d10d22..b3af9f6928cb6 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -9,7 +9,7 @@
  *
  * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
  *
- * $FreeBSD$
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.2 2006/09/30 13:38:05 des Exp $
  */
 
 #define a2port					ssh_a2port
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 6e283b0f6bcfd..2f0e458a00324 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd.8,v 1.234 2006/08/21 08:15:57 dtucker Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.34 2006/09/30 13:38:05 des Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 583252645b433..4797011cb8e30 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -43,7 +43,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.45 2006/11/10 16:52:41 des Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index e01d240c9270d..596d8fc3e2040 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -1,5 +1,5 @@
 #	$OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/crypto/openssh/sshd_config,v 1.47 2006/11/10 16:52:41 des Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index ac95f7bcb13a7..c8cbd5ea704b4 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -35,7 +35,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd_config.5,v 1.70 2006/08/21 08:14:01 dtucker Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.29 2007/05/24 22:04:07 des Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 3976bd1a87730..ebbbeb759f2bd 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,5 +1,5 @@
 /* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/version.h,v 1.35 2006/11/10 16:52:41 des Exp $ */
 
 #ifndef SSH_VERSION
 
diff --git a/crypto/openssl/FREEBSD-Xlist b/crypto/openssl/FREEBSD-Xlist
index 28c299411dbe9..d5d5cf4d45c43 100644
--- a/crypto/openssl/FREEBSD-Xlist
+++ b/crypto/openssl/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/crypto/openssl/FREEBSD-Xlist,v 1.7 2006/07/29 22:40:45 simon Exp $
 INSTALL.DJGPP
 INSTALL.MacOS
 INSTALL.NW
diff --git a/crypto/openssl/FREEBSD-upgrade b/crypto/openssl/FREEBSD-upgrade
index 109df2b100d3b..915a1c1ba81a9 100644
--- a/crypto/openssl/FREEBSD-upgrade
+++ b/crypto/openssl/FREEBSD-upgrade
@@ -40,4 +40,4 @@ cvs ci -m "Upgrade to OpenSSL ${OSSLVER}."
 
 					-- simon@
 
-$FreeBSD$
+$FreeBSD: src/crypto/openssl/FREEBSD-upgrade,v 1.2 2007/03/15 21:06:48 simon Exp $
diff --git a/crypto/openssl/apps/openssl.cnf b/crypto/openssl/apps/openssl.cnf
index cf8f8ea1e4452..18a89b2d14dfe 100644
--- a/crypto/openssl/apps/openssl.cnf
+++ b/crypto/openssl/apps/openssl.cnf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssl/apps/openssl.cnf,v 1.8 2006/07/29 19:14:46 simon Exp $
 #
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.
diff --git a/crypto/openssl/crypto/engine/eng_cryptodev.c b/crypto/openssl/crypto/engine/eng_cryptodev.c
index 4f2ec6946a380..a986ad03deba0 100644
--- a/crypto/openssl/crypto/engine/eng_cryptodev.c
+++ b/crypto/openssl/crypto/engine/eng_cryptodev.c
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/engine/eng_cryptodev.c,v 1.1.1.1.4.1 2008/02/05 21:02:04 simon Exp $ */
 
 #include <openssl/objects.h>
 #include <openssl/engine.h>
diff --git a/crypto/openssl/crypto/rsa/rsa.h b/crypto/openssl/crypto/rsa/rsa.h
index 108f51f1ffde7..782d51de4b9fe 100644
--- a/crypto/openssl/crypto/rsa/rsa.h
+++ b/crypto/openssl/crypto/rsa/rsa.h
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa.h,v 1.13 2006/10/01 07:46:16 simon Exp $ */
 
 #ifndef HEADER_RSA_H
 #define HEADER_RSA_H
diff --git a/crypto/openssl/crypto/rsa/rsa_eay.c b/crypto/openssl/crypto/rsa/rsa_eay.c
index 9db3738609a81..037990aecc48a 100644
--- a/crypto/openssl/crypto/rsa/rsa_eay.c
+++ b/crypto/openssl/crypto/rsa/rsa_eay.c
@@ -108,7 +108,7 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa_eay.c,v 1.15 2006/10/01 07:46:16 simon Exp $ */
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/openssl/crypto/rsa/rsa_lib.c b/crypto/openssl/crypto/rsa/rsa_lib.c
index b1c52152c1b05..e159882cd6236 100644
--- a/crypto/openssl/crypto/rsa/rsa_lib.c
+++ b/crypto/openssl/crypto/rsa/rsa_lib.c
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssl/crypto/rsa/rsa_lib.c,v 1.12 2007/03/15 20:07:27 simon Exp $ */
 
 #include <stdio.h>
 #include <openssl/crypto.h>
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl
index 6ea51794ac872..a2b18ea0cbdcf 100644
--- a/crypto/openssl/util/pl/Mingw32.pl
+++ b/crypto/openssl/util/pl/Mingw32.pl
@@ -1,5 +1,5 @@
 #!/usr/local/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssl/util/pl/Mingw32.pl,v 1.9 2006/10/01 07:46:16 simon Exp $
 #
 # Mingw32.pl -- Mingw
 #
diff --git a/etc/Makefile b/etc/Makefile
index 9745a1574f42c..81e45a691fc49 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD$
+# $FreeBSD: src/etc/Makefile,v 1.360.2.2.2.1 2008/01/29 00:22:32 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/etc/amd.map b/etc/amd.map
index 375ef34a6272d..6937642d8493c 100644
--- a/etc/amd.map
+++ b/etc/amd.map
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/amd.map,v 1.10 2006/11/06 01:42:11 obrien Exp $
 #
 /defaults       type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key}
 *               opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev
diff --git a/etc/apmd.conf b/etc/apmd.conf
index be4a6c3ddd4c5..0522793758241 100644
--- a/etc/apmd.conf
+++ b/etc/apmd.conf
@@ -1,6 +1,6 @@
 # apmd Configuration File
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/apmd.conf,v 1.9 2003/12/30 17:40:28 njl Exp $
 #
 
 apm_event SUSPENDREQ {
diff --git a/etc/auth.conf b/etc/auth.conf
index 08b6f7a3271fa..989c42b033043 100644
--- a/etc/auth.conf
+++ b/etc/auth.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/auth.conf,v 1.6 2003/07/28 02:28:51 rwatson Exp $
 #
 # Configure some authentication-related defaults.  This file is being
 # gradually subsumed by user class and PAM configuration.
diff --git a/etc/bluetooth/Makefile b/etc/bluetooth/Makefile
index e2e3622d451e7..04bf49a74baf9 100644
--- a/etc/bluetooth/Makefile
+++ b/etc/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/10/21 22:22:27 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/Makefile,v 1.2 2005/10/14 15:26:23 ru Exp $
 
 FILESDIR=		/etc/bluetooth
 FILES=			hcsecd.conf hosts protocols
diff --git a/etc/bluetooth/hcsecd.conf b/etc/bluetooth/hcsecd.conf
index e6b95998f33b7..81af4daa08ed9 100644
--- a/etc/bluetooth/hcsecd.conf
+++ b/etc/bluetooth/hcsecd.conf
@@ -1,5 +1,5 @@
 # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.3 2006/05/18 17:53:49 emax Exp $
 #
 # HCI security daemon configuration file
 #
diff --git a/etc/bluetooth/hosts b/etc/bluetooth/hosts
index b704248c65f06..e5f3b66affb2e 100644
--- a/etc/bluetooth/hosts
+++ b/etc/bluetooth/hosts
@@ -1,5 +1,5 @@
 # $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/hosts,v 1.2 2005/11/10 19:09:22 emax Exp $
 #
 # Bluetooth Host Database
 #
diff --git a/etc/bluetooth/protocols b/etc/bluetooth/protocols
index 6715094ce1487..537ad6d1c0fe5 100644
--- a/etc/bluetooth/protocols
+++ b/etc/bluetooth/protocols
@@ -1,5 +1,5 @@
 # $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/bluetooth/protocols,v 1.2 2005/11/10 19:09:22 emax Exp $
 #
 # Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
 #
diff --git a/etc/crontab b/etc/crontab
index 2e538a823e55e..9f5e75c3b6591 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,6 +1,6 @@
 # /etc/crontab - root's crontab for FreeBSD
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp $
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
diff --git a/etc/csh.cshrc b/etc/csh.cshrc
index f4f775ae6ada0..14d67e11932a6 100644
--- a/etc/csh.cshrc
+++ b/etc/csh.cshrc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $
 #
 # System-wide .cshrc file for csh(1).
diff --git a/etc/csh.login b/etc/csh.login
index 62deb32f86de9..9e96c4e04711a 100644
--- a/etc/csh.login
+++ b/etc/csh.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $
 #
 # System-wide .login file for csh(1).
 # Uncomment this to give you the default 4.2 behavior, where disk
diff --git a/etc/csh.logout b/etc/csh.logout
index 6b0584f499845..7255a0076adbd 100644
--- a/etc/csh.logout
+++ b/etc/csh.logout
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.logout,v 1.3 1999/08/27 23:23:41 peter Exp $
 #
 # System-wide .logout file for csh(1).
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
index 269428789cdf1..14bc1332dcb26 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $
 
 FILES=	bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf
 NO_OBJ=
diff --git a/etc/defaults/bluetooth.device.conf b/etc/defaults/bluetooth.device.conf
index 7e22dbbee1565..4c53862b116e8 100644
--- a/etc/defaults/bluetooth.device.conf
+++ b/etc/defaults/bluetooth.device.conf
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1 2005/11/10 19:09:22 emax Exp $
 
 # The authentication_enable parameter controls if the device requires to
 # authenticate the remote device at connection setup. At connection setup,
diff --git a/etc/defaults/devfs.rules b/etc/defaults/devfs.rules
index 70fbe038ca34e..fa1242732aac7 100644
--- a/etc/defaults/devfs.rules
+++ b/etc/defaults/devfs.rules
@@ -13,7 +13,7 @@
 # references must include a dollar sign '$' in front of the
 # name to be expanded properly.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/devfs.rules,v 1.4.2.1 2007/11/11 22:52:31 csjp Exp $
 #
 
 # Very basic and secure ruleset: Hide everything.
diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index b9681c49f7a92..adf4c120693d9 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -1,7 +1,7 @@
 #
 # Default PCCARD configuration file
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/pccard.conf,v 1.272 2005/01/11 00:40:00 imp Exp $
 #
 # Please send new entries for this file to imp@freebsd.org.  He likes to
 # review them before they are committed to make sure they are correct for
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 484b5b00310c6..0ea08ef1648ae 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -13,7 +13,7 @@
 # For a more detailed explanation of all the periodic.conf variables, please
 # refer to the periodic.conf(5) manual page.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.44.2.1 2007/12/06 08:09:52 jhb Exp $
 #
 
 # What files override these defaults ?
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 2b3743d75e817..0df10e4c77485 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.1.2.2 2008/01/29 00:22:33 dougb Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
diff --git a/etc/devd.conf b/etc/devd.conf
index 94fbb79f72714..165474c90a4f8 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
diff --git a/etc/devfs.conf b/etc/devfs.conf
index f7869fe894bb6..f32c00252b1b8 100644
--- a/etc/devfs.conf
+++ b/etc/devfs.conf
@@ -22,7 +22,7 @@
 #  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #  SUCH DAMAGE.
 #
-#  $FreeBSD$
+#  $FreeBSD: src/etc/devfs.conf,v 1.2 2004/06/06 11:46:27 schweikh Exp $
 
 # These are examples of how to configure devices using /etc/rc.d/devfs.
 # The first parameter is always the action to take, the second is always the
diff --git a/etc/dhclient.conf b/etc/dhclient.conf
index a7639d904aad5..5bdbb8b9e875c 100644
--- a/etc/dhclient.conf
+++ b/etc/dhclient.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/dhclient.conf,v 1.3 2001/10/27 03:14:37 rwatson Exp $
 #
 #	This file is required by the ISC DHCP client.
 #	See ``man 5 dhclient.conf'' for details.
diff --git a/etc/disktab b/etc/disktab
index 136a8163efdbb..eea5a366e19eb 100644
--- a/etc/disktab
+++ b/etc/disktab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/disktab,v 1.26 2006/10/14 16:39:03 ru Exp $
 #
 # Disk geometry and partition layout tables.
 # See disktab(5) for format of this file.
diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index a6a75de0197be..5cf3ee4d34677 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.amd64/ttys,v 1.11.2.1 2007/11/27 18:40:15 jhb Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.arm/ttys b/etc/etc.arm/ttys
index 16bddd041cede..3f99370400b51 100644
--- a/etc/etc.arm/ttys
+++ b/etc/etc.arm/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.arm/ttys,v 1.4.2.1 2007/11/27 18:40:15 jhb Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index a6a75de0197be..8c243803ed4bb 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.i386/ttys,v 1.11.2.1 2007/11/27 18:40:15 jhb Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.ia64/ttys b/etc/etc.ia64/ttys
index d6ad0ed04bd38..bb4404df6c292 100644
--- a/etc/etc.ia64/ttys
+++ b/etc/etc.ia64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.6.2.1 2007/11/27 18:40:15 jhb Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.powerpc/ttys b/etc/etc.powerpc/ttys
index 16bddd041cede..4bccd8805cd61 100644
--- a/etc/etc.powerpc/ttys
+++ b/etc/etc.powerpc/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.5.2.1 2007/11/27 18:40:16 jhb Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys
index 75b250d22f250..e812bd6b3d68d 100644
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.14.2.1 2007/11/27 18:40:16 jhb Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/fbtab b/etc/fbtab
index 83ac65ddcdb81..06d2d61271cb0 100644
--- a/etc/fbtab
+++ b/etc/fbtab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/fbtab,v 1.3 1999/09/13 17:09:07 peter Exp $
 #
 #/dev/ttyv0	0600	/dev/console
 #/dev/ttyv0	0600	/dev/pcaudio:/dev/pcaudioctl
diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf
index 001042e5420d9..83e133c036f94 100644
--- a/etc/freebsd-update.conf
+++ b/etc/freebsd-update.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/freebsd-update.conf,v 1.1.4.2 2007/12/04 22:49:18 cperciva Exp $
 
 # Trusted keyprint.  Changing this is a Bad Idea unless you've received
 # a PGP-signed email from <security-officer@FreeBSD.org> telling you to
diff --git a/etc/ftpusers b/etc/ftpusers
index 064282805580d..28c4b63c5767d 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/ftpusers,v 1.14 2005/06/07 03:41:19 maxim Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
diff --git a/etc/gettytab b/etc/gettytab
index b75da3d138162..0a0552ea94bbe 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/gettytab,v 1.24 2006/04/11 09:54:23 des Exp $
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 # Most of the table entries here are just copies of the old getty table,
diff --git a/etc/group b/etc/group
index 044c9f10e1434..f1d7cba7e0e24 100644
--- a/etc/group
+++ b/etc/group
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/group,v 1.35 2007/06/11 18:36:39 ceri Exp $
 #
 wheel:*:0:root
 daemon:*:1:
diff --git a/etc/gss/Makefile b/etc/gss/Makefile
index 479fd2f936473..8d58f191d3f03 100644
--- a/etc/gss/Makefile
+++ b/etc/gss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/gss/Makefile,v 1.1 2005/12/29 14:40:18 dfr Exp $
 
 FILES=	mech qop
 NO_OBJ=
diff --git a/etc/gss/mech b/etc/gss/mech
index b77f7914a7a13..74be36bf5464d 100644
--- a/etc/gss/mech
+++ b/etc/gss/mech
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/gss/mech,v 1.1.4.1 2008/01/09 18:00:51 jhb Exp $
 #
 # Name		OID			Library name			Kernel module
 kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.9	-
diff --git a/etc/gss/qop b/etc/gss/qop
index f975dbf379d86..e9fcbee02b8dd 100644
--- a/etc/gss/qop
+++ b/etc/gss/qop
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/gss/qop,v 1.1 2005/12/29 14:40:18 dfr Exp $
 GSS_KRB5_CONF_C_QOP_DES		0x0100	kerberosv5
 GSS_KRB5_CONF_C_QOP_DES3_KD	0x0200	kerberosv5
diff --git a/etc/hosts b/etc/hosts
index 2690a9ad48e1a..3b84faae084ee 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts,v 1.16 2003/01/28 21:29:23 dbaker Exp $
 #
 # Host Database
 #
diff --git a/etc/hosts.allow b/etc/hosts.allow
index 96e0b67aba110..4fa9a989841b9 100644
--- a/etc/hosts.allow
+++ b/etc/hosts.allow
@@ -1,6 +1,6 @@
 #
 # hosts.allow access control file for "tcp wrapped" applications.
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.allow,v 1.23 2006/08/29 09:20:48 ru Exp $
 #
 # NOTE: The hosts.deny file is deprecated.
 #       Place both 'allow' and 'deny' rules in the hosts.allow file.
diff --git a/etc/hosts.equiv b/etc/hosts.equiv
index d8a71c1ebc7f6..7b7adb0e29593 100644
--- a/etc/hosts.equiv
+++ b/etc/hosts.equiv
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.equiv,v 1.4 1999/08/27 23:23:41 peter Exp $
 #
 #localhost
 #my_very_good_friend.domain
diff --git a/etc/hosts.lpd b/etc/hosts.lpd
index b53202ab18e57..7e0233257008e 100644
--- a/etc/hosts.lpd
+++ b/etc/hosts.lpd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/hosts.lpd,v 1.4 1999/08/27 23:23:42 peter Exp $
 #
 # See lpd(8)
 #machine.domain
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 6f2e234b2578c..e325371c071cd 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/inetd.conf,v 1.73 2007/07/05 09:46:53 delphij Exp $
 #
 # Internet server configuration database
 #
diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index 0f27b5021f832..5cb49a7e5ef03 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/Makefile,v 1.14 2006/03/07 09:53:11 yar Exp $
 
 NO_OBJ=
 
diff --git a/etc/isdn/answer b/etc/isdn/answer
index d39a983312065..36c212f5c4c29 100755
--- a/etc/isdn/answer
+++ b/etc/isdn/answer
@@ -4,7 +4,7 @@
 #	answer script for i4b isdnd
 #	---------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/answer,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:44:38 1999]
 #
diff --git a/etc/isdn/holidays.D b/etc/isdn/holidays.D
index 80b725910846b..7a55a2969f77b 100644
--- a/etc/isdn/holidays.D
+++ b/etc/isdn/holidays.D
@@ -15,7 +15,7 @@
 #	support for this tariff, see output of "man isdnd.rc" and
 #	search for keyword "valid".
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/holidays.D,v 1.3 2002/04/13 12:23:38 hm Exp $
 #
 #---------------------------------------------------------------------------
 #
diff --git a/etc/isdn/isdnd.rates.A b/etc/isdn/isdnd.rates.A
index fa25b22e9e493..67e3e81c397d7 100644
--- a/etc/isdn/isdnd.rates.A
+++ b/etc/isdn/isdnd.rates.A
@@ -5,7 +5,7 @@
 #
 #	$Id: isdnd.rates.A,v 1.2 1999/12/13 21:25:24 hm Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.A,v 1.1 1999/12/14 21:14:27 hm Exp $
 #
 #	last edit-date: [Mon Dec 13 21:42:02 1999]
 #
diff --git a/etc/isdn/isdnd.rates.D b/etc/isdn/isdnd.rates.D
index 388770ea07702..a8a5bbd3ec0f3 100644
--- a/etc/isdn/isdnd.rates.D
+++ b/etc/isdn/isdnd.rates.D
@@ -3,7 +3,7 @@
 #	i4b - Deutsche Telekom charging rates config file
 #	-------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.4 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Sun Jan 17 18:38:29 1999]
 #
diff --git a/etc/isdn/isdnd.rates.F b/etc/isdn/isdnd.rates.F
index 6a73b75f2c42a..308cb72ee77ef 100644
--- a/etc/isdn/isdnd.rates.F
+++ b/etc/isdn/isdnd.rates.F
@@ -3,7 +3,7 @@
 #	i4b - Tarifs France Telecom
 #	---------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.4 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Thu Mar 19 20:05:18 1998]
 #
diff --git a/etc/isdn/isdnd.rates.L b/etc/isdn/isdnd.rates.L
index d3992b052d386..c7e96f72442f5 100644
--- a/etc/isdn/isdnd.rates.L
+++ b/etc/isdn/isdnd.rates.L
@@ -5,7 +5,7 @@
 #
 #	$Id: isdnd.rates.L,v 1.2 1999/12/13 21:25:24 hm Exp $
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.2 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Mon Dec 13 21:42:33 1999]
 #
diff --git a/etc/isdn/isdnd.rates.UK.BT b/etc/isdn/isdnd.rates.UK.BT
index c4d34ec3a6d68..f73bb9c69c707 100644
--- a/etc/isdn/isdnd.rates.UK.BT
+++ b/etc/isdn/isdnd.rates.UK.BT
@@ -3,7 +3,7 @@
 #	i4b - BT charges
 #	-------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rates.UK.BT,v 1.2 1999/09/13 17:09:08 peter Exp $
 #
 #	Barry A. Scott barry@scottb.demon.co.uk
 #
diff --git a/etc/isdn/isdnd.rc.sample b/etc/isdn/isdnd.rc.sample
index 3878e7c80f06c..78a6d41d479bd 100644
--- a/etc/isdn/isdnd.rc.sample
+++ b/etc/isdn/isdnd.rc.sample
@@ -3,7 +3,7 @@
 #	example of a configuration file for the isdn daemon
 #	---------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.4 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Sun May 27 09:33:59 2001]
 #
diff --git a/etc/isdn/isdntel.alias.sample b/etc/isdn/isdntel.alias.sample
index c06bc1942a082..bd8178a26fb3f 100644
--- a/etc/isdn/isdntel.alias.sample
+++ b/etc/isdn/isdntel.alias.sample
@@ -3,7 +3,7 @@
 #	alias file for the isdntel(1) application
 #	-----------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdntel.alias.sample,v 1.2 1999/08/27 23:23:58 peter Exp $
 #
 #	last edit-date: [Fri Dec 18 18:06:03 1998]
 #
diff --git a/etc/isdn/isdntel.sh b/etc/isdn/isdntel.sh
index 14f528a80927b..5ed5fcb331a72 100755
--- a/etc/isdn/isdntel.sh
+++ b/etc/isdn/isdntel.sh
@@ -4,7 +4,7 @@
 #	isdn telephone answering
 #	-------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/isdntel.sh,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:45:04 1999]
 #
diff --git a/etc/isdn/record b/etc/isdn/record
index 61591fbfe6e6e..aec785b895c7e 100755
--- a/etc/isdn/record
+++ b/etc/isdn/record
@@ -4,7 +4,7 @@
 #	answer and record message script for i4b isdnd
 #	----------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/record,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:45:10 1999]
 #
diff --git a/etc/isdn/tell b/etc/isdn/tell
index 047c834b51f6c..82db77fdd2d96 100755
--- a/etc/isdn/tell
+++ b/etc/isdn/tell
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/tell,v 1.4 1999/09/13 15:44:20 sheldonh Exp $
 #
 #	last edit-date: [Thu May 20 11:45:15 1999]
 #
diff --git a/etc/isdn/tell-record b/etc/isdn/tell-record
index ae4c8176de1a7..f8e14c691ac69 100755
--- a/etc/isdn/tell-record
+++ b/etc/isdn/tell-record
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/tell-record,v 1.5 2000/10/31 10:00:51 hm Exp $
 #
 #	last edit-date: [Tue Oct 31 10:59:49 2000]
 #
diff --git a/etc/isdn/unknown_incoming b/etc/isdn/unknown_incoming
index 5debe21fe0e09..0ad9aa9fc5795 100755
--- a/etc/isdn/unknown_incoming
+++ b/etc/isdn/unknown_incoming
@@ -4,7 +4,7 @@
 #	unknown_incoming - script for isdnd
 #	-----------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/isdn/unknown_incoming,v 1.3 2004/06/06 11:46:28 schweikh Exp $
 #
 #	last edit-date: [Wed Jan 10 13:40:36 2001]
 #
diff --git a/etc/libalias.conf b/etc/libalias.conf
index a938e67aaabdb..648f79aa0636d 100644
--- a/etc/libalias.conf
+++ b/etc/libalias.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/libalias.conf,v 1.2 2006/10/08 14:01:58 piso Exp $
 /lib/libalias_cuseeme.so
 /lib/libalias_ftp.so
 /lib/libalias_irc.so
diff --git a/etc/login.access b/etc/login.access
index ffe5fff0abea7..55d031a2afcd5 100644
--- a/etc/login.access
+++ b/etc/login.access
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/login.access,v 1.4 2004/06/06 11:46:27 schweikh Exp $
 #
 # Login access control table.
 #
diff --git a/etc/login.conf b/etc/login.conf
index 9e8d02cd1a492..847407ab68558 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -7,7 +7,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/login.conf,v 1.51 2007/05/29 06:37:57 dougb Exp $
 #
 
 # Default settings effectively disable resource limits, see the
diff --git a/etc/mac.conf b/etc/mac.conf
index 2e1b9a24cf7de..2ada6dd0fbb18 100644
--- a/etc/mac.conf
+++ b/etc/mac.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/mac.conf,v 1.5 2003/11/15 02:08:01 rwatson Exp $
 #
 # TrustedBSD MAC userland policy configuration file.  Kernel modules
 # export label information, and mac.conf indicates to userland
diff --git a/etc/mail/Makefile b/etc/mail/Makefile
index 3f085cc2d7809..8604fcb779c36 100644
--- a/etc/mail/Makefile
+++ b/etc/mail/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/Makefile,v 1.36 2004/06/06 17:28:31 gshapiro Exp $
 #
 # This Makefile provides an easy way to generate the configuration
 # file and database maps for the sendmail(8) daemon.
diff --git a/etc/mail/README b/etc/mail/README
index fd7c8f6ed8128..d10884995a606 100644
--- a/etc/mail/README
+++ b/etc/mail/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/README,v 1.16 2002/05/22 16:37:29 gshapiro Exp $
 
 		Sendmail Processes
 
diff --git a/etc/mail/access.sample b/etc/mail/access.sample
index 81c7c3f852373..15382b904b151 100644
--- a/etc/mail/access.sample
+++ b/etc/mail/access.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/access.sample,v 1.3 2000/11/02 23:40:40 dirk Exp $
 #
 # Mail relay access control list.  Default is to reject mail unless the
 # destination is local, or listed in /etc/mail/local-host-names
diff --git a/etc/mail/aliases b/etc/mail/aliases
index 682f878f53a84..5eaee62e63644 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/aliases,v 1.21 2005/06/07 03:41:20 maxim Exp $
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
diff --git a/etc/mail/mailer.conf b/etc/mail/mailer.conf
index 3fa69223046c3..6f63b9008a91e 100644
--- a/etc/mail/mailer.conf
+++ b/etc/mail/mailer.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/mailer.conf,v 1.3 2002/04/05 04:25:12 gshapiro Exp $
 #
 # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
 #
diff --git a/etc/mail/mailertable.sample b/etc/mail/mailertable.sample
index d2c45e09c36ec..bce93827249a7 100644
--- a/etc/mail/mailertable.sample
+++ b/etc/mail/mailertable.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/mailertable.sample,v 1.2 2000/03/18 06:38:22 rwatson Exp $
 #
 # List of domains (possibly wildcarded) and destination mailers
 #
diff --git a/etc/mail/virtusertable.sample b/etc/mail/virtusertable.sample
index 43e2bbbe4103e..fb6162ed9c564 100644
--- a/etc/mail/virtusertable.sample
+++ b/etc/mail/virtusertable.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mail/virtusertable.sample,v 1.3 2000/11/02 23:32:31 dirk Exp $
 #
 # Map one or all usernames at a source hostname to a specific (or the same)
 # username at another target hostname.  Remember to add the source hostname
diff --git a/etc/man.alias b/etc/man.alias
index 0268403efffc0..36a2d62462704 100644
--- a/etc/man.alias
+++ b/etc/man.alias
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/man.alias,v 1.2 2001/06/26 00:41:07 ache Exp $
 
 en.ISO8859-15   en.ISO8859-1
 
diff --git a/etc/master.passwd b/etc/master.passwd
index 9af31d13e55a8..22a25f9a150f9 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/master.passwd,v 1.40 2005/06/06 20:19:56 brooks Exp $
 #
 root::0:0::0:0:Charlie &:/root:/bin/csh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
diff --git a/etc/mtree/BIND.chroot.dist b/etc/mtree/BIND.chroot.dist
index e41a369a4262a..c66788b60d129 100644
--- a/etc/mtree/BIND.chroot.dist
+++ b/etc/mtree/BIND.chroot.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.6 2004/11/04 05:24:29 gshapiro Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BIND.include.dist b/etc/mtree/BIND.include.dist
index 534794af5eb50..b36b416e9150c 100644
--- a/etc/mtree/BIND.include.dist
+++ b/etc/mtree/BIND.include.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BIND.include.dist,v 1.1 2004/09/27 08:16:29 dougb Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 2c7e3ca8effb8..e0869a1ff7911 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120 2007/10/03 05:51:20 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index bea0f261d7498..abe2a01041055 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.126 2007/10/03 05:51:20 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index 952aacea6a949..6b864f04e2249 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.release.dist,v 1.8 2001/06/26 13:50:32 nik Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 2fac37786c699..2888dfaba1ba6 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.79 2007/04/08 23:59:39 pjd Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.sendmail.dist b/etc/mtree/BSD.sendmail.dist
index 138606b7c44d7..a3dc4c62a0663 100644
--- a/etc/mtree/BSD.sendmail.dist
+++ b/etc/mtree/BSD.sendmail.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.2 2003/11/29 18:22:01 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 1b0a4ff9cc438..32806b828e9d3 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.329.2.2 2007/12/08 12:44:58 benjsc Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 29b48622199c9..8d5c371c94672 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.75 2006/08/31 09:51:33 cperciva Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index c3a233c39a77a..70cdc8d200989 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.32 2007/10/03 05:51:20 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index 122cdd5d60eef..bbf408a042c0a 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/BSD.x11.dist,v 1.18 2006/01/08 10:15:30 dougb Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index de69da92fc51a..be89df0dd9598 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/mtree/Makefile,v 1.6 2006/03/17 18:54:21 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/etc/mtree/README b/etc/mtree/README
index c11d47ecc71e6..062753e22a6e6 100644
--- a/etc/mtree/README
+++ b/etc/mtree/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/etc/mtree/README,v 1.8 2007/10/03 05:44:27 ru Exp $
 
 Note: If you modify these files, please keep hier(7) updated!
 
diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile
index 3a5e1f699a23f..270f28502d817 100644
--- a/etc/namedb/Makefile
+++ b/etc/namedb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/namedb/Makefile,v 1.5 2007/06/18 05:44:38 dougb Exp $
 
 SUBDIR=	master
 
diff --git a/etc/namedb/master/Makefile b/etc/namedb/master/Makefile
index 7907bf3bb5c1e..e11f9510f8efe 100644
--- a/etc/namedb/master/Makefile
+++ b/etc/namedb/master/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/namedb/master/Makefile,v 1.1 2007/06/18 05:44:38 dougb Exp $
 
 FILES=	empty.db localhost-forward.db localhost-reverse.db
 
diff --git a/etc/namedb/master/empty.db b/etc/namedb/master/empty.db
index 070f6634825ae..984c5bef774eb 100644
--- a/etc/namedb/master/empty.db
+++ b/etc/namedb/master/empty.db
@@ -1,5 +1,5 @@
 
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/master/empty.db,v 1.1 2007/06/18 05:58:23 dougb Exp $
 
 $TTL 3h
 @ SOA @ nobody.localhost. 42 1d 12h 1w 3h
diff --git a/etc/namedb/master/localhost-forward.db b/etc/namedb/master/localhost-forward.db
index 9156d2f09978a..cd6a5415be82f 100644
--- a/etc/namedb/master/localhost-forward.db
+++ b/etc/namedb/master/localhost-forward.db
@@ -1,5 +1,5 @@
 
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/master/localhost-forward.db,v 1.1 2007/06/18 05:58:23 dougb Exp $
 
 $TTL 3h
 localhost. SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
diff --git a/etc/namedb/master/localhost-reverse.db b/etc/namedb/master/localhost-reverse.db
index ceabe059ba77d..70ff0c7812ade 100644
--- a/etc/namedb/master/localhost-reverse.db
+++ b/etc/namedb/master/localhost-reverse.db
@@ -1,5 +1,5 @@
 
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/master/localhost-reverse.db,v 1.1 2007/06/18 05:58:23 dougb Exp $
 
 $TTL 3h
 @ SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
index 865eee0f72b6a..57b689278570c 100644
--- a/etc/namedb/named.conf
+++ b/etc/namedb/named.conf
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/etc/namedb/named.conf,v 1.26.4.1 2008/01/13 20:48:23 dougb Exp $
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
 // in /usr/share/doc/bind9 for more details.
diff --git a/etc/namedb/named.root b/etc/namedb/named.root
index 274a3eefd55d2..32d80e9cadeb2 100644
--- a/etc/namedb/named.root
+++ b/etc/namedb/named.root
@@ -1,5 +1,5 @@
 ;
-; $FreeBSD$
+; $FreeBSD: src/etc/namedb/named.root,v 1.12.18.1.2.1 2008/02/07 20:55:42 dougb Exp $
 ;
 
 ;       This file holds the information on root name servers needed to
diff --git a/etc/netconfig b/etc/netconfig
index 109f2e36ad434..4dc463654a120 100644
--- a/etc/netconfig
+++ b/etc/netconfig
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/netconfig,v 1.3 2002/12/16 22:24:25 mbr Exp $
 #
 # The network configuration file. This file is currently only used in
 # conjunction with the (TI-) RPC code in the C library, unlike its
diff --git a/etc/netstart b/etc/netstart
index f83a94a091f9e..75f6eaa4faee9 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/netstart,v 1.67 2006/05/30 02:10:01 brooks Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 #
 
diff --git a/etc/network.subr b/etc/network.subr
index a98954bcc72fe..04bde63ad40e1 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/network.subr,v 1.180.2.1 2007/11/08 05:52:23 thompsa Exp $
 #
 
 #
diff --git a/etc/networks b/etc/networks
index a6b15d4519b77..92982b5b2e10b 100644
--- a/etc/networks
+++ b/etc/networks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/networks,v 1.3 1999/08/27 23:23:42 peter Exp $
 #	@(#)networks	5.1 (Berkeley) 6/30/90
 #
 # Your Local Networks Database
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index a1c5f98e9639f..575982ee23f1c 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -1,5 +1,5 @@
 # configuration file for newsyslog
-# $FreeBSD$
+# $FreeBSD: src/etc/newsyslog.conf,v 1.50 2005/03/02 00:40:55 brooks Exp $
 #
 # Entries which do not specify the '/pid_file' field will cause the
 # syslogd process to be signalled when that log file is rotated.  This
diff --git a/etc/nls.alias b/etc/nls.alias
index 805c34ab6b8ad..a13c121394cc1 100644
--- a/etc/nls.alias
+++ b/etc/nls.alias
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/nls.alias,v 1.5 2003/06/10 01:22:30 ache Exp $
 
 POSIX                   C
 en_US.US-ASCII          C
diff --git a/etc/nscd.conf b/etc/nscd.conf
index 19a8b5b954523..41e5fa372a334 100644
--- a/etc/nscd.conf
+++ b/etc/nscd.conf
@@ -1,6 +1,6 @@
 #
 # Default caching daemon configuration file
-# $FreeBSD$
+# $FreeBSD: src/etc/nscd.conf,v 1.2.2.1 2007/10/19 00:09:54 bushman Exp $
 #
 
 enable-cache passwd yes
diff --git a/etc/nsmb.conf b/etc/nsmb.conf
index e5f225849191f..d6f8c224dd196 100644
--- a/etc/nsmb.conf
+++ b/etc/nsmb.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/nsmb.conf,v 1.4 2002/04/22 16:18:36 sheldonh Exp $
 #
 # smbfs lookups configuration files in next order:
 #	1. ~/.nsmbrc
diff --git a/etc/nsswitch.conf b/etc/nsswitch.conf
index c95b9a4e01c90..a29f46f901e26 100644
--- a/etc/nsswitch.conf
+++ b/etc/nsswitch.conf
@@ -1,6 +1,6 @@
 #
 # nsswitch.conf(5) - name service switch configuration file
-# $FreeBSD$
+# $FreeBSD: src/etc/nsswitch.conf,v 1.1 2006/05/03 15:14:47 ume Exp $
 #
 group: compat
 group_compat: nis
diff --git a/etc/opieaccess b/etc/opieaccess
index ed57ef13a33a0..b30bf78df836d 100644
--- a/etc/opieaccess
+++ b/etc/opieaccess
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/opieaccess,v 1.4 2003/02/16 13:04:27 des Exp $
 #
 # This file controls whether UNIX passwords are to be permitted.  Rules
 # are matched in order, and the search terminates when the first matching
diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 2686cdf740c99..a71df2a352524 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/Makefile,v 1.16 2007/06/17 17:25:52 yar Exp $
 
 NO_OBJ=
 
diff --git a/etc/pam.d/README b/etc/pam.d/README
index 7b8f9582124ea..f83dda74b1111 100644
--- a/etc/pam.d/README
+++ b/etc/pam.d/README
@@ -59,4 +59,4 @@ particular service and module type may result in surprising behaviour.
 To get the intended semantics, add a "required" entry listing the
 pam_deny module at the end of the chain.
 
-$FreeBSD$
+$FreeBSD: src/etc/pam.d/README,v 1.5 2004/06/06 11:46:29 schweikh Exp $
diff --git a/etc/pam.d/atrun b/etc/pam.d/atrun
index 6829469c9595c..752e8f1a07c2a 100644
--- a/etc/pam.d/atrun
+++ b/etc/pam.d/atrun
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/atrun,v 1.1 2007/06/15 12:02:16 yar Exp $
 #
 # PAM configuration for the "atrun" service
 #
diff --git a/etc/pam.d/convert.pl b/etc/pam.d/convert.pl
index f4c0676e1c4ad..e505237de8875 100644
--- a/etc/pam.d/convert.pl
+++ b/etc/pam.d/convert.pl
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/convert.pl,v 1.6 2004/06/06 11:46:29 schweikh Exp $
 #
 
 use strict;
diff --git a/etc/pam.d/cron b/etc/pam.d/cron
index 55a3d1048c53d..ed28cb1cc0708 100644
--- a/etc/pam.d/cron
+++ b/etc/pam.d/cron
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/cron,v 1.1 2007/06/17 17:25:52 yar Exp $
 #
 # PAM configuration for the "cron" service
 #
diff --git a/etc/pam.d/ftpd b/etc/pam.d/ftpd
index 632c97333f18d..29967525ed743 100644
--- a/etc/pam.d/ftpd
+++ b/etc/pam.d/ftpd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "ftpd" service
 #
diff --git a/etc/pam.d/gdm b/etc/pam.d/gdm
index b588aa7375d39..9402936827243 100644
--- a/etc/pam.d/gdm
+++ b/etc/pam.d/gdm
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "gdm" service
 #
diff --git a/etc/pam.d/imap b/etc/pam.d/imap
index 2d5efd0ab72a7..c32c9c2bdf15e 100644
--- a/etc/pam.d/imap
+++ b/etc/pam.d/imap
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/imap,v 1.7 2007/06/15 11:33:13 yar Exp $
 #
 # PAM configuration for the "imap" service
 #
diff --git a/etc/pam.d/kde b/etc/pam.d/kde
index a384d628940b6..3002f20038352 100644
--- a/etc/pam.d/kde
+++ b/etc/pam.d/kde
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "kde" service
 #
diff --git a/etc/pam.d/login b/etc/pam.d/login
index 287036d43f593..4bc26a0b60cff 100644
--- a/etc/pam.d/login
+++ b/etc/pam.d/login
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/login,v 1.17 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "login" service
 #
diff --git a/etc/pam.d/other b/etc/pam.d/other
index c86239cb56dbc..410fb9f6ff9ad 100644
--- a/etc/pam.d/other
+++ b/etc/pam.d/other
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "other" service
 #
diff --git a/etc/pam.d/passwd b/etc/pam.d/passwd
index e65508326ab26..37b681f0cfa5e 100644
--- a/etc/pam.d/passwd
+++ b/etc/pam.d/passwd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/passwd,v 1.3 2003/04/24 12:22:42 des Exp $
 #
 # PAM configuration for the "passwd" service
 #
diff --git a/etc/pam.d/pop3 b/etc/pam.d/pop3
index c59e39b8bfaa3..5cb26dc72d533 100644
--- a/etc/pam.d/pop3
+++ b/etc/pam.d/pop3
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/pop3,v 1.7 2007/06/15 11:33:13 yar Exp $
 #
 # PAM configuration for the "pop3" service
 #
diff --git a/etc/pam.d/rsh b/etc/pam.d/rsh
index 9e562e0786d4f..74c513be34276 100644
--- a/etc/pam.d/rsh
+++ b/etc/pam.d/rsh
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/rsh,v 1.6 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "rsh" service
 #
diff --git a/etc/pam.d/sshd b/etc/pam.d/sshd
index 46f536c74a4f4..ccb00576b6817 100644
--- a/etc/pam.d/sshd
+++ b/etc/pam.d/sshd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "sshd" service
 #
diff --git a/etc/pam.d/su b/etc/pam.d/su
index 834c27e08b8e5..babd642980e5e 100644
--- a/etc/pam.d/su
+++ b/etc/pam.d/su
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/su,v 1.16 2003/07/09 18:40:49 des Exp $
 #
 # PAM configuration for the "su" service
 #
diff --git a/etc/pam.d/system b/etc/pam.d/system
index c2f4d8b3fdaca..a4ac703d02b32 100644
--- a/etc/pam.d/system
+++ b/etc/pam.d/system
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
 #
 # System-wide defaults
 #
diff --git a/etc/pam.d/telnetd b/etc/pam.d/telnetd
index 535afc2931572..3730972839968 100644
--- a/etc/pam.d/telnetd
+++ b/etc/pam.d/telnetd
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "telnetd" service
 #
diff --git a/etc/pam.d/xdm b/etc/pam.d/xdm
index b883de762a40e..c9a401fbba5e8 100644
--- a/etc/pam.d/xdm
+++ b/etc/pam.d/xdm
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $
 #
 # PAM configuration for the "xdm" service
 #
diff --git a/etc/pccard_ether b/etc/pccard_ether
index b284f24aa2de7..b2a564b98f483 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/pccard_ether,v 1.54 2006/12/08 15:48:42 hrs Exp $
 #
 # pccard_ether interfacename [start|stop|restart]
 #
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 8fb56dff051a1..2427cedd2f3ca 100644
--- a/etc/periodic/Makefile
+++ b/etc/periodic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile,v 1.3 2001/12/07 23:57:38 cjc Exp $
 
 SUBDIR=	daily security weekly monthly
 
diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc
index a05341cd8f0bb..c57af9abb153b 100644
--- a/etc/periodic/Makefile.inc
+++ b/etc/periodic/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.7 2004/12/21 08:46:50 ru Exp $
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
 NO_OBJ=
diff --git a/etc/periodic/daily/100.clean-disks b/etc/periodic/daily/100.clean-disks
index 5884664cd3b3b..4494ff2ec94ad 100755
--- a/etc/periodic/daily/100.clean-disks
+++ b/etc/periodic/daily/100.clean-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/100.clean-disks,v 1.9 2001/04/25 12:11:54 ru Exp $
 #
 # Remove garbage files more than $daily_clean_disks_days days old
 #
diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps
index eef3bc6545b5e..611d635e3e07a 100755
--- a/etc/periodic/daily/110.clean-tmps
+++ b/etc/periodic/daily/110.clean-tmps
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/110.clean-tmps,v 1.13 2004/02/28 04:58:40 ache Exp $
 #
 # Perform temporary directory cleaning so that long-lived systems
 # don't end up with excessively old files there.
diff --git a/etc/periodic/daily/120.clean-preserve b/etc/periodic/daily/120.clean-preserve
index d5b34a12c3859..1e2fef247fd6d 100755
--- a/etc/periodic/daily/120.clean-preserve
+++ b/etc/periodic/daily/120.clean-preserve
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/120.clean-preserve,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 # Remove stale files in /var/preserve
 #
diff --git a/etc/periodic/daily/130.clean-msgs b/etc/periodic/daily/130.clean-msgs
index b7890db6d954c..cda67e5095316 100755
--- a/etc/periodic/daily/130.clean-msgs
+++ b/etc/periodic/daily/130.clean-msgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/130.clean-msgs,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 # Remove system	messages
 #
diff --git a/etc/periodic/daily/140.clean-rwho b/etc/periodic/daily/140.clean-rwho
index 9645d7e60bf79..753219b5d5310 100755
--- a/etc/periodic/daily/140.clean-rwho
+++ b/etc/periodic/daily/140.clean-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/140.clean-rwho,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 # Remove stale files in /var/rwho
 #
diff --git a/etc/periodic/daily/150.clean-hoststat b/etc/periodic/daily/150.clean-hoststat
index 460d1a2679086..c330e34c92407 100755
--- a/etc/periodic/daily/150.clean-hoststat
+++ b/etc/periodic/daily/150.clean-hoststat
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.8 2004/01/02 18:50:22 gshapiro Exp $
 #
 # Remove stale persistent host status files
 #
diff --git a/etc/periodic/daily/200.backup-passwd b/etc/periodic/daily/200.backup-passwd
index 5c585aff5f3c7..875c4784eeaf5 100755
--- a/etc/periodic/daily/200.backup-passwd
+++ b/etc/periodic/daily/200.backup-passwd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/200.backup-passwd,v 1.10 2001/11/14 09:30:01 cjc Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/210.backup-aliases b/etc/periodic/daily/210.backup-aliases
index fe170389ef037..118572cdd759b 100755
--- a/etc/periodic/daily/210.backup-aliases
+++ b/etc/periodic/daily/210.backup-aliases
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/210.backup-aliases,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/300.calendar b/etc/periodic/daily/300.calendar
index cc12097162e54..0be139edc4c63 100755
--- a/etc/periodic/daily/300.calendar
+++ b/etc/periodic/daily/300.calendar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5 2000/09/14 17:19:10 brian Exp $
 #
 # `calendar -a' needs to die. Why? Because it's a bad idea, particular
 # with networked home directories, but also in general.  If you want the
diff --git a/etc/periodic/daily/310.accounting b/etc/periodic/daily/310.accounting
index ceb140c76b9a6..f3337e8044f17 100755
--- a/etc/periodic/daily/310.accounting
+++ b/etc/periodic/daily/310.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/310.accounting,v 1.8 2001/05/30 20:23:42 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/330.news b/etc/periodic/daily/330.news
index ec064376d78f0..39c727cde8a88 100755
--- a/etc/periodic/daily/330.news
+++ b/etc/periodic/daily/330.news
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/330.news,v 1.4 2000/09/14 17:19:10 brian Exp $
 #
 # Expire news articles
 # (This is present only for backwards compatibility, usually the news
diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks
index 63b2b6bef6765..2c79c47b3ab9d 100755
--- a/etc/periodic/daily/400.status-disks
+++ b/etc/periodic/daily/400.status-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.6 2002/02/13 19:10:07 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/404.status-zfs b/etc/periodic/daily/404.status-zfs
index 81cc3e4bbb380..5299603310759 100644
--- a/etc/periodic/daily/404.status-zfs
+++ b/etc/periodic/daily/404.status-zfs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/404.status-zfs,v 1.1 2007/04/06 02:33:06 pjd Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/405.status-ata-raid b/etc/periodic/daily/405.status-ata-raid
index f2178390e76c7..71c73175b2f44 100644
--- a/etc/periodic/daily/405.status-ata-raid
+++ b/etc/periodic/daily/405.status-ata-raid
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/405.status-ata-raid,v 1.1 2003/10/27 20:14:53 jesper Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/406.status-gmirror b/etc/periodic/daily/406.status-gmirror
index 8fc698c804d25..0fd87077818ad 100644
--- a/etc/periodic/daily/406.status-gmirror
+++ b/etc/periodic/daily/406.status-gmirror
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/406.status-gmirror,v 1.1 2006/01/13 18:07:52 wollman Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/407.status-graid3 b/etc/periodic/daily/407.status-graid3
index 52750f7d88e52..6ce30de43b62e 100644
--- a/etc/periodic/daily/407.status-graid3
+++ b/etc/periodic/daily/407.status-graid3
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/407.status-graid3,v 1.1 2006/03/02 14:44:19 brueffer Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/408.status-gstripe b/etc/periodic/daily/408.status-gstripe
index ff74f76e3c7c6..fc0b6afe9251e 100644
--- a/etc/periodic/daily/408.status-gstripe
+++ b/etc/periodic/daily/408.status-gstripe
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/408.status-gstripe,v 1.1 2006/03/02 14:44:19 brueffer Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/409.status-gconcat b/etc/periodic/daily/409.status-gconcat
index 7dfa91812f68e..2ca0f5f842823 100644
--- a/etc/periodic/daily/409.status-gconcat
+++ b/etc/periodic/daily/409.status-gconcat
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/409.status-gconcat,v 1.1 2006/03/02 14:44:19 brueffer Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/420.status-network b/etc/periodic/daily/420.status-network
index 8399cf720effb..c5b480cd68c35 100755
--- a/etc/periodic/daily/420.status-network
+++ b/etc/periodic/daily/420.status-network
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/420.status-network,v 1.6 2000/09/14 17:19:10 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-rwho
index 44761368c9338..7cb6eac1c10f7 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/430.status-rwho,v 1.5 2000/09/14 17:19:10 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/440.status-mailq b/etc/periodic/daily/440.status-mailq
index b75e85829e698..e852c388a40f2 100755
--- a/etc/periodic/daily/440.status-mailq
+++ b/etc/periodic/daily/440.status-mailq
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/440.status-mailq,v 1.11 2006/03/08 17:26:53 matteo Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index c0eb46c43024e..56980fa0b486b 100755
--- a/etc/periodic/daily/450.status-security
+++ b/etc/periodic/daily/450.status-security
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.10 2002/05/17 11:31:45 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/460.status-mail-rejects b/etc/periodic/daily/460.status-mail-rejects
index 2ff96010d1407..7a50d80f2b656 100755
--- a/etc/periodic/daily/460.status-mail-rejects
+++ b/etc/periodic/daily/460.status-mail-rejects
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/470.status-named b/etc/periodic/daily/470.status-named
index 987029e5c4f6f..77c0ee0d9fef6 100755
--- a/etc/periodic/daily/470.status-named
+++ b/etc/periodic/daily/470.status-named
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/470.status-named,v 1.8 2006/06/11 20:39:12 maxim Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/480.status-ntpd b/etc/periodic/daily/480.status-ntpd
index 1eb80116f47ba..9352fdb9b5379 100644
--- a/etc/periodic/daily/480.status-ntpd
+++ b/etc/periodic/daily/480.status-ntpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/480.status-ntpd,v 1.1 2007/05/13 09:33:35 maxim Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/500.queuerun b/etc/periodic/daily/500.queuerun
index f46c24614b2c4..24db8c1d34180 100755
--- a/etc/periodic/daily/500.queuerun
+++ b/etc/periodic/daily/500.queuerun
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/500.queuerun,v 1.2 2002/04/10 03:58:39 gshapiro Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/daily/999.local b/etc/periodic/daily/999.local
index 317347526e795..6725009ea061e 100755
--- a/etc/periodic/daily/999.local
+++ b/etc/periodic/daily/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/999.local,v 1.5 2001/06/01 16:40:55 dougb Exp $
 #
 # Run the old /etc/daily.local script.  This is really for backwards
 # compatibility more than anything else.
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 5e25f90ee3a34..46936d5d44262 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.16 2007/05/14 17:34:59 maxim Exp $
 
 FILES=	100.clean-disks \
 	110.clean-tmps \
diff --git a/etc/periodic/monthly/200.accounting b/etc/periodic/monthly/200.accounting
index 0be8c326abf59..06e069de8f88d 100755
--- a/etc/periodic/monthly/200.accounting
+++ b/etc/periodic/monthly/200.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.10 2002/09/24 18:53:46 ache Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/monthly/999.local b/etc/periodic/monthly/999.local
index 4e7c2b991b90c..36b6a1acc47df 100755
--- a/etc/periodic/monthly/999.local
+++ b/etc/periodic/monthly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/999.local,v 1.5 2001/06/01 16:40:57 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index c21323058fd2e..510affba0552c 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.3 2002/07/18 12:32:57 ru Exp $
 
 FILES=	200.accounting \
 	999.local
diff --git a/etc/periodic/security/100.chksetuid b/etc/periodic/security/100.chksetuid
index 2921ee6b7fd9e..500f75c8661a0 100755
--- a/etc/periodic/security/100.chksetuid
+++ b/etc/periodic/security/100.chksetuid
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8.14.1 2008/01/29 00:22:33 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/200.chkmounts b/etc/periodic/security/200.chkmounts
index 3b72c5282b5a7..d7c672e4b2fbe 100755
--- a/etc/periodic/security/200.chkmounts
+++ b/etc/periodic/security/200.chkmounts
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $
 #
 
 # Show changes in the way filesystems are mounted
diff --git a/etc/periodic/security/300.chkuid0 b/etc/periodic/security/300.chkuid0
index 32cc16c846c3c..0dc38a4a87420 100755
--- a/etc/periodic/security/300.chkuid0
+++ b/etc/periodic/security/300.chkuid0
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/300.chkuid0,v 1.1 2001/12/07 23:57:38 cjc Exp $
 #
 
 
diff --git a/etc/periodic/security/400.passwdless b/etc/periodic/security/400.passwdless
index 42ece0453ccd3..21ca297812105 100755
--- a/etc/periodic/security/400.passwdless
+++ b/etc/periodic/security/400.passwdless
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/400.passwdless,v 1.1 2001/12/07 23:57:38 cjc Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/410.logincheck b/etc/periodic/security/410.logincheck
index ab4ab65e0087b..8ae931af687cb 100644
--- a/etc/periodic/security/410.logincheck
+++ b/etc/periodic/security/410.logincheck
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/410.logincheck,v 1.1 2006/08/25 07:34:36 trhodes Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/500.ipfwdenied b/etc/periodic/security/500.ipfwdenied
index 6a6fb8b4f6a6b..4b76adf2f828d 100755
--- a/etc/periodic/security/500.ipfwdenied
+++ b/etc/periodic/security/500.ipfwdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.6 2005/02/23 15:07:36 ssouhlal Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/510.ipfdenied b/etc/periodic/security/510.ipfdenied
index 2058d2b1cb94b..c420293ecce8f 100644
--- a/etc/periodic/security/510.ipfdenied
+++ b/etc/periodic/security/510.ipfdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/510.ipfdenied,v 1.2 2003/06/30 22:06:26 mtm Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/520.pfdenied b/etc/periodic/security/520.pfdenied
index 5e51393630280..6c25cb0195eac 100644
--- a/etc/periodic/security/520.pfdenied
+++ b/etc/periodic/security/520.pfdenied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/520.pfdenied,v 1.1 2004/11/24 18:41:53 mlaier Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/550.ipfwlimit b/etc/periodic/security/550.ipfwlimit
index 6c2e1a04014ad..3f4efb1d73b35 100755
--- a/etc/periodic/security/550.ipfwlimit
+++ b/etc/periodic/security/550.ipfwlimit
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.10 2005/09/11 14:29:58 maxim Exp $
 #
 
 # Show ipfw rules which have reached the log limit
diff --git a/etc/periodic/security/610.ipf6denied b/etc/periodic/security/610.ipf6denied
index 6c64d92eee7e1..be2b9dfd93822 100644
--- a/etc/periodic/security/610.ipf6denied
+++ b/etc/periodic/security/610.ipf6denied
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/610.ipf6denied,v 1.1 2004/04/20 13:44:57 darrenr Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/security/700.kernelmsg b/etc/periodic/security/700.kernelmsg
index fb5ed633f461e..94eff501966e8 100755
--- a/etc/periodic/security/700.kernelmsg
+++ b/etc/periodic/security/700.kernelmsg
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.7 2002/11/16 14:57:12 thomas Exp $
 #
 
 # Show kernel log messages
diff --git a/etc/periodic/security/800.loginfail b/etc/periodic/security/800.loginfail
index 38aeb021af4e0..0ccfc0b27f28f 100755
--- a/etc/periodic/security/800.loginfail
+++ b/etc/periodic/security/800.loginfail
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $
 #
 
 # Show login failures
diff --git a/etc/periodic/security/900.tcpwrap b/etc/periodic/security/900.tcpwrap
index 55f77099bb7c8..7050752679513 100755
--- a/etc/periodic/security/900.tcpwrap
+++ b/etc/periodic/security/900.tcpwrap
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/900.tcpwrap,v 1.3 2003/01/05 21:32:50 se Exp $
 #
 
 # Show tcp_wrapper warning messages
diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile
index c7a9b2bcbac70..81364aa2bb4a6 100644
--- a/etc/periodic/security/Makefile
+++ b/etc/periodic/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/Makefile,v 1.6 2006/08/25 07:34:36 trhodes Exp $
 
 FILES=	100.chksetuid \
 	200.chkmounts \
diff --git a/etc/periodic/security/security.functions b/etc/periodic/security/security.functions
index f5b8dcd203d48..d6d72b3f4bad4 100644
--- a/etc/periodic/security/security.functions
+++ b/etc/periodic/security/security.functions
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.5 2005/08/22 09:33:36 cperciva Exp $
 #
 
 #
diff --git a/etc/periodic/weekly/310.locate b/etc/periodic/weekly/310.locate
index 4079f5e8287ea..b1fc1bf270b2f 100755
--- a/etc/periodic/weekly/310.locate
+++ b/etc/periodic/weekly/310.locate
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.7 2007/02/23 18:44:20 remko Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis
index dfc218ae008c3..5dacbe8de15d4 100755
--- a/etc/periodic/weekly/320.whatis
+++ b/etc/periodic/weekly/320.whatis
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/320.whatis,v 1.8 2001/03/02 16:52:09 ru Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman
index e810fcb9645bd..9d7f92a6989c4 100755
--- a/etc/periodic/weekly/330.catman
+++ b/etc/periodic/weekly/330.catman
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.10 2005/03/30 18:02:49 ru Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/340.noid b/etc/periodic/weekly/340.noid
index 11a5f53ea25d6..bc86bfc87a901 100644
--- a/etc/periodic/weekly/340.noid
+++ b/etc/periodic/weekly/340.noid
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/340.noid,v 1.5 2001/05/31 09:53:53 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/400.status-pkg b/etc/periodic/weekly/400.status-pkg
index 785c2fffd7563..2141b77677ac8 100755
--- a/etc/periodic/weekly/400.status-pkg
+++ b/etc/periodic/weekly/400.status-pkg
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/400.status-pkg,v 1.9 2004/05/19 09:18:08 joe Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/999.local b/etc/periodic/weekly/999.local
index 3951bb584d273..1a34e722889be 100755
--- a/etc/periodic/weekly/999.local
+++ b/etc/periodic/weekly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/999.local,v 1.6 2001/06/01 16:40:57 dougb Exp $
 #
 
 # If there is a global system configuration file, suck it in.
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index bc97fa9822faf..5201d3c83b333 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.9 2006/08/29 08:49:57 ru Exp $
 
 FILES=	310.locate \
 	320.whatis \
diff --git a/etc/pf.os b/etc/pf.os
index b282c9437d73c..69b3841371642 100644
--- a/etc/pf.os
+++ b/etc/pf.os
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/pf.os,v 1.4 2006/10/23 05:09:44 delphij Exp $
 # $OpenBSD: pf.os,v 1.21 2006/07/28 21:51:12 david Exp $
 # passive OS fingerprinting
 # -------------------------
diff --git a/etc/phones b/etc/phones
index fbeddf613cbb5..99901579781c0 100644
--- a/etc/phones
+++ b/etc/phones
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/phones,v 1.9 2006/08/31 21:13:12 ru Exp $
 #	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
diff --git a/etc/portsnap.conf b/etc/portsnap.conf
index 4a6609db2662f..97314f7197430 100644
--- a/etc/portsnap.conf
+++ b/etc/portsnap.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/portsnap.conf,v 1.3 2006/01/18 03:40:57 cperciva Exp $
 
 # Default directory where compressed snapshots are stored.
 # WORKDIR=/var/db/portsnap
diff --git a/etc/ppp/ppp.conf b/etc/ppp/ppp.conf
index 4ddbda504eee8..4aec9b65ffd99 100644
--- a/etc/ppp/ppp.conf
+++ b/etc/ppp/ppp.conf
@@ -5,7 +5,7 @@
 #
 # See /usr/share/examples/ppp/ for some examples
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/ppp/ppp.conf,v 1.10 2004/11/19 17:12:56 obrien Exp $
 #################################################################
 
 default:
diff --git a/etc/printcap b/etc/printcap
index 5319a0ec2b932..1b768da964892 100644
--- a/etc/printcap
+++ b/etc/printcap
@@ -1,5 +1,5 @@
 #	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $FreeBSD$
+# $FreeBSD: src/etc/printcap,v 1.14 2004/06/06 11:46:27 schweikh Exp $
 
 #
 # This enables a simple local "raw" printer, hooked up to the first
diff --git a/etc/profile b/etc/profile
index 665b61a36aed7..631ebeef6bbec 100644
--- a/etc/profile
+++ b/etc/profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/profile,v 1.14 2004/06/06 11:46:27 schweikh Exp $
 #
 # System-wide .profile file for sh(1).
 #
diff --git a/etc/protocols b/etc/protocols
index a27b226422aa2..7549c12615168 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet protocols
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/protocols,v 1.22 2007/05/20 03:55:22 grog Exp $
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # See also http://www.iana.org/assignments/protocol-numbers
diff --git a/etc/rc b/etc/rc
index 144e3c9421975..1ace291889424 100644
--- a/etc/rc
+++ b/etc/rc
@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)rc	5.27 (Berkeley) 6/5/91
-# $FreeBSD$
+# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $
 #
 
 # System startup script run by init on autoboot
diff --git a/etc/rc.bsdextended b/etc/rc.bsdextended
index b933a96fbcb71..6702d98cce7a1 100644
--- a/etc/rc.bsdextended
+++ b/etc/rc.bsdextended
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.bsdextended,v 1.2 2006/04/22 11:02:44 trhodes Exp $
 #
 
 ####
diff --git a/etc/rc.d/DAEMON b/etc/rc.d/DAEMON
index a656a88ac6641..74a02a6a15c1d 100755
--- a/etc/rc.d/DAEMON
+++ b/etc/rc.d/DAEMON
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: DAEMON
diff --git a/etc/rc.d/FILESYSTEMS b/etc/rc.d/FILESYSTEMS
index ba2a2d6ea91dd..a82404c04374c 100644
--- a/etc/rc.d/FILESYSTEMS
+++ b/etc/rc.d/FILESYSTEMS
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/FILESYSTEMS,v 1.2 2007/04/09 08:44:50 des Exp $
 #
 
 # PROVIDE: FILESYSTEMS
diff --git a/etc/rc.d/LOGIN b/etc/rc.d/LOGIN
index 2b45ba88a4b4d..07516a9d4c77f 100755
--- a/etc/rc.d/LOGIN
+++ b/etc/rc.d/LOGIN
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: LOGIN
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 36269159ff514..28e9a6dc83649 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84.4.2 2008/01/29 00:22:33 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index 21b584b33240a..1baaebf932ce4 100644
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: NETWORKING NETWORK
diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS
index 01e51a81492e8..aa46f2af7c940 100755
--- a/etc/rc.d/SERVERS
+++ b/etc/rc.d/SERVERS
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: SERVERS
diff --git a/etc/rc.d/abi b/etc/rc.d/abi
index d2d3c31f604a0..1c821aa9ce012 100644
--- a/etc/rc.d/abi
+++ b/etc/rc.d/abi
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/abi,v 1.11 2006/12/30 22:53:19 yar Exp $
 #
 
 # PROVIDE: abi
diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting
index e4ae4a12bce47..05e8003471c17 100755
--- a/etc/rc.d/accounting
+++ b/etc/rc.d/accounting
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/accounting,v 1.10.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: accounting
diff --git a/etc/rc.d/addswap b/etc/rc.d/addswap
index 8ca3cf83696ba..ac8db5bf1bce5 100644
--- a/etc/rc.d/addswap
+++ b/etc/rc.d/addswap
@@ -2,7 +2,7 @@
 #
 # Add additional swap files
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/addswap,v 1.7 2007/04/02 22:53:07 des Exp $
 #
 
 # PROVIDE: addswap
diff --git a/etc/rc.d/adjkerntz b/etc/rc.d/adjkerntz
index 77e1e9dd41d94..9ac3f8946e18e 100644
--- a/etc/rc.d/adjkerntz
+++ b/etc/rc.d/adjkerntz
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.6 2007/04/02 22:53:07 des Exp $
 #
 
 # PROVIDE: adjkerntz
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 546f652714609..648fb954c9a08 100755
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/amd,v 1.18.2.1.2.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: amd
diff --git a/etc/rc.d/apm b/etc/rc.d/apm
index 3d15701956ed6..c5230f76a2735 100644
--- a/etc/rc.d/apm
+++ b/etc/rc.d/apm
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/apm,v 1.6 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: apm
diff --git a/etc/rc.d/apmd b/etc/rc.d/apmd
index 7b56d2f476b57..cf7c4a141e02f 100755
--- a/etc/rc.d/apmd
+++ b/etc/rc.d/apmd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/apmd,v 1.12.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: apmd
diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep
index 466f45ff65fae..378aa4535a701 100644
--- a/etc/rc.d/archdep
+++ b/etc/rc.d/archdep
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/archdep,v 1.14 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: archdep
diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1
index da50df0a9e952..e8f6392a98485 100644
--- a/etc/rc.d/atm1
+++ b/etc/rc.d/atm1
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/atm1,v 1.16 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: atm1
diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2
index ffb63c35aef53..a13a5a4ae32a3 100644
--- a/etc/rc.d/atm2
+++ b/etc/rc.d/atm2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/atm2,v 1.16 2004/10/07 13:55:25 mtm Exp $
 #
 
 # PROVIDE: atm2
diff --git a/etc/rc.d/atm3 b/etc/rc.d/atm3
index 4dbd128b8e858..9effa00ee6d67 100644
--- a/etc/rc.d/atm3
+++ b/etc/rc.d/atm3
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/atm3,v 1.14 2004/10/07 13:55:25 mtm Exp $
 #
 
 # Start ATM daemons
diff --git a/etc/rc.d/auditd b/etc/rc.d/auditd
index 4d0760ceb35b5..4e14338b7d0b7 100644
--- a/etc/rc.d/auditd
+++ b/etc/rc.d/auditd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/auditd,v 1.3 2006/09/24 17:31:04 rwatson Exp $
 #
 # Start up for the Audit daemon.
 #
diff --git a/etc/rc.d/auto_linklocal b/etc/rc.d/auto_linklocal
index 8278696d741a5..ae6902575dc15 100644
--- a/etc/rc.d/auto_linklocal
+++ b/etc/rc.d/auto_linklocal
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.5 2006/12/29 15:56:21 hrs Exp $
 #
 
 # PROVIDE: auto_linklocal
diff --git a/etc/rc.d/bgfsck b/etc/rc.d/bgfsck
index 19ffb714325a2..af942ec19327b 100644
--- a/etc/rc.d/bgfsck
+++ b/etc/rc.d/bgfsck
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bgfsck,v 1.8 2007/03/11 06:53:06 brooks Exp $
 #
 
 # PROVIDE: bgfsck
diff --git a/etc/rc.d/bluetooth b/etc/rc.d/bluetooth
index cfcf104f349b8..9818bc8205f59 100644
--- a/etc/rc.d/bluetooth
+++ b/etc/rc.d/bluetooth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bluetooth,v 1.3 2006/12/31 10:37:18 yar Exp $
 
 # PROVIDE: bluetooth
 # REQUIRE: DAEMON
diff --git a/etc/rc.d/bootparams b/etc/rc.d/bootparams
index 1081bbfb6eed2..ad560a363ee48 100755
--- a/etc/rc.d/bootparams
+++ b/etc/rc.d/bootparams
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bootparams,v 1.7.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: bootparams
diff --git a/etc/rc.d/bridge b/etc/rc.d/bridge
index 5c8f61a10a18f..a88f7909d523c 100644
--- a/etc/rc.d/bridge
+++ b/etc/rc.d/bridge
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bridge,v 1.2 2006/12/30 22:53:20 yar Exp $
 #
 
 # PROVIDE: bridge
diff --git a/etc/rc.d/bsnmpd b/etc/rc.d/bsnmpd
index e266c3ba448ff..e2e10621c3f94 100644
--- a/etc/rc.d/bsnmpd
+++ b/etc/rc.d/bsnmpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bsnmpd,v 1.1 2005/04/17 10:47:58 glebius Exp $
 #
 
 # PROVIDE: bsnmpd
diff --git a/etc/rc.d/bthidd b/etc/rc.d/bthidd
index 5a784f65472b1..cebec75ffc92b 100644
--- a/etc/rc.d/bthidd
+++ b/etc/rc.d/bthidd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/bthidd,v 1.1 2006/09/07 22:25:08 emax Exp $
 #
 
 # PROVIDE: bthidd
diff --git a/etc/rc.d/ccd b/etc/rc.d/ccd
index 1188148760dcb..b6e1c50c21c85 100755
--- a/etc/rc.d/ccd
+++ b/etc/rc.d/ccd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ccd,v 1.5.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar
index 68e03bdc11190..ccdefd67e3318 100644
--- a/etc/rc.d/cleanvar
+++ b/etc/rc.d/cleanvar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/cleanvar,v 1.13 2007/05/24 05:58:20 rse Exp $
 #
 
 # PROVIDE: cleanvar
diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp
index e3588f1f5bb10..57f0433fabdff 100755
--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $
 #
 
 # PROVIDE: cleartmp
diff --git a/etc/rc.d/cron b/etc/rc.d/cron
index cc87d42bc066d..35edab1127d40 100755
--- a/etc/rc.d/cron
+++ b/etc/rc.d/cron
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/cron,v 1.7.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: cron
diff --git a/etc/rc.d/devd b/etc/rc.d/devd
index 7b0df846d5eb1..334941683ee85 100644
--- a/etc/rc.d/devd
+++ b/etc/rc.d/devd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/devd,v 1.10 2006/09/21 14:29:32 brooks Exp $
 #
 
 # PROVIDE: devd
diff --git a/etc/rc.d/devfs b/etc/rc.d/devfs
index cd50b15a9776d..58ce5286676bd 100644
--- a/etc/rc.d/devfs
+++ b/etc/rc.d/devfs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/devfs,v 1.12 2006/01/21 14:31:45 matteo Exp $
 #
 
 # PROVIDE: devfs
diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient
index d18221470ddca..16ea5eeb50e78 100755
--- a/etc/rc.d/dhclient
+++ b/etc/rc.d/dhclient
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.28.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: dhclient
diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg
index c6cdca3635004..4547d39b2780f 100755
--- a/etc/rc.d/dmesg
+++ b/etc/rc.d/dmesg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dmesg,v 1.5.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: dmesg
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index cc049ec89a000..4bcde12e08f04 100644
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/dumpon,v 1.11 2005/12/10 20:21:45 dougb Exp $
 #
 
 # PROVIDE: dumpon
diff --git a/etc/rc.d/early.sh b/etc/rc.d/early.sh
index 8955ba87d7ab4..2751cfc00d92f 100644
--- a/etc/rc.d/early.sh
+++ b/etc/rc.d/early.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/early.sh,v 1.3 2007/10/09 07:30:14 dougb Exp $
 #
 
 # PROVIDE: early
diff --git a/etc/rc.d/encswap b/etc/rc.d/encswap
index 622199869d1c8..92285022d2363 100644
--- a/etc/rc.d/encswap
+++ b/etc/rc.d/encswap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/encswap,v 1.8 2005/08/05 23:38:51 pjd Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/fsck b/etc/rc.d/fsck
index 66fb26c31968e..73449eccf123e 100755
--- a/etc/rc.d/fsck
+++ b/etc/rc.d/fsck
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/fsck,v 1.11.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: fsck
diff --git a/etc/rc.d/ftp-proxy b/etc/rc.d/ftp-proxy
index 4ef40d9393a27..4980e54c5cedf 100644
--- a/etc/rc.d/ftp-proxy
+++ b/etc/rc.d/ftp-proxy
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ftp-proxy
diff --git a/etc/rc.d/ftpd b/etc/rc.d/ftpd
index 4837815f75bd1..891a215a61173 100644
--- a/etc/rc.d/ftpd
+++ b/etc/rc.d/ftpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ftpd,v 1.1 2006/01/21 18:08:15 yar Exp $
 #
 
 # PROVIDE: ftpd
diff --git a/etc/rc.d/gbde b/etc/rc.d/gbde
index 6117b86ea6172..167c71fd1364d 100644
--- a/etc/rc.d/gbde
+++ b/etc/rc.d/gbde
@@ -3,7 +3,7 @@
 # This file, originally written by Garrett A. Wollman, is in the public
 # domain.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/gbde,v 1.13 2005/08/14 17:28:15 pjd Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/geli b/etc/rc.d/geli
index 253dbab47c033..cc9a66ed7baf1 100644
--- a/etc/rc.d/geli
+++ b/etc/rc.d/geli
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/geli,v 1.4 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: disks
diff --git a/etc/rc.d/geli2 b/etc/rc.d/geli2
index 50f13aad5c572..826c6d20ce422 100644
--- a/etc/rc.d/geli2
+++ b/etc/rc.d/geli2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/geli2,v 1.2 2007/04/02 22:53:07 des Exp $
 #
 
 # PROVIDE: geli2
diff --git a/etc/rc.d/hcsecd b/etc/rc.d/hcsecd
index c78ce9dabe30b..328f8e24afc4a 100644
--- a/etc/rc.d/hcsecd
+++ b/etc/rc.d/hcsecd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/hcsecd,v 1.5 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: hcsecd
diff --git a/etc/rc.d/hostapd b/etc/rc.d/hostapd
index 0dc39714a2240..8d079e583abf4 100644
--- a/etc/rc.d/hostapd
+++ b/etc/rc.d/hostapd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.1.6.1 2008/01/07 21:15:45 brix Exp $
 #
 
 # PROVIDE: hostapd
diff --git a/etc/rc.d/hostid b/etc/rc.d/hostid
index 38da97ebe7922..ecb52799c947b 100644
--- a/etc/rc.d/hostid
+++ b/etc/rc.d/hostid
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/hostid,v 1.7 2007/05/22 13:53:59 rse Exp $
 #
 
 # PROVIDE: hostid
diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname
index 6d0f12e9c92d1..caeb3cfa0ce46 100644
--- a/etc/rc.d/hostname
+++ b/etc/rc.d/hostname
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/hostname,v 1.12 2007/04/02 22:53:07 des Exp $
 #
 
 # PROVIDE: hostname
diff --git a/etc/rc.d/idmapd b/etc/rc.d/idmapd
index c5e38867153ab..01049a0171109 100644
--- a/etc/rc.d/idmapd
+++ b/etc/rc.d/idmapd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/idmapd,v 1.1 2006/10/15 14:19:06 ceri Exp $
 #
 
 # PROVIDE: idmapd
diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd
index fc00f38d712c9..2a954984aab41 100755
--- a/etc/rc.d/inetd
+++ b/etc/rc.d/inetd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/inetd,v 1.5.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: inetd
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index fb15064d0c84e..cced5def8e7ba 100644
--- a/etc/rc.d/initrandom
+++ b/etc/rc.d/initrandom
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.7 2007/05/24 05:58:20 rse Exp $
 #
 
 # PROVIDE: initrandom
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl
index 88e1f990f0e26..325124e2698a4 100644
--- a/etc/rc.d/ip6addrctl
+++ b/etc/rc.d/ip6addrctl
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.5 2007/04/02 22:53:07 des Exp $
 #
 
 # PROVIDE: ip6addrctl
diff --git a/etc/rc.d/ip6fw b/etc/rc.d/ip6fw
index 131d7a080e870..38223bd07041b 100644
--- a/etc/rc.d/ip6fw
+++ b/etc/rc.d/ip6fw
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ip6fw,v 1.9 2007/04/02 15:38:53 mtm Exp $
 #
 
 # PROVIDE: ip6fw
diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter
index b0db8025c82d6..fc0c56932b4ee 100755
--- a/etc/rc.d/ipfilter
+++ b/etc/rc.d/ipfilter
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ipfilter
diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs
index d9eb62d8c1219..c2d8ff3bebf61 100755
--- a/etc/rc.d/ipfs
+++ b/etc/rc.d/ipfs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipfs,v 1.6.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ipfs
diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw
index 920eb28f1781f..d9359eb2bc4d1 100644
--- a/etc/rc.d/ipfw
+++ b/etc/rc.d/ipfw
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $
 #
 
 # PROVIDE: ipfw
diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon
index 74ed092e0e205..94800b4aa6dde 100755
--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipmon,v 1.15.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ipmon
diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat
index 00434d58716e7..656fd0f865213 100755
--- a/etc/rc.d/ipnat
+++ b/etc/rc.d/ipnat
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipnat,v 1.15.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ipnat
diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec
index 2bb3cf5d63c15..241744d3add83 100755
--- a/etc/rc.d/ipsec
+++ b/etc/rc.d/ipsec
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipsec,v 1.19.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ipsec
diff --git a/etc/rc.d/ipxrouted b/etc/rc.d/ipxrouted
index 04d3586daa39c..8808b1f7be708 100644
--- a/etc/rc.d/ipxrouted
+++ b/etc/rc.d/ipxrouted
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ipxrouted,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: ipxrouted
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
index ab38764f2ed86..0c02dd251155a 100644
--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/isdnd,v 1.23.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 # Mostly based on original script (/etc/rc.isdn) written by  Hellmuth Michaelis
 #
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index d35f3f70f1392..156589bb73732 100644
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/jail,v 1.37.4.1 2008/01/29 00:22:33 dougb Exp $
 #
 
 # PROVIDE: jail
diff --git a/etc/rc.d/kadmind b/etc/rc.d/kadmind
index 1e07938ffcd64..2f2295b2fa832 100644
--- a/etc/rc.d/kadmind
+++ b/etc/rc.d/kadmind
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kadmind,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: kadmin
diff --git a/etc/rc.d/kerberos b/etc/rc.d/kerberos
index 3eeb32af3ff57..77d51750ae637 100644
--- a/etc/rc.d/kerberos
+++ b/etc/rc.d/kerberos
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.6.4.2 2008/01/29 07:15:46 mtm Exp $
 #
 
 # PROVIDE: kerberos
diff --git a/etc/rc.d/kernel b/etc/rc.d/kernel
index b718f103d85eb..9645aa74ce4ca 100644
--- a/etc/rc.d/kernel
+++ b/etc/rc.d/kernel
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kernel,v 1.2 2006/07/30 12:54:37 mckay Exp $
 #
 
 # PROVIDE: kernel
diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv
index 5792ad4113db8..87e02001955f9 100644
--- a/etc/rc.d/keyserv
+++ b/etc/rc.d/keyserv
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/keyserv,v 1.3.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # Start keyserv if we are running Secure RPC
diff --git a/etc/rc.d/kldxref b/etc/rc.d/kldxref
index 40140cc092fed..2603ca6a8bc6f 100644
--- a/etc/rc.d/kldxref
+++ b/etc/rc.d/kldxref
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kldxref,v 1.6 2007/04/09 08:53:40 des Exp $
 #
 
 # PROVIDE: kldxref
diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd
index d7f40ac4ad7d8..a581734af59a4 100644
--- a/etc/rc.d/kpasswdd
+++ b/etc/rc.d/kpasswdd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: kpasswdd
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index b8a54988a9ffd..8ee87d70eb86d 100755
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17.2.1.2.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: ldconfig
diff --git a/etc/rc.d/local b/etc/rc.d/local
index 1901cb4ccc720..46a50b2a6d7e4 100755
--- a/etc/rc.d/local
+++ b/etc/rc.d/local
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/local,v 1.6.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: local
diff --git a/etc/rc.d/localpkg b/etc/rc.d/localpkg
index 5de96ee471af0..e5be0681cd700 100644
--- a/etc/rc.d/localpkg
+++ b/etc/rc.d/localpkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/localpkg,v 1.8 2006/02/12 10:04:56 matteo Exp $
 #
 
 # PROVIDE: localpkg
diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd
index 809b2ff544fe5..7e5a76a28190e 100644
--- a/etc/rc.d/lockd
+++ b/etc/rc.d/lockd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lockd,v 1.18.6.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: lockd
diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd
index eae99e87cf2bf..d167e9dc574c0 100755
--- a/etc/rc.d/lpd
+++ b/etc/rc.d/lpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/lpd,v 1.8.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: lpd
diff --git a/etc/rc.d/mdconfig b/etc/rc.d/mdconfig
index 372cd7a4e0a79..dd617df25fe11 100644
--- a/etc/rc.d/mdconfig
+++ b/etc/rc.d/mdconfig
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mdconfig,v 1.5 2007/08/25 00:19:17 matteo Exp $
 #
 
 # PROVIDE: mdconfig
diff --git a/etc/rc.d/mdconfig2 b/etc/rc.d/mdconfig2
index efd26a8a14a15..9d4f3a50b63c5 100644
--- a/etc/rc.d/mdconfig2
+++ b/etc/rc.d/mdconfig2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mdconfig2,v 1.4 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: mdconfig2
diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index cc7fb2d749c00..37aab6323f9d2 100644
--- a/etc/rc.d/mixer
+++ b/etc/rc.d/mixer
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $
 #
 
 # PROVIDE: mixer
diff --git a/etc/rc.d/motd b/etc/rc.d/motd
index ddd55f92c7f28..7c226a76e348e 100755
--- a/etc/rc.d/motd
+++ b/etc/rc.d/motd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/motd,v 1.9.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: motd
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 880f07553f921..242d61b1c6718 100755
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: mountcritlocal
diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote
index bacf73240aa39..b2e0faeb807d3 100755
--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: mountcritremote
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index 12d441d83fa94..c05fade5251a6 100755
--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountd,v 1.19.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: mountd
diff --git a/etc/rc.d/mountlate b/etc/rc.d/mountlate
index 6da5e79152818..bb36eaeb20d4e 100644
--- a/etc/rc.d/mountlate
+++ b/etc/rc.d/mountlate
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mountlate,v 1.2 2007/05/18 12:04:41 mtm Exp $
 #
 
 # PROVIDE: mountlate
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
index df1e27eb31035..3a6b27d25ab9d 100644
--- a/etc/rc.d/moused
+++ b/etc/rc.d/moused
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/moused,v 1.11.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: moused
diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d
index d733092df145e..63ac345bc6f82 100644
--- a/etc/rc.d/mroute6d
+++ b/etc/rc.d/mroute6d
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mroute6d,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: mroute6d
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index 2eb9144661e7f..28f9f26c60e04 100755
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/mrouted,v 1.10.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: mrouted
diff --git a/etc/rc.d/msgs b/etc/rc.d/msgs
index 6031acc7337d9..3b578195a5f1a 100644
--- a/etc/rc.d/msgs
+++ b/etc/rc.d/msgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/msgs,v 1.2 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: msgs
diff --git a/etc/rc.d/named b/etc/rc.d/named
index 7466739abcbc4..9282724b9b997 100755
--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/named,v 1.26.2.1 2007/10/28 00:26:53 dougb Exp $
 #
 
 # PROVIDE: named
diff --git a/etc/rc.d/natd b/etc/rc.d/natd
index e22353a6431b5..98804bbb44088 100644
--- a/etc/rc.d/natd
+++ b/etc/rc.d/natd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/natd,v 1.5 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: natd
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index c2ac7119c0e18..1874c8a5897bf 100644
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/netif,v 1.24 2007/07/25 18:08:01 jhb Exp $
 #
 
 # PROVIDE: netif
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 7104952d2ce84..9e3305bf9147d 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $
 #
 
 # PROVIDE: netoptions
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index d47416449778d..3a278fcf5c3a0 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $
 # 	From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43
 #
 
diff --git a/etc/rc.d/newsyslog b/etc/rc.d/newsyslog
index 7993d97d009bb..abdfa57e8798c 100755
--- a/etc/rc.d/newsyslog
+++ b/etc/rc.d/newsyslog
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: newsyslog
diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient
index 4888685d4b360..4b99529e6432c 100644
--- a/etc/rc.d/nfsclient
+++ b/etc/rc.d/nfsclient
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: nfsclient
diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index 83ba9cd9f2f7b..f94a9496a79b7 100755
--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: nfsd
diff --git a/etc/rc.d/nfsserver b/etc/rc.d/nfsserver
index bfa3f1205af6e..72d6ab42977d4 100644
--- a/etc/rc.d/nfsserver
+++ b/etc/rc.d/nfsserver
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nfsserver,v 1.5 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: nfsserver
diff --git a/etc/rc.d/nisdomain b/etc/rc.d/nisdomain
index a24f107d15136..0f84c87af5a15 100644
--- a/etc/rc.d/nisdomain
+++ b/etc/rc.d/nisdomain
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nisdomain,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: nisdomain
diff --git a/etc/rc.d/nscd b/etc/rc.d/nscd
index 3eb88232ad4ff..cefd109c4ff7a 100644
--- a/etc/rc.d/nscd
+++ b/etc/rc.d/nscd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
 #
 
 # PROVIDE: nscd
diff --git a/etc/rc.d/nsswitch b/etc/rc.d/nsswitch
index 1540583c1633e..3e6fd3a19d199 100644
--- a/etc/rc.d/nsswitch
+++ b/etc/rc.d/nsswitch
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/nsswitch,v 1.12 2006/12/30 22:53:20 yar Exp $
 #
 
 # PROVIDE: nsswitch
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index ba01b436a45c4..0e492410c0c0f 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ntpd,v 1.13 2006/04/18 15:02:24 flz Exp $
 #
 
 # PROVIDE: ntpd
diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate
index c76f7a0e7f546..b7f4190639a14 100755
--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ntpdate,v 1.16 2006/07/20 10:07:34 flz Exp $
 #
 
 # PROVIDE: ntpdate
diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta
index 7ab3e63649ac1..467953c149d90 100644
--- a/etc/rc.d/othermta
+++ b/etc/rc.d/othermta
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/othermta,v 1.3 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/pf b/etc/rc.d/pf
index 80afcc677157a..704f2d04d3ba6 100644
--- a/etc/rc.d/pf
+++ b/etc/rc.d/pf
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pf,v 1.16 2007/04/09 08:53:40 des Exp $
 #
 
 # PROVIDE: pf
diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog
index 001ad38de2cf9..382b9f4b08d37 100644
--- a/etc/rc.d/pflog
+++ b/etc/rc.d/pflog
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pflog,v 1.12 2007/04/09 08:53:40 des Exp $
 #
 
 # PROVIDE: pflog
diff --git a/etc/rc.d/pfsync b/etc/rc.d/pfsync
index 8be89282d1203..dd738d2b691c2 100644
--- a/etc/rc.d/pfsync
+++ b/etc/rc.d/pfsync
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pfsync,v 1.5 2007/04/10 16:42:13 keramida Exp $
 #
 
 # PROVIDE: pfsync
diff --git a/etc/rc.d/power_profile b/etc/rc.d/power_profile
index 7f64b7229575a..3faf7ddb422b2 100644
--- a/etc/rc.d/power_profile
+++ b/etc/rc.d/power_profile
@@ -5,7 +5,7 @@
 #
 # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance)
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/power_profile,v 1.11.4.1 2008/01/29 00:22:33 dougb Exp $
 #
 
 # PROVIDE: power_profile
diff --git a/etc/rc.d/powerd b/etc/rc.d/powerd
index fe7237e5bd3ff..4dd57510ee629 100644
--- a/etc/rc.d/powerd
+++ b/etc/rc.d/powerd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/powerd,v 1.4 2006/08/27 11:04:39 cperciva Exp $
 #
 
 # PROVIDE: powerd
diff --git a/etc/rc.d/ppp b/etc/rc.d/ppp
index b5ca7df045669..eb64093c3e3fc 100644
--- a/etc/rc.d/ppp
+++ b/etc/rc.d/ppp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ppp,v 1.13.2.1 2007/10/31 16:42:41 emax Exp $
 #
 
 # PROVIDE: ppp
diff --git a/etc/rc.d/pppoed b/etc/rc.d/pppoed
index c939112528c53..49e68542d94b9 100644
--- a/etc/rc.d/pppoed
+++ b/etc/rc.d/pppoed
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pppoed,v 1.4 2006/12/30 22:53:20 yar Exp $
 #
 
 # PROVIDE: pppoed
diff --git a/etc/rc.d/pwcheck b/etc/rc.d/pwcheck
index a8df716cf9952..38628a4dacda0 100755
--- a/etc/rc.d/pwcheck
+++ b/etc/rc.d/pwcheck
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: pwcheck
diff --git a/etc/rc.d/quota b/etc/rc.d/quota
index 2a1a2def4989c..d723e0e8af200 100755
--- a/etc/rc.d/quota
+++ b/etc/rc.d/quota
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/quota,v 1.6.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # Enable/Check the quotas (must be after ypbind if using NIS)
diff --git a/etc/rc.d/random b/etc/rc.d/random
index 160b1d4a4015f..c49cab3494f13 100644
--- a/etc/rc.d/random
+++ b/etc/rc.d/random
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/random,v 1.9 2007/03/03 06:39:06 njl Exp $
 #
 
 # PROVIDE: random
diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd
index 3602c879c5c90..5c57bf5b9bbab 100755
--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rarpd,v 1.6.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: rarpd
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index c34209cd37017..0531cc43e461f 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/resolv,v 1.37.4.1 2008/01/29 00:22:33 dougb Exp $
 #
 
 # PROVIDE: resolv
diff --git a/etc/rc.d/root b/etc/rc.d/root
index f2131d836d660..588c4eb4092f1 100755
--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/root,v 1.15.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: root
diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d
index f8a2bca14ee20..1a4a55637ac8b 100755
--- a/etc/rc.d/route6d
+++ b/etc/rc.d/route6d
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/route6d,v 1.9.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: route6d
diff --git a/etc/rc.d/routed b/etc/rc.d/routed
index be4cebc721d6f..3baa61883973f 100755
--- a/etc/rc.d/routed
+++ b/etc/rc.d/routed
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/routed,v 1.12.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: routed
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 874eda517458e..092d94a8ae05a 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -2,7 +2,7 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $
 #
 
 # PROVIDE: routing
diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index c6661089cd474..43ab77c520cf1 100755
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: rpcbind
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index 8c9dc530460ae..a6ac28a74a480 100755
--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: rtadvd
diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho
index 665bab35a7c9e..cc78ccb712685 100755
--- a/etc/rc.d/rwho
+++ b/etc/rc.d/rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/rwho,v 1.4.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: rwho
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 816d8424cbb8f..0962d9e291e84 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/savecore,v 1.10.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: savecore
diff --git a/etc/rc.d/sdpd b/etc/rc.d/sdpd
index ccf2257d54ac5..4d7b5544f647d 100644
--- a/etc/rc.d/sdpd
+++ b/etc/rc.d/sdpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sdpd,v 1.5 2006/12/31 10:37:18 yar Exp $
 #
 
 # PROVIDE: sdpd
diff --git a/etc/rc.d/securelevel b/etc/rc.d/securelevel
index 620a22e4ea1cc..7180515b7c24b 100755
--- a/etc/rc.d/securelevel
+++ b/etc/rc.d/securelevel
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/securelevel,v 1.10.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: securelevel
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index a862f313fd690..1dbc930042ff6 100755
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sendmail,v 1.17.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: mail
diff --git a/etc/rc.d/serial b/etc/rc.d/serial
index f53f40c65bec8..726c118fa3c02 100644
--- a/etc/rc.d/serial
+++ b/etc/rc.d/serial
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/serial,v 1.25 2006/03/23 08:48:38 ru Exp $
 #
 
 # PROVIDE: serial
diff --git a/etc/rc.d/sppp b/etc/rc.d/sppp
index d4a183bf3fb5b..f5deb2b1f397d 100644
--- a/etc/rc.d/sppp
+++ b/etc/rc.d/sppp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sppp,v 1.4 2004/10/07 13:55:26 mtm Exp $
 #
 
 # PROVIDE: sppp
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index 84f1ef2bcc9ba..727a9542f78a9 100755
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sshd,v 1.12.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: sshd
diff --git a/etc/rc.d/statd b/etc/rc.d/statd
index bdb40953326e1..98fd9b9c2be91 100644
--- a/etc/rc.d/statd
+++ b/etc/rc.d/statd
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/statd,v 1.17.6.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: statd
diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1
index a4aecf84727d2..370ef2b233479 100755
--- a/etc/rc.d/swap1
+++ b/etc/rc.d/swap1
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/swap1,v 1.9.14.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: localswap
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index 211fcb1894180..29361f08b1a60 100644
--- a/etc/rc.d/syscons
+++ b/etc/rc.d/syscons
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/syscons,v 1.21 2007/03/25 23:58:46 brooks Exp $
 #
 
 # PROVIDE: syscons
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index f83d7f8c83d2d..e7f55c5302b31 100644
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/sysctl,v 1.17.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: sysctl
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index 5dcd3e98bfe89..a733ff21423e7 100755
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/syslogd,v 1.12.4.1 2008/01/28 07:58:31 dougb Exp $
 #
 
 # PROVIDE: syslogd
diff --git a/etc/rc.d/timed b/etc/rc.d/timed
index bd7d8c12bcdaa..b768238318b99 100755
--- a/etc/rc.d/timed
+++ b/etc/rc.d/timed
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/timed,v 1.5.14.1 2008/01/28 07:58:32 dougb Exp $
 #
 
 # PROVIDE: timed
diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index 9750b6e2d06be..79d6fef7e6e3e 100644
--- a/etc/rc.d/tmp
+++ b/etc/rc.d/tmp
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/tmp,v 1.38.4.1 2008/01/29 00:22:33 dougb Exp $
 #
 
 # PROVIDE: tmp
diff --git a/etc/rc.d/ugidfw b/etc/rc.d/ugidfw
index 01632c990dfd5..700c940389de1 100644
--- a/etc/rc.d/ugidfw
+++ b/etc/rc.d/ugidfw
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ugidfw,v 1.5.4.1 2008/01/28 07:58:32 dougb Exp $
 
 # PROVIDE: ugidfw
 # BEFORE: LOGIN
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 4b57fb5026f23..e623e4fce6b09 100644
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/var,v 1.43.4.1 2008/01/29 00:22:33 dougb Exp $
 #
 
 # PROVIDE: var
diff --git a/etc/rc.d/virecover b/etc/rc.d/virecover
index 77cd9a0736bab..3e9c5458c6166 100755
--- a/etc/rc.d/virecover
+++ b/etc/rc.d/virecover
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/virecover,v 1.9.14.1 2008/01/28 07:58:32 dougb Exp $
 #
 
 # PROVIDE: virecover
diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd
index 3e12f54be96ac..ee1d644abf263 100644
--- a/etc/rc.d/watchdogd
+++ b/etc/rc.d/watchdogd
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/watchdogd,v 1.5 2005/01/16 03:12:03 obrien Exp $
 #
 
 # PROVIDE: watchdogd
diff --git a/etc/rc.d/wpa_supplicant b/etc/rc.d/wpa_supplicant
index 6e34924b07de5..fe64dde59b902 100644
--- a/etc/rc.d/wpa_supplicant
+++ b/etc/rc.d/wpa_supplicant
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $
 #
 
 # PROVIDE: wpa_supplicant
diff --git a/etc/rc.d/ypbind b/etc/rc.d/ypbind
index edf15b934d67f..8edef2642893c 100755
--- a/etc/rc.d/ypbind
+++ b/etc/rc.d/ypbind
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypbind,v 1.10.4.1 2008/01/28 07:58:32 dougb Exp $
 #
 
 # PROVIDE: ypbind
diff --git a/etc/rc.d/yppasswdd b/etc/rc.d/yppasswdd
index 86e38edfa01c6..f8121e7a56d38 100755
--- a/etc/rc.d/yppasswdd
+++ b/etc/rc.d/yppasswdd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.11.4.1 2008/01/28 07:58:32 dougb Exp $
 #
 
 # PROVIDE: yppasswdd
diff --git a/etc/rc.d/ypserv b/etc/rc.d/ypserv
index 1c056b9c9ff54..31a41cc1b8451 100755
--- a/etc/rc.d/ypserv
+++ b/etc/rc.d/ypserv
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypserv,v 1.12.4.1 2008/01/28 07:58:32 dougb Exp $
 #
 
 # PROVIDE: ypserv
diff --git a/etc/rc.d/ypset b/etc/rc.d/ypset
index bc2c154365e16..301a532e48ba8 100644
--- a/etc/rc.d/ypset
+++ b/etc/rc.d/ypset
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypset,v 1.7 2006/12/30 22:53:20 yar Exp $
 #
 
 # PROVIDE: ypset
diff --git a/etc/rc.d/ypupdated b/etc/rc.d/ypupdated
index e1d6fd73a15fa..f132e259cb7d1 100644
--- a/etc/rc.d/ypupdated
+++ b/etc/rc.d/ypupdated
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypupdated,v 1.6 2006/12/30 22:53:20 yar Exp $
 #
 
 # PROVIDE: ypupdated
diff --git a/etc/rc.d/ypxfrd b/etc/rc.d/ypxfrd
index dd9488a96677d..33643a373f586 100644
--- a/etc/rc.d/ypxfrd
+++ b/etc/rc.d/ypxfrd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.8 2006/12/30 22:53:20 yar Exp $
 #
 
 # PROVIDE: ypxfrd
diff --git a/etc/rc.d/zfs b/etc/rc.d/zfs
index 4f9bc6a94b628..40b3bbf7e308d 100644
--- a/etc/rc.d/zfs
+++ b/etc/rc.d/zfs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.d/zfs,v 1.5 2007/04/22 20:55:08 pjd Exp $
 #
 
 # PROVIDE: zfs
diff --git a/etc/rc.firewall b/etc/rc.firewall
index fa2558de361ef..2fcc8f4480c67 100644
--- a/etc/rc.firewall
+++ b/etc/rc.firewall
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.firewall,v 1.52.4.1 2008/01/29 00:22:32 dougb Exp $
 #
 
 #
diff --git a/etc/rc.firewall6 b/etc/rc.firewall6
index 7498bbc68f5d7..36905d140d002 100644
--- a/etc/rc.firewall6
+++ b/etc/rc.firewall6
@@ -1,7 +1,7 @@
 #!/bin/sh -
 ############
 # Setup system for IPv6 firewall service.
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.firewall6,v 1.17.4.1 2008/01/29 00:22:32 dougb Exp $
 
 # Suck in the configuration variables.
 if [ -z "${source_rc_confs_defined}" ]; then
diff --git a/etc/rc.initdiskless b/etc/rc.initdiskless
index 744d767974a71..a9fc61e526f57 100644
--- a/etc/rc.initdiskless
+++ b/etc/rc.initdiskless
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.initdiskless,v 1.52 2006/12/03 23:50:29 luigi Exp $
 
 # On entry to this script the entire system consists of a read-only root
 # mounted via NFS. The kernel has run BOOTP and configured an interface
diff --git a/etc/rc.resume b/etc/rc.resume
index 54f49c53b1231..dbbfa1c461ff6 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.resume,v 1.8 2007/06/21 22:50:36 njl Exp $
 #
 
 # sample run command file for APM Resume Event
diff --git a/etc/rc.sendmail b/etc/rc.sendmail
index b025bc0bd62cb..f9343a56e05d9 100644
--- a/etc/rc.sendmail
+++ b/etc/rc.sendmail
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.sendmail,v 1.6 2003/10/19 00:31:50 gshapiro Exp $
 #
 
 # This script is used by /etc/rc at boot time to start sendmail.  It
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index ebe79d74132bc..422a554b4a6e4 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.shutdown,v 1.31 2005/12/02 20:06:07 dougb Exp $
 #
 
 # Site-specific closing actions for daemons run by init on shutdown,
diff --git a/etc/rc.subr b/etc/rc.subr
index ba3e0a4e852e1..b4c27201cab20 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.subr,v 1.77 2007/10/09 07:20:44 dougb Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/etc/rc.suspend b/etc/rc.suspend
index 4028b3254b555..0bd3e1ebecef6 100755
--- a/etc/rc.suspend
+++ b/etc/rc.suspend
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rc.suspend,v 1.7 2007/06/21 22:50:36 njl Exp $
 #
 
 # sample run command file for APM Suspend Event
diff --git a/etc/remote b/etc/remote
index f58463ca03500..996efabddba0d 100644
--- a/etc/remote
+++ b/etc/remote
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/remote,v 1.16 2004/10/13 08:32:34 phk Exp $
 #
 #	@(#)remote	5.2 (Berkeley) 6/30/90
 #
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 36df9c61f71d8..4dbe36453d012 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.cshrc,v 1.30 2007/05/29 06:37:58 dougb Exp $
 #
 # .cshrc - csh resource script, read at beginning of execution by each shell
 #
diff --git a/etc/root/dot.k5login b/etc/root/dot.k5login
index e01b9417fdbe1..6736182501e9d 100644
--- a/etc/root/dot.k5login
+++ b/etc/root/dot.k5login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.k5login,v 1.1 2003/04/30 20:58:49 markm Exp $
 #
 # user1/root@YOUR.REALM.WHEREVER
 # user2/root@YOUR.REALM.WHEREVER
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 3032ef97c762d..813654cb44e11 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.login,v 1.22 2000/07/15 03:25:14 rwatson Exp $
 #
 # .login - csh login script, read by login shell, after `.cshrc' at login.
 #
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index ab8431959c7ce..67d73fa142827 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $
 #
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
 export PATH
diff --git a/etc/rpc b/etc/rpc
index 935ea2f1b5924..3b42b0a39e3ab 100644
--- a/etc/rpc
+++ b/etc/rpc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/rpc,v 1.11 2004/06/06 11:46:27 schweikh Exp $
 # rpc 88/08/01 4.0 RPCSRC; from 1.12   99/07/25 SMI
 #
 rpcbind		100000  portmap sunrpc rpcbind
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index b79e722a4bf47..42723081e964d 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.19 (Berkeley) 1/14/97
-# $FreeBSD$
+# $FreeBSD: src/etc/sendmail/Makefile,v 1.31 2004/01/22 17:51:02 ru Exp $
 
 M4=		m4
 CHMOD=		chmod
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index fe45fa534c0fa..452e6a031f56b 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -44,7 +44,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.34.2.1 2007/11/22 16:19:40 gshapiro Exp $')
 OSTYPE(freebsd6)
 DOMAIN(generic)
 
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
index bfc98a2bbfc7a..fb0a9233faeff 100644
--- a/etc/sendmail/freebsd.submit.mc
+++ b/etc/sendmail/freebsd.submit.mc
@@ -16,7 +16,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.5.2.1 2007/11/22 16:19:40 gshapiro Exp $')
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc
index 9f77dbd180256..6f65da8e16eed 100644
--- a/etc/sendmail/freefall.mc
+++ b/etc/sendmail/freefall.mc
@@ -40,7 +40,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$FreeBSD$')
+VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.20 2005/06/14 02:25:17 gshapiro Exp $')
 
 OSTYPE(freebsd6)
 FEATURE(nullclient, hub.$m)
diff --git a/etc/services b/etc/services
index 729f20be11dc4..432a175ee9a9b 100644
--- a/etc/services
+++ b/etc/services
@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD$
+# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
diff --git a/etc/shells b/etc/shells
index fe1e0294a0103..673332a82fd3b 100644
--- a/etc/shells
+++ b/etc/shells
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/shells,v 1.5 2000/04/27 21:58:46 ache Exp $
 #
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
diff --git a/etc/snmpd.config b/etc/snmpd.config
index 0d136ef1131f3..98f0cda0e716d 100644
--- a/etc/snmpd.config
+++ b/etc/snmpd.config
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/snmpd.config,v 1.9 2006/12/31 11:19:48 maxim Exp $
 #
 # Example configuration file for bsnmpd(1).
 #
diff --git a/etc/sysctl.conf b/etc/sysctl.conf
index 0c9e796a7ac8f..21fb8e77d3dfd 100644
--- a/etc/sysctl.conf
+++ b/etc/sysctl.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/sysctl.conf,v 1.8 2003/03/13 18:43:50 mux Exp $
 #
 #  This file is read when going to multi-user and its contents piped thru
 #  ``sysctl'' to adjust kernel values.  ``man 5 sysctl.conf'' for details.
diff --git a/etc/syslog.conf b/etc/syslog.conf
index cf8667a73d19c..38869eb83d038 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/syslog.conf,v 1.28 2005/03/12 12:31:16 glebius Exp $
 #
 #	Spaces ARE valid field separators in this file. However,
 #	other *nix-like systems still insist on using tabs as field
diff --git a/etc/termcap.small b/etc/termcap.small
index f8a68a7d1748d..2156843cc7378 100644
--- a/etc/termcap.small
+++ b/etc/termcap.small
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)termcap.src	5.88 (Berkeley) 4/30/91
-# $FreeBSD$
+# $FreeBSD: src/etc/termcap.small,v 1.28 2004/06/06 11:46:27 schweikh Exp $
 #
 # for syscons
 # common entry without semigraphics
diff --git a/games/Makefile b/games/Makefile
index 214a394f44959..720cd71d5e9a4 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/games/Makefile,v 1.20 2002/10/20 11:18:56 markm Exp $
 
 SUBDIR= \
 	bcd \
diff --git a/games/Makefile.inc b/games/Makefile.inc
index b81af5e0f2463..5886b3851a96f 100644
--- a/games/Makefile.inc
+++ b/games/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/Makefile.inc,v 1.16 2002/10/21 10:05:14 markm Exp $
 
 BINDIR?=	/usr/games
 FILESDIR?=	${SHAREDIR}/games
diff --git a/games/bcd/Makefile b/games/bcd/Makefile
index 5698c121d638a..5ef7a419a2a96 100644
--- a/games/bcd/Makefile
+++ b/games/bcd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/bcd/Makefile,v 1.6 2004/07/11 17:26:18 stefanf Exp $
 
 PROG=	bcd
 WARNS?=	6
diff --git a/games/bcd/bcd.6 b/games/bcd/bcd.6
index dc64317908882..c4af8df310753 100644
--- a/games/bcd/bcd.6
+++ b/games/bcd/bcd.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bcd.6	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/bcd/bcd.6,v 1.12 2001/02/06 16:13:09 ru Exp $
 .\"
 .Dd December 7, 2000
 .Dt BCD 6
diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c
index 27f483ec6313f..9e7a84b8ab07b 100644
--- a/games/bcd/bcd.c
+++ b/games/bcd/bcd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)bcd.c	8.2 (Berkeley) 3/20/94";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/bcd/bcd.c,v 1.9 2004/07/11 17:26:18 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index ebb770e861e41..4ebb3e43265ff 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/caesar/Makefile,v 1.10 2005/05/01 19:34:22 stefanf Exp $
 
 PROG=	caesar
 DPADD=	${LIBM}
diff --git a/games/caesar/caesar.6 b/games/caesar/caesar.6
index 4f6ac172a9ca4..a95ecff512a12 100644
--- a/games/caesar/caesar.6
+++ b/games/caesar/caesar.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)caesar.6	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/caesar/caesar.6,v 1.9 2003/05/16 21:26:39 ru Exp $
 .\"
 .Dd November 16, 1993
 .Dt CAESAR 6
diff --git a/games/caesar/caesar.c b/games/caesar/caesar.c
index 25c0a123bd4fb..b0e21f2a69775 100644
--- a/games/caesar/caesar.c
+++ b/games/caesar/caesar.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)caesar.c    8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.14 2005/05/01 19:34:22 stefanf Exp $");
 
 #include <errno.h>
 #include <math.h>
diff --git a/games/factor/Makefile b/games/factor/Makefile
index da1737cdb28d8..d50be6661f9eb 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/factor/Makefile,v 1.11 2006/03/17 18:54:21 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/games/factor/factor.6 b/games/factor/factor.6
index 07fc7b98a6971..3163d29eb549f 100644
--- a/games/factor/factor.6
+++ b/games/factor/factor.6
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)factor.6	8.1 (Berkeley) 5/31/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/factor/factor.6,v 1.8 2002/11/29 16:21:33 ru Exp $
 .\"
 .\" By: Landon Curt Noll   chongo@toad.com,   ...!{sun,tolsoft}!hoptoad!chongo
 .\"
diff --git a/games/factor/factor.c b/games/factor/factor.c
index e3aa90cb8bee6..0d6370c48c149 100644
--- a/games/factor/factor.c
+++ b/games/factor/factor.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)factor.c	8.4 (Berkeley) 5/4/95";
 __RCSID("$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $");
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/factor/factor.c,v 1.13 2002/10/09 19:55:04 fanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/fortune/Notes b/games/fortune/Notes
index 83b062defa30e..3641de35ada70 100644
--- a/games/fortune/Notes
+++ b/games/fortune/Notes
@@ -1,5 +1,5 @@
 #	@(#)Notes	8.1 (Berkeley) 5/31/93
-#	$FreeBSD$
+#	$FreeBSD: src/games/fortune/Notes,v 1.3 2003/02/16 18:38:12 schweikh Exp $
 
 Warning:
 	The fortunes contained in the fortune database have been collected
diff --git a/games/fortune/README b/games/fortune/README
index 31b96a2535fb8..50d18f1808786 100644
--- a/games/fortune/README
+++ b/games/fortune/README
@@ -1,5 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/README,v 1.2 2002/09/24 19:00:52 schweikh Exp $
 
 The potentially offensive fortunes are installed by default on FreeBSD
 systems.  If you're absolutely, *positively*, without-a-shadow-of-a-doubt
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index 100182f5606a8..a2d42d27dc0bb 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/19/94
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.34.2.1 2007/12/13 05:45:06 dougb Exp $
 
 FILES=	fortunes freebsd-tips murphy startrek zippy
 BLDS=	fortunes.dat murphy.dat startrek.dat zippy.dat \
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index 373da35d3c740..613f3f515664f 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.241.2.2 2007/12/13 05:45:06 dougb Exp $
 %
 =======================================================================
 ||								     ||
diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o.real
index 9a5401fc5c12c..b3b305c3d6c02 100644
--- a/games/fortune/datfiles/fortunes-o.real
+++ b/games/fortune/datfiles/fortunes-o.real
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.22.2.2 2007/12/13 05:45:07 dougb Exp $
 %
 						PLAYGIRL, Inc.
 						Philadelphia, Pa.  19369
diff --git a/games/fortune/datfiles/fortunes-o.sp.ok b/games/fortune/datfiles/fortunes-o.sp.ok
index 75cff751f68ae..a7882abf3b463 100644
--- a/games/fortune/datfiles/fortunes-o.sp.ok
+++ b/games/fortune/datfiles/fortunes-o.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.1.1.1.56.1 2007/12/13 05:45:07 dougb Exp $
 a'plucking
 AAAaaeeeeeeeeeiiiiiiiii
 Aaah
diff --git a/games/fortune/datfiles/fortunes.sp.ok b/games/fortune/datfiles/fortunes.sp.ok
index ffe8b3c9c33f6..6e4e79c51d03f 100644
--- a/games/fortune/datfiles/fortunes.sp.ok
+++ b/games/fortune/datfiles/fortunes.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.7.2.1 2007/12/13 05:45:07 dougb Exp $
 AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk
 AAAARRRRGGGGHHHH
 aafte
diff --git a/games/fortune/datfiles/freebsd-tips b/games/fortune/datfiles/freebsd-tips
index cc5d69286fadb..dbedc5c6d4384 100644
--- a/games/fortune/datfiles/freebsd-tips
+++ b/games/fortune/datfiles/freebsd-tips
@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD$
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.42.2.1 2007/12/13 05:45:08 dougb Exp $
 %
 Any user that is a member of the wheel group can use "su -" to simulate
 a root login. You can add a user to the wheel group by editing /etc/group.
diff --git a/games/fortune/datfiles/freebsd-tips.sp.ok b/games/fortune/datfiles/freebsd-tips.sp.ok
index b543ea0bdee9f..61f5a60402833 100644
--- a/games/fortune/datfiles/freebsd-tips.sp.ok
+++ b/games/fortune/datfiles/freebsd-tips.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/freebsd-tips.sp.ok,v 1.1.4.1 2007/12/13 05:45:08 dougb Exp $
 aliasname
 allscreens
 AUTH
diff --git a/games/fortune/datfiles/gerrold.limerick b/games/fortune/datfiles/gerrold.limerick
index cd0b87fb068cb..8ff27cd91556c 100755
--- a/games/fortune/datfiles/gerrold.limerick
+++ b/games/fortune/datfiles/gerrold.limerick
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.5 2002/11/10 23:37:25 dcs Exp $
 %% From The War Against The Chtorr,
 %% Copyright David Gerrold, 1984-2000, all rights reserved,
 %% used with permission of the author.
diff --git a/games/fortune/datfiles/limerick b/games/fortune/datfiles/limerick
index 0a3d7cbbe999f..d196707601c56 100644
--- a/games/fortune/datfiles/limerick
+++ b/games/fortune/datfiles/limerick
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.11.2.2 2007/12/13 05:45:08 dougb Exp $
 %
 A bad little girl in Madrid,
 A most reprehensible kid,
diff --git a/games/fortune/datfiles/limerick.sp.ok b/games/fortune/datfiles/limerick.sp.ok
index 00f1b42f2d852..891c14fb2c273 100644
--- a/games/fortune/datfiles/limerick.sp.ok
+++ b/games/fortune/datfiles/limerick.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/limerick.sp.ok,v 1.1.4.1 2007/12/13 05:45:08 dougb Exp $
 abbess's
 Abercrombie
 Aberystwyth
diff --git a/games/fortune/datfiles/murphy b/games/fortune/datfiles/murphy
index d04440987a0f5..a5ad2a4c458d6 100644
--- a/games/fortune/datfiles/murphy
+++ b/games/fortune/datfiles/murphy
@@ -1,4 +1,4 @@
-%%$FreeBSD$
+%%$FreeBSD: src/games/fortune/datfiles/murphy,v 1.11.10.1 2007/12/13 05:45:08 dougb Exp $
 %
 (1)	Anyone can make a decision given enough facts.
 (2)	A good manager can make a decision without enough
diff --git a/games/fortune/datfiles/murphy-o b/games/fortune/datfiles/murphy-o
index 94c9cc22bc4fa..e99ed9d0560c9 100644
--- a/games/fortune/datfiles/murphy-o
+++ b/games/fortune/datfiles/murphy-o
@@ -1,4 +1,4 @@
-%%$FreeBSD$
+%%$FreeBSD: src/games/fortune/datfiles/murphy-o,v 1.2.22.1 2007/12/13 05:45:08 dougb Exp $
 %
 All probabilities are 50%: either a thing will
 happen or it won't.
diff --git a/games/fortune/datfiles/murphy.sp.ok b/games/fortune/datfiles/murphy.sp.ok
index 0287e6a3301fc..f8ff5fe2a0722 100644
--- a/games/fortune/datfiles/murphy.sp.ok
+++ b/games/fortune/datfiles/murphy.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/murphy.sp.ok,v 1.1.4.1 2007/12/13 05:45:08 dougb Exp $
 abend
 ACF
 barbeque
diff --git a/games/fortune/datfiles/startrek b/games/fortune/datfiles/startrek
index f45a0e2057349..addfce733fdfb 100644
--- a/games/fortune/datfiles/startrek
+++ b/games/fortune/datfiles/startrek
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.9.2.1 2007/12/13 05:45:08 dougb Exp $
 %
 	"... freedom ... is a worship word..."
 	"It is our worship word too."
diff --git a/games/fortune/datfiles/startrek.sp.ok b/games/fortune/datfiles/startrek.sp.ok
index 5d1180e0230b1..34ee9328cbb97 100644
--- a/games/fortune/datfiles/startrek.sp.ok
+++ b/games/fortune/datfiles/startrek.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.2 2003/01/04 17:08:23 schweikh Exp $
 Adonais
 Amanda
 Apella
diff --git a/games/fortune/datfiles/zippy b/games/fortune/datfiles/zippy
index a613036e2d465..5ca1ddfb38733 100644
--- a/games/fortune/datfiles/zippy
+++ b/games/fortune/datfiles/zippy
@@ -1,4 +1,4 @@
-%% $FreeBSD$
+%% $FreeBSD: src/games/fortune/datfiles/zippy,v 1.5.2.1 2007/12/13 05:45:08 dougb Exp $
 %
 	Talking Pinhead Blues:
 Oh, I LOST my ``HELLO KITTY'' DOLL and I get BAD reception on channel
diff --git a/games/fortune/datfiles/zippy.sp.ok b/games/fortune/datfiles/zippy.sp.ok
index 4214fca564c6e..40ffda40fc623 100644
--- a/games/fortune/datfiles/zippy.sp.ok
+++ b/games/fortune/datfiles/zippy.sp.ok
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/datfiles/zippy.sp.ok,v 1.1.1.1.56.1 2007/12/13 05:45:08 dougb Exp $
 ANAL
 ASEXUAL
 Astro
diff --git a/games/fortune/fortune/Makefile b/games/fortune/fortune/Makefile
index e8bd74be5626a..a5a0f248181d4 100644
--- a/games/fortune/fortune/Makefile
+++ b/games/fortune/fortune/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/fortune/Makefile,v 1.8 2005/02/17 18:06:37 ru Exp $
 
 PROG=	fortune
 MAN=	fortune.6
diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 96aee79f67e1e..969079a0f839c 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fortune.6	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.20 2005/02/13 23:45:45 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt FORTUNE 6
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index a7a8f452e6125..01fd0fa97f928 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)fortune.c   8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.29 2005/07/23 18:24:47 ache Exp $");
 
 # include	<sys/stat.h>
 # include	<sys/endian.h>
diff --git a/games/fortune/strfile/Makefile b/games/fortune/strfile/Makefile
index 251779eb22744..1208d2de23f8a 100644
--- a/games/fortune/strfile/Makefile
+++ b/games/fortune/strfile/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.7 2005/02/23 20:42:47 ru Exp $
 
 PROG=	strfile
 MAN=	strfile.8
diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index 5c2d64241be47..883acc152ae74 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strfile.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/fortune/strfile/strfile.8,v 1.14 2005/02/17 18:06:37 ru Exp $
 .\"
 .Dd February 17, 2005
 .Dt STRFILE 8
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index 69240d142cb1c..d6a6621bc8179 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)strfile.c   8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.28 2005/02/17 18:06:37 ru Exp $");
 
 # include	<sys/param.h>
 # include	<sys/endian.h>
diff --git a/games/fortune/strfile/strfile.h b/games/fortune/strfile/strfile.h
index 4726024cca135..1aa4bdef7e8e4 100644
--- a/games/fortune/strfile/strfile.h
+++ b/games/fortune/strfile/strfile.h
@@ -35,7 +35,7 @@
  *
  *	@(#)strfile.h	8.1 (Berkeley) 5/31/93
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/games/fortune/strfile/strfile.h,v 1.4 2005/02/17 18:06:37 ru Exp $ */
 
 #include <sys/types.h>
 
diff --git a/games/fortune/tools/do_sort b/games/fortune/tools/do_sort
index 07e301b2cf719..b5f7a4bbe4c28 100644
--- a/games/fortune/tools/do_sort
+++ b/games/fortune/tools/do_sort
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 #	@(#)do_sort	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/tools/do_sort,v 1.2 2005/02/03 00:18:06 ru Exp $
 #
 # an aggressive little script for sorting the fortune files
 # depends on octal 02 and 03 not being anywhere in the files.
diff --git a/games/fortune/tools/do_uniq.py b/games/fortune/tools/do_uniq.py
index bea9644d9dcae..eb05f5f6a312a 100644
--- a/games/fortune/tools/do_uniq.py
+++ b/games/fortune/tools/do_uniq.py
@@ -1,6 +1,6 @@
 #!/usr/local/bin/python
 #
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/tools/do_uniq.py,v 1.1 2005/02/07 21:15:16 ru Exp $
 #
 # an aggressive little script for trimming duplicate cookies
 
diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile
index 0331e4bfa2a8e..be95ad0618eb5 100644
--- a/games/fortune/unstr/Makefile
+++ b/games/fortune/unstr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/fortune/unstr/Makefile,v 1.7 2005/02/23 20:59:03 ru Exp $
 
 PROG=	unstr
 NO_MAN=
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index 25996f4f6b95d..2d888d66b911c 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)unstr.c     8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/fortune/unstr/unstr.c,v 1.11 2005/02/23 20:59:03 ru Exp $");
 
 /*
  *	This program un-does what "strfile" makes, thereby obtaining the
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 0aeea1e2ab2e9..1dfcf0b4252d5 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/games/grdc/Makefile,v 1.8 2001/09/25 13:45:46 ru Exp $
 
 PROG=   grdc
 WARNS?=	2
diff --git a/games/grdc/grdc.6 b/games/grdc/grdc.6
index 5226a6b2a9c76..84b2ea0ccf92e 100644
--- a/games/grdc/grdc.6
+++ b/games/grdc/grdc.6
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/grdc/grdc.6,v 1.6 2003/05/16 21:27:23 ru Exp $
 .Dd September 25, 2001
 .Dt GRDC 6
 .Os
diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c
index d27b10ed79160..d9a9b628bcb5a 100644
--- a/games/grdc/grdc.c
+++ b/games/grdc/grdc.c
@@ -11,7 +11,7 @@
  * modified 03-25-03 for 12 hour option
  *     - Samy Al Bahra <samy@kerneled.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/games/grdc/grdc.c,v 1.12 2003/06/23 16:02:40 will Exp $
  */
 
 #include <err.h>
diff --git a/games/morse/Makefile b/games/morse/Makefile
index 92d11214760bb..a7c267e406a07 100644
--- a/games/morse/Makefile
+++ b/games/morse/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/morse/Makefile,v 1.8 2005/11/11 09:57:32 ru Exp $
 
 PROG=	morse
 MAN=	morse.6
diff --git a/games/morse/morse.6 b/games/morse/morse.6
index f9ac378dc2d96..dfca303228a4f 100644
--- a/games/morse/morse.6
+++ b/games/morse/morse.6
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bcd.6	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/morse/morse.6,v 1.17 2005/06/07 21:43:16 ru Exp $
 .\"
 .Dd June 7, 2005
 .Dt MORSE 6
diff --git a/games/morse/morse.c b/games/morse/morse.c
index 87f97dccd5de3..3c2e31e1fa153 100644
--- a/games/morse/morse.c
+++ b/games/morse/morse.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)morse.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $";
 #endif /* not lint */
 
 #include <sys/time.h>
diff --git a/games/number/Makefile b/games/number/Makefile
index 8e75f71a78587..cebde90fa5f96 100644
--- a/games/number/Makefile
+++ b/games/number/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/number/Makefile,v 1.4 2001/03/26 14:20:58 ru Exp $
 
 PROG=	number
 MAN=	number.6
diff --git a/games/number/number.6 b/games/number/number.6
index eb7892d80d589..67ac04dd12185 100644
--- a/games/number/number.6
+++ b/games/number/number.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)number.6	8.2 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/number/number.6,v 1.6 2005/02/13 22:25:10 ru Exp $
 .\"
 .Dd March 31, 1994
 .Dt NUMBER 6
diff --git a/games/number/number.c b/games/number/number.c
index 243fc8ddc8660..5901f917cb8e0 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)number.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/number/number.c,v 1.15 2005/02/09 18:22:15 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/pom/Makefile b/games/pom/Makefile
index 332f3cf1aeafb..b574d0acbcf21 100644
--- a/games/pom/Makefile
+++ b/games/pom/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/pom/Makefile,v 1.7 2005/05/01 19:34:22 stefanf Exp $
 
 PROG=	pom
 MAN=	pom.6
diff --git a/games/pom/pom.6 b/games/pom/pom.6
index 1a5325b4b5a00..67f27c1e43066 100644
--- a/games/pom/pom.6
+++ b/games/pom/pom.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pom.6	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/pom/pom.6,v 1.4 2001/07/15 07:49:21 dd Exp $
 .\"
 .TH POM 6 "May 31, 1993"
 .UC 7
diff --git a/games/pom/pom.c b/games/pom/pom.c
index d245f34bd7f2a..fe2b45c874441 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -45,7 +45,7 @@ static const char sccsid[] = "@(#)pom.c       8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/pom/pom.c,v 1.13 2005/05/01 19:34:22 stefanf Exp $");
 
 /*
  * Phase of the Moon.  Calculates the current phase of the moon.
diff --git a/games/ppt/Makefile b/games/ppt/Makefile
index d4433c45ccc34..c423d9d754e4f 100644
--- a/games/ppt/Makefile
+++ b/games/ppt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/ppt/Makefile,v 1.5 2004/12/21 08:46:57 ru Exp $
 
 PROG=	ppt
 NO_MAN=
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index e0ae5e137c544..9a902e91da274 100644
--- a/games/ppt/ppt.c
+++ b/games/ppt/ppt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ppt.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/ppt/ppt.c,v 1.8 2004/08/01 18:52:40 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/primes/Makefile b/games/primes/Makefile
index 5e111e7baf10c..a4032a3156bce 100644
--- a/games/primes/Makefile
+++ b/games/primes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/games/primes/Makefile,v 1.3 2004/12/21 08:46:57 ru Exp $
 
 PROG=	primes
 SRCS=	pattern.c pr_tbl.c primes.c
diff --git a/games/primes/pattern.c b/games/primes/pattern.c
index 66b2dc8071513..1e08b75038498 100644
--- a/games/primes/pattern.c
+++ b/games/primes/pattern.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)pattern.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/primes/pattern.c,v 1.6 2003/01/01 18:48:42 schweikh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/pr_tbl.c b/games/primes/pr_tbl.c
index 6447916daad32..e615439aa6d97 100644
--- a/games/primes/pr_tbl.c
+++ b/games/primes/pr_tbl.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)pr_tbl.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/primes/pr_tbl.c,v 1.5 2002/10/09 19:38:55 fanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/primes.c b/games/primes/primes.c
index c89817d7da68a..52c32b35fcb80 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)primes.c	8.5 (Berkeley) 5/10/95";
 #endif
 static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: src/games/primes/primes.c,v 1.21 2002/10/09 20:42:40 fanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/primes.h b/games/primes/primes.h
index fde2b83f3fa90..3f12e4dfbffef 100644
--- a/games/primes/primes.h
+++ b/games/primes/primes.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)primes.h	8.2 (Berkeley) 3/1/94
- * $FreeBSD$
+ * $FreeBSD: src/games/primes/primes.h,v 1.3 2003/01/01 18:48:42 schweikh Exp $
  */
 
 /*
diff --git a/games/random/Makefile b/games/random/Makefile
index 7db5a8f8f85a5..6b8fe1ee860cb 100644
--- a/games/random/Makefile
+++ b/games/random/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/games/random/Makefile,v 1.5 2003/02/15 10:26:10 seanc Exp $
 
 PROG=	random
 MAN=	random.6
diff --git a/games/random/random.6 b/games/random/random.6
index 33a3511eaf8f7..0125338213b71 100644
--- a/games/random/random.6
+++ b/games/random/random.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.6	8.2 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/games/random/random.6,v 1.8 2005/01/18 08:57:18 ru Exp $
 .\"
 .Dd February 8, 2003
 .Dt RANDOM 6
diff --git a/games/random/random.c b/games/random/random.c
index b7b732a521dab..f8dab222eb561 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)random.c	8.5 (Berkeley) 4/5/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/random/random.c,v 1.20 2006/04/14 17:32:27 ache Exp $");
 
 #include <sys/types.h>
 
diff --git a/games/random/randomize_fd.c b/games/random/randomize_fd.c
index b60c53c90e4ea..6fe2be86a920d 100644
--- a/games/random/randomize_fd.c
+++ b/games/random/randomize_fd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.3 2006/04/14 17:32:27 ache Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/games/random/randomize_fd.h b/games/random/randomize_fd.h
index 5b50e62655045..6e4c19f611b15 100644
--- a/games/random/randomize_fd.h
+++ b/games/random/randomize_fd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/games/random/randomize_fd.h,v 1.2 2003/02/15 10:26:10 seanc Exp $
  */
 
 #ifndef __RANDOMIZE_FD__
diff --git a/gnu/Makefile b/gnu/Makefile
index 6656adfbdfad6..5f2502f6d3049 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
-# $FreeBSD$
+# $FreeBSD: src/gnu/Makefile,v 1.36 2002/06/05 17:02:37 obrien Exp $
 
 SUBDIR= lib usr.bin
 
diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc
index 5de8a1ece6f82..70c0792c4b2e7 100644
--- a/gnu/Makefile.inc
+++ b/gnu/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/Makefile.inc,v 1.6 2004/12/21 09:33:44 ru Exp $
 
 # Do not lint the GNU stuff. It is all externally maintained and
 # lint output is wasteful noise here.
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 0db955fa0f57d..86c606de133a8 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/Makefile,v 1.42 2007/05/19 04:25:54 kan Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc
index 265f86d1ed55a..7fa85248ad1b2 100644
--- a/gnu/lib/Makefile.inc
+++ b/gnu/lib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/Makefile.inc,v 1.8 2002/09/25 09:55:19 markm Exp $
 
 .include "../Makefile.inc"
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 173920ca79251..12857ea7a99f9 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.25 2007/05/19 04:25:55 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 0697dee34a809..5c2b25a38878e 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.45 2007/06/18 18:47:52 rafan Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/lib/libdialog/TESTS/Makefile b/gnu/lib/libdialog/TESTS/Makefile
index 65e3d71c1f6a8..c2ba8592e8e20 100644
--- a/gnu/lib/libdialog/TESTS/Makefile
+++ b/gnu/lib/libdialog/TESTS/Makefile
@@ -2,7 +2,7 @@
 # bmake was friendlier to the concept of multiple progs/libs in the same
 # directory.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libdialog/TESTS/Makefile,v 1.11 2003/05/03 21:30:34 obrien Exp $
 
 PROGS=	msg yesno prgbox gauge dselect fselect text menu1 menu2 menu3 \
 	input1 input2 check1 check2 check3 radio1 radio2 radio3 \
diff --git a/gnu/lib/libdialog/TESTS/check1.c b/gnu/lib/libdialog/TESTS/check1.c
index a2bec62606aca..775aa1ce76488 100644
--- a/gnu/lib/libdialog/TESTS/check1.c
+++ b/gnu/lib/libdialog/TESTS/check1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/check1.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/check2.c b/gnu/lib/libdialog/TESTS/check2.c
index 3608261caf8fe..60013a748174e 100644
--- a/gnu/lib/libdialog/TESTS/check2.c
+++ b/gnu/lib/libdialog/TESTS/check2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/check2.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/check3.c b/gnu/lib/libdialog/TESTS/check3.c
index d97b8048415cc..d44933881d86f 100644
--- a/gnu/lib/libdialog/TESTS/check3.c
+++ b/gnu/lib/libdialog/TESTS/check3.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/check3.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <sys/wait.h>
 #include <dialog.h>
diff --git a/gnu/lib/libdialog/TESTS/dselect.c b/gnu/lib/libdialog/TESTS/dselect.c
index 11103791f680d..78dc60d2727d4 100644
--- a/gnu/lib/libdialog/TESTS/dselect.c
+++ b/gnu/lib/libdialog/TESTS/dselect.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/dselect.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/fselect.c b/gnu/lib/libdialog/TESTS/fselect.c
index 6cefaf3f4b8ff..c14174bca7dd1 100644
--- a/gnu/lib/libdialog/TESTS/fselect.c
+++ b/gnu/lib/libdialog/TESTS/fselect.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/fselect.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/ftree1.c b/gnu/lib/libdialog/TESTS/ftree1.c
index f21e0e50bf6d4..638a91201675d 100644
--- a/gnu/lib/libdialog/TESTS/ftree1.c
+++ b/gnu/lib/libdialog/TESTS/ftree1.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/ftree1.c,v 1.3 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/ftree2.c b/gnu/lib/libdialog/TESTS/ftree2.c
index aa4663adf2cd0..97245c1adc7a8 100644
--- a/gnu/lib/libdialog/TESTS/ftree2.c
+++ b/gnu/lib/libdialog/TESTS/ftree2.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/ftree2.c,v 1.3 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/gauge.c b/gnu/lib/libdialog/TESTS/gauge.c
index bf0cfc9894bc3..c351010a5639e 100644
--- a/gnu/lib/libdialog/TESTS/gauge.c
+++ b/gnu/lib/libdialog/TESTS/gauge.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/gauge.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/input1.c b/gnu/lib/libdialog/TESTS/input1.c
index 37510712d7ea1..d14bf2244d85a 100644
--- a/gnu/lib/libdialog/TESTS/input1.c
+++ b/gnu/lib/libdialog/TESTS/input1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/input1.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/input2.c b/gnu/lib/libdialog/TESTS/input2.c
index 827c0522b4df3..26ab24665f73e 100644
--- a/gnu/lib/libdialog/TESTS/input2.c
+++ b/gnu/lib/libdialog/TESTS/input2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/input2.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/menu1.c b/gnu/lib/libdialog/TESTS/menu1.c
index 640157a896921..34d30f9861fb5 100644
--- a/gnu/lib/libdialog/TESTS/menu1.c
+++ b/gnu/lib/libdialog/TESTS/menu1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/menu1.c,v 1.9 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/menu2.c b/gnu/lib/libdialog/TESTS/menu2.c
index 1545cd828b125..cb348ae5b10f8 100644
--- a/gnu/lib/libdialog/TESTS/menu2.c
+++ b/gnu/lib/libdialog/TESTS/menu2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/menu2.c,v 1.9 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/menu3.c b/gnu/lib/libdialog/TESTS/menu3.c
index 4a29074b36d89..8196d25640f72 100644
--- a/gnu/lib/libdialog/TESTS/menu3.c
+++ b/gnu/lib/libdialog/TESTS/menu3.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/menu3.c,v 1.10 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/msg.c b/gnu/lib/libdialog/TESTS/msg.c
index c6f590fc7a046..d6667d20d7b62 100644
--- a/gnu/lib/libdialog/TESTS/msg.c
+++ b/gnu/lib/libdialog/TESTS/msg.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/msg.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/prgbox.c b/gnu/lib/libdialog/TESTS/prgbox.c
index 2da4611ce0156..0419d3ebab1ea 100644
--- a/gnu/lib/libdialog/TESTS/prgbox.c
+++ b/gnu/lib/libdialog/TESTS/prgbox.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/prgbox.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/radio1.c b/gnu/lib/libdialog/TESTS/radio1.c
index afcac1e0bddbc..2086a9b942994 100644
--- a/gnu/lib/libdialog/TESTS/radio1.c
+++ b/gnu/lib/libdialog/TESTS/radio1.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/radio1.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/radio2.c b/gnu/lib/libdialog/TESTS/radio2.c
index 15e353cc82940..81386bbad3c05 100644
--- a/gnu/lib/libdialog/TESTS/radio2.c
+++ b/gnu/lib/libdialog/TESTS/radio2.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/radio2.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/radio3.c b/gnu/lib/libdialog/TESTS/radio3.c
index e11011cffd9cd..57b3976414225 100644
--- a/gnu/lib/libdialog/TESTS/radio3.c
+++ b/gnu/lib/libdialog/TESTS/radio3.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/radio3.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/text.c b/gnu/lib/libdialog/TESTS/text.c
index e071937e30f55..79346cc47d43f 100644
--- a/gnu/lib/libdialog/TESTS/text.c
+++ b/gnu/lib/libdialog/TESTS/text.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/text.c,v 1.6 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/tree.c b/gnu/lib/libdialog/TESTS/tree.c
index c69b52e7d04f0..2a5072a424d68 100644
--- a/gnu/lib/libdialog/TESTS/tree.c
+++ b/gnu/lib/libdialog/TESTS/tree.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/tree.c,v 1.3 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/TESTS/yesno.c b/gnu/lib/libdialog/TESTS/yesno.c
index 647b51c44fe8c..d0c386169713d 100644
--- a/gnu/lib/libdialog/TESTS/yesno.c
+++ b/gnu/lib/libdialog/TESTS/yesno.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/TESTS/yesno.c,v 1.7 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c
index dc65d755b86e8..663c1e4f9b7fd 100644
--- a/gnu/lib/libdialog/checklist.c
+++ b/gnu/lib/libdialog/checklist.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/checklist.c,v 1.40 2005/01/04 11:30:24 phantom Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index 2e4b8fbaabba4..d797a0b40579d 100644
--- a/gnu/lib/libdialog/dialog.3
+++ b/gnu/lib/libdialog/dialog.3
@@ -11,7 +11,7 @@
 .\" nor does the author assume any responsibility for damages incurred with
 .\" its use.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.28 2005/08/20 10:17:03 trhodes Exp $
 .\"
 .Dd January 1, 2000
 .Dt DIALOG 3
diff --git a/gnu/lib/libdialog/dialog.h b/gnu/lib/libdialog/dialog.h
index 369b139eb80f3..7e2518bfac00f 100644
--- a/gnu/lib/libdialog/dialog.h
+++ b/gnu/lib/libdialog/dialog.h
@@ -22,7 +22,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.23 2007/08/24 16:26:24 ache Exp $
  *
  */
 
diff --git a/gnu/lib/libdialog/gauge.c b/gnu/lib/libdialog/gauge.c
index d8138f6327400..68ae1684fb658 100644
--- a/gnu/lib/libdialog/gauge.c
+++ b/gnu/lib/libdialog/gauge.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/gauge.c,v 1.5 2002/09/09 17:44:08 wollman Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/gnu/lib/libdialog/kernel.c b/gnu/lib/libdialog/kernel.c
index 9ed5eac6fccc6..4e41d137eb637 100644
--- a/gnu/lib/libdialog/kernel.c
+++ b/gnu/lib/libdialog/kernel.c
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/kernel.c,v 1.28 2003/05/03 21:31:08 obrien Exp $");
 
 #define __DIALOG_MAIN__
 
diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c
index a01acd5760880..e4abb95b0bc8d 100644
--- a/gnu/lib/libdialog/menubox.c
+++ b/gnu/lib/libdialog/menubox.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/menubox.c,v 1.38 2004/02/26 01:52:39 eric Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/msgbox.c b/gnu/lib/libdialog/msgbox.c
index 41d78c8284141..295ece87aacd3 100644
--- a/gnu/lib/libdialog/msgbox.c
+++ b/gnu/lib/libdialog/msgbox.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/msgbox.c,v 1.19 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/notify.c b/gnu/lib/libdialog/notify.c
index 7fc22eb355a38..cf1d834fe6b2d 100644
--- a/gnu/lib/libdialog/notify.c
+++ b/gnu/lib/libdialog/notify.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/notify.c,v 1.9 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/prgbox.c b/gnu/lib/libdialog/prgbox.c
index bcafacfc059fe..b885592a479fd 100644
--- a/gnu/lib/libdialog/prgbox.c
+++ b/gnu/lib/libdialog/prgbox.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/prgbox.c,v 1.14 2003/05/03 21:31:08 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index 4b865a63be326..dfe5da11b2f15 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/radiolist.c,v 1.40 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/raw_popen.c b/gnu/lib/libdialog/raw_popen.c
index 163c09a6a1481..af2f4cab7b08d 100644
--- a/gnu/lib/libdialog/raw_popen.c
+++ b/gnu/lib/libdialog/raw_popen.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/raw_popen.c,v 1.5 2003/05/03 21:31:08 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/gnu/lib/libdialog/textbox.c b/gnu/lib/libdialog/textbox.c
index 19a13bbc650e1..147011cd436bb 100644
--- a/gnu/lib/libdialog/textbox.c
+++ b/gnu/lib/libdialog/textbox.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/textbox.c,v 1.22 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libdialog/tree.c b/gnu/lib/libdialog/tree.c
index ceacf05f0e597..2a94c470e4768 100644
--- a/gnu/lib/libdialog/tree.c
+++ b/gnu/lib/libdialog/tree.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/tree.c,v 1.8 2003/05/03 21:31:08 obrien Exp $");
 
 #include <stdlib.h>
 #include <strings.h>
diff --git a/gnu/lib/libdialog/yesno.c b/gnu/lib/libdialog/yesno.c
index 24eb41a27a016..ab6f5c4041350 100644
--- a/gnu/lib/libdialog/yesno.c
+++ b/gnu/lib/libdialog/yesno.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/lib/libdialog/yesno.c,v 1.15 2003/05/03 21:31:08 obrien Exp $");
 
 #include <dialog.h>
 #include "dialog.priv.h"
diff --git a/gnu/lib/libg2c/MAIN.c b/gnu/lib/libg2c/MAIN.c
index 9c6f895b3ae25..09bbd6d71882e 100644
--- a/gnu/lib/libg2c/MAIN.c
+++ b/gnu/lib/libg2c/MAIN.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libg2c/MAIN.c,v 1.2 2000/10/31 11:36:33 obrien Exp $ */
 
 int
 MAIN__(){ return 0; }
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index cb053b2ab61ed..0353ba7f895aa 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.17 2006/03/18 21:37:03 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/lib/libg2c/config.h b/gnu/lib/libg2c/config.h
index c4d0c2860cc37..90f00ca6f0ef0 100644
--- a/gnu/lib/libg2c/config.h
+++ b/gnu/lib/libg2c/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libg2c/config.h,v 1.3 2004/04/20 15:33:00 obrien Exp $ */
 
 /* *****[ libU77 ]***** */
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 82bf504d340ec..2b509eb6d10d5 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index 623a793f00fd1..fde7f64344310 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.5 2007/05/19 04:25:55 kan Exp $
 
 NO_PROFILE=
 .include <bsd.own.mk>
diff --git a/gnu/lib/libgomp/Makefile b/gnu/lib/libgomp/Makefile
index 17f8b46f2411f..c0a58d574e3db 100644
--- a/gnu/lib/libgomp/Makefile
+++ b/gnu/lib/libgomp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.2 2007/05/31 13:21:30 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
diff --git a/gnu/lib/libgomp/config.h b/gnu/lib/libgomp/config.h
index 2616a50beee76..a2b149f4a75d8 100644
--- a/gnu/lib/libgomp/config.h
+++ b/gnu/lib/libgomp/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libgomp/config.h,v 1.1 2007/05/19 04:25:55 kan Exp $ */
 
 /* Define to 1 if the target supports __attribute__((alias(...))). */
 #define HAVE_ATTRIBUTE_ALIAS 1
diff --git a/gnu/lib/libiberty/Makefile b/gnu/lib/libiberty/Makefile
index 17228f85b94f7..dde139d0a2109 100644
--- a/gnu/lib/libiberty/Makefile
+++ b/gnu/lib/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libiberty/Makefile,v 1.4 2002/05/13 10:53:23 ru Exp $
 
 SRCDIR=	${.CURDIR}/../../../contrib/binutils/libiberty
 
diff --git a/gnu/lib/libiberty/config.h b/gnu/lib/libiberty/config.h
index 3db0e3ee7dba7..8ff81744de1cf 100644
--- a/gnu/lib/libiberty/config.h
+++ b/gnu/lib/libiberty/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libiberty/config.h,v 1.1 2001/03/31 07:02:02 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index bc652e4a49f90..e74bab8b1a6e2 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.31.2.2 2007/11/20 20:48:01 kensmith Exp $
 
 OBJCDIR=${.CURDIR}/../../../contrib/libobjc
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 637dcc8a57336..273f41d5cd169 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/Makefile,v 1.34 2000/01/29 12:01:51 obrien Exp $
 
 SUBDIR = history readline
 
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index dcbf208c8cd90..be9174abd4b7c 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.15 2007/06/18 18:47:53 rafan Exp $
 
 SHLIB_MAJOR=7
 RL_LIBRARY_VERSION=5.2
diff --git a/gnu/lib/libreadline/config.h b/gnu/lib/libreadline/config.h
index c13b50c26d398..66c183e33bb76 100644
--- a/gnu/lib/libreadline/config.h
+++ b/gnu/lib/libreadline/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libreadline/config.h,v 1.9 2006/12/31 09:26:00 ache Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Maintained by hand. */
 
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
index 7c8349653c80f..4227026ab82d8 100644
--- a/gnu/lib/libreadline/history/Makefile
+++ b/gnu/lib/libreadline/history/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/history/Makefile,v 1.6 2001/04/21 22:05:30 ache Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/history/doc/Makefile b/gnu/lib/libreadline/history/doc/Makefile
index 4b050e75ad921..d9a24220f3a96 100644
--- a/gnu/lib/libreadline/history/doc/Makefile
+++ b/gnu/lib/libreadline/history/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/history/doc/Makefile,v 1.3 2004/10/18 08:08:03 ache Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index fab4aa230513e..bec78c24dded6 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.13 2004/10/18 08:36:40 ache Exp $
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
index 42254de7fdaa5..4664b4a3d374e 100644
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ b/gnu/lib/libreadline/readline/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libreadline/readline/doc/Makefile,v 1.5 2004/10/18 08:03:38 ache Exp $
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libregex/FREEBSD-upgrade b/gnu/lib/libregex/FREEBSD-upgrade
index d072aafec5fc0..03b6feea308a7 100644
--- a/gnu/lib/libregex/FREEBSD-upgrade
+++ b/gnu/lib/libregex/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/lib/libregex/FREEBSD-upgrade,v 1.3 2005/05/10 12:04:01 tjr Exp $
 
 GNU regex (from glibc):
 
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index a3506d25d496e..763f5843db7fd 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.33 2007/06/18 18:47:53 rafan Exp $
 
 SUBDIR=		doc
 
diff --git a/gnu/lib/libregex/config.h b/gnu/lib/libregex/config.h
index bf7f0a03b8679..3f59c7c2d0d4e 100644
--- a/gnu/lib/libregex/config.h
+++ b/gnu/lib/libregex/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libregex/config.h,v 1.1 2005/05/10 11:37:37 tjr Exp $ */
 
 #define	_REGEX_RE_COMP	1
 #define	HAVE_LANGINFO_H	1
diff --git a/gnu/lib/libregex/doc/Makefile b/gnu/lib/libregex/doc/Makefile
index b812f4445df70..e4c4959330eae 100644
--- a/gnu/lib/libregex/doc/Makefile
+++ b/gnu/lib/libregex/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libregex/doc/Makefile,v 1.5 2001/11/01 07:11:10 obrien Exp $
 
 INFO = regex
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/lib/libregex/gnuregex.h b/gnu/lib/libregex/gnuregex.h
index 7356f9ffbe422..6767df4fa934f 100644
--- a/gnu/lib/libregex/gnuregex.h
+++ b/gnu/lib/libregex/gnuregex.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/lib/libregex/gnuregex.h,v 1.3 2004/02/25 10:56:54 ache Exp $
  */
 
 #ifdef __GNUC__
diff --git a/gnu/lib/libregex/regex.c b/gnu/lib/libregex/regex.c
index df7abe2a42a25..862020b51de11 100644
--- a/gnu/lib/libregex/regex.c
+++ b/gnu/lib/libregex/regex.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.15 2005/05/10 10:52:30 tjr Exp $ */
 /* Extended regular expression matching and search library.
    Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
diff --git a/gnu/lib/libregex/regex.h b/gnu/lib/libregex/regex.h
index 364966d3606bf..240d752464d54 100644
--- a/gnu/lib/libregex/regex.h
+++ b/gnu/lib/libregex/regex.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libregex/regex.h,v 1.5 2004/02/25 02:39:10 ache Exp $ */
 #ifndef _REGEX_H
 #include <posix/regex.h>
 
diff --git a/gnu/lib/libssp/Makefile b/gnu/lib/libssp/Makefile
index 90f2a8a50ad0f..0ed53e389c05d 100644
--- a/gnu/lib/libssp/Makefile
+++ b/gnu/lib/libssp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libssp/Makefile,v 1.2 2007/05/22 10:40:58 ru Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
diff --git a/gnu/lib/libssp/config.h b/gnu/lib/libssp/config.h
index 680f107544545..dc82697d31740 100644
--- a/gnu/lib/libssp/config.h
+++ b/gnu/lib/libssp/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libssp/config.h,v 1.1 2007/05/19 04:25:55 kan Exp $ */
 
 /* Define to 1 if you have the <alloca.h> header file. */
 /* #undef HAVE_ALLOCA_H */
diff --git a/gnu/lib/libssp/libssp_nonshared/Makefile b/gnu/lib/libssp/libssp_nonshared/Makefile
index 1dcd54f6d5574..47335dbeacd52 100644
--- a/gnu/lib/libssp/libssp_nonshared/Makefile
+++ b/gnu/lib/libssp/libssp_nonshared/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libssp/libssp_nonshared/Makefile,v 1.1 2007/05/19 04:25:56 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 43b7ff19246cf..98767ebea59fb 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
diff --git a/gnu/lib/libstdc++/config.h b/gnu/lib/libstdc++/config.h
index 7ff63eb698d05..2cdbb453da128 100644
--- a/gnu/lib/libstdc++/config.h
+++ b/gnu/lib/libstdc++/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.15 2007/05/19 04:25:56 kan Exp $ */
 #ifndef __ISO_C_VISIBLE
 #include <sys/cdefs.h>
 #endif
diff --git a/gnu/lib/libstdc++/doc/Makefile b/gnu/lib/libstdc++/doc/Makefile
index b0285199e051d..9c7d0004fc367 100644
--- a/gnu/lib/libstdc++/doc/Makefile
+++ b/gnu/lib/libstdc++/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libstdc++/doc/Makefile,v 1.7 2002/05/29 21:14:48 obrien Exp $
 
 SRCDIR= ${.CURDIR}/../../../../contrib/libstdc++
 
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index 54e96b8555658..09f7bf680b963 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.9 2007/05/19 04:25:56 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index b54f8409655d0..f46b12fe464da 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.92 2007/01/26 10:19:07 delphij Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc
index 4cec6fe01a452..398952b0f1b9e 100644
--- a/gnu/usr.bin/Makefile.inc
+++ b/gnu/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/Makefile.inc,v 1.5 2002/09/25 09:55:20 markm Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile
index 74419f2d8d224..bf2f33a1df5de 100644
--- a/gnu/usr.bin/bc/Makefile
+++ b/gnu/usr.bin/bc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/bc/Makefile,v 1.26 2006/03/17 18:54:22 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/usr.bin/bc/config.h b/gnu/usr.bin/bc/config.h
index b9e3520ac551f..599feef96c2fd 100644
--- a/gnu/usr.bin/bc/config.h
+++ b/gnu/usr.bin/bc/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/bc/config.h,v 1.7 2001/11/09 17:09:42 ache Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 80c9d29114228..b1e888c6777a6 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $
 
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as ld nm objcopy objdump ranlib readelf \
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 9ce4ca3e5f326..ab7f0215d2c75 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.9 2006/09/12 19:24:01 obrien Exp $
 
 .if (${TARGET_ARCH} == "alpha")
 WARNS?=	2
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index 859a3a8cff3b9..7d8521c18cadb 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.38 2007/02/11 07:15:05 marcel Exp $
 #
 # This is included explicitly at the top of each sub-Makefile.  We can't
 # use the normal "Makefile.inc" mechanism, because we need some of these
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 958afa65d7b05..e12aca5440600 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/addr2line/Makefile,v 1.11 2004/06/16 07:09:33 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index 59031869a25a9..cb6d1683d5cad 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index ea61d0ac70181..d4f43e1660160 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $
 
 
 # BINDIR
diff --git a/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h b/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h
index a0fe73b3c8df2..ef18309db6a81 100644
--- a/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h
+++ b/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h,v 1.1 2003/04/26 03:28:20 obrien Exp $ */
 
 #include "itbl-i386.h"
diff --git a/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h
index 34219a5293f8e..66a236cbe62c9 100644
--- a/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$*/
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h,v 1.1 2003/04/26 03:28:20 obrien Exp $*/
 
 #include "tc-i386.h"
diff --git a/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h
index ac410744deb03..4ebf6572c8f68 100644
--- a/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h,v 1.1 2006/09/14 06:39:07 imp Exp $ */
 
 #include "tc-arm.h"
diff --git a/gnu/usr.bin/binutils/as/config.h b/gnu/usr.bin/binutils/as/config.h
index 35986130f1942..a8639296e2c59 100644
--- a/gnu/usr.bin/binutils/as/config.h
+++ b/gnu/usr.bin/binutils/as/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/config.h,v 1.1 2004/07/08 17:05:30 obrien Exp $ */
 
 #define HAVE_DECL_GETOPT 1
 
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
index a0a6360d68e08..35172e8432423 100644
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h,v 1.1 2001/10/15 02:12:09 obrien Exp $ */
 
 #include "tc-ia64.h"
diff --git a/gnu/usr.bin/binutils/as/obj-format.h b/gnu/usr.bin/binutils/as/obj-format.h
index 02a3030e1ad34..773a26a71628c 100644
--- a/gnu/usr.bin/binutils/as/obj-format.h
+++ b/gnu/usr.bin/binutils/as/obj-format.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/obj-format.h,v 1.1 2001/10/15 01:43:21 obrien Exp $ */
 
 #include "obj-elf.h"
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h
index b55da9afd1aa9..2719c1d0580e0 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h,v 1.2 2002/05/18 04:50:32 obrien Exp $ */
 
 /* Values for processors will be from 0 to NUMBER_OF_PROCESSORS-1 */
 #define NUMBER_OF_PROCESSORS 1
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h
index 891bd6cabaf1b..ee364d8370ed2 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h,v 1.2 2002/05/18 04:50:32 obrien Exp $ */
 
 #include "tc-ppc.h"
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h
index 46e43130fc111..199ca9a0d565e 100644
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h
+++ b/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-cpu.h,v 1.3 2002/03/15 07:45:42 obrien Exp $ */
 
 #include "tc-sparc.h"
diff --git a/gnu/usr.bin/binutils/as/targ-env.h b/gnu/usr.bin/binutils/as/targ-env.h
index 8e14d63ff12d4..00894448e63b3 100644
--- a/gnu/usr.bin/binutils/as/targ-env.h
+++ b/gnu/usr.bin/binutils/as/targ-env.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/targ-env.h,v 1.1 2001/10/15 01:43:21 obrien Exp $ */
 
 #include "te-freebsd.h"
diff --git a/gnu/usr.bin/binutils/as/tc-sparc-fixed.c b/gnu/usr.bin/binutils/as/tc-sparc-fixed.c
index 8088fa8a97fc5..afd62aca4d998 100644
--- a/gnu/usr.bin/binutils/as/tc-sparc-fixed.c
+++ b/gnu/usr.bin/binutils/as/tc-sparc-fixed.c
@@ -19,7 +19,7 @@
    to the Free Software Foundation, 51 Franklin Street - Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/tc-sparc-fixed.c,v 1.1 2006/10/09 04:52:14 kmacy Exp $ */
 
 #include <stdio.h>
 
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index b271f19b0a622..5b9638702eb75 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.21 2004/06/25 06:55:49 marcel Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index 51ea9d9ec4791..36d3fb370742e 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gasp/Makefile,v 1.20 2004/03/17 18:38:07 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gasp/gasp.1 b/gnu/usr.bin/binutils/gasp/gasp.1
index 5aaff9a165bba..2263a2068a4bd 100644
--- a/gnu/usr.bin/binutils/gasp/gasp.1
+++ b/gnu/usr.bin/binutils/gasp/gasp.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/binutils/gasp/gasp.1,v 1.4 2005/01/09 19:54:23 ru Exp $
 .\"
 .Dd December 29, 1999
 .Dt GASP 1
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index ecf8cce33ed9e..c7b7b30ce559c 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,5 +1,5 @@
 # ex:ts=8
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.82 2004/12/21 09:59:40 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha
index e05dd278a82a7..038d3bd6f37dd 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.alpha
+++ b/gnu/usr.bin/binutils/gdb/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.8 2002/10/11 19:39:18 obrien Exp $
 
 XSRCS+=	alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.arm b/gnu/usr.bin/binutils/gdb/Makefile.arm
index 3a8bcff9b135e..c70b9e03d8a26 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.arm
+++ b/gnu/usr.bin/binutils/gdb/Makefile.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.arm,v 1.1 2002/06/29 03:18:28 obrien Exp $
 
 XSRCS+=	armnbsd-nat.c armnbsd-tdep.c arm-tdep.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.i386 b/gnu/usr.bin/binutils/gdb/Makefile.i386
index 14e7a3fe78564..1358dd774d38b 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.i386
+++ b/gnu/usr.bin/binutils/gdb/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.7 2002/10/11 19:39:18 obrien Exp $
 
 XSRCS+=	i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \
 	i387-nat.c i387-tdep.c \
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.ia64 b/gnu/usr.bin/binutils/gdb/Makefile.ia64
index 08283c7344b09..a591d6e6bdbc8 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.ia64
+++ b/gnu/usr.bin/binutils/gdb/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.ia64,v 1.1 2002/06/29 03:18:28 obrien Exp $
 
 XSRCS+=	ia64-tdep.c ia64-fbsd-nat.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.powerpc b/gnu/usr.bin/binutils/gdb/Makefile.powerpc
index b5f9778667a39..9d076ee9e61ed 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/gdb/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.powerpc,v 1.1 2002/06/29 03:18:28 obrien Exp $
 
 XSRCS+=	ppcnbsd-nat.c ppc-tdep.c \
 	core-regset.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.sparc64 b/gnu/usr.bin/binutils/gdb/Makefile.sparc64
index 5eb0f2ec7dfe1..08802720202a6 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/gdb/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.sparc64,v 1.1 2002/06/29 03:16:40 obrien Exp $
 
 XSRCS+=	sparc-nat.c sparc-tdep.c
 CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_sparc_vec
diff --git a/gnu/usr.bin/binutils/gdb/config.h b/gnu/usr.bin/binutils/gdb/config.h
index a5731261b088f..4b6c77e1972e1 100644
--- a/gnu/usr.bin/binutils/gdb/config.h
+++ b/gnu/usr.bin/binutils/gdb/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.8 2002/10/20 07:50:19 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
index 6b5cf20a8527d..dae50b1619aa0 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_ALPHA_H
 #define FBSD_KGDB_ALPHA_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h
index ee62200abb770..6f69176b955a9 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h,v 1.1 2004/01/26 09:17:26 obrien Exp $ */
 
 #ifndef FBSD_KGDB_AMD64_H
 #define FBSD_KGDB_AMD64_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
index 5896125f03c8b..99dad1bb37b06 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_ARM_H
 #define FBSD_KGDB_ARM_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
index 3196316d83b91..ba91221d7fe83 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.5 2004/01/26 19:40:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_I386_H
 #define FBSD_KGDB_I386_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
index 8f198fdfa1b3f..78ab8801a3f8b 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_IA64_H
 #define FBSD_KGDB_IA64_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
index c6821e109e55e..7279bace3741b 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_POWERPC_H
 #define FBSD_KGDB_POWERPC_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
index 56fd480deffab..c2b243d0d2b77 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h,v 1.2 2004/01/26 09:18:47 obrien Exp $ */
 
 #ifndef FBSD_KGDB_SPARC64_H
 #define FBSD_KGDB_SPARC64_H
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h
index e7744363106f5..818cb86b4b7d1 100644
--- a/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h
@@ -1,5 +1,5 @@
 /* Native-kernel debugging definitions for FreeBSD.
- * $FreeBSD$ 
+ * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.4 2003/03/21 00:30:53 iedowse Exp $ 
  */
 
 #ifndef FBSD_KGDB_H
diff --git a/gnu/usr.bin/binutils/gdb/freebsd-uthread.c b/gnu/usr.bin/binutils/gdb/freebsd-uthread.c
index 0974c3ee04fc6..6cb9579cca822 100644
--- a/gnu/usr.bin/binutils/gdb/freebsd-uthread.c
+++ b/gnu/usr.bin/binutils/gdb/freebsd-uthread.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.11 2003/11/12 08:33:18 obrien Exp $ */
 
 /* This module implements a sort of half target that sits between the
    machine-independent parts of GDB and the ptrace interface (infptrace.c) to
diff --git a/gnu/usr.bin/binutils/gdb/gdb.1 b/gnu/usr.bin/binutils/gdb/gdb.1
index b6cd3cc47d763..31f7c7f1d3e89 100644
--- a/gnu/usr.bin/binutils/gdb/gdb.1
+++ b/gnu/usr.bin/binutils/gdb/gdb.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/binutils/gdb/gdb.1,v 1.7 1999/08/27 23:34:49 peter Exp $
 .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h b/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h
index 11260acec53a4..e89736562677c 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h,v 1.1 2004/06/11 16:09:38 obrien Exp $");
 
 #include "alpha/tm-alpha.h"
 
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h b/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h
index b7e4a204108de..d4de0223eb7d6 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h,v 1.1 2004/06/11 16:09:38 obrien Exp $");
 
 #include <machine/frame.h>
 
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h b/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h
index 52ed91cf09381..31f1f9c5aeeeb 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h,v 1.1 2004/06/11 16:09:38 obrien Exp $");
 
 #define	SPARC_INTREG_SIZE	8
 
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
index 93395a7f9040c..6401c20f3a3ce 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.49 2004/06/11 16:09:38 obrien Exp $");
 
 /*
  * This works like "remote" but, you use it like this:
diff --git a/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c b/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c
index 190e6e6687164..b986b547bee80 100644
--- a/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c
+++ b/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c,v 1.2 2003/10/29 14:40:59 simokawa Exp $ */
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile
index 107051a118739..145210346ecb7 100644
--- a/gnu/usr.bin/binutils/gdbreplay/Makefile
+++ b/gnu/usr.bin/binutils/gdbreplay/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/gdbreplay/Makefile,v 1.15 2004/12/21 08:46:58 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 7774822774351..b7f87e0e8b29d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.32 2007/09/26 01:31:28 marcel Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 06a14bd00bfd9..2800551608117 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.alpha,v 1.23 2006/07/22 14:37:17 obrien Exp $
 
 NATIVE_EMULATION= elf64alpha_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.amd64 b/gnu/usr.bin/binutils/ld/Makefile.amd64
index 8a0812925bffd..8d06c00ed5f74 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.amd64,v 1.8 2006/07/22 14:37:17 obrien Exp $
 
 NATIVE_EMULATION= elf_x86_64_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.arm b/gnu/usr.bin/binutils/ld/Makefile.arm
index b4d9d69e27749..06052ebd83557 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.arm
+++ b/gnu/usr.bin/binutils/ld/Makefile.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.arm,v 1.3 2006/09/14 07:44:05 imp Exp $
 
 .if defined(TARGET_BIG_ENDIAN)
 NATIVE_EMULATION= armelfb_fbsd
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 784b31a6d6431..9288072f99e7a 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.i386,v 1.23 2006/07/22 14:37:17 obrien Exp $
 
 NATIVE_EMULATION= elf_i386_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
index 3454a091c5c87..e1813d8576e52 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ b/gnu/usr.bin/binutils/ld/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.ia64,v 1.10 2006/07/22 14:37:17 obrien Exp $
 
 NATIVE_EMULATION= elf64_ia64_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index 4eaac084d9e46..7ff98c2f63b03 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.16 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION=	elf32ppc
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index 14126e38387d4..6722c62cd0493 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.sparc64,v 1.16 2004/07/08 17:05:32 obrien Exp $
 
 NATIVE_EMULATION= elf64_sparc_fbsd
 
diff --git a/gnu/usr.bin/binutils/ld/armelf_fbsd.sh b/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
index 197180c8bd09e..3a9c4476f9add 100644
--- a/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
+++ b/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh,v 1.1 2006/09/14 07:46:32 imp Exp $
 . ${srcdir}/emulparams/armelf.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
 MAXPAGESIZE=0x8000
diff --git a/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh b/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
index a67fb3820d7c8..a08c1200fcdc8 100644
--- a/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
+++ b/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh,v 1.1 2006/09/14 07:46:32 imp Exp $
 #XXX: This should be used once those bits are merged back in the FSF repo.
 #. ${srcdir}/emulparams/armelf_fbsd.sh
 #
diff --git a/gnu/usr.bin/binutils/ld/config.h b/gnu/usr.bin/binutils/ld/config.h
index c645f91ea2ec2..08cc1f42a9524 100644
--- a/gnu/usr.bin/binutils/ld/config.h
+++ b/gnu/usr.bin/binutils/ld/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/ld/config.h,v 1.8 2004/06/16 07:09:37 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/ld/genscripts.sh b/gnu/usr.bin/binutils/ld/genscripts.sh
index 20d1022a46fdb..c7f87c01e78d7 100755
--- a/gnu/usr.bin/binutils/ld/genscripts.sh
+++ b/gnu/usr.bin/binutils/ld/genscripts.sh
@@ -9,7 +9,7 @@
 # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.9 2007/09/19 14:19:32 obrien Exp $
 #
 # This is a cut-down version of the GNU script. Instead of jumping through
 # hoops for all possible combinations of paths, just use the libdir
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index c90281ad0c599..17985b938521e 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.33 2004/10/24 15:32:25 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 5d413fa78f62f..83b9370e2b826 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.13 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_alpha_freebsd_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.amd64 b/gnu/usr.bin/binutils/libbfd/Makefile.amd64
index abe8d6be36b04..ed96e16b11234 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.4 2004/07/08 17:05:32 obrien Exp $
 
 .include "${.CURDIR}/Makefile.i386"
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.arm b/gnu/usr.bin/binutils/libbfd/Makefile.arm
index 7349375694f9b..35ab1bafb8e41 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.arm
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.8 2006/09/14 08:21:20 imp Exp $
 
 .if defined(TARGET_BIG_ENDIAN)
 DEFAULT_VECTOR=	bfd_elf32_bigarm_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index 7ab33ddb04043..be5916d54ee12 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf32_i386_freebsd_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
index d45f7913f80c5..d49f3f3e7ed54 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.9 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_ia64_little_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index aa3e4f477a0ea..52ddf0059feeb 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.9 2006/08/24 02:36:21 marcel Exp $
 
 ARCHS+=	rs6000
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index 9a3fc03d4f2b1..246cd5a98272a 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.11 2004/07/08 17:05:32 obrien Exp $
 
 DEFAULT_VECTOR=	bfd_elf64_sparc_vec
 
diff --git a/gnu/usr.bin/binutils/libbfd/bfd.h b/gnu/usr.bin/binutils/libbfd/bfd.h
index 570927fb11ca7..e49cb0c23da97 100644
--- a/gnu/usr.bin/binutils/libbfd/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/bfd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */
 
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
    generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", 
diff --git a/gnu/usr.bin/binutils/libbfd/config.h.fbsd b/gnu/usr.bin/binutils/libbfd/config.h.fbsd
index 1864ef5f3dfee..0dd687841af40 100644
--- a/gnu/usr.bin/binutils/libbfd/config.h.fbsd
+++ b/gnu/usr.bin/binutils/libbfd/config.h.fbsd
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.6 2004/06/19 19:25:33 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c b/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
index 526ba8cfb2c11..fd885b9061e62 100644
--- a/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
+++ b/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c,v 1.1 2003/04/26 03:28:21 obrien Exp $
  */
 
 #include "bfd.h"
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index d8dc0469f5f00..38421d4e97e0b 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.22 2004/10/24 15:32:26 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libbinutils/config.h b/gnu/usr.bin/binutils/libbinutils/config.h
index 1b35139f1c667..1d76a4f21b958 100644
--- a/gnu/usr.bin/binutils/libbinutils/config.h
+++ b/gnu/usr.bin/binutils/libbinutils/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/config.h,v 1.12 2004/06/16 07:09:40 obrien Exp $ */
 
 /* FreeBSD isn't any form of AIX. */
 #define bin_dummy_emulation bin_vanilla_emulation
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 292d1fcbe7339..e231c582043b3 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.24 2005/02/14 12:10:13 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libiberty/config.h b/gnu/usr.bin/binutils/libiberty/config.h
index 190bee5e47c0c..2ea0adbe7db65 100644
--- a/gnu/usr.bin/binutils/libiberty/config.h
+++ b/gnu/usr.bin/binutils/libiberty/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.9 2006/11/06 02:32:29 obrien Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index a2b271201d05a..4fbe5d21809c9 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile,v 1.10 2004/10/24 15:32:26 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index 03d911dbd73be..5dee51c5c1770 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.alpha,v 1.4 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	alpha-dis.c alpha-opc.c
 CFLAGS+= -DARCH_alpha
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
index 5b1ce3a96896d..21e5fd601561b 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.amd64,v 1.3 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	i386-dis.c
 CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.arm b/gnu/usr.bin/binutils/libopcodes/Makefile.arm
index 67bb751db4779..5c6183e673925 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.arm
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.arm,v 1.2 2006/07/22 14:59:50 obrien Exp $
 
 SRCS+=	arm-dis.c
 CFLAGS+= -DARCH_arm
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
index 5b1ce3a96896d..889c076e92364 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.i386
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.i386,v 1.3 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	i386-dis.c
 CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
index 98198cdea1095..ca4238b74e929 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.ia64,v 1.1 2001/10/15 02:12:08 obrien Exp $
 
 SRCS+=	ia64-dis.c ia64-opc.c
 CFLAGS+= -DARCH_ia64
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.m68k b/gnu/usr.bin/binutils/libopcodes/Makefile.m68k
index 927e2a1ea5cb2..e0e1f6aa45427 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.m68k
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.m68k
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.m68k,v 1.1 1999/11/06 21:02:48 jb Exp $
 #
 
 SRCS+=		m68k-dis.c m68k-opc.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
index cc010ec4a3060..72345b269b806 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc,v 1.2 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	ppc-dis.c ppc-opc.c
 CFLAGS+= -DARCH_powerpc -DARCH_rs6000
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc
index 190b76621cc0f..ac2e8b4b6ba70 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.sparc,v 1.1 1999/11/06 21:02:48 jb Exp $
 #
 
 SRCS+=		sparc-dis.c sparc-opc.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64 b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
index e795ad494bba7..28d1abce36206 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64,v 1.3 2001/10/14 01:27:57 obrien Exp $
 
 SRCS+=	sparc-dis.c sparc-opc.c
 CFLAGS+= -DARCH_sparc
diff --git a/gnu/usr.bin/binutils/libopcodes/config.h b/gnu/usr.bin/binutils/libopcodes/config.h
index 9ad1fc8c3bb35..4b70bbc6598e2 100644
--- a/gnu/usr.bin/binutils/libopcodes/config.h
+++ b/gnu/usr.bin/binutils/libopcodes/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libopcodes/config.h,v 1.8 2004/06/16 07:09:41 obrien Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 4da4bb2d04235..b7b0def22326f 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/nm/Makefile,v 1.13 2004/06/16 07:09:41 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index 977e1d86aece3..2d90148ab233f 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/objcopy/Makefile,v 1.12 2004/06/16 07:09:42 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index e86d9cac5ec94..39d139bf7131a 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.14 2004/06/16 07:09:42 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index 8edfa01bb13bb..cc3487242db24 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index 8a50e06304e0e..bc32402c95479 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/readelf/Makefile,v 1.10 2004/06/16 07:09:43 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index dc1f896fb7e6e..1c6d4ea35db84 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/size/Makefile,v 1.12 2004/06/16 07:09:43 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 0f80db4a4a8bf..04128cf91d04f 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/strings/Makefile,v 1.12 2004/06/16 07:09:44 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index a3ed45aeafe0b..40f0619481cd5 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.17 2004/06/16 07:09:44 obrien Exp $
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/update.sh b/gnu/usr.bin/binutils/update.sh
index 976cf3ec61c66..1042226bb8ccd 100755
--- a/gnu/usr.bin/binutils/update.sh
+++ b/gnu/usr.bin/binutils/update.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/binutils/update.sh,v 1.4 2000/12/15 20:11:28 obrien Exp $
 #
 # This script installs the main files generated by the binutils
 # "configure" scripts and makefiles.  It can be used for upgrading to
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index d08b723b93a89..5702f6b329e1a 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.41 2007/05/19 04:25:56 kan Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/usr.bin/cc/Makefile.fe b/gnu/usr.bin/cc/Makefile.fe
index d9c5fe58574ec..5b23f30f78c1d 100644
--- a/gnu/usr.bin/cc/Makefile.fe
+++ b/gnu/usr.bin/cc/Makefile.fe
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.fe,v 1.5 2007/05/19 04:25:56 kan Exp $
 
 #	Front-end-only bits
 
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 2281f74de1e86..4f4fdcc45d0dc 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.inc,v 1.66 2007/05/19 04:25:56 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index d044a471870eb..9ddd8c077c399 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.11 2007/05/19 04:25:56 kan Exp $
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
diff --git a/gnu/usr.bin/cc/Makefile.ver b/gnu/usr.bin/cc/Makefile.ver
index c3b8c4a6f99d3..dada8280ac317 100644
--- a/gnu/usr.bin/cc/Makefile.ver
+++ b/gnu/usr.bin/cc/Makefile.ver
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.ver,v 1.1 2007/05/19 04:25:56 kan Exp $
 
 BASEVER!=	cat ${GCCDIR}/BASE-VER
 DATESTAMP!=	cat ${GCCDIR}/DATESTAMP
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index d661d0d731e5d..f88c63479ddb0 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.24 2007/05/19 04:25:56 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index 03ad7c25dbbc8..a196b8d728235 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.22 2007/05/19 04:25:57 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 03ac2d1981c19..75dd44f537ffe 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.33 2007/05/19 04:25:57 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index c65acd28ecec5..b769501271fdb 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.35 2007/05/19 04:25:57 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 8baf9d6df9784..005ac389fc47d 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.28 2007/05/19 04:25:57 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 964d20fd46d19..94ea05b01f565 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.39 2007/05/19 04:25:57 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index a7ec17c064105..1bd429f1500a9 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.ver"
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 8366a8a4144d1..056620dfc1c29 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88 2007/05/28 00:25:07 kan Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile.dep b/gnu/usr.bin/cc/cc_tools/Makefile.dep
index 5d132af6020bf..6be6b1a8be9c9 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile.dep
+++ b/gnu/usr.bin/cc/cc_tools/Makefile.dep
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile.dep,v 1.1 2007/05/19 04:25:58 kan Exp $
 
 errors.o: bconfig.h auto-host.h
 
diff --git a/gnu/usr.bin/cc/cc_tools/arm.md.diff b/gnu/usr.bin/cc/cc_tools/arm.md.diff
index f395b20ba223c..097588562b6d1 100644
--- a/gnu/usr.bin/cc/cc_tools/arm.md.diff
+++ b/gnu/usr.bin/cc/cc_tools/arm.md.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.2 2006/11/06 02:49:19 obrien Exp $
 Index: arm.md
 ===================================================================
 RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/arm.md,v
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 0ed3e972c58f2..2bcc70a533d88 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -1,6 +1,6 @@
 /* auto-host.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.21 2007/10/08 18:59:34 marius Exp $ */
 
 /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
 #ifndef USED_FOR_TARGET
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index f7987092b8494..cf0b455c5f3dd 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.28 2007/05/19 04:25:58 kan Exp $ */
 
 /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
    source tree so it can be configured appropriately without using
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd.opt b/gnu/usr.bin/cc/cc_tools/freebsd.opt
index f71a5058b9ecf..ebf6ec96a8eeb 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd.opt
+++ b/gnu/usr.bin/cc/cc_tools/freebsd.opt
@@ -1,4 +1,4 @@
-; $FreeBSD$
+; $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd.opt,v 1.1 2007/05/19 04:25:58 kan Exp $
 
 fformat-extensions
 Common Report Var(flag_format_extensions) Init(0)
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
index 23f14d1e088d7..bbdca350d29cb 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
@@ -3,7 +3,7 @@
  * function name.  In order to avoid touching vendor source while gcc3.4
  * is in progress, try a minimal workaround.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h,v 1.1 2004/06/10 22:18:33 peter Exp $
  */
 #undef MCOUNT_NAME
 #define MCOUNT_NAME ".mcount"
diff --git a/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt b/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
index ca71a8bb5685b..9a0ff8386280f 100644
--- a/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
+++ b/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
@@ -1,4 +1,4 @@
-; $FreeBSD$
+; $FreeBSD: src/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt,v 1.1 2007/05/19 04:25:58 kan Exp $
 
 mno-align-long-strings
 Target RejectNegative Report Mask(NO_ALIGN_LONG_STRINGS)
diff --git a/gnu/usr.bin/cc/cc_tools/size-host.h b/gnu/usr.bin/cc/cc_tools/size-host.h
index 8d5136f654194..0f6a37ed2fdc6 100644
--- a/gnu/usr.bin/cc/cc_tools/size-host.h
+++ b/gnu/usr.bin/cc/cc_tools/size-host.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/size-host.h,v 1.1 2007/05/19 04:25:58 kan Exp $ */
 
 #ifdef	SIZEOF_INT
 # undef	SIZEOF_INT
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 5aa9e35f4e0ba..0cf7032baa8c6 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.9 2004/12/21 08:46:59 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 4193bd47b2eaf..2861c9453c774 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.27 2007/05/19 04:25:58 kan Exp $
 
 
 .include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index 41397690bb137..f98641eb33e8c 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/doc/Makefile,v 1.14 2007/05/19 04:25:58 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.ver"
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index 9160391bc9157..90d614313aa0b 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.22 2007/03/12 00:28:06 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile
index 8d0909270e395..12d446c40d4be 100644
--- a/gnu/usr.bin/cc/f771/Makefile
+++ b/gnu/usr.bin/cc/f771/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f771/Makefile,v 1.13 2004/12/21 08:46:59 ru Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile
index 5e0808d355f5c..618aa7420244a 100644
--- a/gnu/usr.bin/cc/f77doc/Makefile
+++ b/gnu/usr.bin/cc/f77doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/f77doc/Makefile,v 1.5 2003/07/01 14:46:26 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/gcov/Makefile b/gnu/usr.bin/cc/gcov/Makefile
index f48d177521646..f99186828666d 100644
--- a/gnu/usr.bin/cc/gcov/Makefile
+++ b/gnu/usr.bin/cc/gcov/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/gcov/Makefile,v 1.5 2007/05/19 04:25:58 kan Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.ver"
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index 875cc1f1f9e0e..5bc97681b227d 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.9 2007/05/19 04:25:59 kan Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/libcpp/Makefile b/gnu/usr.bin/cc/libcpp/Makefile
index 23bc26e2a2281..089c55169e42a 100644
--- a/gnu/usr.bin/cc/libcpp/Makefile
+++ b/gnu/usr.bin/cc/libcpp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/libcpp/Makefile,v 1.1 2007/05/19 04:25:59 kan Exp $
 
 # Use our headers in preference to ones from ../cc_tools.
 CFLAGS+=	-I${.CURDIR} -I.
diff --git a/gnu/usr.bin/cc/libcpp/config.h b/gnu/usr.bin/cc/libcpp/config.h
index 5577f2840df3f..131b06e3e0b82 100644
--- a/gnu/usr.bin/cc/libcpp/config.h
+++ b/gnu/usr.bin/cc/libcpp/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/libcpp/config.h,v 1.1 2007/05/19 04:25:59 kan Exp $ */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
diff --git a/gnu/usr.bin/cc/libdecnumber/Makefile b/gnu/usr.bin/cc/libdecnumber/Makefile
index 82df5a9c4b07e..2007a94912f7d 100644
--- a/gnu/usr.bin/cc/libdecnumber/Makefile
+++ b/gnu/usr.bin/cc/libdecnumber/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/libdecnumber/Makefile,v 1.1 2007/05/19 04:25:59 kan Exp $
 
 # Use our headers in preference to ones from ../cc_tools.
 CFLAGS+=	-I${.CURDIR} -I.
diff --git a/gnu/usr.bin/cc/libdecnumber/config.h b/gnu/usr.bin/cc/libdecnumber/config.h
index 53b586f254d70..bad2b1a9714f0 100644
--- a/gnu/usr.bin/cc/libdecnumber/config.h
+++ b/gnu/usr.bin/cc/libdecnumber/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/libdecnumber/config.h,v 1.1 2007/05/19 04:25:59 kan Exp $ */
 
 /* Define to 1 if you have the <ctype.h> header file. */
 #define HAVE_CTYPE_H 1
diff --git a/gnu/usr.bin/cc/libiberty/Makefile b/gnu/usr.bin/cc/libiberty/Makefile
index 7446793670e92..f870a6ec6eebd 100644
--- a/gnu/usr.bin/cc/libiberty/Makefile
+++ b/gnu/usr.bin/cc/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/libiberty/Makefile,v 1.1 2007/05/19 04:25:59 kan Exp $
 
 #
 # Make sure we will pick up our config.h file first, not the one from
diff --git a/gnu/usr.bin/cc/libiberty/config.h b/gnu/usr.bin/cc/libiberty/config.h
index 0fc8ed6ebb571..6f1e8dc2b39f2 100644
--- a/gnu/usr.bin/cc/libiberty/config.h
+++ b/gnu/usr.bin/cc/libiberty/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.1 2007/05/19 04:25:59 kan Exp $ */
 
 /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
    This function is required for alloca.c support on those systems. */
diff --git a/gnu/usr.bin/cc/protoize/Makefile b/gnu/usr.bin/cc/protoize/Makefile
index acd970058d632..0a992a3c3721e 100644
--- a/gnu/usr.bin/cc/protoize/Makefile
+++ b/gnu/usr.bin/cc/protoize/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cc/protoize/Makefile,v 1.3 2004/12/21 08:46:59 ru Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 2d1e575565c73..12ff666a13d99 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.12 2005/10/06 09:49:37 tjr Exp $
 
 CPIODIR= ${.CURDIR}/../../../contrib/cpio
 .PATH: ${CPIODIR}/lib ${CPIODIR}/src ${CPIODIR}/doc
diff --git a/gnu/usr.bin/cpio/config.h b/gnu/usr.bin/cpio/config.h
index 133e5ad86fb22..8b14d59953c6f 100644
--- a/gnu/usr.bin/cpio/config.h
+++ b/gnu/usr.bin/cpio/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cpio/config.h,v 1.1 2005/10/01 04:57:01 tjr Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
diff --git a/gnu/usr.bin/cpio/doc/Makefile b/gnu/usr.bin/cpio/doc/Makefile
index 220de5fdf8230..0acc014959712 100644
--- a/gnu/usr.bin/cpio/doc/Makefile
+++ b/gnu/usr.bin/cpio/doc/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cpio/doc/Makefile,v 1.4 2005/10/01 04:57:01 tjr Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/cpio/doc
 
diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index dc41a73ad96a5..08726b7a7b567 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.16 2005/06/03 15:08:29 imp Exp $
 
 SUBDIR = lib libdiff cvs contrib cvsbug doc
 
diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index 4acfa0b9cd7a3..dd09976099b1a 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/Makefile.inc,v 1.6 2005/06/10 06:12:50 des Exp $
 
 .if !defined(CVSDIR)
 
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 56e026d6b33a5..71b6004c1b6d9 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.18 2005/06/03 15:08:29 imp Exp $
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl
index d2669578fdb9d..cece2c0c50ff3 100644
--- a/gnu/usr.bin/cvs/contrib/easy-import.pl
+++ b/gnu/usr.bin/cvs/contrib/easy-import.pl
@@ -8,7 +8,7 @@
 #
 # Written by Jörg Wunsch, 95/03/07, and placed in the public domain.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/easy-import.pl,v 1.16 1999/09/05 17:35:31 peter Exp $
 
 require "complete.pl";
 require "getopts.pl";
@@ -22,7 +22,7 @@ sub scan_opts
 
     $dont_do_it = "-n" if $opt_n;
     if($opt_v) {
-	print STDERR '$FreeBSD$' . "\n"; # 'emacs kludge
+	print STDERR '$FreeBSD: src/gnu/usr.bin/cvs/contrib/easy-import.pl,v 1.16 1999/09/05 17:35:31 peter Exp $' . "\n"; # 'emacs kludge
 	exit 0;
     }
     die "usage: $0 [-v] [-n] [moduledir]\n" .
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index c5e2ff1f32d89..167066af5ac73 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.52 2006/03/17 18:54:23 ru Exp $
 
 .include <bsd.own.mk>
 .include "${.CURDIR}/../Makefile.inc"
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.c b/gnu/usr.bin/cvs/cvs/prepend_args.c
index 12322ce48bdf9..fa1c47d8ef4e7 100644
--- a/gnu/usr.bin/cvs/cvs/prepend_args.c
+++ b/gnu/usr.bin/cvs/cvs/prepend_args.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/cvs/prepend_args.c,v 1.3 2002/09/02 06:09:03 peter Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.h b/gnu/usr.bin/cvs/cvs/prepend_args.h
index 6708442ec1240..b4cfb042f003a 100644
--- a/gnu/usr.bin/cvs/cvs/prepend_args.h
+++ b/gnu/usr.bin/cvs/cvs/prepend_args.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/cvs/prepend_args.h,v 1.2 2002/09/02 06:09:03 peter Exp $ */
 
 /* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
    current GNU coding standards requires.  Older GNU code used the "PROTO"
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index ad07f39f5b6ca..112c5995d6e56 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.23 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index ade0e8b3e2baf..3e3534f24e656 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/doc/Makefile,v 1.15 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 3a04eef1fd79d..35991e08c7137 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.28 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index adea88889770f..4623c9579f46f 100644
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ b/gnu/usr.bin/cvs/lib/config.h.proto
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.17 2003/07/07 19:13:39 obrien Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index 7fd67a43fec57..4c61a2c13cb83 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/cvs/libdiff/Makefile,v 1.10 2005/06/03 15:08:30 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/dc/Makefile b/gnu/usr.bin/dc/Makefile
index 12de718b8f8fe..1ec66d504e035 100644
--- a/gnu/usr.bin/dc/Makefile
+++ b/gnu/usr.bin/dc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dc/Makefile,v 1.12 2004/02/17 01:34:53 ache Exp $
 
 BCDIR=	${.CURDIR}/../../../contrib/bc
 
diff --git a/gnu/usr.bin/dc/doc/Makefile b/gnu/usr.bin/dc/doc/Makefile
index 2b3d553efb8af..3cc009d42e701 100644
--- a/gnu/usr.bin/dc/doc/Makefile
+++ b/gnu/usr.bin/dc/doc/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright Andreas Klemm <andreas@FreeBSD.ORG> 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dc/doc/Makefile,v 1.4 1999/08/27 23:35:31 peter Exp $
 
 .PATH:	${.CURDIR}/../../../../contrib/bc/doc
 
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index 8e50ad3bd0d7e..98ccf318fc34e 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for dialog
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dialog/Makefile,v 1.13 2006/03/17 18:54:23 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/gnu/usr.bin/dialog/TESTS/Makefile b/gnu/usr.bin/dialog/TESTS/Makefile
index 39eb15e23a2c5..215266dba4c6a 100644
--- a/gnu/usr.bin/dialog/TESTS/Makefile
+++ b/gnu/usr.bin/dialog/TESTS/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/dialog/TESTS/Makefile,v 1.5 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 FILES=		README checklist ftreebox infobox inputbox menubox msgbox \
diff --git a/gnu/usr.bin/dialog/TESTS/README b/gnu/usr.bin/dialog/TESTS/README
index 951fe3b597d6d..79cea96b02b79 100644
--- a/gnu/usr.bin/dialog/TESTS/README
+++ b/gnu/usr.bin/dialog/TESTS/README
@@ -12,4 +12,4 @@ textbox		- simple text box
 treebox		- tree box
 yesno		- yes/no dialog
 
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/dialog/TESTS/README,v 1.1 2000/01/07 13:35:10 phantom Exp $
diff --git a/gnu/usr.bin/dialog/dialog.1 b/gnu/usr.bin/dialog/dialog.1
index 99823f1ce0c4a..02f5d21583efc 100644
--- a/gnu/usr.bin/dialog/dialog.1
+++ b/gnu/usr.bin/dialog/dialog.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/dialog/dialog.1,v 1.8 2006/02/07 20:14:07 jkim Exp $
 .TH DIALOG 1 "2 October 1998"
 .SH NAME
 dialog \- display dialog boxes from shell scripts
diff --git a/gnu/usr.bin/dialog/dialog.c b/gnu/usr.bin/dialog/dialog.c
index dcbf19d271d44..7c7e6c3d214c0 100644
--- a/gnu/usr.bin/dialog/dialog.c
+++ b/gnu/usr.bin/dialog/dialog.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/dialog/dialog.c,v 1.15 2006/02/07 20:14:07 jkim Exp $
  *
  *
  *  HISTORY:
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index d1ba0028f0df1..071a0f74ab038 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.17 2007/06/15 07:09:33 delphij Exp $
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH: ${DIFFSRC} \
diff --git a/gnu/usr.bin/diff/context.c.diff b/gnu/usr.bin/diff/context.c.diff
index ee1ab21165dd9..6efe7335a81df 100644
--- a/gnu/usr.bin/diff/context.c.diff
+++ b/gnu/usr.bin/diff/context.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/diff/context.c.diff,v 1.2 2007/06/17 00:43:50 delphij Exp $
 --- context.c.orig	2004-04-12 15:44:35.000000000 +0800
 +++ context.c	2007-06-16 22:25:11.705063242 +0800
 @@ -29,7 +29,7 @@
diff --git a/gnu/usr.bin/diff/diff.c.diff b/gnu/usr.bin/diff/diff.c.diff
index 884a9c49d2eff..f137f93d1bf89 100644
--- a/gnu/usr.bin/diff/diff.c.diff
+++ b/gnu/usr.bin/diff/diff.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/diff/diff.c.diff,v 1.1 2007/06/15 07:09:33 delphij Exp $
 --- diff.c.orig	2004-04-12 15:44:35.000000000 +0800
 +++ diff.c	2007-06-15 14:51:05.506679851 +0800
 @@ -137,7 +137,7 @@
diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile
index a8a874a6d6d34..1cab8e86625f7 100644
--- a/gnu/usr.bin/diff/doc/Makefile
+++ b/gnu/usr.bin/diff/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff/doc/Makefile,v 1.7 2007/06/15 07:09:33 delphij Exp $
 
 INFO = diff
 
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 9fbb5dba6150a..b5239aaf656db 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/diff3/Makefile,v 1.8 2007/06/15 07:09:33 delphij Exp $
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH:  ${DIFFSRC} \
diff --git a/gnu/usr.bin/diff3/diff3.c.diff b/gnu/usr.bin/diff3/diff3.c.diff
index 153d6e88c6d40..21ad2871db53c 100644
--- a/gnu/usr.bin/diff3/diff3.c.diff
+++ b/gnu/usr.bin/diff3/diff3.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/diff3/diff3.c.diff,v 1.1 2007/06/15 07:09:33 delphij Exp $
 --- diff3.c.orig	2004-04-12 15:44:35.000000000 +0800
 +++ diff3.c	2007-06-15 14:49:23.903835977 +0800
 @@ -230,7 +230,6 @@
diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index 8f2870bb86379..df3fc1129574b 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.12 2006/10/21 17:27:36 jmg Exp $
 
 SUBDIR=	doc libgdb gdb gdbtui kgdb
 
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index abb5296dd056c..91bf991a43041 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.13 2004/12/21 08:47:00 ru Exp $
 
 VERSION= "6.1.1 [FreeBSD]"
 VENDOR= marcel
diff --git a/gnu/usr.bin/gdb/arch/amd64/Makefile b/gnu/usr.bin/gdb/arch/amd64/Makefile
index 94d7bbbcdc35d..3b5f1135ffce4 100644
--- a/gnu/usr.bin/gdb/arch/amd64/Makefile
+++ b/gnu/usr.bin/gdb/arch/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.4 2007/05/19 03:22:18 kan Exp $
 
 GENSRCS+= xm.h
 .if !defined(GDB_CROSS_DEBUGGER)
diff --git a/gnu/usr.bin/gdb/arch/amd64/config.h b/gnu/usr.bin/gdb/arch/amd64/config.h
index ac81c5491cff0..0cf9b72026229 100644
--- a/gnu/usr.bin/gdb/arch/amd64/config.h
+++ b/gnu/usr.bin/gdb/arch/amd64/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/config.h,v 1.3 2004/12/05 06:58:59 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/amd64/init.c b/gnu/usr.bin/gdb/arch/amd64/init.c
index 1b296f4a94060..acdf795de7965 100644
--- a/gnu/usr.bin/gdb/arch/amd64/init.c
+++ b/gnu/usr.bin/gdb/arch/amd64/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/init.c,v 1.3 2004/12/05 06:58:59 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/arm/Makefile b/gnu/usr.bin/gdb/arch/arm/Makefile
index 50ff34b1b5bc8..1cce57159d621 100644
--- a/gnu/usr.bin/gdb/arch/arm/Makefile
+++ b/gnu/usr.bin/gdb/arch/arm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/Makefile,v 1.1.4.1 2007/12/02 14:37:36 cognet Exp $
 
 GENSRCS+= xm.h
 LIBSRCS+= armfbsd-nat.c
diff --git a/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c b/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c
index 84599d9fc8cd5..4911fb6b2b906 100644
--- a/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c
+++ b/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c,v 1.1.4.1 2007/12/02 14:37:36 cognet Exp $ */
 
  /* Native-dependent code for BSD Unix running on ARM's, for GDB.
    Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002
diff --git a/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c b/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c
index 785897dad3449..877fec4ab074e 100644
--- a/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c
+++ b/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c,v 1.1.4.1 2007/12/02 14:37:36 cognet Exp $ */
 
 /* Target-specific functions for ARM running under NetBSD.
    Copyright 2002, 2003 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/gdb/arch/arm/config.h b/gnu/usr.bin/gdb/arch/arm/config.h
index e1b128ced48d6..490778efef78e 100644
--- a/gnu/usr.bin/gdb/arch/arm/config.h
+++ b/gnu/usr.bin/gdb/arch/arm/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/config.h,v 1.1 2006/09/14 06:49:34 imp Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/arm/init.c b/gnu/usr.bin/gdb/arch/arm/init.c
index d4064dadd4ab8..8a6782c4fe815 100644
--- a/gnu/usr.bin/gdb/arch/arm/init.c
+++ b/gnu/usr.bin/gdb/arch/arm/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/init.c,v 1.1.4.1 2007/12/02 14:37:36 cognet Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h b/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h
index cf2c64f6e75a4..51b473d21d6f1 100644
--- a/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h
+++ b/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h,v 1.1.4.1 2007/12/02 14:37:36 cognet Exp $ */
 
 /* Native-dependent definitions for ARM running NetBSD, for GDB.
    Copyright 1986, 1987, 1989, 1992, 1994, 1999 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h b/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h
index b010a969acf88..7689d01d31810 100644
--- a/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h
+++ b/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h,v 1.1 2006/09/14 06:49:34 imp Exp $ */
 
 /* Macro definitions for ARM running under NetBSD.
    Copyright 2003 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h b/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h
index 75f8077564c28..5b5f64b75f467 100644
--- a/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h
+++ b/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h,v 1.1 2006/09/14 06:49:34 imp Exp $ */
 
 /* Parameters for execution on an ARM running NetBSD, for GDB.
    Copyright 1994 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/gdb/arch/i386/Makefile b/gnu/usr.bin/gdb/arch/i386/Makefile
index f0286593f30e9..fab00ead0cf19 100644
--- a/gnu/usr.bin/gdb/arch/i386/Makefile
+++ b/gnu/usr.bin/gdb/arch/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.5 2007/05/19 03:22:19 kan Exp $
 
 GENSRCS+= xm.h
 .if !defined(GDB_CROSS_DEBUGGER)
diff --git a/gnu/usr.bin/gdb/arch/i386/config.h b/gnu/usr.bin/gdb/arch/i386/config.h
index f21da4c579e29..cb11f871e011f 100644
--- a/gnu/usr.bin/gdb/arch/i386/config.h
+++ b/gnu/usr.bin/gdb/arch/i386/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/config.h,v 1.4 2005/05/31 09:43:03 dfr Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/i386/init.c b/gnu/usr.bin/gdb/arch/i386/init.c
index 7675d8e688ce9..b5de9d1c9dd19 100644
--- a/gnu/usr.bin/gdb/arch/i386/init.c
+++ b/gnu/usr.bin/gdb/arch/i386/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/init.c,v 1.3 2004/12/05 06:59:00 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/ia64/Makefile b/gnu/usr.bin/gdb/arch/ia64/Makefile
index 5462cc2b94c30..f39bbab7e25e3 100644
--- a/gnu/usr.bin/gdb/arch/ia64/Makefile
+++ b/gnu/usr.bin/gdb/arch/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.3 2004/12/05 06:59:01 marcel Exp $
 
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= fbsd-proc.c gcore.c
diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h
index 5faa96bb51130..d0e389b9bf36f 100644
--- a/gnu/usr.bin/gdb/arch/ia64/config.h
+++ b/gnu/usr.bin/gdb/arch/ia64/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/config.h,v 1.3 2004/12/05 06:59:01 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/ia64/init.c b/gnu/usr.bin/gdb/arch/ia64/init.c
index c2cd71f42bb2b..ab8a2a9add345 100644
--- a/gnu/usr.bin/gdb/arch/ia64/init.c
+++ b/gnu/usr.bin/gdb/arch/ia64/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/init.c,v 1.2 2004/12/05 06:59:01 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/powerpc/Makefile b/gnu/usr.bin/gdb/arch/powerpc/Makefile
index fa41a237d1f7d..b96d8c957083a 100644
--- a/gnu/usr.bin/gdb/arch/powerpc/Makefile
+++ b/gnu/usr.bin/gdb/arch/powerpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/Makefile,v 1.2 2007/05/01 18:29:34 marcel Exp $
 
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
diff --git a/gnu/usr.bin/gdb/arch/powerpc/config.h b/gnu/usr.bin/gdb/arch/powerpc/config.h
index cb70b9e960ac4..53e26e2f0f828 100644
--- a/gnu/usr.bin/gdb/arch/powerpc/config.h
+++ b/gnu/usr.bin/gdb/arch/powerpc/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/config.h,v 1.1 2006/08/24 02:44:59 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/powerpc/init.c b/gnu/usr.bin/gdb/arch/powerpc/init.c
index 5b96bd5137a22..c13c5617d7aa9 100644
--- a/gnu/usr.bin/gdb/arch/powerpc/init.c
+++ b/gnu/usr.bin/gdb/arch/powerpc/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/powerpc/init.c,v 1.2 2007/05/01 18:29:34 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/arch/sparc64/Makefile b/gnu/usr.bin/gdb/arch/sparc64/Makefile
index b985711f009cf..1acadecf7bd0d 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/Makefile
+++ b/gnu/usr.bin/gdb/arch/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.3 2004/12/05 06:59:01 marcel Exp $
 
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= solib.c solib-legacy.c solib-svr4.c
diff --git a/gnu/usr.bin/gdb/arch/sparc64/config.h b/gnu/usr.bin/gdb/arch/sparc64/config.h
index 5527a79d2bf54..d332d16b473d9 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/config.h
+++ b/gnu/usr.bin/gdb/arch/sparc64/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/config.h,v 1.3 2004/12/05 06:59:01 marcel Exp $ */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/gnu/usr.bin/gdb/arch/sparc64/init.c b/gnu/usr.bin/gdb/arch/sparc64/init.c
index 25f46580a1e18..9f9260b3c45a7 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/init.c
+++ b/gnu/usr.bin/gdb/arch/sparc64/init.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/init.c,v 1.2 2004/12/05 06:59:01 marcel Exp $ */
 
 /* Do not modify this file.  */
 /* It is created automatically by the Makefile.  */
diff --git a/gnu/usr.bin/gdb/doc/Makefile b/gnu/usr.bin/gdb/doc/Makefile
index a09f66a9b1235..a70599ec2d746 100644
--- a/gnu/usr.bin/gdb/doc/Makefile
+++ b/gnu/usr.bin/gdb/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/doc/Makefile,v 1.13 2004/10/18 10:13:24 ache Exp $
 
 INFO=	gdb gdbint stabs
 INFOSECTION= "Software development"
diff --git a/gnu/usr.bin/gdb/doc/inc-hist.diff b/gnu/usr.bin/gdb/doc/inc-hist.diff
index 923f97322641d..a176df364f98b 100644
--- a/gnu/usr.bin/gdb/doc/inc-hist.diff
+++ b/gnu/usr.bin/gdb/doc/inc-hist.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/gdb/doc/inc-hist.diff,v 1.5 2004/06/27 03:31:49 marcel Exp $
 
 --- inc-hist.texinfo.orig	Wed Apr 11 08:20:01 2001
 +++ inc-hist.texinfo	Wed Apr 11 08:21:57 2001
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index ef9e135746618..a3cc0d47f8396 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.44 2005/02/14 12:10:13 obrien Exp $
 
 PROG=	gdb${GDB_SUFFIX}
 SRCS=	gdb.c
diff --git a/gnu/usr.bin/gdb/gdb/gdb.1 b/gnu/usr.bin/gdb/gdb/gdb.1
index ea4d6494ef309..dbd85e8d6f2a9 100644
--- a/gnu/usr.bin/gdb/gdb/gdb.1
+++ b/gnu/usr.bin/gdb/gdb/gdb.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gdb/gdb/gdb.1,v 1.9 2005/02/15 07:13:51 marcel Exp $
 .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
diff --git a/gnu/usr.bin/gdb/gdbserver/Makefile b/gnu/usr.bin/gdb/gdbserver/Makefile
index 191232d89d2f2..c2c2b04732db4 100644
--- a/gnu/usr.bin/gdb/gdbserver/Makefile
+++ b/gnu/usr.bin/gdb/gdbserver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/gdbserver/Makefile,v 1.5 2006/04/06 22:24:01 jmg Exp $
 
 # Not elf specific so don't install in /usr/libexec/elf
 BINDIR=/usr/bin
diff --git a/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c b/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c
index cd296f9b6655a..01d0d04929357 100644
--- a/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c
+++ b/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c,v 1.2 2006/04/06 22:24:01 jmg Exp $");
 
 #include "server.h"
 #include "fbsd-low.h"
diff --git a/gnu/usr.bin/gdb/gdbserver/fbsd-low.c b/gnu/usr.bin/gdb/gdbserver/fbsd-low.c
index ab6ff2f307318..65ad6443bb124 100644
--- a/gnu/usr.bin/gdb/gdbserver/fbsd-low.c
+++ b/gnu/usr.bin/gdb/gdbserver/fbsd-low.c
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/gdbserver/fbsd-low.c,v 1.2 2006/04/06 22:24:01 jmg Exp $");
 
 #include "server.h"
 #include "fbsd-low.h"
diff --git a/gnu/usr.bin/gdb/gdbserver/fbsd-low.h b/gnu/usr.bin/gdb/gdbserver/fbsd-low.h
index 310368c9b2c15..550664ad83dee 100644
--- a/gnu/usr.bin/gdb/gdbserver/fbsd-low.h
+++ b/gnu/usr.bin/gdb/gdbserver/fbsd-low.h
@@ -19,7 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/gdb/gdbserver/fbsd-low.h,v 1.2 2006/04/06 22:24:01 jmg Exp $
  */
 
 typedef void (*regset_fill_func) (void *);
diff --git a/gnu/usr.bin/gdb/gdbserver/reg-i386.c b/gnu/usr.bin/gdb/gdbserver/reg-i386.c
index 3307ea933c451..bf95ade197e93 100644
--- a/gnu/usr.bin/gdb/gdbserver/reg-i386.c
+++ b/gnu/usr.bin/gdb/gdbserver/reg-i386.c
@@ -3,7 +3,7 @@
 /* This file was created with the aid of ``regdat.sh'' and ``../../../../contrib/gdb/gdb/regformats/reg-i386.dat''.  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/gdbserver/reg-i386.c,v 1.1 2006/04/06 22:24:01 jmg Exp $");
 
 #include "regdef.h"
 #include "regcache.h"
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile
index 4a01eae71ce52..25eda0e77ec7d 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.6 2005/02/14 12:10:14 obrien Exp $
 
 PROG=	gdbtui${GDB_SUFFIX}
 SRCS=	tui-main.c
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 8093f9ce2b571..d65953e591778 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.6 2005/02/20 23:06:03 kan Exp $
 
 PROG=	kgdb${GDB_SUFFIX}
 SRCS=	main.c kthr.c trgt.c trgt_${TARGET_ARCH}.c
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.1 b/gnu/usr.bin/gdb/kgdb/kgdb.1
index 5b6fea0bacea7..981faa9548f53 100644
--- a/gnu/usr.bin/gdb/kgdb/kgdb.1
+++ b/gnu/usr.bin/gdb/kgdb/kgdb.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.10 2006/10/21 17:39:35 ru Exp $
 .\"
 .Dd October 11, 2006
 .Os
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.h b/gnu/usr.bin/gdb/kgdb/kgdb.h
index d723a5ff7fa45..2dc7235eb23ca 100644
--- a/gnu/usr.bin/gdb/kgdb/kgdb.h
+++ b/gnu/usr.bin/gdb/kgdb/kgdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.5.2.1 2007/11/21 16:43:46 jhb Exp $
  */
 
 #ifndef _KGDB_H_
diff --git a/gnu/usr.bin/gdb/kgdb/kthr.c b/gnu/usr.bin/gdb/kgdb/kthr.c
index 4c7f55656d1a6..b10b7fc35cb34 100644
--- a/gnu/usr.bin/gdb/kgdb/kthr.c
+++ b/gnu/usr.bin/gdb/kgdb/kthr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.7.2.1 2007/11/21 16:43:46 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/gnu/usr.bin/gdb/kgdb/main.c b/gnu/usr.bin/gdb/kgdb/main.c
index 12bc3c468f91c..b9640acf8edb1 100644
--- a/gnu/usr.bin/gdb/kgdb/main.c
+++ b/gnu/usr.bin/gdb/kgdb/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11 2006/01/04 23:17:52 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt.c b/gnu/usr.bin/gdb/kgdb/trgt.c
index f79e4345d1b5e..f566fdd0d5f26 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5 2006/10/16 20:06:32 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_amd64.c b/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
index 064d482a5c0c7..f92cbf8fa0b1e 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c,v 1.8 2007/08/22 20:28:13 jhb Exp $");
 
 #include <sys/types.h>
 #include <machine/pcb.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_arm.c b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
index afdcbc627589e..9377207c5ff0a 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_arm.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_arm.c,v 1.3 2006/10/16 20:07:23 jhb Exp $");
 
 #include <sys/types.h>
 #ifndef CROSS_DEBUGGER
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_i386.c b/gnu/usr.bin/gdb/kgdb/trgt_i386.c
index c3581b5e9f519..5a932d1111221 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_i386.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_i386.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.6.2.1 2007/11/21 16:43:46 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c b/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
index 86d83fc2fcebc..6279d7c30c5b3 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c,v 1.4 2005/09/11 00:47:03 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/frame.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c b/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c
index 5c0ffe7701d18..c30753c557fbd 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c,v 1.2 2006/10/16 20:07:23 jhb Exp $");
 
 #include <sys/types.h>
 #include <machine/pcb.h>
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c b/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
index 3e4a41abb4d51..cfdf462fe0529 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c,v 1.6 2005/09/11 06:52:14 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/asm.h>
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index 8c22a1acb3651..f14617dbe904f 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.11 2006/04/10 09:00:19 ru Exp $
 
 TARGET_ARCH?= ${MACHINE_ARCH}
 
diff --git a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
index 0000cb8ff38b0..52517c68fbe4e 100644
--- a/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
+++ b/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.16 2007/02/20 18:10:13 emaste Exp $ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
diff --git a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff b/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
index 8143c55aeefec..8528e88ae92af 100644
--- a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
+++ b/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/gdb/libgdb/frame-unwind.diff,v 1.1 2005/09/10 18:25:53 marcel Exp $
 
 Index: frame-unwind.c
 ===================================================================
diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 57fd0612bf770..364d20802311d 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gperf/Makefile,v 1.11 2004/02/17 01:49:20 ache Exp $
 
 GPROFDIR=	${.CURDIR}/../../../contrib/gperf
 
diff --git a/gnu/usr.bin/gperf/config.h b/gnu/usr.bin/gperf/config.h
index 464005e3fa589..508fd570e117c 100644
--- a/gnu/usr.bin/gperf/config.h
+++ b/gnu/usr.bin/gperf/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/gperf/config.h,v 1.1 2000/03/25 07:49:58 kris Exp $ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/gperf/doc/Makefile b/gnu/usr.bin/gperf/doc/Makefile
index 1c0ec790e597f..69321baa49fac 100644
--- a/gnu/usr.bin/gperf/doc/Makefile
+++ b/gnu/usr.bin/gperf/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/gperf/doc/Makefile,v 1.7 2000/03/25 07:50:02 kris Exp $
 
 INFO = gperf
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/usr.bin/grep/FREEBSD-upgrade b/gnu/usr.bin/grep/FREEBSD-upgrade
index 06b14fe13139a..8bac83f1a31e6 100644
--- a/gnu/usr.bin/grep/FREEBSD-upgrade
+++ b/gnu/usr.bin/grep/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/grep/FREEBSD-upgrade,v 1.1 2005/05/14 06:33:23 tjr Exp $
 
 GNU grep
 
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index b0c3988552b4f..c91038df276a2 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.30 2004/07/04 10:05:37 tjr Exp $
 
 GREP_LIBZ=YES
 
diff --git a/gnu/usr.bin/grep/config.h b/gnu/usr.bin/grep/config.h
index 6f7794e485f15..216d597e13a4d 100644
--- a/gnu/usr.bin/grep/config.h
+++ b/gnu/usr.bin/grep/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/config.h,v 1.9 2004/08/12 06:45:31 tjr Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.in by autoheader.  */
 
diff --git a/gnu/usr.bin/grep/dfa.c b/gnu/usr.bin/grep/dfa.c
index 920d13986fdf9..1e4a978d44c15 100644
--- a/gnu/usr.bin/grep/dfa.c
+++ b/gnu/usr.bin/grep/dfa.c
@@ -18,7 +18,7 @@
 /* Written June, 1988 by Mike Haertel
    Modified July, 1988 by Arthur David Olson to assist BMG speedups  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/dfa.c,v 1.21 2005/05/14 03:18:20 tjr Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/gnu/usr.bin/grep/dfa.h b/gnu/usr.bin/grep/dfa.h
index 4cdbe7a4f7f98..bca07f8c3c6d4 100644
--- a/gnu/usr.bin/grep/dfa.h
+++ b/gnu/usr.bin/grep/dfa.h
@@ -17,7 +17,7 @@
 
 /* Written June, 1988 by Mike Haertel */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/dfa.h,v 1.9 2005/05/14 03:02:22 tjr Exp $ */
 
 /* FIXME:
    2.  We should not export so much of the DFA internals.
diff --git a/gnu/usr.bin/grep/doc/Makefile b/gnu/usr.bin/grep/doc/Makefile
index 82620f984eb7d..fcb1f2e372fe0 100644
--- a/gnu/usr.bin/grep/doc/Makefile
+++ b/gnu/usr.bin/grep/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/grep/doc/Makefile,v 1.3 1999/11/22 08:56:30 obrien Exp $
 
 INFO=		grep
 INFOSECTION=	"System Utilities"
diff --git a/gnu/usr.bin/grep/getpagesize.h b/gnu/usr.bin/grep/getpagesize.h
index 7b3e3763c45fe..4105120691617 100644
--- a/gnu/usr.bin/grep/getpagesize.h
+++ b/gnu/usr.bin/grep/getpagesize.h
@@ -1,6 +1,6 @@
 /* Emulate getpagesize on systems that lack it.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/getpagesize.h,v 1.7 2004/07/04 10:02:03 tjr Exp $ */
 
 #ifndef HAVE_GETPAGESIZE
 
diff --git a/gnu/usr.bin/grep/grep.1 b/gnu/usr.bin/grep/grep.1
index 877dd25795fb7..93400d1c49363 100644
--- a/gnu/usr.bin/grep/grep.1
+++ b/gnu/usr.bin/grep/grep.1
@@ -1,5 +1,5 @@
 .\" grep man page
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.30 2006/10/11 09:52:32 trhodes Exp $
 .if !\n(.g \{\
 .	if !\w|\*(lq| \{\
 .		ds lq ``
diff --git a/gnu/usr.bin/grep/grep.c b/gnu/usr.bin/grep/grep.c
index 1684a820b6701..28f1eb14f5735 100644
--- a/gnu/usr.bin/grep/grep.c
+++ b/gnu/usr.bin/grep/grep.c
@@ -19,7 +19,7 @@
 /* Written July 1992 by Mike Haertel.  */
 /* Builtin decompression 1997 by Wolfram Schneider <wosch@FreeBSD.org>.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/grep.c,v 1.33 2005/10/21 15:17:18 jkim Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/gnu/usr.bin/grep/grep.h b/gnu/usr.bin/grep/grep.h
index f4937e7638334..04f4380d5d72e 100644
--- a/gnu/usr.bin/grep/grep.h
+++ b/gnu/usr.bin/grep/grep.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/grep.h,v 1.8 2005/05/14 03:02:22 tjr Exp $ */
 
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || __STRICT_ANSI__
 # define __attribute__(x)
diff --git a/gnu/usr.bin/grep/hard-locale.c b/gnu/usr.bin/grep/hard-locale.c
index 9c5da2b3ea8be..a6d027338d7b6 100644
--- a/gnu/usr.bin/grep/hard-locale.c
+++ b/gnu/usr.bin/grep/hard-locale.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/hard-locale.c,v 1.2 2004/07/04 10:22:50 tjr Exp $ */
 
 #if HAVE_CONFIG_H
 # include <config.h>
diff --git a/gnu/usr.bin/grep/kwset.c b/gnu/usr.bin/grep/kwset.c
index 79025396d1b9d..c1ccfbcf13ff6 100644
--- a/gnu/usr.bin/grep/kwset.c
+++ b/gnu/usr.bin/grep/kwset.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/kwset.c,v 1.9 2004/07/04 10:02:03 tjr Exp $ */
 
 /* Written August 1989 by Mike Haertel.
    The author may be reached (Email) at the address mike@ai.mit.edu,
diff --git a/gnu/usr.bin/grep/kwset.h b/gnu/usr.bin/grep/kwset.h
index 1724f68de11b2..5e107c8bde41e 100644
--- a/gnu/usr.bin/grep/kwset.h
+++ b/gnu/usr.bin/grep/kwset.h
@@ -20,7 +20,7 @@
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/kwset.h,v 1.5 2004/07/04 10:02:03 tjr Exp $ */
 
 struct kwsmatch
 {
diff --git a/gnu/usr.bin/grep/search.c b/gnu/usr.bin/grep/search.c
index 982d2c5ce0987..67676a77c4992 100644
--- a/gnu/usr.bin/grep/search.c
+++ b/gnu/usr.bin/grep/search.c
@@ -18,7 +18,7 @@
 
 /* Written August 1992 by Mike Haertel. */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/grep/search.c,v 1.25 2006/02/19 04:27:39 tjr Exp $ */
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 7c61f71be9458..3bfe9b6275275 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.11 2003/05/02 00:55:52 ru Exp $
 
 SUBDIR=		contrib doc font man src tmac
 
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index 053f38580d715..207d76befa19a 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.12 2005/10/20 10:57:52 ru Exp $
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
diff --git a/gnu/usr.bin/groff/contrib/Makefile b/gnu/usr.bin/groff/contrib/Makefile
index 6718107cafddf..ec60e6b049729 100644
--- a/gnu/usr.bin/groff/contrib/Makefile
+++ b/gnu/usr.bin/groff/contrib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile,v 1.1 2001/04/17 12:36:32 ru Exp $
 
 SUBDIR=		mm
 
diff --git a/gnu/usr.bin/groff/contrib/Makefile.inc b/gnu/usr.bin/groff/contrib/Makefile.inc
index d5552c54c4f8c..3c30d5c661ad7 100644
--- a/gnu/usr.bin/groff/contrib/Makefile.inc
+++ b/gnu/usr.bin/groff/contrib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.1 2001/04/17 12:36:32 ru Exp $
 
 DIST_SUBDIR=	contrib/${.CURDIR:T}
 TOPREL=		../..
diff --git a/gnu/usr.bin/groff/contrib/groffer/Makefile b/gnu/usr.bin/groff/contrib/groffer/Makefile
index 2b07a88cb8b61..f50ac0289ca2e 100644
--- a/gnu/usr.bin/groff/contrib/groffer/Makefile
+++ b/gnu/usr.bin/groff/contrib/groffer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/groffer/Makefile,v 1.1 2002/10/11 08:58:13 ru Exp $
 
 SCRIPTS=	groffer
 MAN=		groffer.1
diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile
index 763386ba780ec..2faca82ae7dc2 100644
--- a/gnu/usr.bin/groff/contrib/mm/Makefile
+++ b/gnu/usr.bin/groff/contrib/mm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.8 2006/08/14 13:02:01 ru Exp $
 
 SCRIPTS=	mmroff.pl
 MAN=		mmroff.1
diff --git a/gnu/usr.bin/groff/doc/Makefile b/gnu/usr.bin/groff/doc/Makefile
index 6381812cab455..c4ccea7208f2c 100644
--- a/gnu/usr.bin/groff/doc/Makefile
+++ b/gnu/usr.bin/groff/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/doc/Makefile,v 1.4 2000/12/06 12:17:01 ru Exp $
 
 INFO=	groff
 SRCDIR=	${DIST_DIR}
diff --git a/gnu/usr.bin/groff/font/Makefile b/gnu/usr.bin/groff/font/Makefile
index d78fc81e4b9e5..9be9ef22cb776 100644
--- a/gnu/usr.bin/groff/font/Makefile
+++ b/gnu/usr.bin/groff/font/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile,v 2.1 2001/04/17 12:36:42 ru Exp $
 
 SUBDIR=		devX100 devX100-12 devX75 devX75-12 \
 		devascii devcp1047 devdvi devhtml devkoi8-r \
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index c4a74c62fc751..a62a4091ff7f6 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.12 2003/05/01 13:22:18 ru Exp $
 
 FILES=		${DEVFILES}
 FILESDIR?=	${fontdir}/dev${DEV}
diff --git a/gnu/usr.bin/groff/font/Makefile.inc b/gnu/usr.bin/groff/font/Makefile.inc
index 22a1a42e40c77..c917736c93796 100644
--- a/gnu/usr.bin/groff/font/Makefile.inc
+++ b/gnu/usr.bin/groff/font/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.inc,v 2.1 2001/04/17 12:36:42 ru Exp $
 
 DIST_SUBDIR=	font/${.CURDIR:T}
 TOPREL=		../..
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index 8e5e158889426..c891dda79f7bd 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.8 2005/10/20 10:57:52 ru Exp $
 
 FONTS?=R I B BI S L CW
 DEVFILES=$(FONTS) DESC
diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile b/gnu/usr.bin/groff/font/devX100-12/Makefile
index 1d77faa431c61..dac74237568f7 100644
--- a/gnu/usr.bin/groff/font/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX100-12/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX100-12/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile
index 1d77faa431c61..1a8ad19c5d4ae 100644
--- a/gnu/usr.bin/groff/font/devX100/Makefile
+++ b/gnu/usr.bin/groff/font/devX100/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX100/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile
index 1d77faa431c61..3cc429cf64ba5 100644
--- a/gnu/usr.bin/groff/font/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX75-12/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX75-12/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile
index 1d77faa431c61..f9cf792dc2a0c 100644
--- a/gnu/usr.bin/groff/font/devX75/Makefile
+++ b/gnu/usr.bin/groff/font/devX75/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devX75/Makefile,v 1.2 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 
diff --git a/gnu/usr.bin/groff/font/devascii/Makefile b/gnu/usr.bin/groff/font/devascii/Makefile
index 544ec16e475d5..462f2d03aed1d 100644
--- a/gnu/usr.bin/groff/font/devascii/Makefile
+++ b/gnu/usr.bin/groff/font/devascii/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devascii/Makefile,v 1.1 2001/04/17 12:36:46 ru Exp $
 
 DEV=		ascii
 
diff --git a/gnu/usr.bin/groff/font/devcp1047/Makefile b/gnu/usr.bin/groff/font/devcp1047/Makefile
index d0a887a685c44..a3eaa06396d26 100644
--- a/gnu/usr.bin/groff/font/devcp1047/Makefile
+++ b/gnu/usr.bin/groff/font/devcp1047/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devcp1047/Makefile,v 1.1 2001/04/17 12:36:46 ru Exp $
 
 DEV=		cp1047
 
diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile
index 9497e2d45b4ab..8d276e55e74e6 100644
--- a/gnu/usr.bin/groff/font/devdvi/Makefile
+++ b/gnu/usr.bin/groff/font/devdvi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
 
 DEV=		dvi
 DEVFILES=	DESC \
diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile
index 61e720a954f01..4dc82264aa31c 100644
--- a/gnu/usr.bin/groff/font/devhtml/Makefile
+++ b/gnu/usr.bin/groff/font/devhtml/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.3 2005/10/20 10:57:52 ru Exp $
 
 DEV=		html
 FONTS=		R I B BI CR CI CB CBI S
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/Makefile b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
index 399d2b6d0879f..24605ddc537f8 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/Makefile
+++ b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/Makefile,v 1.1 2001/04/17 12:36:47 ru Exp $
 
 DEV=		koi8-r
 
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/R.proto b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
index 8c16013d46698..73511e47b1d95 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/R.proto
+++ b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.6 2003/09/08 17:46:33 ru Exp $
 name R
 internalname 0
 spacewidth 24
diff --git a/gnu/usr.bin/groff/font/devlatin1/Makefile b/gnu/usr.bin/groff/font/devlatin1/Makefile
index 238320216c1e8..f33a41b19195a 100644
--- a/gnu/usr.bin/groff/font/devlatin1/Makefile
+++ b/gnu/usr.bin/groff/font/devlatin1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlatin1/Makefile,v 1.1 2001/04/17 12:36:47 ru Exp $
 
 DEV=		latin1
 
diff --git a/gnu/usr.bin/groff/font/devlbp/Makefile b/gnu/usr.bin/groff/font/devlbp/Makefile
index 1372c8fd87689..07d6a1e052212 100644
--- a/gnu/usr.bin/groff/font/devlbp/Makefile
+++ b/gnu/usr.bin/groff/font/devlbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $
 
 DEV=		lbp
 LBPPRINT=	${PSPRINT}
diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile b/gnu/usr.bin/groff/font/devlj4/Makefile
index 3f9aa525893e6..62ab657a216d8 100644
--- a/gnu/usr.bin/groff/font/devlj4/Makefile
+++ b/gnu/usr.bin/groff/font/devlj4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.2 2005/10/20 10:57:52 ru Exp $
 
 DEV=		lj4
 LJ4RES=		1200
diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index d45d4426a06e4..f69a1629e7bb6 100644
--- a/gnu/usr.bin/groff/font/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
 
 DEV=		ps
 DISTFILES=	text.enc download \
diff --git a/gnu/usr.bin/groff/font/devutf8/Makefile b/gnu/usr.bin/groff/font/devutf8/Makefile
index bf5965e19d3e0..a6699b8cf5f1b 100644
--- a/gnu/usr.bin/groff/font/devutf8/Makefile
+++ b/gnu/usr.bin/groff/font/devutf8/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/font/devutf8/Makefile,v 1.1 2001/04/17 12:36:49 ru Exp $
 
 DEV=		utf8
 
diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile
index b22c4c4b19046..4e4c1e42db66e 100644
--- a/gnu/usr.bin/groff/man/Makefile
+++ b/gnu/usr.bin/groff/man/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/man/Makefile,v 1.9 2002/10/11 08:58:14 ru Exp $
 
 MAN=		groff_font.5 groff_out.5 groff_tmac.5
 MLINKS=		groff_tmac.5 tmac.5
diff --git a/gnu/usr.bin/groff/src/Makefile b/gnu/usr.bin/groff/src/Makefile
index 7d2ca90a2252d..e18d64543f82b 100644
--- a/gnu/usr.bin/groff/src/Makefile
+++ b/gnu/usr.bin/groff/src/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/Makefile,v 1.1 2001/04/17 12:37:02 ru Exp $
 
 SUBDIR=		libs devices preproc roff utils
 
diff --git a/gnu/usr.bin/groff/src/devices/Makefile b/gnu/usr.bin/groff/src/devices/Makefile
index 8af4ff85b996d..6e83166bebb4d 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile
+++ b/gnu/usr.bin/groff/src/devices/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile,v 1.1 2001/04/17 12:37:02 ru Exp $
 
 SUBDIR=		grodvi grohtml grolbp grolj4 grops grotty
 
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc
index 4619cbe9ad15d..b0e19d9db159c 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/devices/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 37454406520a4..01beb68df0782 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
 
 PROG_CXX=	grodvi
 SRCS=		dvi.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 0a1a08636f2f9..cd5a7de21c022 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $
 
 PROG_CXX=	post-grohtml
 SRCS=		post-html.cpp html-table.cpp html-text.cpp output.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 85a41c169b953..1eed35e97634b 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $
 
 PROG_CXX=	grolbp
 SRCS=		lbp.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index bb3f9e4f62d38..2774f1d1849a8 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.5 2005/10/20 10:57:52 ru Exp $
 
 PROG_CXX=	grolj4
 MAN=		grolj4.1 lj4_font.5
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 4511f69b152e4..0626ed4a2f739 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	grops
 SRCS=		ps.cpp psrm.cpp
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index d15ee8bf62319..539538415a0ea 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	grotty
 SRCS=		tty.cpp
diff --git a/gnu/usr.bin/groff/src/devices/xditview/Makefile b/gnu/usr.bin/groff/src/devices/xditview/Makefile
index 91bfcf3b3224b..2ab6c01097a6c 100644
--- a/gnu/usr.bin/groff/src/devices/xditview/Makefile
+++ b/gnu/usr.bin/groff/src/devices/xditview/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/devices/xditview/Makefile,v 1.2 2005/10/20 11:10:43 ru Exp $
 
 PROG=		gxditview
 SRCS=		device.c draw.c Dvi.c font.c lex.c page.c parse.c xditview.c
diff --git a/gnu/usr.bin/groff/src/include/config.h b/gnu/usr.bin/groff/src/include/config.h
index 8135efeb14734..6fcf67d4b5561 100644
--- a/gnu/usr.bin/groff/src/include/config.h
+++ b/gnu/usr.bin/groff/src/include/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/groff/src/include/config.h,v 1.5 2005/10/20 10:57:52 ru Exp $ */
 
 /* src/include/config.h.  Generated by configure.  */
 /* src/include/config.hin.  Generated from configure.ac by autoheader.  */
diff --git a/gnu/usr.bin/groff/src/include/defs.h b/gnu/usr.bin/groff/src/include/defs.h
index 76bd1178d45f4..4fe5a37a440b8 100644
--- a/gnu/usr.bin/groff/src/include/defs.h
+++ b/gnu/usr.bin/groff/src/include/defs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/groff/src/include/defs.h,v 1.4 2001/04/17 12:37:07 ru Exp $ */
 
 #define PROG_PREFIX ""
 #define DEVICE "ps"
diff --git a/gnu/usr.bin/groff/src/libs/Makefile b/gnu/usr.bin/groff/src/libs/Makefile
index 1461cda28bac7..9b1e706be76aa 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile
+++ b/gnu/usr.bin/groff/src/libs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile,v 1.1 2001/04/17 12:37:08 ru Exp $
 
 SUBDIR=		libgroff libdriver libbib
 
diff --git a/gnu/usr.bin/groff/src/libs/Makefile.inc b/gnu/usr.bin/groff/src/libs/Makefile.inc
index 627553fa6e85f..3f786b71de5ec 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile.inc
+++ b/gnu/usr.bin/groff/src/libs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.1 2001/04/17 12:37:08 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/libs/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile
index ed1fd2fc7a6d0..5b4a1450af2ee 100644
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
 
 LIB=		bib
 INTERNALLIB=
diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
index 0c107b4918f84..45b2ffdbdfc4f 100644
--- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.4 2004/10/24 15:32:28 ru Exp $
 
 LIB=		driver
 INTERNALLIB=
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index 6b29f0def653d..245164c0b8832 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.9 2005/10/20 10:57:53 ru Exp $
 
 LIB=		groff
 INTERNALLIB=
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile
index 70af839313d67..411115b49cb95 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile,v 1.2 2002/10/29 14:56:06 ru Exp $
 
 SUBDIR=		eqn grn html pic refer soelim tbl
 
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc
index 16c104a1aae62..20129800b27db 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1 2001/04/17 12:37:09 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/preproc/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 80871fee3c891..b7049443fb4bc 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	eqn
 SRCS=		eqn.cpp eqn_tab.h main.cpp lex.cpp \
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 58309d2a5eb80..3bec3ddbb0c0b 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
 PROG_CXX=	grn
 SRCS=		hdb.cpp hpoint.cpp hgraph.cpp main.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 2a3fb4952e4f6..532326a9f6363 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $
 
 PROG_CXX=	pre-grohtml
 SRCS=		pre-html.cpp pushback.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 3b5939c3bff16..d100f7490bf06 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	pic
 SRCS=		lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 8a18f6f7987c1..5e76656ebfc18 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	refer
 SRCS=		command.cpp label.cpp ref.cpp refer.cpp token.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
index 2c68b8005f0ab..04999bc75a2a3 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	soelim
 SRCS=		soelim.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index 29e7ac238f895..bf25418acb18d 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	tbl
 SRCS=		main.cpp table.cpp
diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile
index 543a990c680ff..e0ab68576ebb9 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
 
 SUBDIR=		groff grog nroff psroff troff
 
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
index f893659c1b992..a910a7134dc69 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/roff/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 2ae541bbb5024..f963934a934f1 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	groff
 SRCS=		groff.cpp pipeline.c
diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile b/gnu/usr.bin/groff/src/roff/grog/Makefile
index 718f0cf78acdf..09b3b90dcb390 100644
--- a/gnu/usr.bin/groff/src/roff/grog/Makefile
+++ b/gnu/usr.bin/groff/src/roff/grog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
 
 SCRIPTS=	grog
 MAN=		grog.1
diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile b/gnu/usr.bin/groff/src/roff/nroff/Makefile
index 6971890c67e6c..be4631f42da80 100644
--- a/gnu/usr.bin/groff/src/roff/nroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
 
 SCRIPTS=	nroff
 MAN=		nroff.1
diff --git a/gnu/usr.bin/groff/src/roff/psroff/Makefile b/gnu/usr.bin/groff/src/roff/psroff/Makefile
index 74bb4ad54980e..508f69c27ed74 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/psroff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $
 
 SCRIPTS=	psroff.sh
 MAN=		psroff.1
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.1 b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
index e2291bab49d3d..57bd86e5ffdef 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/psroff.1
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.1,v 1.1 2001/04/10 17:04:31 ru Exp $
 .Dd September 15, 1997
 .Dt PSROFF 1
 .Os
diff --git a/gnu/usr.bin/groff/src/roff/psroff/psroff.sh b/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
index 612fbcce39231..a8e8e7fe3fcf1 100644
--- a/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
+++ b/gnu/usr.bin/groff/src/roff/psroff/psroff.sh
@@ -1,5 +1,5 @@
 #! /bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/psroff.sh,v 1.2 2001/07/10 17:23:07 ru Exp $
 
 exec groff -Tps -l -C ${1+"$@"}
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 802af2b6be097..4f46873c5ed3b 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.5 2005/10/20 10:57:53 ru Exp $
 
 PROG_CXX=	troff
 SRCS=		dictionary.cpp div.cpp env.cpp input.cpp \
diff --git a/gnu/usr.bin/groff/src/utils/Makefile b/gnu/usr.bin/groff/src/utils/Makefile
index 14953b925312a..816a8025a52ff 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile
+++ b/gnu/usr.bin/groff/src/utils/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
 
 SUBDIR=		addftinfo afmtodit hpftodit indxbib lkbib lookbib pfbtops tfmtodit
 
diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc
index 68945ab39f933..e11ee4704235d 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile.inc
+++ b/gnu/usr.bin/groff/src/utils/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1 2001/04/17 12:37:15 ru Exp $
 
 TOPREL=		../../..
 DIST_SUBDIR=	src/utils/${.CURDIR:T}
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index 26fbb57b9d1ce..20476a396158b 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
 PROG_CXX=	addftinfo
 SRCS=		addftinfo.cpp guess.cpp
diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
index 00f88ad2b9824..ecc4c7b665d64 100644
--- a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
 
 SCRIPTS=	afmtodit
 MAN=		afmtodit.1
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 1376702a9a831..978f55db4e541 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.5 2005/10/20 10:57:53 ru Exp $
 
 PROG_CXX=	hpftodit
 SRCS=		hpftodit.cpp hpuni.cpp
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index b2c59a2cee814..9cd0fb5a73282 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	indxbib
 SRCS=		indxbib.cpp signal.c
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index f30dc56cbb8f2..3168aca0fc5b6 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	lkbib
 SRCS=		lkbib.cpp
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index 18834a7432d3c..c7d50112fc428 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	lookbib
 SRCS=		lookbib.cpp
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
index 4fa71b525af6b..c03a11eaff776 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $
 
 PROG=		pfbtops
 DPADD=		${LIBGROFF}
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index ba3bbc54646ff..d9cfdf26746a3 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $
 
 PROG_CXX=	tfmtodit
 SRCS=		tfmtodit.cpp
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index e7b96a5e3d015..195aba4c90e6c 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.45 2006/08/14 13:02:01 ru Exp $
 
 .include <bsd.own.mk>			# SHAREDIR
 
diff --git a/gnu/usr.bin/groff/tmac/fr.ISO8859-1 b/gnu/usr.bin/groff/tmac/fr.ISO8859-1
index 88dda0d296c60..7b882c7fc6ebd 100644
--- a/gnu/usr.bin/groff/tmac/fr.ISO8859-1
+++ b/gnu/usr.bin/groff/tmac/fr.ISO8859-1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/fr.ISO8859-1,v 1.4 2003/09/20 21:23:53 ru Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/groff/tmac/koi8-r.tmac b/gnu/usr.bin/groff/tmac/koi8-r.tmac
index 068f7162af6e7..77b342552cbd9 100644
--- a/gnu/usr.bin/groff/tmac/koi8-r.tmac
+++ b/gnu/usr.bin/groff/tmac/koi8-r.tmac
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/koi8-r.tmac,v 1.1 2003/09/08 17:46:33 ru Exp $
 .\"
 .nr _C \n(.C
 .cp 0
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index fbb22ff50a560..0acad0fcc8669 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.59.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/groff/tmac/ru.KOI8-R b/gnu/usr.bin/groff/tmac/ru.KOI8-R
index 0d3eb0f7eb7a3..8032126c28272 100644
--- a/gnu/usr.bin/groff/tmac/ru.KOI8-R
+++ b/gnu/usr.bin/groff/tmac/ru.KOI8-R
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/ru.KOI8-R,v 1.14 2003/09/20 21:30:33 ru Exp $
 .\"
 .\"     %beginstrip%
 .
diff --git a/gnu/usr.bin/man/Makefile b/gnu/usr.bin/man/Makefile
index 8a730e198ad7a..8d34315d52e86 100644
--- a/gnu/usr.bin/man/Makefile
+++ b/gnu/usr.bin/man/Makefile
@@ -4,7 +4,7 @@
 # License as specified in the README file that comes with the man 1.0
 # distribution.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $
 #
 
 SUBDIR = lib man manpath apropos
diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index e1caf901ef6a3..c2ba800fcf5c5 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/Makefile.inc,v 1.22 2005/06/10 06:12:50 des Exp $
 #
 # Set a bunch of things to hardcoded paths so that we don't accidently
 # pick up a user's own version of some utility and hose ourselves.
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index f3399ef5370cf..2a1e3084a4328 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/apropos/Makefile,v 1.17 2005/07/17 21:18:09 wosch Exp $
 
 SCRIPTS=apropos
 MAN=	apropos.1
diff --git a/gnu/usr.bin/man/apropos/apropos.man b/gnu/usr.bin/man/apropos/apropos.man
index 351ed432b3a20..679b4e9b4b612 100644
--- a/gnu/usr.bin/man/apropos/apropos.man
+++ b/gnu/usr.bin/man/apropos/apropos.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.16 2006/12/23 23:26:05 ru Exp $
 .Dd January 15, 1991
 .Dt APROPOS 1
 .Os
diff --git a/gnu/usr.bin/man/apropos/apropos.sh b/gnu/usr.bin/man/apropos/apropos.sh
index 093d633c72b7a..4e8437ba06c3c 100644
--- a/gnu/usr.bin/man/apropos/apropos.sh
+++ b/gnu/usr.bin/man/apropos/apropos.sh
@@ -15,7 +15,7 @@
 # The University of Texas at Austin
 # Austin, Texas  78712
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.16 2002/10/21 07:44:42 ru Exp $
 
 
 PATH=/bin:/usr/bin:$PATH
diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile
index d707316a2684d..f65efa8cf9bb6 100644
--- a/gnu/usr.bin/man/lib/Makefile
+++ b/gnu/usr.bin/man/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/lib/Makefile,v 1.13 2004/10/24 15:32:29 ru Exp $
 
 LIB=	man
 INTERNALLIB=
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 905d4dbedf521..521bc90f8d8e3 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/man/Makefile,v 1.33 2002/01/15 14:11:05 ru Exp $
 #
 
 MAN_LIBZ=YES
diff --git a/gnu/usr.bin/man/man/glob.c b/gnu/usr.bin/man/man/glob.c
index 1dff84ae75d3e..53396fe360812 100644
--- a/gnu/usr.bin/man/man/glob.c
+++ b/gnu/usr.bin/man/man/glob.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/man/man/glob.c,v 1.5 2003/08/03 04:47:34 ache Exp $ */
 
 /* To whomever it may concern: I have never seen the code which most
    Unix programs use to perform this function.  I wrote this from scratch
diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c
index 2cdd22a76b30a..8b40689d502e6 100644
--- a/gnu/usr.bin/man/man/man.c
+++ b/gnu/usr.bin/man/man/man.c
@@ -16,7 +16,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $";
 #endif /* not lint */
 
 #define MAN_MAIN
diff --git a/gnu/usr.bin/man/man/man.man b/gnu/usr.bin/man/man/man.man
index 7a3cc0ed7d060..adc80742530ed 100644
--- a/gnu/usr.bin/man/man/man.man
+++ b/gnu/usr.bin/man/man/man.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.27 2006/12/25 15:09:06 ru Exp $
 .\"
 .Dd December 3, 2005
 .Dt MAN 1
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index b4d04faf0aaf8..345f1174ba3fc 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/manpath/Makefile,v 1.26 2002/01/11 15:12:00 ru Exp $
 
 PROG=	manpath
 
diff --git a/gnu/usr.bin/man/manpath/manpath.c b/gnu/usr.bin/man/manpath/manpath.c
index c1a25dea2f539..92b0473ae0be6 100644
--- a/gnu/usr.bin/man/manpath/manpath.c
+++ b/gnu/usr.bin/man/manpath/manpath.c
@@ -13,7 +13,7 @@
  * The University of Texas at Austin
  * Austin, Texas  78712
  *
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.13 2002/10/27 02:12:52 kris Exp $
  */
 
 #define MANPATH_MAIN
diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config
index 5134e46ff017f..66fc7548c619d 100644
--- a/gnu/usr.bin/man/manpath/manpath.config
+++ b/gnu/usr.bin/man/manpath/manpath.config
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.25 2004/02/04 22:37:14 des Exp $
 #
 # This file is read by manpath(1) to configure the mandatory manpath,
 # optional manpath and to map each path element to a manpath element.
diff --git a/gnu/usr.bin/man/manpath/manpath.man b/gnu/usr.bin/man/manpath/manpath.man
index 6ca873da5e4c9..86eda66e1f9fa 100644
--- a/gnu/usr.bin/man/manpath/manpath.man
+++ b/gnu/usr.bin/man/manpath/manpath.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.man,v 1.11 2006/12/24 23:07:11 ru Exp $
 .Dd August 16, 1999
 .Dt MANPATH 1
 .Os
diff --git a/gnu/usr.bin/patch/EXTERN.h b/gnu/usr.bin/patch/EXTERN.h
index 374c94faa178a..2a55648dc8717 100644
--- a/gnu/usr.bin/patch/EXTERN.h
+++ b/gnu/usr.bin/patch/EXTERN.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/EXTERN.h,v 1.6 1999/09/05 17:31:54 peter Exp $
  *
  * $Log: EXTERN.h,v $
  * Revision 2.0  86/09/17  15:35:37  lwall
diff --git a/gnu/usr.bin/patch/INTERN.h b/gnu/usr.bin/patch/INTERN.h
index c04e722248a5d..c59f8e90cd7b1 100644
--- a/gnu/usr.bin/patch/INTERN.h
+++ b/gnu/usr.bin/patch/INTERN.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/INTERN.h,v 1.6 1999/09/05 17:31:54 peter Exp $
  *
  * $Log: INTERN.h,v $
  * Revision 2.0  86/09/17  15:35:58  lwall
diff --git a/gnu/usr.bin/patch/Makefile b/gnu/usr.bin/patch/Makefile
index 373efbb83f772..1be477faff76c 100644
--- a/gnu/usr.bin/patch/Makefile
+++ b/gnu/usr.bin/patch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/patch/Makefile,v 1.8 2004/02/17 01:24:45 ache Exp $
 
 PROG= 	patch
 SRCS=   backupfile.c inp.c patch.c pch.c util.c version.c
diff --git a/gnu/usr.bin/patch/backupfile.c b/gnu/usr.bin/patch/backupfile.c
index 94a615de5f7c5..6d8b786e35e0d 100644
--- a/gnu/usr.bin/patch/backupfile.c
+++ b/gnu/usr.bin/patch/backupfile.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/patch/backupfile.c,v 1.8 2003/10/26 04:20:19 peter Exp $");
 
 #include "config.h"
 #include <stdio.h>
diff --git a/gnu/usr.bin/patch/backupfile.h b/gnu/usr.bin/patch/backupfile.h
index 7600714ae3642..78a7cb73ad8c2 100644
--- a/gnu/usr.bin/patch/backupfile.h
+++ b/gnu/usr.bin/patch/backupfile.h
@@ -16,7 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/gnu/usr.bin/patch/backupfile.h,v 1.5 2002/04/28 01:33:45 gad Exp $
  */
 
 /* When to make backup files. */
diff --git a/gnu/usr.bin/patch/common.h b/gnu/usr.bin/patch/common.h
index ed97132183f6b..44f473d23ccd8 100644
--- a/gnu/usr.bin/patch/common.h
+++ b/gnu/usr.bin/patch/common.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.9 2002/10/13 01:18:33 kris Exp $
  *
  * $Log: common.h,v $
  * Revision 2.0.1.2  88/06/22  20:44:53  lwall
diff --git a/gnu/usr.bin/patch/inp.c b/gnu/usr.bin/patch/inp.c
index d77ef65ff841f..9b35e4debbc9d 100644
--- a/gnu/usr.bin/patch/inp.c
+++ b/gnu/usr.bin/patch/inp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/inp.c,v 1.12 2002/05/21 00:44:18 gad Exp $
  *
  * $Log: inp.c,v $
  * Revision 2.0.1.1  88/06/03  15:06:13  lwall
diff --git a/gnu/usr.bin/patch/inp.h b/gnu/usr.bin/patch/inp.h
index f1f0386e02b38..b585d7947cf58 100644
--- a/gnu/usr.bin/patch/inp.h
+++ b/gnu/usr.bin/patch/inp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/inp.h,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: inp.h,v $
  * Revision 2.0  86/09/17  15:37:25  lwall
diff --git a/gnu/usr.bin/patch/patch.1 b/gnu/usr.bin/patch/patch.1
index 3cc7957b63047..e17bab84b481b 100644
--- a/gnu/usr.bin/patch/patch.1
+++ b/gnu/usr.bin/patch/patch.1
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .rn '' }`
 '\" $Header: patch.man,v 2.0.1.2 88/06/22 20:47:18 lwall Locked $
-'\" $FreeBSD$
+'\" $FreeBSD: src/gnu/usr.bin/patch/patch.1,v 1.14 2004/03/18 20:36:14 dannyboy Exp $
 '\" 
 '\" $Log:	patch.man,v $
 '\" Revision 2.0.1.2  88/06/22  20:47:18  lwall
diff --git a/gnu/usr.bin/patch/patch.c b/gnu/usr.bin/patch/patch.c
index 8e06c33beaf5e..e3a069bff4662 100644
--- a/gnu/usr.bin/patch/patch.c
+++ b/gnu/usr.bin/patch/patch.c
@@ -1,5 +1,5 @@
 char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/gnu/usr.bin/patch/patch.c,v 1.21 2002/10/13 01:18:33 kris Exp $";
 
 /* patch - a program to apply diffs to original files
  *
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 7dee1a64ed0e3..89c9d327d92c8 100644
--- a/gnu/usr.bin/patch/pch.c
+++ b/gnu/usr.bin/patch/pch.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.20 2002/05/21 00:44:18 gad Exp $
  *
  * $Log: pch.c,v $
  * Revision 2.0.2.0  90/05/01  22:17:51  davison
diff --git a/gnu/usr.bin/patch/pch.h b/gnu/usr.bin/patch/pch.h
index d815fe8d14e8b..8aebf32db9673 100644
--- a/gnu/usr.bin/patch/pch.h
+++ b/gnu/usr.bin/patch/pch.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/pch.h,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: pch.h,v $
  * Revision 2.0.1.1  87/01/30  22:47:16  lwall
diff --git a/gnu/usr.bin/patch/util.c b/gnu/usr.bin/patch/util.c
index b6e6652646b40..436e30f28bc34 100644
--- a/gnu/usr.bin/patch/util.c
+++ b/gnu/usr.bin/patch/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/patch/util.c,v 1.10 2002/05/21 00:44:18 gad Exp $ */
 
 #include <paths.h>
 
diff --git a/gnu/usr.bin/patch/util.h b/gnu/usr.bin/patch/util.h
index f31f2e2d5444c..42469ece14bbb 100644
--- a/gnu/usr.bin/patch/util.h
+++ b/gnu/usr.bin/patch/util.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/util.h,v 1.8 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: util.h,v $
  * Revision 2.0  86/09/17  15:40:06  lwall
diff --git a/gnu/usr.bin/patch/version.c b/gnu/usr.bin/patch/version.c
index 753dbfbcd6291..b32a14e60c10c 100644
--- a/gnu/usr.bin/patch/version.c
+++ b/gnu/usr.bin/patch/version.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/version.c,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: version.c,v $
  * Revision 2.0  86/09/17  15:40:11  lwall
diff --git a/gnu/usr.bin/patch/version.h b/gnu/usr.bin/patch/version.h
index faddf7c65ecdb..d08fd580c26ca 100644
--- a/gnu/usr.bin/patch/version.h
+++ b/gnu/usr.bin/patch/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/gnu/usr.bin/patch/version.h,v 1.7 2002/04/28 01:33:45 gad Exp $
  *
  * $Log: version.h,v $
  * Revision 2.0  86/09/17  15:40:14  lwall
diff --git a/gnu/usr.bin/rcs/CREDITS b/gnu/usr.bin/rcs/CREDITS
index 589e8b6850919..9b3e93cdbabde 100644
--- a/gnu/usr.bin/rcs/CREDITS
+++ b/gnu/usr.bin/rcs/CREDITS
@@ -21,4 +21,4 @@ Brendan Kehoe of Cygnus Support suggested rlog's -N option.
 Paul D. Smith of Data General suggested improvements in option
 and error processing.  Adam Hammer of Purdue QAed.
 
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/rcs/CREDITS,v 1.5 1999/08/27 23:36:36 peter Exp $
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
index a46437ad8c824..67c9fd6c43e22 100644
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ b/gnu/usr.bin/rcs/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/Makefile.inc,v 1.4 2005/06/10 06:12:50 des Exp $
 
 LIBRCS=	${.OBJDIR}/../lib/librcs.a
diff --git a/gnu/usr.bin/rcs/NEWS b/gnu/usr.bin/rcs/NEWS
index 99208064bd329..b23236a3b8acd 100644
--- a/gnu/usr.bin/rcs/NEWS
+++ b/gnu/usr.bin/rcs/NEWS
@@ -1,6 +1,6 @@
 Recent changes to RCS (and possible future changes)
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/rcs/NEWS,v 1.5 1999/08/27 23:36:36 peter Exp $
 
 	Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
 	Distributed under license by the Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/rcs/REFS b/gnu/usr.bin/rcs/REFS
index 89fc823525ee9..0e008885d3e3a 100644
--- a/gnu/usr.bin/rcs/REFS
+++ b/gnu/usr.bin/rcs/REFS
@@ -2,7 +2,7 @@ Here are references to RCS and related free software and documentation.
 Some of this information changes often; see the Frequently Asked Questions
 for more up-to-date references.
 
- $FreeBSD$
+ $FreeBSD: src/gnu/usr.bin/rcs/REFS,v 1.5 1999/08/27 23:36:36 peter Exp $
 
 
 Frequently Asked Questions (FAQs)
diff --git a/gnu/usr.bin/rcs/ci/ci.1 b/gnu/usr.bin/rcs/ci/ci.1
index 1378af222cb8f..d55b45d75cdf0 100644
--- a/gnu/usr.bin/rcs/ci/ci.1
+++ b/gnu/usr.bin/rcs/ci/ci.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/ci/ci.1,v 1.6 1999/08/27 23:36:38 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
index 749a4cf6dbe93..dec62f8d7f2cd 100644
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ b/gnu/usr.bin/rcs/ci/ci.c
@@ -274,7 +274,7 @@ static struct hshentry newdelta;	/* new delta to be inserted	*/
 static struct stat workstat;
 static struct Symrev *assoclst, **nextassoc;
 
-mainProg(ciId, "ci", "$FreeBSD$")
+mainProg(ciId, "ci", "$FreeBSD: src/gnu/usr.bin/rcs/ci/ci.c,v 1.7 1999/08/27 23:36:38 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/co/co.1 b/gnu/usr.bin/rcs/co/co.1
index 2aea3ad1b40da..9aa12ff8b8c9a 100644
--- a/gnu/usr.bin/rcs/co/co.1
+++ b/gnu/usr.bin/rcs/co/co.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/co/co.1,v 1.6 1999/08/27 23:36:39 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c
index 51cb2b277927e..82564325c10ec 100644
--- a/gnu/usr.bin/rcs/co/co.c
+++ b/gnu/usr.bin/rcs/co/co.c
@@ -191,7 +191,7 @@ static struct hshentries *gendeltas;	/* deltas to be generated	*/
 static struct hshentry *targetdelta;	/* final delta to be generated	*/
 static struct stat workstat;
 
-mainProg(coId, "co", "$FreeBSD$")
+mainProg(coId, "co", "$FreeBSD: src/gnu/usr.bin/rcs/co/co.c,v 1.10 1999/08/27 23:36:40 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/doc/rcs.ms b/gnu/usr.bin/rcs/doc/rcs.ms
index f6b0db300330e..4abeed7e98059 100644
--- a/gnu/usr.bin/rcs/doc/rcs.ms
+++ b/gnu/usr.bin/rcs/doc/rcs.ms
@@ -18,7 +18,7 @@
 .de Id
 .ND \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/doc/rcs.ms,v 1.5 1999/08/27 23:36:41 peter Exp $
 .RP
 .TL
 RCS\*-A System for Version Control
diff --git a/gnu/usr.bin/rcs/ident/ident.1 b/gnu/usr.bin/rcs/ident/ident.1
index 253a2ce72724a..5b1240dd65fcb 100644
--- a/gnu/usr.bin/rcs/ident/ident.1
+++ b/gnu/usr.bin/rcs/ident/ident.1
@@ -3,7 +3,7 @@
 .ds Dt \\$4
 .ds iD \\$3 \\$4 \\$5 \\$6 \\$7
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/ident/ident.1,v 1.5 1999/08/27 23:36:42 peter Exp $
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
 .if n .ds - \%--
diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c
index 9b8bf57365ec7..1057abbb55273 100644
--- a/gnu/usr.bin/rcs/ident/ident.c
+++ b/gnu/usr.bin/rcs/ident/ident.c
@@ -102,7 +102,7 @@ static int match P((FILE*));
 static int scanfile P((FILE*,char const*,int));
 static void reportError P((char const*));
 
-mainProg(identId, "ident", "$FreeBSD$")
+mainProg(identId, "ident", "$FreeBSD: src/gnu/usr.bin/rcs/ident/ident.c,v 1.8 2001/12/10 20:44:31 peter Exp $")
 /*  Ident searches the named files for all occurrences
  *  of the pattern $@: text $ where @ is a keyword.
  */
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index f21fda1e81001..6883d8145f543 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/lib/Makefile,v 1.9 2004/10/24 15:32:29 ru Exp $
 
 # Define FSYNC_ALL to get slower but safer writes in case of crashes in
 # the middle of CVS/RCS changes
diff --git a/gnu/usr.bin/rcs/lib/conf.h b/gnu/usr.bin/rcs/lib/conf.h
index 96ec07d6c8754..805870d35ca58 100644
--- a/gnu/usr.bin/rcs/lib/conf.h
+++ b/gnu/usr.bin/rcs/lib/conf.h
@@ -1,6 +1,6 @@
 /* RCS compile-time configuration */
 
-	/* $FreeBSD$ */
+	/* $FreeBSD: src/gnu/usr.bin/rcs/lib/conf.h,v 1.11 2003/10/26 04:26:52 peter Exp $ */
 
 /*
  * This file is generated automatically.
diff --git a/gnu/usr.bin/rcs/lib/maketime.c b/gnu/usr.bin/rcs/lib/maketime.c
index 0f83bf5690d69..878aa28e9cd75 100644
--- a/gnu/usr.bin/rcs/lib/maketime.c
+++ b/gnu/usr.bin/rcs/lib/maketime.c
@@ -43,7 +43,7 @@ Report problems and direct all questions to:
 #include "maketime.h"
 
 char const maketId[]
-  = "$FreeBSD$";
+  = "$FreeBSD: src/gnu/usr.bin/rcs/lib/maketime.c,v 1.7 1999/08/27 23:36:43 peter Exp $";
 
 static int isleap P((int));
 static int month_days P((struct tm const*));
diff --git a/gnu/usr.bin/rcs/lib/merger.c b/gnu/usr.bin/rcs/lib/merger.c
index 8f1d610d5f564..9f261b65e827e 100644
--- a/gnu/usr.bin/rcs/lib/merger.c
+++ b/gnu/usr.bin/rcs/lib/merger.c
@@ -28,7 +28,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mergerId, "$FreeBSD$")
+libId(mergerId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/merger.c,v 1.5 1999/08/27 23:36:44 peter Exp $")
 
 	static char const *normalize_arg P((char const*,char**));
 	static char const *
diff --git a/gnu/usr.bin/rcs/lib/partime.c b/gnu/usr.bin/rcs/lib/partime.c
index 05b010854950f..ca796444aa82e 100644
--- a/gnu/usr.bin/rcs/lib/partime.c
+++ b/gnu/usr.bin/rcs/lib/partime.c
@@ -46,7 +46,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 
 char const partimeId[]
-  = "$FreeBSD$";
+  = "$FreeBSD: src/gnu/usr.bin/rcs/lib/partime.c,v 1.6 1999/08/27 23:36:44 peter Exp $";
 
 
 /* Lookup tables for names of months, weekdays, time zones.  */
diff --git a/gnu/usr.bin/rcs/lib/rcsbase.h b/gnu/usr.bin/rcs/lib/rcsbase.h
index 9f2f68cc8b6bb..c44af38156e4f 100644
--- a/gnu/usr.bin/rcs/lib/rcsbase.h
+++ b/gnu/usr.bin/rcs/lib/rcsbase.h
@@ -1,6 +1,6 @@
 /* RCS common definitions and data structures */
 
-#define RCSBASE "$FreeBSD$"
+#define RCSBASE "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsbase.h,v 1.10 1999/08/27 23:36:44 peter Exp $"
 
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/lib/rcsedit.c b/gnu/usr.bin/rcs/lib/rcsedit.c
index dc9dd307de6ae..5c8212d46766d 100644
--- a/gnu/usr.bin/rcs/lib/rcsedit.c
+++ b/gnu/usr.bin/rcs/lib/rcsedit.c
@@ -201,7 +201,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(editId, "$FreeBSD$")
+libId(editId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsedit.c,v 1.12 2001/05/06 03:07:12 kris Exp $")
 
 static void editEndsPrematurely P((void)) exiting;
 static void editLineNumberOverflow P((void)) exiting;
diff --git a/gnu/usr.bin/rcs/lib/rcsfcmp.c b/gnu/usr.bin/rcs/lib/rcsfcmp.c
index ef0529001b872..7a9a68f01b7cf 100644
--- a/gnu/usr.bin/rcs/lib/rcsfcmp.c
+++ b/gnu/usr.bin/rcs/lib/rcsfcmp.c
@@ -118,7 +118,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(fcmpId, "$FreeBSD$")
+libId(fcmpId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsfcmp.c,v 1.7 1999/08/27 23:36:45 peter Exp $")
 
 	static int discardkeyval P((int,RILE*));
 	static int
diff --git a/gnu/usr.bin/rcs/lib/rcsfnms.c b/gnu/usr.bin/rcs/lib/rcsfnms.c
index 00caec5adf6f4..4ba009d9d989b 100644
--- a/gnu/usr.bin/rcs/lib/rcsfnms.c
+++ b/gnu/usr.bin/rcs/lib/rcsfnms.c
@@ -177,7 +177,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(fnmsId, "$FreeBSD$")
+libId(fnmsId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsfnms.c,v 1.11 2001/05/06 03:07:12 kris Exp $")
 
 static char const *bindex P((char const*,int));
 static int fin2open P((char const*, size_t, char const*, size_t, char const*, size_t, RILE*(*)P((struct buf*,struct stat*,int)), int));
diff --git a/gnu/usr.bin/rcs/lib/rcsgen.c b/gnu/usr.bin/rcs/lib/rcsgen.c
index 35d8702a34f84..03469ec010df7 100644
--- a/gnu/usr.bin/rcs/lib/rcsgen.c
+++ b/gnu/usr.bin/rcs/lib/rcsgen.c
@@ -140,7 +140,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(genId, "$FreeBSD$")
+libId(genId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsgen.c,v 1.7 1999/08/27 23:36:46 peter Exp $")
 
 int interactiveflag;  /* Should we act as if stdin is a tty?  */
 struct buf curlogbuf;  /* buffer for current log message */
diff --git a/gnu/usr.bin/rcs/lib/rcskeep.c b/gnu/usr.bin/rcs/lib/rcskeep.c
index 4a90f851e6156..059e815abf648 100644
--- a/gnu/usr.bin/rcs/lib/rcskeep.c
+++ b/gnu/usr.bin/rcs/lib/rcskeep.c
@@ -98,7 +98,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(keepId, "$FreeBSD$")
+libId(keepId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcskeep.c,v 1.8 1999/08/27 23:36:46 peter Exp $")
 
 static int badly_terminated P((void));
 static int checknum P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcskeys.c b/gnu/usr.bin/rcs/lib/rcskeys.c
index 378f57dd0f775..34e2c39af1f2b 100644
--- a/gnu/usr.bin/rcs/lib/rcskeys.c
+++ b/gnu/usr.bin/rcs/lib/rcskeys.c
@@ -63,7 +63,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(keysId, "$FreeBSD$")
+libId(keysId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcskeys.c,v 1.13 2002/02/08 11:57:43 ru Exp $")
 
 
 char const *Keyword[] = {
diff --git a/gnu/usr.bin/rcs/lib/rcslex.c b/gnu/usr.bin/rcs/lib/rcslex.c
index 7a11f79b46c86..e8c00e3486c00 100644
--- a/gnu/usr.bin/rcs/lib/rcslex.c
+++ b/gnu/usr.bin/rcs/lib/rcslex.c
@@ -168,7 +168,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(lexId, "$FreeBSD$")
+libId(lexId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcslex.c,v 1.8 1999/08/27 23:36:47 peter Exp $")
 
 static char *checkidentifier P((char*,int,int));
 static void errsay P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcsmap.c b/gnu/usr.bin/rcs/lib/rcsmap.c
index 89fb08daf3646..fa4bd8ab5b769 100644
--- a/gnu/usr.bin/rcs/lib/rcsmap.c
+++ b/gnu/usr.bin/rcs/lib/rcsmap.c
@@ -29,7 +29,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mapId, "$FreeBSD$")
+libId(mapId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsmap.c,v 1.5 1999/08/27 23:36:47 peter Exp $")
 
 /* map of character types */
 /* ISO 8859/1 (Latin-1) */
diff --git a/gnu/usr.bin/rcs/lib/rcsrev.c b/gnu/usr.bin/rcs/lib/rcsrev.c
index 12c6c43006ac5..3d623d5b40a76 100644
--- a/gnu/usr.bin/rcs/lib/rcsrev.c
+++ b/gnu/usr.bin/rcs/lib/rcsrev.c
@@ -105,7 +105,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(revId, "$FreeBSD$")
+libId(revId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsrev.c,v 1.8 1999/08/27 23:36:48 peter Exp $")
 
 static char const *branchtip P((char const*));
 static char const *lookupsym P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcssyn.c b/gnu/usr.bin/rcs/lib/rcssyn.c
index 07f155bfb8ea8..72e84ec1efa52 100644
--- a/gnu/usr.bin/rcs/lib/rcssyn.c
+++ b/gnu/usr.bin/rcs/lib/rcssyn.c
@@ -153,7 +153,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(synId, "$FreeBSD$")
+libId(synId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcssyn.c,v 1.7 1999/08/27 23:36:48 peter Exp $")
 
 static char const *getkeyval P((char const*,enum tokens,int));
 static int getdelta P((void));
diff --git a/gnu/usr.bin/rcs/lib/rcstime.c b/gnu/usr.bin/rcs/lib/rcstime.c
index cfd466096ff7e..6083c1e4bd0d5 100644
--- a/gnu/usr.bin/rcs/lib/rcstime.c
+++ b/gnu/usr.bin/rcs/lib/rcstime.c
@@ -30,7 +30,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 #include "maketime.h"
 
-libId(rcstimeId, "$FreeBSD$")
+libId(rcstimeId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcstime.c,v 1.5 1999/08/27 23:36:48 peter Exp $")
 
 static long zone_offset; /* seconds east of UTC, or TM_LOCAL_ZONE */
 static int use_zone_offset; /* if zero, use UTC without zone indication */
diff --git a/gnu/usr.bin/rcs/lib/rcsutil.c b/gnu/usr.bin/rcs/lib/rcsutil.c
index e10afff6c20d2..dfa516a6d4915 100644
--- a/gnu/usr.bin/rcs/lib/rcsutil.c
+++ b/gnu/usr.bin/rcs/lib/rcsutil.c
@@ -186,7 +186,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(utilId, "$FreeBSD$")
+libId(utilId, "$FreeBSD: src/gnu/usr.bin/rcs/lib/rcsutil.c,v 1.8 1999/08/27 23:36:49 peter Exp $")
 
 #if !has_memcmp
 	int
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1
index a4fd35b7986aa..d59d9c2539a3d 100644
--- a/gnu/usr.bin/rcs/merge/merge.1
+++ b/gnu/usr.bin/rcs/merge/merge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/merge/merge.1,v 1.6 1999/08/27 23:36:50 peter Exp $
 .ds r \&\s-1RCS\s0
 .TH MERGE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index aa127bf1c8ec8..57e540e70b2b3 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -41,7 +41,7 @@ badoption(a)
 }
 
 
-mainProg(mergeId, "merge", "$FreeBSD$")
+mainProg(mergeId, "merge", "$FreeBSD: src/gnu/usr.bin/rcs/merge/merge.c,v 1.5 1999/08/27 23:36:51 peter Exp $")
 {
 	register char const *a;
 	char const *arg[3], *label[3], *edarg = 0;
diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile
index aa7cc5fb315d2..7e97a2ec7f4d1 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile
+++ b/gnu/usr.bin/rcs/rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcs/Makefile,v 1.8 2001/03/27 14:59:05 ru Exp $
 
 PROG=	rcs
 MAN=	rcs.1 rcsintro.1 rcsfile.5
diff --git a/gnu/usr.bin/rcs/rcs/rcs.1 b/gnu/usr.bin/rcs/rcs/rcs.1
index 37fb59fea0684..0b0dba116b650 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.1
+++ b/gnu/usr.bin/rcs/rcs/rcs.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcs.1,v 1.5 1999/08/27 23:36:52 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcs.c b/gnu/usr.bin/rcs/rcs/rcs.c
index dfb622a6f8082..d97ad3717cd12 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.c
+++ b/gnu/usr.bin/rcs/rcs/rcs.c
@@ -275,7 +275,7 @@ static struct delrevpair delrev;
 static struct hshentry *cuthead, *cuttail, *delstrt;
 static struct hshentries *gendeltas;
 
-mainProg(rcsId, "rcs", "$FreeBSD$")
+mainProg(rcsId, "rcs", "$FreeBSD: src/gnu/usr.bin/rcs/rcs/rcs.c,v 1.7 1999/08/27 23:36:52 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iILqTU} -ksubst -mrev:msg -{nN}name[:[rev]] -orange -sstate[:rev] -t[text] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcs/rcsfile.5 b/gnu/usr.bin/rcs/rcs/rcsfile.5
index 0d8aac874d45c..6d2f7404e1a44 100644
--- a/gnu/usr.bin/rcs/rcs/rcsfile.5
+++ b/gnu/usr.bin/rcs/rcs/rcsfile.5
@@ -5,7 +5,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcsfile.5,v 1.6 2001/07/09 09:53:19 dd Exp $
 .ds r \s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcsintro.1 b/gnu/usr.bin/rcs/rcs/rcsintro.1
index edcd9ee9389d1..f02c0e7ea9271 100644
--- a/gnu/usr.bin/rcs/rcs/rcsintro.1
+++ b/gnu/usr.bin/rcs/rcs/rcsintro.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcs/rcsintro.1,v 1.5 1999/08/27 23:36:53 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.1 b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
index 3111915455a68..5f8245060ec65 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.1
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsclean/rcsclean.1,v 1.5 1999/08/27 23:36:54 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.c b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
index 32c8e7dfbc63f..6759d8263f251 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.c
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
@@ -38,7 +38,7 @@ static void cleanup P((void));
 static RILE *workptr;
 static int exitstatus;
 
-mainProg(rcscleanId, "rcsclean", "$FreeBSD$")
+mainProg(rcscleanId, "rcsclean", "$FreeBSD: src/gnu/usr.bin/rcs/rcsclean/rcsclean.c,v 1.5 1999/08/27 23:36:54 peter Exp $")
 {
 	static char const usage[] =
 		"\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1 b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
index 74117c270e6c3..deeedd9ec94f9 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1,v 1.5 1999/08/27 23:36:55 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
index 7d3c0a37f66a6..8c8a119055aaf 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
@@ -151,7 +151,7 @@ static int exitstatus;
 static RILE *workptr;
 static struct stat workstat;
 
-mainProg(rcsdiffId, "rcsdiff", "$FreeBSD$")
+mainProg(rcsdiffId, "rcsdiff", "$FreeBSD: src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c,v 1.8 1999/08/27 23:36:55 peter Exp $")
 {
     static char const cmdusage[] =
 	    "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone [diff options] file ...";
diff --git a/gnu/usr.bin/rcs/rcsfreeze/Makefile b/gnu/usr.bin/rcs/rcsfreeze/Makefile
index 1b249c737f177..3e6247d154921 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/Makefile
+++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.9 2004/10/18 21:44:17 ru Exp $
 
 SCRIPTS= rcsfreeze.sh
 MAN=	rcsfreeze.1
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
index 3f513c4d65add..084830aeb51d9 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1,v 1.5 1999/08/27 23:36:57 peter Exp $
 .ds r \s-1RCS\s0
 .TH RCSFREEZE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
index be79406fe0c14..9ef61e1184096 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
@@ -2,7 +2,7 @@
 
 # rcsfreeze - assign a symbolic revision number to a configuration of RCS files
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh,v 1.9 2001/03/02 16:52:11 ru Exp $
 
 #       The idea is to run rcsfreeze each time a new version is checked
 #       in. A unique symbolic revision number (C_[number], where number
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
index aff6f666dabb6..e9c4187f7313a 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1,v 1.5 1999/08/27 23:36:58 peter Exp $
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index e09dc2469867f..72ef0cf09ad7a 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -117,7 +117,7 @@ Report problems and direct all questions to:
 
 static char const co[] = CO;
 
-mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$")
+mainProg(rcsmergeId, "rcsmerge", "$FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c,v 1.7 1999/08/27 23:36:58 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
diff --git a/gnu/usr.bin/rcs/rcstest b/gnu/usr.bin/rcs/rcstest
index 75165f1bbd59e..777ff906678cf 100755
--- a/gnu/usr.bin/rcs/rcstest
+++ b/gnu/usr.bin/rcs/rcstest
@@ -15,7 +15,7 @@
 
 # The current directory and ./RCS must be readable, writable, and searchable.
 
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/rcs/rcstest,v 1.5 1999/08/27 23:36:37 peter Exp $
 
 
 #    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/rlog/rlog.1 b/gnu/usr.bin/rcs/rlog/rlog.1
index 26bf08a2bcb09..891b4a23dfe94 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.1
+++ b/gnu/usr.bin/rcs/rlog/rlog.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/rlog/rlog.1,v 1.8 1999/08/27 23:36:59 peter Exp $
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/rlog/rlog.c b/gnu/usr.bin/rcs/rlog/rlog.c
index f8872febb971d..755828cca3de6 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.c
+++ b/gnu/usr.bin/rcs/rlog/rlog.c
@@ -218,7 +218,7 @@ static struct rcslockers *lockerlist;
 static struct stateattri *statelist;
 
 
-mainProg(rlogId, "rlog", "$FreeBSD$")
+mainProg(rlogId, "rlog", "$FreeBSD: src/gnu/usr.bin/rcs/rlog/rlog.c,v 1.13 1999/08/27 23:36:59 peter Exp $")
 {
 	static char const cmdusage[] =
 		"\nrlog usage: rlog -{bhLNRt} -v[string] -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index c40cd4d9d5682..e5d1e0a2da693 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/sdiff/Makefile,v 1.7 2007/06/15 07:09:33 delphij Exp $
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH:  ${DIFFSRC} \
diff --git a/gnu/usr.bin/sdiff/sdiff.c.diff b/gnu/usr.bin/sdiff/sdiff.c.diff
index bdb208bea834b..da4940a4bfb7f 100644
--- a/gnu/usr.bin/sdiff/sdiff.c.diff
+++ b/gnu/usr.bin/sdiff/sdiff.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/gnu/usr.bin/sdiff/sdiff.c.diff,v 1.1 2007/06/15 07:09:34 delphij Exp $
 --- sdiff.c.orig	2004-04-12 15:44:35.000000000 +0800
 +++ sdiff.c	2007-06-15 14:53:08.790433972 +0800
 @@ -455,7 +455,6 @@
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index f17db49acca5b..60b9d0b03318c 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.18 2003/09/07 13:38:07 ru Exp $
 #
 # Makefile for building a standalone send-pr.
 #
diff --git a/gnu/usr.bin/send-pr/categories b/gnu/usr.bin/send-pr/categories
index 5b312d45b295f..175ab7b9f689a 100644
--- a/gnu/usr.bin/send-pr/categories
+++ b/gnu/usr.bin/send-pr/categories
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $
 advocacy
 alpha
 amd64
diff --git a/gnu/usr.bin/send-pr/doc/categ.texi b/gnu/usr.bin/send-pr/doc/categ.texi
index fe84918c917fb..e7d9a48c5d723 100644
--- a/gnu/usr.bin/send-pr/doc/categ.texi
+++ b/gnu/usr.bin/send-pr/doc/categ.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/categ.texi,v 1.2 2000/10/29 22:05:52 steve Exp $
 
 @node Valid Categories
 @unnumberedsec Valid Categories
diff --git a/gnu/usr.bin/send-pr/doc/fields.texi b/gnu/usr.bin/send-pr/doc/fields.texi
index 0cce6424dc4bd..bc6eb8ba24e48 100644
--- a/gnu/usr.bin/send-pr/doc/fields.texi
+++ b/gnu/usr.bin/send-pr/doc/fields.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/fields.texi,v 1.3 2002/08/29 22:59:22 keramida Exp $
 
 @node Fields
 @section Problem Report format
diff --git a/gnu/usr.bin/send-pr/doc/s-usage.texi b/gnu/usr.bin/send-pr/doc/s-usage.texi
index 5c9006b200af7..6e4a19d10c226 100644
--- a/gnu/usr.bin/send-pr/doc/s-usage.texi
+++ b/gnu/usr.bin/send-pr/doc/s-usage.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/s-usage.texi,v 1.3 2000/10/29 22:05:52 steve Exp $
 
 @c This is the usage section for send-pr.  It is called as 
 @c chapter (Invoking send-pr) by send-pr.texi, and also as
diff --git a/gnu/usr.bin/send-pr/doc/send-pr.texi b/gnu/usr.bin/send-pr/doc/send-pr.texi
index 1abb296d86458..d08be352936f4 100644
--- a/gnu/usr.bin/send-pr/doc/send-pr.texi
+++ b/gnu/usr.bin/send-pr/doc/send-pr.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/send-pr.texi,v 1.3 2000/10/29 22:05:52 steve Exp $
 
 \input texinfo   @c -*-texinfo-*-
 @setfilename send-pr.info
diff --git a/gnu/usr.bin/send-pr/doc/states.texi b/gnu/usr.bin/send-pr/doc/states.texi
index f38405c8f292d..c264169a65f8a 100644
--- a/gnu/usr.bin/send-pr/doc/states.texi
+++ b/gnu/usr.bin/send-pr/doc/states.texi
@@ -1,4 +1,4 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/states.texi,v 1.2 2000/10/29 22:05:52 steve Exp $
 
 @node States
 @section States of Problem Reports
diff --git a/gnu/usr.bin/send-pr/doc/version.texi b/gnu/usr.bin/send-pr/doc/version.texi
index bffedc2a60d91..405d774a44165 100644
--- a/gnu/usr.bin/send-pr/doc/version.texi
+++ b/gnu/usr.bin/send-pr/doc/version.texi
@@ -1,3 +1,3 @@
-@c $FreeBSD$
+@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/version.texi,v 1.2 2000/10/29 22:05:52 steve Exp $
 
 @set VERSION 3.113
diff --git a/gnu/usr.bin/send-pr/send-pr-el.in b/gnu/usr.bin/send-pr/send-pr-el.in
index 8195ecbd0dd43..c8e3ff720fede 100644
--- a/gnu/usr.bin/send-pr/send-pr-el.in
+++ b/gnu/usr.bin/send-pr/send-pr-el.in
@@ -40,7 +40,7 @@
 ;;;;
 ;;;;---------------------------------------------------------------------------
 ;;;;
-;;;; $FreeBSD$
+;;;; $FreeBSD: src/gnu/usr.bin/send-pr/send-pr-el.in,v 1.7 2000/10/29 22:11:38 steve Exp $
 
 (provide 'send-pr)
 
diff --git a/gnu/usr.bin/send-pr/send-pr.1 b/gnu/usr.bin/send-pr/send-pr.1
index 7113968892d2c..a4ea27f1e914a 100644
--- a/gnu/usr.bin/send-pr/send-pr.1
+++ b/gnu/usr.bin/send-pr/send-pr.1
@@ -22,7 +22,7 @@
 .\"
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $
 .nh
 .TH SEND-PR 1 3.113 "October 2006"
 .SH NAME
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index 5b9d71bb78448..6647a8627affa 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -20,7 +20,7 @@
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.39 2007/06/02 18:06:08 philip Exp $
 
 # The version of this send-pr.
 VERSION=3.113
diff --git a/gnu/usr.bin/sort/Makefile b/gnu/usr.bin/sort/Makefile
index 2b116183792fa..5f76bd7921f15 100644
--- a/gnu/usr.bin/sort/Makefile
+++ b/gnu/usr.bin/sort/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/sort/Makefile,v 1.12 2004/08/12 06:02:28 tjr Exp $
 
 SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort
 .PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man
diff --git a/gnu/usr.bin/sort/alloca.h b/gnu/usr.bin/sort/alloca.h
index 59a1309f3cdc9..839bdd15e2f98 100644
--- a/gnu/usr.bin/sort/alloca.h
+++ b/gnu/usr.bin/sort/alloca.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/alloca.h,v 1.1 2004/07/02 09:34:37 tjr Exp $ */
 extern void *alloca(size_t size);
diff --git a/gnu/usr.bin/sort/config.h b/gnu/usr.bin/sort/config.h
index 44f944c04b0c2..127dee1234a20 100644
--- a/gnu/usr.bin/sort/config.h
+++ b/gnu/usr.bin/sort/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.8 2004/08/12 06:40:31 tjr Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
diff --git a/gnu/usr.bin/sort/localedir.h b/gnu/usr.bin/sort/localedir.h
index f119a5fbad3aa..7da16bcbc4f08 100644
--- a/gnu/usr.bin/sort/localedir.h
+++ b/gnu/usr.bin/sort/localedir.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/localedir.h,v 1.1 2004/07/02 09:34:37 tjr Exp $ */
 #define	LOCALEDIR	""
diff --git a/gnu/usr.bin/sort/unlocked-io.h b/gnu/usr.bin/sort/unlocked-io.h
index 3c7a4765eedac..8270f1ad88908 100644
--- a/gnu/usr.bin/sort/unlocked-io.h
+++ b/gnu/usr.bin/sort/unlocked-io.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/gnu/usr.bin/sort/unlocked-io.h,v 1.1 2002/06/08 10:34:12 ache Exp $ */
 /* Dummy file for trimmed down sort */
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index dc0d9e420a2cd..4c5a6d0a389cc 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/gnu/usr.bin/texinfo/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile,v 1.11 2002/03/25 13:20:03 ru Exp $
 #
 
 SUBDIR= libtxi makeinfo info infokey install-info texindex doc
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index d5c8e8154e460..4d0ec72286278 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.12 2005/06/10 06:12:51 des Exp $
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
 LIBTXI=		${.OBJDIR}/../libtxi/libtxi.a
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index 2a0b1a3616a71..0dd18306c7e1c 100644
--- a/gnu/usr.bin/texinfo/doc/Makefile
+++ b/gnu/usr.bin/texinfo/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/doc/Makefile,v 1.12 2000/01/17 10:59:24 ru Exp $
 
 INFO=	info info-stnd texinfo
 SRCDIR=	${TXIDIR}/doc
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index b4e44ac33a8b7..f5d1cca964cd0 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.14 2007/09/19 14:21:18 obrien Exp $
 
 PROG=	info
 MAN=	info.1 info.5 texinfo.5
diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile
index 50be00d914053..6c4e03a5b3706 100644
--- a/gnu/usr.bin/texinfo/infokey/Makefile
+++ b/gnu/usr.bin/texinfo/infokey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/infokey/Makefile,v 1.4 2005/05/23 10:52:07 ru Exp $
 
 PROG=	infokey
 SRCS=	infokey.c key.c
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index 325c9095b35f8..81496c3edfb83 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/install-info/Makefile,v 1.12 2002/06/05 06:58:32 ru Exp $
 
 PROG=	install-info
 
diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile
index 8decad1daed4f..7dabf988f4e68 100644
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/libtxi/Makefile,v 1.10 2004/10/24 15:32:29 ru Exp $
 
 LIB=	txi
 INTERNALLIB=
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index 373c326467b4c..01f079cfc4f3f 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/makeinfo/Makefile,v 1.17 2005/05/23 10:52:07 ru Exp $
 
 PROG=	makeinfo
 SRCS=	cmds.c defun.c files.c float.c footnote.c html.c \
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile
index 91c2dfc14e308..00a36664f2cdf 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile
+++ b/gnu/usr.bin/texinfo/texindex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/gnu/usr.bin/texinfo/texindex/Makefile,v 1.8 2002/06/05 06:58:33 ru Exp $
 
 PROG=	texindex
 
diff --git a/include/Makefile b/include/Makefile
index 40e35436bd9dc..d877cf5cb6ca7 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD$
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
 #
 # Doing a "make install" builds /usr/include.
 
diff --git a/include/_ctype.h b/include/_ctype.h
index 7600c4b5b6bc2..069a7f9c466ad 100644
--- a/include/_ctype.h
+++ b/include/_ctype.h
@@ -40,7 +40,7 @@
  *
  * From @(#)ctype.h	8.4 (Berkeley) 1/21/94
  * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD$
+ * $FreeBSD: src/include/_ctype.h,v 1.30.10.2 2007/10/30 04:45:27 rafan Exp $
  */
 
 #ifndef __CTYPE_H_
diff --git a/include/a.out.h b/include/a.out.h
index b0bbe49548196..4053ce08d8c95 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)a.out.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/a.out.h,v 1.4 2004/06/22 17:05:36 obrien Exp $
  */
 
 #ifndef	_AOUT_H_
diff --git a/include/ar.h b/include/ar.h
index 40b4d74b04c63..79cfcab47faf4 100644
--- a/include/ar.h
+++ b/include/ar.h
@@ -40,7 +40,7 @@
  *
  *	@(#)ar.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/ar.h,v 1.2 2006/11/13 04:28:29 jkoshy Exp $
  */
 
 #ifndef _AR_H_
diff --git a/include/arpa/Makefile b/include/arpa/Makefile
index a480b31341e5b..1944e03c7d479 100644
--- a/include/arpa/Makefile
+++ b/include/arpa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/arpa/Makefile,v 1.3 2004/12/21 08:46:51 ru Exp $
 
 NO_OBJ=
 INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index b6708366dd158..4250e447c3ce3 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -56,7 +56,7 @@
 /*%
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	$Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/inet.h,v 1.30 2007/08/24 20:25:52 bms Exp $
  */
 
 #ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index b8910263aef01..bcce320551558 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -50,7 +50,7 @@
 
 /*
  *	$Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/nameser.h,v 1.20 2007/06/03 17:20:25 ume Exp $
  */
 
 #ifndef _ARPA_NAMESER_H_
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index 64d05f8287211..da46dba973a91 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -33,7 +33,7 @@
 /*%
  *      from nameser.h	8.1 (Berkeley) 6/2/93
  *	$Id: nameser_compat.h,v 1.5.18.3 2006/05/19 02:36:00 marka Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.7 2007/06/03 17:20:25 ume Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index c937f03eacded..dd941c7e700ab 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/telnet.h,v 1.9 2003/01/18 06:13:57 billf Exp $
  */
 
 #ifndef _ARPA_TELNET_H_
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index eef9d4dc513f0..5af8908ba7ccb 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/arpa/tftp.h,v 1.6 2007/08/01 11:59:09 ticso Exp $
  */
 
 #ifndef _ARPA_TFTP_H_
diff --git a/include/assert.h b/include/assert.h
index f267a4a2a2ab5..5ad013563851d 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)assert.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/assert.h,v 1.4 2002/03/23 17:24:53 imp Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/include/bitstring.h b/include/bitstring.h
index cef9d0248d847..3dfb955cb4a61 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/bitstring.h,v 1.3 2003/06/13 19:40:13 phk Exp $
  */
 
 #ifndef _BITSTRING_H_
diff --git a/include/complex.h b/include/complex.h
index 502a178dff334..51d9a7f722518 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/complex.h,v 1.6 2004/08/14 18:03:21 stefanf Exp $
  */
 
 #ifndef _COMPLEX_H
diff --git a/include/cpio.h b/include/cpio.h
index e1d27ce5d2d98..d287af631ca16 100644
--- a/include/cpio.h
+++ b/include/cpio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/cpio.h,v 1.1 2002/08/01 07:18:38 mike Exp $
  */
 
 #ifndef _CPIO_H_
diff --git a/include/ctype.h b/include/ctype.h
index dfc89ccd5951a..6ce0970cce50c 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
- *      $FreeBSD$
+ *      $FreeBSD: src/include/ctype.h,v 1.28.18.1 2007/10/24 14:29:31 rafan Exp $
  */
 
 #ifndef _CTYPE_H_
diff --git a/include/db.h b/include/db.h
index c192a88733da8..a3975f0eda53d 100644
--- a/include/db.h
+++ b/include/db.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)db.h	8.7 (Berkeley) 6/16/94
- * $FreeBSD$
+ * $FreeBSD: src/include/db.h,v 1.5 2002/03/26 01:35:05 bde Exp $
  */
 
 #ifndef _DB_H_
diff --git a/include/dirent.h b/include/dirent.h
index d686dafc8e9f6..1d0e1e0be5664 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
- * $FreeBSD$
+ * $FreeBSD: src/include/dirent.h,v 1.14 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _DIRENT_H_
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 38f21b2468126..9ac91492faee1 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/dlfcn.h,v 1.20 2005/12/18 19:43:31 kan Exp $
  */
 
 #ifndef _DLFCN_H_
diff --git a/include/elf-hints.h b/include/elf-hints.h
index e009074a98e7d..d572a4f14a437 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/elf-hints.h,v 1.4 2001/05/02 23:56:17 obrien Exp $
  */
 
 #ifndef	_ELF_HINTS_H_
diff --git a/include/elf.h b/include/elf.h
index 9090137e82b32..74b66cc6a40cf 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $
  */
 
 /*
diff --git a/include/err.h b/include/err.h
index 675c708f98cbb..a3c04cf19f463 100644
--- a/include/err.h
+++ b/include/err.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)err.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/err.h,v 1.11 2002/08/21 16:19:55 mike Exp $
  */
 
 #ifndef _ERR_H_
diff --git a/include/fmtmsg.h b/include/fmtmsg.h
index 32f0970fb94ec..256cf335e696d 100644
--- a/include/fmtmsg.h
+++ b/include/fmtmsg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/fmtmsg.h,v 1.2 2002/08/05 16:37:05 mike Exp $
  */
 
 #ifndef _FMTMSG_H_
diff --git a/include/fnmatch.h b/include/fnmatch.h
index f905ff6e3c267..d1cc03ac650d2 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/fnmatch.h,v 1.15 2003/12/18 10:41:39 jkh Exp $
  *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
  */
 
diff --git a/include/fstab.h b/include/fstab.h
index cae9172aed8c9..22d807cb6bd1d 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fstab.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/fstab.h,v 1.4 2003/04/07 12:54:59 mdodd Exp $
  */
 
 #ifndef _FSTAB_H_
diff --git a/include/fts.h b/include/fts.h
index 7eb03a6499433..2178559a05986 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
+ * $FreeBSD: src/include/fts.h,v 1.11 2005/01/07 00:06:20 pjd Exp $
  */
 
 #ifndef	_FTS_H_
diff --git a/include/ftw.h b/include/ftw.h
index f01fda20d9250..9fc3edea17b80 100644
--- a/include/ftw.h
+++ b/include/ftw.h
@@ -19,7 +19,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/ftw.h,v 1.2 2004/08/24 13:00:54 tjr Exp $
  */
 
 #ifndef	_FTW_H
diff --git a/include/getopt.h b/include/getopt.h
index dca3c3d661944..ddacd89406e9e 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/getopt.h,v 1.6 2004/02/24 08:09:20 ache Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/include/glob.h b/include/glob.h
index 1c0605e559981..905c4a1597bc1 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/glob.h,v 1.10 2006/05/22 05:57:39 ache Exp $
  */
 
 #ifndef _GLOB_H_
diff --git a/include/grp.h b/include/grp.h
index 70b4a8a245137..55a57a7152237 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)grp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/grp.h,v 1.18 2003/04/17 14:15:25 nectar Exp $
  */
 
 #ifndef _GRP_H_
diff --git a/include/gssapi.h b/include/gssapi.h
index 5557de8f73569..0d7e478e45999 100644
--- a/include/gssapi.h
+++ b/include/gssapi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/gssapi.h,v 1.1 2005/12/29 14:40:19 dfr Exp $ */
 #ifdef __GNUC__
 #warning "this file includes <gssapi.h> which is deprecated, use <gssapi/gssapi.h> instead"
 #endif
diff --git a/include/gssapi/Makefile b/include/gssapi/Makefile
index 8fb643fb3b564..dbe64864b9a5b 100644
--- a/include/gssapi/Makefile
+++ b/include/gssapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/gssapi/Makefile,v 1.1 2005/12/29 14:40:19 dfr Exp $
 
 NO_OBJ=
 INCS= gssapi.h
diff --git a/include/gssapi/gssapi.h b/include/gssapi/gssapi.h
index 7509b0481209f..93c9c9c039922 100644
--- a/include/gssapi/gssapi.h
+++ b/include/gssapi/gssapi.h
@@ -25,7 +25,7 @@
  * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
  * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/gssapi/gssapi.h,v 1.1 2005/12/29 14:40:19 dfr Exp $
  */
 
 #ifndef _GSSAPI_GSSAPI_H_
diff --git a/include/hesiod.h b/include/hesiod.h
index 4b5d42f7d3023..c7dbeee332e70 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hesiod.h,v 1.3 1999/01/24 23:53:18 lukem Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/hesiod.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
 
 
 /*-
diff --git a/include/histedit.h b/include/histedit.h
index 0824a60233397..a336ecd3a0063 100644
--- a/include/histedit.h
+++ b/include/histedit.h
@@ -31,7 +31,7 @@
  *
  *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
  *	$NetBSD: histedit.h,v 1.32 2007/06/10 20:20:28 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/histedit.h,v 1.12 2007/06/11 06:25:19 stefanf Exp $
  */
 
 /*
diff --git a/include/ieeefp.h b/include/ieeefp.h
index e4f943d389162..981deea0a2cd0 100644
--- a/include/ieeefp.h
+++ b/include/ieeefp.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/ieeefp.h,v 1.7 2003/01/19 06:01:32 marcel Exp $ */
 
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index f0911a48f3ef9..4de13c5a61388 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/include/ifaddrs.h,v 1.3 2003/11/14 18:53:22 bms Exp $	*/
 
 /*
  * Copyright (c) 1995, 1999
diff --git a/include/inttypes.h b/include/inttypes.h
index 05171a6c9d426..ae537a5771983 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/inttypes.h,v 1.8 2002/09/22 08:06:45 tjr Exp $
  */
 
 #ifndef _INTTYPES_H_
diff --git a/include/iso646.h b/include/iso646.h
index d38bf4be6a2e4..392b19f0b53f1 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/iso646.h,v 1.4 2002/09/18 22:23:59 mike Exp $
  */
 
 #ifndef _ISO646_H_
diff --git a/include/kenv.h b/include/kenv.h
index 90af9298f3667..3b0d533aeca65 100644
--- a/include/kenv.h
+++ b/include/kenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/kenv.h,v 1.2 2005/11/24 07:20:26 ru Exp $
  */
 
 #ifndef _KENV_H_
diff --git a/include/langinfo.h b/include/langinfo.h
index 59b50f9ce34c0..4a1375ce77250 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/langinfo.h,v 1.6 2002/09/18 05:54:25 mike Exp $
  */
 
 #ifndef _LANGINFO_H_
diff --git a/include/libgen.h b/include/libgen.h
index 3639c712b9fa2..df21c663bf7f3 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/include/limits.h b/include/limits.h
index 3f770cc3408e3..587f01f767bc5 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $
  */
 
 #ifndef _LIMITS_H_
diff --git a/include/link.h b/include/link.h
index f95bbe8872a40..bb1c737dd552a 100644
--- a/include/link.h
+++ b/include/link.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/link.h,v 1.25 2002/09/17 01:48:50 peter Exp $
  */
 
 #include <sys/link_elf.h>
diff --git a/include/locale.h b/include/locale.h
index ba702140a4ec4..b5a48eaaee27b 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locale.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/locale.h,v 1.8 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _LOCALE_H_
diff --git a/include/malloc.h b/include/malloc.h
index 5d7d7e8396d3f..0688aaae7aaf2 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/malloc.h,v 1.5 2001/11/07 23:14:31 obrien Exp $ */
 #if __STDC__
 #error "<malloc.h> has been replaced by <stdlib.h>"
 #else
diff --git a/include/malloc_np.h b/include/malloc_np.h
index bd45d195b8c8a..5be54698a3645 100644
--- a/include/malloc_np.h
+++ b/include/malloc_np.h
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/malloc_np.h,v 1.2 2006/06/30 20:57:41 jasone Exp $
  */
 
 #ifndef _MALLOC_NP_H_
diff --git a/include/monetary.h b/include/monetary.h
index ade6a88b511fc..4d4c69d5a5d61 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/monetary.h,v 1.7 2002/09/20 08:22:48 mike Exp $
  */
 
 #ifndef _MONETARY_H_
diff --git a/include/mpool.h b/include/mpool.h
index b5be330a0cc52..8342ca1cb698f 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mpool.h	8.2 (Berkeley) 7/14/94
- * $FreeBSD$
+ * $FreeBSD: src/include/mpool.h,v 1.9 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef _MPOOL_H_
diff --git a/include/mqueue.h b/include/mqueue.h
index 833274f04b898..6b9958d70b8dc 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/mqueue.h,v 1.3 2007/01/06 11:30:04 davidxu Exp $
  */
 
 #ifndef _MQUEUE_H_
diff --git a/include/ndbm.h b/include/ndbm.h
index e144ba816a465..1637cd903d525 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ndbm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/ndbm.h,v 1.4 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef _NDBM_H_
diff --git a/include/netconfig.h b/include/netconfig.h
index 80dc0da2738f0..cead3210902c1 100644
--- a/include/netconfig.h
+++ b/include/netconfig.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/netconfig.h,v 1.3 2002/03/23 17:24:53 imp Exp $ */
 
 
 #ifndef _NETCONFIG_H_
diff --git a/include/netdb.h b/include/netdb.h
index cd7fc74182792..4a078e9e3eec5 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -55,7 +55,7 @@
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/netdb.h,v 1.44 2006/05/21 11:27:28 ume Exp $
  */
 
 #ifndef _NETDB_H_
diff --git a/include/nl_types.h b/include/nl_types.h
index e3865680bbef6..c1b272cfbd943 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $
  */
 
 #ifndef _NL_TYPES_H_
diff --git a/include/nlist.h b/include/nlist.h
index 3dccf9e7b8eb9..ec5507423103e 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nlist.h,v 1.9 2002/08/22 20:37:57 peter Exp $
  */
 
 #ifndef _NLIST_H_
diff --git a/include/nss.h b/include/nss.h
index 1f4d078b1c3b3..792b16bb5a4ff 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/nss.h,v 1.2 2004/01/09 13:43:49 nectar Exp $
  *
  * Compatibility header for the GNU C Library-style nsswitch interface.
  */
diff --git a/include/nsswitch.h b/include/nsswitch.h
index 5e7ee0c29ba7b..34e436795fa71 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/include/paths.h b/include/paths.h
index 69990a6f79294..f8c90d74bd80e 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/paths.h,v 1.26 2007/06/11 02:21:18 simokawa Exp $
  */
 
 #ifndef _PATHS_H_
diff --git a/include/printf.h b/include/printf.h
index 02fe6398b692a..bcaa4a924ddd5 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/printf.h,v 1.4 2006/03/02 10:01:52 phk Exp $
  */
 
 #ifndef _PRINTF_H_
diff --git a/include/proc_service.h b/include/proc_service.h
index c9e6f27b4ef7c..5378f51ac438f 100644
--- a/include/proc_service.h
+++ b/include/proc_service.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/proc_service.h,v 1.4 2006/02/07 02:29:54 davidxu Exp $
  */
 
 #ifndef _PROC_SERVICE_H_
diff --git a/include/protocols/Makefile b/include/protocols/Makefile
index ddd8f21dc9129..2dc4e9e684274 100644
--- a/include/protocols/Makefile
+++ b/include/protocols/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/include/protocols/Makefile,v 1.3 2004/12/21 08:46:52 ru Exp $
 
 NO_OBJ=
 INCS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 0b69e2d9709af..ec8153d0f1d1b 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -37,7 +37,7 @@
  *
  *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/protocols/dumprestore.h,v 1.11 2007/02/26 08:15:56 mckusick Exp $
  */
 
 #ifndef _PROTOCOLS_DUMPRESTORE_H_
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index b55b622507881..5ed6aafb1cefb 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -32,7 +32,7 @@
  *
  *	@(#)routed.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/protocols/routed.h,v 1.16 2004/02/25 23:45:57 bms Exp $
  *	$Revision: 2.26 $
  */
 
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index faa44e4e49fd1..cc23ac845c6db 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -32,7 +32,7 @@
  *
  *	@(#)timed.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/protocols/timed.h,v 1.7 2002/02/03 12:00:05 markm Exp $
  */
 
 #ifndef	_PROTOCOLS_TIMED_H_
diff --git a/include/pthread.h b/include/pthread.h
index 361b45ce91e01..06ca03f6816ab 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/pthread.h,v 1.40.2.1 2007/11/14 01:10:11 kris Exp $
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
diff --git a/include/pthread_np.h b/include/pthread_np.h
index cebf4cfdfc00f..f8394634dd3b6 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/pthread_np.h,v 1.16 2005/10/04 07:23:56 davidxu Exp $
  */
 #ifndef _PTHREAD_NP_H_
 #define _PTHREAD_NP_H_
diff --git a/include/pwd.h b/include/pwd.h
index 4503ddb243a07..69a1a8950cf79 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pwd.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/pwd.h,v 1.16 2005/01/26 17:26:54 nectar Exp $
  */
 
 #ifndef _PWD_H_
diff --git a/include/readpassphrase.h b/include/readpassphrase.h
index 031f51796c913..ce28f2a5df880 100644
--- a/include/readpassphrase.h
+++ b/include/readpassphrase.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: /usr/local/www/cvsroot/OpenBSD/src/include/readpassphrase.h,v 1.2 2002/02/16 21:27:17 millert Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/include/readpassphrase.h,v 1.2 2002/03/08 20:52:52 green Exp $	*/
 
 /*
  * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/include/regex.h b/include/regex.h
index 3c3c87fde57b0..5c072f46bf9a7 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $
  */
 
 #ifndef _REGEX_H_
diff --git a/include/regexp.h b/include/regexp.h
index 96c2c94db9518..53330155665d3 100644
--- a/include/regexp.h
+++ b/include/regexp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regexp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/regexp.h,v 1.2 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef	_REGEXP_H_
diff --git a/include/res_update.h b/include/res_update.h
index f09d3a1a49cdb..36a20360e2e9e 100644
--- a/include/res_update.h
+++ b/include/res_update.h
@@ -17,7 +17,7 @@
 
 /*
  *	$Id: res_update.h,v 1.2.18.1 2005/04/27 05:00:49 sra Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/res_update.h,v 1.3 2007/06/03 17:20:25 ume Exp $
  */
 
 #ifndef __RES_UPDATE_H
diff --git a/include/resolv.h b/include/resolv.h
index ec18f5f00a446..117aa58d8175d 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -51,7 +51,7 @@
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	$Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/resolv.h,v 1.32 2007/06/03 17:20:25 ume Exp $
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/Makefile b/include/rpc/Makefile
index ee78fcf00e174..2cfc36683d594 100644
--- a/include/rpc/Makefile
+++ b/include/rpc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-#	$FreeBSD$
+#	$FreeBSD: src/include/rpc/Makefile,v 1.3 2007/04/10 22:10:16 pjd Exp $
 
 .SUFFIXES: .x
 
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index fd48421de8a00..f7eae228564cc 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -31,7 +31,7 @@
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
  *	from: @(#)auth.h	1.43 	98/02/02 SMI
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/auth.h,v 1.21 2006/02/28 16:02:26 deischen Exp $
  */
 
 /*
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index fff4ebfe300c4..24ef5d3442ef4 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -1,5 +1,5 @@
 /*	@(#)auth_des.h	2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/auth_des.h,v 1.3 2002/03/23 17:24:55 imp Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h
index 1dcfb0d4f4f25..0231598f56e76 100644
--- a/include/rpc/auth_kerb.h
+++ b/include/rpc/auth_kerb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/auth_kerb.h,v 1.3 2007/02/02 18:11:18 schweikh Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 48373b2c24c71..721a5c942ad80 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/auth_unix.h,v 1.11 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 1c85a4a736881..ef0cb764f3f97 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -47,7 +47,7 @@
  *
  *	from: @(#)clnt.h 1.31 94/04/29 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/clnt.h,v 1.21 2003/01/24 01:47:55 fjoe Exp $
  */
 
 /*
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index 1e7a0dea59e41..338d28fbd51c3 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/clnt_soc.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/clnt_stat.h b/include/rpc/clnt_stat.h
index 6148b4eb94a52..397bdbc596ed1 100644
--- a/include/rpc/clnt_stat.h
+++ b/include/rpc/clnt_stat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/clnt_stat.h,v 1.2 2001/03/20 08:20:50 alfred Exp $ */
 /*
  * Copyright (c) 1986 - 1991, 1994, 1996, 1997 by Sun Microsystems, Inc.
  * All rights reserved.
diff --git a/include/rpc/des.h b/include/rpc/des.h
index f920e22d24a3f..385afde075d3b 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -1,5 +1,5 @@
 /*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/include/rpc/des.h,v 1.4 2002/03/23 17:24:55 imp Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index a5df606e9e0b0..eb166eded1f5b 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -1,6 +1,6 @@
 /*
  * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/des_crypt.h,v 1.4 2002/03/23 17:24:55 imp Exp $
  *
  * des_crypt.h, des library routine interface
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index 5e26268a68dab..b18dc49fe6341 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/nettype.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 89f1614ab9c9a..e6333c7c7e7bd 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI 
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_clnt.h,v 1.14 2002/04/28 15:18:45 des Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 366832a7d3f8c..d83049943c257 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_prot.h,v 1.12 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 5c0806681e9e2..3e069e785c3b6 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/pmap_rmt.h,v 1.12 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/raw.h b/include/rpc/raw.h
index 0fea4ad087a28..d418bf41ebba5 100644
--- a/include/rpc/raw.h
+++ b/include/rpc/raw.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: raw.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/raw.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 725b542a8dde3..72a717c053955 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/rpc.h,v 1.17 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index 122fe7e4baca4..56bc68aea8292 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/rpc_com.h,v 1.6 2003/01/16 07:13:51 mbr Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 354b341476771..ab2cde81a535f 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/rpc_msg.h,v 1.15 2003/01/01 18:48:42 schweikh Exp $
  */
 
 /*
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index fa64a853f90dd..3b9966b3b08b9 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/rpcb_clnt.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x
index c5748413cdfd5..39f1627765930 100644
--- a/include/rpc/rpcb_prot.x
+++ b/include/rpc/rpcb_prot.x
@@ -1,5 +1,5 @@
 %/*
-% * $FreeBSD$
+% * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
 % *
 % * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 % * unrestricted use provided that this legend is included on all tape
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 876b488b2b1ba..31f0942ed7da6 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcent.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/rpcent.h,v 1.4 2006/04/29 04:26:16 ume Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 7ecae0c68e8f0..393d104ce44cb 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)svc.h 1.35 88/12/17 SMI
  *	from: @(#)svc.h      1.27    94/04/25 SMI
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/svc.h,v 1.24 2003/06/15 10:32:01 mbr Exp $
  */
 
 /*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 67df9765e62b2..366f752d9093e 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpc/svc_dg.h b/include/rpc/svc_dg.h
index 3514745d2efd4..67d25643b2cec 100644
--- a/include/rpc/svc_dg.h
+++ b/include/rpc/svc_dg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/svc_dg.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 6c528dbc95c6e..ceb4392c74dac 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: svc_soc.h,v 1.1 2000/06/02 22:57:57 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/include/rpc/svc_soc.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index db29cc3cf5fa1..3138a21b11542 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.23 2003/03/07 13:19:40 nectar Exp $
  */
 
 /*
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
index d7d093fe5eb70..31613697fe1a5 100644
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-# $FreeBSD$
+# $FreeBSD: src/include/rpcsvc/Makefile,v 1.25 2002/05/12 16:00:49 ru Exp $
 
 .SUFFIXES: .x
 
diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x
index 78b0a15754875..af4f3cd964df6 100644
--- a/include/rpcsvc/bootparam_prot.x
+++ b/include/rpcsvc/bootparam_prot.x
@@ -49,7 +49,7 @@
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/bootparam_prot.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const MAX_MACHINE_NAME  = 255;
diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x
index 3b296c0ddf1d5..23772ab066fb2 100644
--- a/include/rpcsvc/crypt.x
+++ b/include/rpcsvc/crypt.x
@@ -32,7 +32,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/crypt.x,v 1.5 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /*
diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x
index 7800a0781ec67..555d1d203fcec 100644
--- a/include/rpcsvc/key_prot.x
+++ b/include/rpcsvc/key_prot.x
@@ -46,7 +46,7 @@
 %/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
 %/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/key_prot.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 %
 %/* 
 % * Compiled from key_prot.x using rpcgen.
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index f820bdc1fc80d..6a3f8614d22da 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -42,7 +42,7 @@
 %/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/klm_prot.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const	LM_MAXSTRLEN = 1024;
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index 95966610cf149..d9dc426ec41fb 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -37,7 +37,7 @@
 %/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/mount.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index 8a09ac3a4d1fc..722ea38742545 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -33,7 +33,7 @@
 %/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nfs_prot.x,v 1.8 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const NFS_PORT          = 2049;
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index 7ebb19dff81be..8cf9b1cea5d2d 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -30,7 +30,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nis.x,v 1.6 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /* 
diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x
index 6edaea92c38b0..01a0af926a5f8 100644
--- a/include/rpcsvc/nis_cache.x
+++ b/include/rpcsvc/nis_cache.x
@@ -39,7 +39,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nis_cache.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 #ifdef RPC_HDR
diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x
index 3146ec30673dc..7fd6b53236a7e 100644
--- a/include/rpcsvc/nis_callback.x
+++ b/include/rpcsvc/nis_callback.x
@@ -39,7 +39,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nis_callback.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /*
diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h
index 9dcc78376b1aa..b0b59fbbd2ce8 100644
--- a/include/rpcsvc/nis_db.h
+++ b/include/rpcsvc/nis_db.h
@@ -26,7 +26,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/nis_db.h,v 1.6 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpcsvc/nislib.h b/include/rpcsvc/nislib.h
index 754affe9a4307..9b2e7f2508f58 100644
--- a/include/rpcsvc/nislib.h
+++ b/include/rpcsvc/nislib.h
@@ -26,7 +26,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/nislib.h,v 1.4 2002/03/23 17:24:55 imp Exp $
  */
 
 /*
diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x
index 87bf6c8443594..d9f44dba27742 100644
--- a/include/rpcsvc/nlm_prot.x
+++ b/include/rpcsvc/nlm_prot.x
@@ -15,7 +15,7 @@
 %/*static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
 %__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $");
 %#endif /* not lint */
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/nlm_prot.x,v 1.11 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /*
diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x
index 19a4d8c5a2fda..ceb0b6aea38b9 100644
--- a/include/rpcsvc/pmap_prot.x
+++ b/include/rpcsvc/pmap_prot.x
@@ -36,7 +36,7 @@
 %
 %#pragma ident	"@(#)pmap_prot.x	1.6	94/04/29 SMI"
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/pmap_prot.x,v 1.3 2003/05/04 02:51:42 obrien Exp $");
 %
 %#ifndef _KERNEL
 %
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index eabc4d5928ee2..507f79afbf67c 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -37,7 +37,7 @@
 %/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rex.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const STRINGSIZE = 1024;
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index c554827a079e1..5ddb22dcf3eec 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -37,7 +37,7 @@
 %/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rnusers.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const MAXUSERS = 100;
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 0f3ecfc54d2e0..fb73b2796b6be 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -9,7 +9,7 @@
 %/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rquota.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const RQ_PATHLEN = 1024;
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index 3f524ee4c81b6..b3d19a67ca5a6 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -49,7 +49,7 @@
 %/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/rstat.x,v 1.8 2003/05/04 02:51:42 obrien Exp $");
 
 #endif /* def RPC_HDR */
 
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index c66287d73231a..dd50d4127b21a 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -38,7 +38,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/sm_inter.x,v 1.11 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 program SM_PROG { 
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index 0e7c44e92e7b0..2e14fea55a617 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -38,7 +38,7 @@
 %/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/spray.x,v 1.7 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const SPRAYMAX = 8845;	/* max amount can spray */
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index 212050fd7eb64..ae4454f6584bc 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -35,7 +35,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/yp.x,v 1.13 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 const YPMAXRECORD = 1024;
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index 10d5828914868..3e3827d6470ff 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/yp_prot.h,v 1.13 2005/12/06 02:01:06 peter Exp $
  */
 
 #ifndef _RPCSVC_YP_PROT_H_
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index abde97c3efeb9..e51a65225d5c2 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/rpcsvc/ypclnt.h,v 1.16 2003/10/26 16:35:11 peter Exp $
  */
 
 #ifndef _RPCSVC_YPCLNT_H_
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index da0399d82db27..c42b3855f1bb9 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -38,7 +38,7 @@
 %/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
 %#endif /* not lint */
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/yppasswd.x,v 1.8 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 program YPPASSWDPROG {
diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x
index 90648a023e6ea..04bef54ae10cd 100644
--- a/include/rpcsvc/ypupdate_prot.x
+++ b/include/rpcsvc/ypupdate_prot.x
@@ -35,7 +35,7 @@
 %/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/ypupdate_prot.x,v 1.4 2003/05/04 02:51:42 obrien Exp $");
 #endif
 %
 %/*
diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x
index 6a767682360a8..96b980b0e2bfa 100644
--- a/include/rpcsvc/ypxfrd.x
+++ b/include/rpcsvc/ypxfrd.x
@@ -66,7 +66,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/include/rpcsvc/ypxfrd.x,v 1.9 2003/05/04 02:51:42 obrien Exp $");
 #endif
 
 /* XXX cribbed from yp.x */
diff --git a/include/runetype.h b/include/runetype.h
index 1625ef8f4e830..f3054fa51bb93 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/runetype.h,v 1.9 2004/06/23 07:01:43 tjr Exp $
  */
 
 #ifndef	_RUNETYPE_H_
diff --git a/include/search.h b/include/search.h
index 4e4606f12720c..e401e01528c9c 100644
--- a/include/search.h
+++ b/include/search.h
@@ -3,7 +3,7 @@
  * Public domain.
  *
  *	$NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/search.h,v 1.10 2002/10/16 14:29:23 robert Exp $
  */
 
 #ifndef _SEARCH_H_
diff --git a/include/setjmp.h b/include/setjmp.h
index 95644113e7103..eb8e63081bc51 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/setjmp.h,v 1.8 2002/10/05 05:48:50 mike Exp $
  */
 
 #ifndef _SETJMP_H_
diff --git a/include/signal.h b/include/signal.h
index 3241193ca5883..bb34dbecf9013 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- * $FreeBSD$
+ * $FreeBSD: src/include/signal.h,v 1.26 2005/10/16 22:23:03 davidxu Exp $
  */
 
 #ifndef _SIGNAL_H_
diff --git a/include/stdbool.h b/include/stdbool.h
index c0d6459cc029b..dc8af5b1de872 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/stdbool.h,v 1.7 2005/02/19 13:47:33 marius Exp $
  */
 
 #ifndef _STDBOOL_H_
diff --git a/include/stddef.h b/include/stddef.h
index dd7362129323f..a331305f57bbf 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -32,7 +32,7 @@
  *
  *	@(#)stddef.h	8.1 (Berkeley) 6/2/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/stddef.h,v 1.10 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _STDDEF_H_
diff --git a/include/stdio.h b/include/stdio.h
index 348db22e181c6..1eef5637b77e3 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD$
+ * $FreeBSD: src/include/stdio.h,v 1.60 2007/04/07 16:02:30 pjd Exp $
  */
 
 #ifndef	_STDIO_H_
diff --git a/include/stdlib.h b/include/stdlib.h
index 98cb465c8f336..4b72bbe9f729b 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/include/stdlib.h,v 1.65 2007/07/04 00:00:38 scf Exp $
  */
 
 #ifndef _STDLIB_H_
diff --git a/include/string.h b/include/string.h
index f0dc21814897b..ce53559df9b03 100644
--- a/include/string.h
+++ b/include/string.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $
  */
 
 #ifndef _STRING_H_
diff --git a/include/stringlist.h b/include/stringlist.h
index bae2a2ca3871a..52a121c24bdb5 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/stringlist.h,v 1.3 2003/01/19 01:16:00 obrien Exp $
  */
 
 #ifndef _STRINGLIST_H
diff --git a/include/strings.h b/include/strings.h
index 4b19d0ecc665b..a7f289ff8ecac 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $
  */
 
 #ifndef _STRINGS_H_
diff --git a/include/tgmath.h b/include/tgmath.h
index 7ff8dd4ec0a8c..01ba0c2da37dd 100644
--- a/include/tgmath.h
+++ b/include/tgmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/tgmath.h,v 1.5 2007/02/02 18:30:23 schweikh Exp $
  */
 
 #ifndef _TGMATH_H_
diff --git a/include/time.h b/include/time.h
index 69a41c2451eee..393830fc94259 100644
--- a/include/time.h
+++ b/include/time.h
@@ -39,7 +39,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/include/time.h,v 1.34 2006/04/15 03:08:55 jb Exp $
  */
 
 #ifndef _TIME_H_
diff --git a/include/timeconv.h b/include/timeconv.h
index cce937cf7e546..a9345c6986e2d 100644
--- a/include/timeconv.h
+++ b/include/timeconv.h
@@ -39,7 +39,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/include/timeconv.h,v 1.2 2002/08/21 16:19:55 mike Exp $
  */
 
 #ifndef _TIMECONV_H_
diff --git a/include/timers.h b/include/timers.h
index 73180f9c75e11..9a6eacda8ad33 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/timers.h,v 1.4 1999/08/27 23:44:52 peter Exp $
  *
  * Description : Basic timers header.
  *
diff --git a/include/ttyent.h b/include/ttyent.h
index 12902d097fcf1..e870d705da54c 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttyent.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/ttyent.h,v 1.7 2002/03/23 17:24:53 imp Exp $
  */
 
 #ifndef	_TTYENT_H_
diff --git a/include/ulimit.h b/include/ulimit.h
index ffc40671ea0f3..c6a451c75f9c1 100644
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/ulimit.h,v 1.4 2003/01/08 01:18:13 tjr Exp $
  */
 
 #ifndef _ULIMIT_H_
diff --git a/include/unistd.h b/include/unistd.h
index 48c925c340a0d..1b71526364d2a 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD$
+ * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $
  */
 
 #ifndef _UNISTD_H_
diff --git a/include/utime.h b/include/utime.h
index 8f803657bc487..ded805af27c6d 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utime.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/utime.h,v 1.5 2002/08/24 00:11:52 mike Exp $
  */
 
 #ifndef	_UTIME_H_
diff --git a/include/utmp.h b/include/utmp.h
index bdf137be93e81..fdd9accc6a605 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/include/utmp.h,v 1.10 2001/10/27 20:40:54 peter Exp $
  */
 
 #ifndef	_UTMP_H_
diff --git a/include/uuid.h b/include/uuid.h
index 13e65ea4a09f0..634f5b2f6bede 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/uuid.h,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #ifndef _UUID_H_
diff --git a/include/varargs.h b/include/varargs.h
index 51a9b595c54b7..cd5444f907bfe 100644
--- a/include/varargs.h
+++ b/include/varargs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/varargs.h,v 1.1 2003/09/01 03:28:25 kan Exp $
  */
 
 #ifndef _VARARGS_H_
diff --git a/include/vis.h b/include/vis.h
index 28f9765e78bd2..f06cfbac98106 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $
  */
 
 #ifndef _VIS_H_
diff --git a/include/wchar.h b/include/wchar.h
index 2326b1debb504..240ec84b17447 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/wchar.h,v 1.46 2005/08/13 05:54:33 tjr Exp $
  */
 
 /*-
diff --git a/include/wctype.h b/include/wctype.h
index 098045fa11a50..2372176de4da3 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -25,7 +25,7 @@
  *
  *	citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp
  *	$NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $
- * $FreeBSD$
+ * $FreeBSD: src/include/wctype.h,v 1.13 2004/08/12 10:29:14 tjr Exp $
  */
 
 #ifndef _WCTYPE_H_
diff --git a/include/wordexp.h b/include/wordexp.h
index b86e6f9e34b78..1a41e3512620d 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/include/wordexp.h,v 1.5 2004/06/30 13:55:08 tjr Exp $
  */
 
 #ifndef _WORDEXP_H_
diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index 366540c6ee72a..28c016a482fdf 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/Makefile,v 1.17 2006/03/17 18:54:23 ru Exp $
 
 SUBDIR=	doc tools lib libexec usr.bin usr.sbin
 
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 2dc673904a470..c4ebc5ef4e434 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/Makefile.inc,v 1.27 2006/07/28 06:33:27 yar Exp $
 
 NO_LINT=
 
diff --git a/kerberos5/doc/Makefile b/kerberos5/doc/Makefile
index 1f71ed85cf5e1..83b11f9460479 100644
--- a/kerberos5/doc/Makefile
+++ b/kerberos5/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/doc/Makefile,v 1.1 2002/07/05 05:47:13 ru Exp $
 
 INFO=	heimdal
 SRCDIR=	${.CURDIR}/../../crypto/heimdal/doc
diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index fd7ad26012090..ea5cecbe98856 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -1,7 +1,7 @@
 /* include/config.h.  Generated automatically by configure.  */
 /* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/config.h,v 1.15 2005/02/24 22:24:23 nectar Exp $ */
 
 #include <osreldate.h>
 
diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h
index b224364140f0a..904e0c81e5d15 100644
--- a/kerberos5/include/crypto-headers.h
+++ b/kerberos5/include/crypto-headers.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/crypto-headers.h,v 1.2 2003/01/21 14:08:24 nectar Exp $ */
 #ifndef __crypto_headers_h__
 #define __crypto_headers_h__
 #define OPENSSL_DES_LIBDES_COMPATIBILITY
diff --git a/kerberos5/include/krb5-types.h b/kerberos5/include/krb5-types.h
index d43bb74db6790..b88f94b97e8eb 100644
--- a/kerberos5/include/krb5-types.h
+++ b/kerberos5/include/krb5-types.h
@@ -1,7 +1,7 @@
 /* krb5-types.h -- this file was generated for i386-unknown-freebsd5.0 by
                    $Id: bits.c,v 1.22 2002/08/28 16:08:44 joda Exp $ */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/krb5-types.h,v 1.3 2002/08/30 21:33:16 nectar Exp $ */
 
 #ifndef __krb5_types_h__
 #define __krb5_types_h__
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index 14807354c390a..95a75efd4db44 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/kerberos5/include/version.h,v 1.14 2005/02/24 22:24:23 nectar Exp $ */
 const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6.3 (FreeBSD) $";
 const char *heimdal_version = "Heimdal 0.6.3";
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index 1d07e0b47cfd8..333ed56ed2422 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/Makefile,v 1.10 2004/01/31 08:15:52 ru Exp $
 
 SUBDIR=	libasn1 libgssapi libhdb libkadm5clnt libkadm5srv \
 	libkafs5 libkrb5 libroken libsl libvers
diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc
index 441a0ec00e22f..9671cf9512716 100644
--- a/kerberos5/lib/Makefile.inc
+++ b/kerberos5/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7.2.1 2007/11/20 20:48:01 kensmith Exp $
 
 SHLIB_MAJOR?=	9
 
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index b42f8025cc889..5ce6ced41a917 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.23 2005/02/24 22:24:24 nectar Exp $
 
 LIB=	asn1
 INCS=	asn1_err.h krb5_asn1.h
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index 518b445a0aa9f..0162d78fcb9a6 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.12 2006/03/16 15:18:15 ru Exp $
 
 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index eef619f4a9e03..f8a153acd9845 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.18 2004/02/05 18:51:49 ru Exp $
 
 LIB=	hdb
 
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index 32cc80b3b0042..23d0e70476763 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkadm5clnt/Makefile,v 1.8 2004/02/05 18:51:49 ru Exp $
 
 LIB=	kadm5clnt
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 086cb8f631789..c142bc0bad0aa 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkadm5srv/Makefile,v 1.7 2004/02/05 18:51:49 ru Exp $
 
 LIB=	kadm5srv
 
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 337c642be9dda..5ce85714c6bc6 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkafs5/Makefile,v 1.9 2004/02/05 18:51:49 ru Exp $
 
 LIB=	kafs5
 INCS=	kafs.h
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 40cddc361d796..64bca5663c55b 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.17 2004/02/05 18:51:49 ru Exp $
 
 LIB=	krb5
 
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index fceb6ec71cb70..9c7eb08fb7a8d 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libroken/Makefile,v 1.17 2006/05/21 15:15:20 ume Exp $
 
 LIB=	roken
 SHLIB_MAJOR=	9
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 71a38a5729d17..46fb0bca8da63 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libsl/Makefile,v 1.8 2004/02/05 18:51:49 ru Exp $
 
 LIB=	sl
 INTERNALLIB=
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index 1b91ac172e26a..2cc95e2adff8a 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/lib/libvers/Makefile,v 1.8 2004/02/05 18:51:50 ru Exp $
 
 LIB=	vers
 INTERNALLIB=
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile
index 89baf6daad57a..559f609faa5f9 100644
--- a/kerberos5/libexec/Makefile
+++ b/kerberos5/libexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/Makefile,v 1.6 2004/01/30 11:06:48 mr Exp $
 
 SUBDIR=	ipropd-master ipropd-slave hprop hpropd kadmind kdc kpasswdd
 
diff --git a/kerberos5/libexec/Makefile.inc b/kerberos5/libexec/Makefile.inc
index 535597e7d2a59..9bc86b2794053 100644
--- a/kerberos5/libexec/Makefile.inc
+++ b/kerberos5/libexec/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/Makefile.inc,v 1.2 2004/02/05 18:51:50 ru Exp $
 
 BINDIR=	/usr/libexec
 
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 84523cfac15d1..7694414858696 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.15 2004/02/05 18:51:50 ru Exp $
 
 PROG=	hprop
 MAN=	hprop.8
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 4db38fb4bb1b6..c98df00ff9713 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.15 2004/02/05 18:51:50 ru Exp $
 
 PROG=	hpropd
 MAN=	hpropd.8
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 6cfa99d9e7892..58b89c45413e3 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.17 2004/12/21 08:47:01 ru Exp $
 
 PROG=	ipropd-master
 NO_MAN=
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 11e2bc3761b00..b898595e289a7 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.17 2004/12/21 08:47:01 ru Exp $
 
 PROG=	ipropd-slave
 NO_MAN=
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index d0514a01342cc..87a4e09225360 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.18 2004/02/05 18:51:50 ru Exp $
 
 PROG=	kadmind
 MAN=	kadmind.8
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 73a1efcbf853e..3d1d27e2d2b12 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.17 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kdc
 MAN=	kdc.8
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index c0e6a1ea1aa12..c7b3f7075eff4 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.18 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kpasswdd
 MAN=	kpasswdd.8
diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile
index ed8d30a030196..0bd508de1de84 100644
--- a/kerberos5/tools/Makefile
+++ b/kerberos5/tools/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/Makefile,v 1.2 2004/02/01 09:30:02 ru Exp $
 
 SUBDIR=	make-print-version make-roken asn1_compile
 
diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc
index c0703a968ec6c..7ceb8c8c3f232 100644
--- a/kerberos5/tools/Makefile.inc
+++ b/kerberos5/tools/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/Makefile.inc,v 1.1 2004/01/31 08:15:55 ru Exp $
 
 realinstall:
 
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index a8ffa3283c731..4dd1bc46d6643 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.7 2007/05/19 03:29:37 kan Exp $
 
 PROG=	asn1_compile
 NO_MAN=
diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile
index 08899dc97c276..b82c4090c4494 100644
--- a/kerberos5/tools/make-print-version/Makefile
+++ b/kerberos5/tools/make-print-version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/make-print-version/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $
 
 PROG=	make-print-version
 NO_MAN=
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index 6f75cc64cdd55..a9d0d752c4d74 100644
--- a/kerberos5/tools/make-roken/Makefile
+++ b/kerberos5/tools/make-roken/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/tools/make-roken/Makefile,v 1.2 2004/12/21 08:47:02 ru Exp $
 
 PROG=	make-roken
 NO_MAN=
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 737f13e871ef0..e61b52e0e24f8 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/Makefile,v 1.11 2004/01/31 08:15:56 ru Exp $
 
 SUBDIR=	kadmin kdestroy kinit klist kpasswd krb5-config ksu \
 	verify_krb5_conf
diff --git a/kerberos5/usr.bin/Makefile.inc b/kerberos5/usr.bin/Makefile.inc
index abd146b6720e0..390acb095d612 100644
--- a/kerberos5/usr.bin/Makefile.inc
+++ b/kerberos5/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/Makefile.inc,v 1.1.1.1 2000/01/15 21:38:04 markm Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index b646c986eb945..7af1fee532311 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.18 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kadmin
 MAN=	kadmin.8
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 60bc792780d1a..72fe0c59da10f 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 172ad985a84af..22d0d72f98ff7 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
 
 PROG=	kinit
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index c97d65fc2ef6f..5c078fcfa19af 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.15 2004/02/05 18:51:51 ru Exp $
 
 PROG=	klist
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 686c299ccdcaa..708c929c9b50a 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.14 2004/02/05 18:51:52 ru Exp $
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index d9b48b9f5e582..ac1a411180c2c 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.15 2005/02/24 22:24:24 nectar Exp $
 
 SCRIPTS=krb5-config
 MAN=	krb5-config.1
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index cca520e4e3c67..bae36a8d8280b 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.16.10.1 2007/10/29 21:39:03 peter Exp $
 
 PROG=	ksu
 .if defined(ENABLE_SUID_K5SU)
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index 7acce0eb7cad2..d93e3a8ca3464 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.bin/verify_krb5_conf/Makefile,v 1.3 2004/02/05 18:51:52 ru Exp $
 
 PROG=	verify_krb5_conf
 MAN=	verify_krb5_conf.8
diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile
index 2e722ee64ddf4..859d51ca02228 100644
--- a/kerberos5/usr.sbin/Makefile
+++ b/kerberos5/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/Makefile,v 1.3 2003/03/09 21:56:55 markm Exp $
 
 SUBDIR=	kstash ktutil
 
diff --git a/kerberos5/usr.sbin/Makefile.inc b/kerberos5/usr.sbin/Makefile.inc
index dab729d159e4e..ae5a70c4a3dbc 100644
--- a/kerberos5/usr.sbin/Makefile.inc
+++ b/kerberos5/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/Makefile.inc,v 1.1.1.1 2000/01/24 19:56:25 markm Exp $
 
 BINDIR=	/usr/sbin
 
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index d9c6d8d9461d6..44369dbebf5e1 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.16 2004/02/05 18:51:52 ru Exp $
 
 PROG=	kstash
 MAN=	kstash.8
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index e134cce942eb7..a77d29bd0d6e1 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.17 2004/02/05 18:51:52 ru Exp $
 
 PROG=	ktutil
 MAN=	ktutil.8
diff --git a/lib/Makefile b/lib/Makefile
index 328e4b38d0642..a8855a0c1cc91 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/Makefile,v 1.224.2.1.2.1 2008/01/28 08:57:11 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 2ea740eaf64da..c12a905223aa8 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/Makefile.inc,v 1.4 2007/05/21 02:49:02 deischen Exp $
 # Default version for system libs (override in <lib>/Makefile if necessary)
 SHLIB_MAJOR?= 4
diff --git a/lib/bind/Makefile b/lib/bind/Makefile
index 5eccf49cf248b..0f10e65320a07 100644
--- a/lib/bind/Makefile
+++ b/lib/bind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/Makefile,v 1.1 2004/09/21 19:01:42 des Exp $
 
 SUBDIR=		bind bind9 dns isc isccc isccfg lwres
 
diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile
index 7f3bd827bbbce..ff1528182d5bd 100644
--- a/lib/bind/bind/Makefile
+++ b/lib/bind/bind/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/bind/Makefile,v 1.7.2.1 2007/12/07 08:31:23 dougb Exp $
 
 #.include <bsd.own.mk>
 
diff --git a/lib/bind/bind/config.h b/lib/bind/bind/config.h
index 71eef86af70c4..738db87d2237c 100644
--- a/lib/bind/bind/config.h
+++ b/lib/bind/bind/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/bind/config.h,v 1.5.2.1 2007/12/07 08:31:23 dougb Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* #undef _SOCKADDR_LEN */
diff --git a/lib/bind/bind/port_after.h b/lib/bind/bind/port_after.h
index 38335d6fc618e..654c7cde3f21f 100644
--- a/lib/bind/bind/port_after.h
+++ b/lib/bind/bind/port_after.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.3 2006/12/10 07:11:03 dougb Exp $ */
 
 #ifndef port_after_h
 #define port_after_h
diff --git a/lib/bind/bind/port_before.h b/lib/bind/bind/port_before.h
index e6571e9cd15bc..6b22a6463d849 100644
--- a/lib/bind/bind/port_before.h
+++ b/lib/bind/bind/port_before.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/bind/port_before.h,v 1.4.2.1 2007/12/07 08:31:23 dougb Exp $ */
 
 #ifndef port_before_h
 #define port_before_h
diff --git a/lib/bind/bind9/Makefile b/lib/bind/bind9/Makefile
index 5abbeb1ed225a..17e6f303cbcd8 100644
--- a/lib/bind/bind9/Makefile
+++ b/lib/bind/bind9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.7 2007/06/02 23:19:55 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/config.h b/lib/bind/config.h
index cffb26cf4c6c5..fa33def1e2f14 100644
--- a/lib/bind/config.h
+++ b/lib/bind/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/config.h,v 1.7.2.1 2007/12/07 08:31:23 dougb Exp $ */
 
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 92cfbec36cc76..22677ef553877 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/config.mk,v 1.19.2.1 2007/12/07 08:31:23 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile
index 6850098343e57..c8fd5256da817 100644
--- a/lib/bind/dns/Makefile
+++ b/lib/bind/dns/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/dns/Makefile,v 1.8 2007/06/02 23:19:56 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h
index 0fccb43935f14..9ef8b771f512e 100644
--- a/lib/bind/dns/code.h
+++ b/lib/bind/dns/code.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/code.h,v 1.5 2007/06/02 23:24:13 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/enumclass.h b/lib/bind/dns/dns/enumclass.h
index 5b44c17099b80..f9ea97f20f5e4 100644
--- a/lib/bind/dns/dns/enumclass.h
+++ b/lib/bind/dns/dns/enumclass.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/dns/enumclass.h,v 1.5 2007/06/02 23:24:13 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/enumtype.h b/lib/bind/dns/dns/enumtype.h
index ef6975dadbdb0..8e60a794d6433 100644
--- a/lib/bind/dns/dns/enumtype.h
+++ b/lib/bind/dns/dns/enumtype.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/dns/enumtype.h,v 1.5 2007/06/02 23:24:13 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h
index ce4bf952011f0..061b0fd4afbc5 100644
--- a/lib/bind/dns/dns/rdatastruct.h
+++ b/lib/bind/dns/dns/rdatastruct.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/dns/dns/rdatastruct.h,v 1.5 2007/06/02 23:24:14 dougb Exp $ */
 
 /*
  * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index 22bcaa9b7313d..9808c6f123a17 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/isc/Makefile,v 1.8 2007/06/02 23:19:56 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h
index d0f9f25daf7a4..0cb6a8a515074 100644
--- a/lib/bind/isc/isc/platform.h
+++ b/lib/bind/isc/isc/platform.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.4.2.1 2007/12/07 08:31:23 dougb Exp $ */
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/isccc/Makefile b/lib/bind/isccc/Makefile
index 19fc2bfd6fdaa..155589e61c9c6 100644
--- a/lib/bind/isccc/Makefile
+++ b/lib/bind/isccc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.7 2007/06/02 23:19:56 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/isccfg/Makefile b/lib/bind/isccfg/Makefile
index a4f57855f3f9e..daf8e424d9532 100644
--- a/lib/bind/isccfg/Makefile
+++ b/lib/bind/isccfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.7 2007/06/02 23:19:56 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile
index 26dfeb1fcb2c1..9120114667634 100644
--- a/lib/bind/lwres/Makefile
+++ b/lib/bind/lwres/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.10.2.1 2007/12/07 08:31:23 dougb Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/bind/lwres/lwres/netdb.h b/lib/bind/lwres/lwres/netdb.h
index 7daa3889c5b76..fbc462fd3061c 100644
--- a/lib/bind/lwres/lwres/netdb.h
+++ b/lib/bind/lwres/lwres/netdb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/lwres/lwres/netdb.h,v 1.2 2007/06/02 23:24:14 dougb Exp $ */
 
 /*
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/bind/lwres/lwres/platform.h b/lib/bind/lwres/lwres/platform.h
index 87ebb22082207..0b0fa9ec6e423 100644
--- a/lib/bind/lwres/lwres/platform.h
+++ b/lib/bind/lwres/lwres/platform.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/bind/lwres/lwres/platform.h,v 1.4 2007/06/02 23:24:14 dougb Exp $ */
 
 /*
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index 4b51e6b68a70d..283dddc086bf4 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.18 2003/06/30 12:53:39 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/amd64/crt1.c b/lib/csu/amd64/crt1.c
index 943b07b31a94d..fa36ca1ebd301 100644
--- a/lib/csu/amd64/crt1.c
+++ b/lib/csu/amd64/crt1.c
@@ -92,4 +92,4 @@ __asm__("eprol:");
 	exit( main(argc, argv, env) );
 }
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");
diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
index c46f001019162..a1a209e919263 100644
--- a/lib/csu/amd64/crti.S
+++ b/lib/csu/amd64/crti.S
@@ -38,4 +38,4 @@ _fini:
 	subq	$8,%rsp
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.7 2004/03/21 01:39:01 peter Exp $\0"
diff --git a/lib/csu/amd64/crtn.S b/lib/csu/amd64/crtn.S
index d6d09dabeb218..4f9325cc50b55 100644
--- a/lib/csu/amd64/crtn.S
+++ b/lib/csu/amd64/crtn.S
@@ -32,4 +32,4 @@
 	ret
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.6 2004/03/21 01:39:01 peter Exp $\0"
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
index 23954e840f36b..c14a75dd607e1 100644
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/arm/Makefile,v 1.1 2004/05/14 12:19:04 cognet Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/arm/crt1.c b/lib/csu/arm/crt1.c
index 02af3c290470a..b11fb98977393 100644
--- a/lib/csu/arm/crt1.c
+++ b/lib/csu/arm/crt1.c
@@ -134,4 +134,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/arm/crt1.c,v 1.3 2004/09/23 23:00:51 cognet Exp $\"");
diff --git a/lib/csu/arm/crti.S b/lib/csu/arm/crti.S
index 40e83bbf2f11f..9459e1d3aa645 100644
--- a/lib/csu/arm/crti.S
+++ b/lib/csu/arm/crti.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
 
 	.section .init,"ax",%progbits
 	.align 4
diff --git a/lib/csu/arm/crtn.S b/lib/csu/arm/crtn.S
index d148b1eb09657..6c116fc532389 100644
--- a/lib/csu/arm/crtn.S
+++ b/lib/csu/arm/crtn.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/csu/arm/crtn.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
 	.section .init,"ax",%progbits
 	ldmea	fp, {fp, sp, pc}
 	mov	pc, lr
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index 684a48e9b64f8..dddaaf6242c5d 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.4.20.1 2007/12/06 13:43:43 kib Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile
index 8598ce8552f5f..7f5c3bef679bb 100644
--- a/lib/csu/i386-elf/Makefile
+++ b/lib/csu/i386-elf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.20 2004/01/20 13:31:35 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/i386-elf/crt1.c b/lib/csu/i386-elf/crt1.c
index 093433330e358..c2958e04589de 100644
--- a/lib/csu/i386-elf/crt1.c
+++ b/lib/csu/i386-elf/crt1.c
@@ -110,4 +110,4 @@ __asm__("eprol:");
 	exit( main(argc, argv, env) );
 }
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");
diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386-elf/crti.S
index bb11f3ac718d5..ff895cbdadd23 100644
--- a/lib/csu/i386-elf/crti.S
+++ b/lib/csu/i386-elf/crti.S
@@ -38,4 +38,4 @@ _fini:
 	sub	$12,%esp	/* re-align stack pointer */
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.7 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386-elf/crtn.S
index bc90d31d7c137..8e820e3c0d961 100644
--- a/lib/csu/i386-elf/crtn.S
+++ b/lib/csu/i386-elf/crtn.S
@@ -32,4 +32,4 @@
 	ret
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.6 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile
index c906c094267be..c17035908d81b 100644
--- a/lib/csu/ia64/Makefile
+++ b/lib/csu/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/ia64/Makefile,v 1.12 2003/07/13 23:11:37 marcel Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/ia64/crt1.S b/lib/csu/ia64/crt1.S
index 10e1a63d17b4d..0a1be8ae5ad0f 100644
--- a/lib/csu/ia64/crt1.S
+++ b/lib/csu/ia64/crt1.S
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-		.ident		"$FreeBSD$"
+		.ident		"$FreeBSD: src/lib/csu/ia64/crt1.S,v 1.4 2004/08/18 23:06:47 marcel Exp $"
 
 		.text
 
diff --git a/lib/csu/ia64/crti.S b/lib/csu/ia64/crti.S
index 1314cb3a5b2cb..5bb540ecf8174 100644
--- a/lib/csu/ia64/crti.S
+++ b/lib/csu/ia64/crti.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/ia64/crti.S,v 1.3 2001/11/03 06:31:27 peter Exp $
  */
 
 /*
diff --git a/lib/csu/ia64/crtn.S b/lib/csu/ia64/crtn.S
index 42ec1feffabe2..68b496fc9fb4b 100644
--- a/lib/csu/ia64/crtn.S
+++ b/lib/csu/ia64/crtn.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/csu/ia64/crtn.S,v 1.2 2001/10/29 10:18:58 peter Exp $
  */
 
 	.file	"crtn.S"
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index 23954e840f36b..e8b4de9ac6b2a 100644
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/powerpc/Makefile,v 1.9 2002/07/29 09:40:11 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/powerpc/crt1.c b/lib/csu/powerpc/crt1.c
index 080691c57ccf6..e6c00bd35719c 100644
--- a/lib/csu/powerpc/crt1.c
+++ b/lib/csu/powerpc/crt1.c
@@ -120,4 +120,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/powerpc/crt1.c,v 1.11 2004/08/15 16:18:52 dfr Exp $\"");
diff --git a/lib/csu/powerpc/crti.S b/lib/csu/powerpc/crti.S
index 75d4345cad2d2..45679438fe214 100644
--- a/lib/csu/powerpc/crti.S
+++ b/lib/csu/powerpc/crti.S
@@ -47,4 +47,4 @@ _fini:
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/powerpc/crti.S,v 1.2 2002/05/15 04:19:49 obrien Exp $\0"
diff --git a/lib/csu/powerpc/crtn.S b/lib/csu/powerpc/crtn.S
index 80735cc3a8ab3..c860eafd94db8 100644
--- a/lib/csu/powerpc/crtn.S
+++ b/lib/csu/powerpc/crtn.S
@@ -42,4 +42,4 @@
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/powerpc/crtn.S,v 1.2 2002/05/15 04:19:49 obrien Exp $\0"
diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile
index 2e1d03f9cb6da..1eb2230e517d8 100644
--- a/lib/csu/sparc64/Makefile
+++ b/lib/csu/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.12 2002/07/29 09:40:11 ru Exp $
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/lib/csu/sparc64/crt1.c b/lib/csu/sparc64/crt1.c
index 5d8e371624466..2acde55c13b0f 100644
--- a/lib/csu/sparc64/crt1.c
+++ b/lib/csu/sparc64/crt1.c
@@ -121,4 +121,4 @@ __asm__("eprol:");
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD$\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/sparc64/crt1.c,v 1.17 2006/10/08 02:50:33 kmacy Exp $\"");
diff --git a/lib/csu/sparc64/crti.S b/lib/csu/sparc64/crti.S
index e3e81af18cc9e..466645c4af41e 100644
--- a/lib/csu/sparc64/crti.S
+++ b/lib/csu/sparc64/crti.S
@@ -55,4 +55,4 @@ _fini:
 
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/sparc64/crti.S,v 1.1 2001/10/28 00:20:34 obrien Exp $\0"
diff --git a/lib/csu/sparc64/crtn.S b/lib/csu/sparc64/crtn.S
index 7c0d1605393db..c35fecad30c11 100644
--- a/lib/csu/sparc64/crtn.S
+++ b/lib/csu/sparc64/crtn.S
@@ -39,4 +39,4 @@
 	 restore
 
 	.section .rodata
-.ascii "$FreeBSD$\0"
+.ascii "$FreeBSD: src/lib/csu/sparc64/crtn.S,v 1.1 2001/10/28 00:20:34 obrien Exp $\0"
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index e4296e1dfa15c..1ddc7271077eb 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/Makefile,v 1.33 2006/09/27 12:30:27 ru Exp $
 
 SUBDIR=	libalias modules
 
diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile
index 7d8885d981b0e..e946c65e31c7b 100644
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $
 
 .PATH: ${.CURDIR}/../../../sys/netinet/libalias
 
diff --git a/lib/libalias/modules/Makefile b/lib/libalias/modules/Makefile
index dc66ad23c2e51..2accb8d969f77 100644
--- a/lib/libalias/modules/Makefile
+++ b/lib/libalias/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/Makefile,v 1.2 2006/09/27 12:30:27 ru Exp $
 
 .include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
 
diff --git a/lib/libalias/modules/Makefile.inc b/lib/libalias/modules/Makefile.inc
index 23df02da7db79..8e502299b2227 100644
--- a/lib/libalias/modules/Makefile.inc
+++ b/lib/libalias/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/Makefile.inc,v 1.3 2006/10/08 14:01:59 piso Exp $
 
 .PATH: ${.CURDIR}/../../../../sys/netinet/libalias
 
diff --git a/lib/libalias/modules/cuseeme/Makefile b/lib/libalias/modules/cuseeme/Makefile
index aad93c0353c91..21aea28c56e16 100644
--- a/lib/libalias/modules/cuseeme/Makefile
+++ b/lib/libalias/modules/cuseeme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $
 
 NAME=	cuseeme
 SRCS=	alias_cuseeme.c
diff --git a/lib/libalias/modules/dummy/Makefile b/lib/libalias/modules/dummy/Makefile
index 8a2abe594d48f..aeba8fc37abb3 100644
--- a/lib/libalias/modules/dummy/Makefile
+++ b/lib/libalias/modules/dummy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $
 
 NAME=	dummy
 SRCS=	alias_dummy.c
diff --git a/lib/libalias/modules/ftp/Makefile b/lib/libalias/modules/ftp/Makefile
index ad3f86fc0fe3e..49c889d684be2 100644
--- a/lib/libalias/modules/ftp/Makefile
+++ b/lib/libalias/modules/ftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $
 
 NAME=	ftp
 SRCS=	alias_ftp.c
diff --git a/lib/libalias/modules/irc/Makefile b/lib/libalias/modules/irc/Makefile
index 1d5308d704890..f6ead71477bf6 100644
--- a/lib/libalias/modules/irc/Makefile
+++ b/lib/libalias/modules/irc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $
 
 NAME=	irc
 SRCS=	alias_irc.c
diff --git a/lib/libalias/modules/nbt/Makefile b/lib/libalias/modules/nbt/Makefile
index a8cfc8c5fdc0d..5474437dffdb7 100644
--- a/lib/libalias/modules/nbt/Makefile
+++ b/lib/libalias/modules/nbt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $
 
 NAME=	nbt
 SRCS=	alias_nbt.c
diff --git a/lib/libalias/modules/pptp/Makefile b/lib/libalias/modules/pptp/Makefile
index ffbae7ede829f..98bb4453337d3 100644
--- a/lib/libalias/modules/pptp/Makefile
+++ b/lib/libalias/modules/pptp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $
 
 NAME=	pptp
 SRCS=	alias_pptp.c
diff --git a/lib/libalias/modules/skinny/Makefile b/lib/libalias/modules/skinny/Makefile
index 4969ecb0bf6c5..a5258739ca0ac 100644
--- a/lib/libalias/modules/skinny/Makefile
+++ b/lib/libalias/modules/skinny/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $
 
 NAME=	skinny
 SRCS=	alias_skinny.c
diff --git a/lib/libalias/modules/smedia/Makefile b/lib/libalias/modules/smedia/Makefile
index 135d22c7460b9..92069f989bc32 100644
--- a/lib/libalias/modules/smedia/Makefile
+++ b/lib/libalias/modules/smedia/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $
 
 NAME=	smedia
 SRCS=	alias_smedia.c
diff --git a/lib/libarchive/COPYING b/lib/libarchive/COPYING
index 5fea0f65d1baa..90ef9549fe6b5 100644
--- a/lib/libarchive/COPYING
+++ b/lib/libarchive/COPYING
@@ -32,5 +32,5 @@ contain Makefiles and/or shell scripts that are generated
 automatically by GNU autoconf and GNU automake.  Those generated files
 are controlled by the relevant licenses.
 
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/COPYING,v 1.3 2007/01/09 08:05:54 kientzle Exp $
 
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 1ebc8e1b4612a..043ae9e87e76f 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.77 2007/07/15 19:10:34 kientzle Exp $
 
 LIB=	archive
 DPADD=	${LIBBZ2} ${LIBZ}
diff --git a/lib/libarchive/README b/lib/libarchive/README
index 3157108728b56..df62c2307e534 100644
--- a/lib/libarchive/README
+++ b/lib/libarchive/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/README,v 1.5 2007/03/03 07:37:35 kientzle Exp $
 
 libarchive: a library for reading and writing streaming archives
 
diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h.in
index bf90f4a53fd79..843276f72dfc7 100644
--- a/lib/libarchive/archive.h.in
+++ b/lib/libarchive/archive.h.in
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.46 2007/07/06 15:36:37 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c
index d9cfbc62c6c3c..715486dcfeb76 100644
--- a/lib/libarchive/archive_check_magic.c
+++ b/lib/libarchive/archive_check_magic.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.8 2007/04/02 00:15:45 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_entry.3 b/lib/libarchive/archive_entry.3
index 0dc69cf59d701..6b1b270f1a50e 100644
--- a/lib/libarchive/archive_entry.3
+++ b/lib/libarchive/archive_entry.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $
 .\"
 .Dd December 15, 2003
 .Dt archive_entry 3
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index 3f6984d720146..0ef2a18dd7b03 100644
--- a/lib/libarchive/archive_entry.c
+++ b/lib/libarchive/archive_entry.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.44 2007/07/15 19:10:34 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_entry.h b/lib/libarchive/archive_entry.h
index 2f18d31cac475..a6f3291b65ccc 100644
--- a/lib/libarchive/archive_entry.h
+++ b/lib/libarchive/archive_entry.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.23 2007/07/15 19:10:34 kientzle Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED
diff --git a/lib/libarchive/archive_entry_copy_stat.c b/lib/libarchive/archive_entry_copy_stat.c
index 5b3d35e2aa38a..514db02743b4f 100644
--- a/lib/libarchive/archive_entry_copy_stat.c
+++ b/lib/libarchive/archive_entry_copy_stat.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_entry_private.h b/lib/libarchive/archive_entry_private.h
index 34b8e26663675..234ba47e8444e 100644
--- a/lib/libarchive/archive_entry_private.h
+++ b/lib/libarchive/archive_entry_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.1 2007/05/29 01:00:18 kientzle Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_entry_stat.c b/lib/libarchive/archive_entry_stat.c
index d06ee2c81de00..6ef5b37287f50 100644
--- a/lib/libarchive/archive_entry_stat.c
+++ b/lib/libarchive/archive_entry_stat.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index cd48a83fce677..0f8a17016674a 100644
--- a/lib/libarchive/archive_platform.h
+++ b/lib/libarchive/archive_platform.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.27 2007/05/29 01:00:18 kientzle Exp $
  */
 
 /*
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index a75489d7e33a6..9ca5893d80a1d 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.29 2007/04/02 00:15:45 kientzle Exp $
  */
 
 #ifndef ARCHIVE_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read.3 b/lib/libarchive/archive_read.3
index 735e7eee65648..6daba3f3d11db 100644
--- a/lib/libarchive/archive_read.3
+++ b/lib/libarchive/archive_read.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $
 .\"
 .Dd August 19, 2006
 .Dt archive_read 3
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index e0763f291e89d..54330971200bb 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -32,7 +32,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.35 2007/05/29 01:00:18 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_data_into_fd.c b/lib/libarchive/archive_read_data_into_fd.c
index cc15a9c76c3c2..664cc2c3c2455 100644
--- a/lib/libarchive/archive_read_data_into_fd.c
+++ b/lib/libarchive/archive_read_data_into_fd.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.15 2007/04/02 00:21:46 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c
index c69c34f1c5de3..423ff7dd3c56b 100644
--- a/lib/libarchive/archive_read_extract.c
+++ b/lib/libarchive/archive_read_extract.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.59 2007/05/29 01:00:18 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_read_open_fd.c b/lib/libarchive/archive_read_open_fd.c
index 13afe63f8c2b3..2ebd46d6cdf8b 100644
--- a/lib/libarchive/archive_read_open_fd.c
+++ b/lib/libarchive/archive_read_open_fd.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.13 2007/06/26 03:06:48 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_open_file.c b/lib/libarchive/archive_read_open_file.c
index eb440845a899e..55c431c7da6e6 100644
--- a/lib/libarchive/archive_read_open_file.c
+++ b/lib/libarchive/archive_read_open_file.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_open_filename.c b/lib/libarchive/archive_read_open_filename.c
index fa3563a8173c4..02e7902f3a8bf 100644
--- a/lib/libarchive/archive_read_open_filename.c
+++ b/lib/libarchive/archive_read_open_filename.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_open_memory.c b/lib/libarchive/archive_read_open_memory.c
index 7f521173ca270..61f574fa7705e 100644
--- a/lib/libarchive/archive_read_open_memory.c
+++ b/lib/libarchive/archive_read_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/06 15:51:59 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_read_private.h b/lib/libarchive/archive_read_private.h
index f9b174984c1d3..f0f52021132c3 100644
--- a/lib/libarchive/archive_read_private.h
+++ b/lib/libarchive/archive_read_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.3 2007/05/29 01:00:18 kientzle Exp $
  */
 
 #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read_support_compression_all.c b/lib/libarchive/archive_read_support_compression_all.c
index de3d585525dd0..da2b246bed544 100644
--- a/lib/libarchive/archive_read_support_compression_all.c
+++ b/lib/libarchive/archive_read_support_compression_all.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_all.c,v 1.6 2007/01/09 08:05:55 kientzle Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c
index ec399811a639d..aa664d10b19f5 100644
--- a/lib/libarchive/archive_read_support_compression_bzip2.c
+++ b/lib/libarchive/archive_read_support_compression_bzip2.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.16 2007/05/29 01:00:18 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_compress.c b/lib/libarchive/archive_read_support_compression_compress.c
index f45b7cdc65b28..050099b210edc 100644
--- a/lib/libarchive/archive_read_support_compression_compress.c
+++ b/lib/libarchive/archive_read_support_compression_compress.c
@@ -64,7 +64,7 @@
 
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.10 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_gzip.c b/lib/libarchive/archive_read_support_compression_gzip.c
index 72afbd14de260..89784b8dfccfa 100644
--- a/lib/libarchive/archive_read_support_compression_gzip.c
+++ b/lib/libarchive/archive_read_support_compression_gzip.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.15 2007/05/29 01:00:19 kientzle Exp $");
 
 
 #ifdef HAVE_ERRNO_H
diff --git a/lib/libarchive/archive_read_support_compression_none.c b/lib/libarchive/archive_read_support_compression_none.c
index 99586c0643065..ec64fae313fc2 100644
--- a/lib/libarchive/archive_read_support_compression_none.c
+++ b/lib/libarchive/archive_read_support_compression_none.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17.2.1 2007/11/02 08:42:14 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_program.c b/lib/libarchive/archive_read_support_compression_program.c
index dfea568fee205..58b4bbddf0bb5 100644
--- a/lib/libarchive/archive_read_support_compression_program.c
+++ b/lib/libarchive/archive_read_support_compression_program.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.2 2007/07/20 01:28:50 kientzle Exp $");
 
 #ifdef HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
diff --git a/lib/libarchive/archive_read_support_format_all.c b/lib/libarchive/archive_read_support_format_all.c
index d03f362b26b7b..3fdfa05285e4e 100644
--- a/lib/libarchive/archive_read_support_format_all.c
+++ b/lib/libarchive/archive_read_support_format_all.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.9 2007/04/07 05:54:23 kientzle Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_format_ar.c b/lib/libarchive/archive_read_support_format_ar.c
index c7f4cae43fdd6..97ed28af1fa38 100644
--- a/lib/libarchive/archive_read_support_format_ar.c
+++ b/lib/libarchive/archive_read_support_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.6 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c
index 7eccc8719b335..7a056b9f43938 100644
--- a/lib/libarchive/archive_read_support_format_cpio.c
+++ b/lib/libarchive/archive_read_support_format_cpio.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.24 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_empty.c b/lib/libarchive/archive_read_support_format_empty.c
index 976306c441465..837fdef997c12 100644
--- a/lib/libarchive/archive_read_support_format_empty.c
+++ b/lib/libarchive/archive_read_support_format_empty.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_empty.c,v 1.3 2007/05/29 01:00:19 kientzle Exp $");
 
 #include "archive.h"
 #include "archive_entry.h"
diff --git a/lib/libarchive/archive_read_support_format_iso9660.c b/lib/libarchive/archive_read_support_format_iso9660.c
index 9e3785c53524a..d77bd871c0e36 100644
--- a/lib/libarchive/archive_read_support_format_iso9660.c
+++ b/lib/libarchive/archive_read_support_format_iso9660.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.23 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_tar.c b/lib/libarchive/archive_read_support_format_tar.c
index 72d2e85adde73..ab30ea5ac630e 100644
--- a/lib/libarchive/archive_read_support_format_tar.c
+++ b/lib/libarchive/archive_read_support_format_tar.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61.2.1 2007/10/29 03:28:28 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_zip.c b/lib/libarchive/archive_read_support_format_zip.c
index e9976779f4075..37780b3531108 100644
--- a/lib/libarchive/archive_read_support_format_zip.c
+++ b/lib/libarchive/archive_read_support_format_zip.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.14.2.2 2007/12/08 07:52:40 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index 8e1d11cb818c8..7e43b360a4d0b 100644
--- a/lib/libarchive/archive_string.c
+++ b/lib/libarchive/archive_string.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_string.c,v 1.11 2007/07/15 19:13:59 kientzle Exp $");
 
 /*
  * Basic resizable string support, to simplify manipulating arbitrary-sized
diff --git a/lib/libarchive/archive_string.h b/lib/libarchive/archive_string.h
index b9b5352cd6444..596db9a1482b9 100644
--- a/lib/libarchive/archive_string.h
+++ b/lib/libarchive/archive_string.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.9 2007/05/29 01:00:19 kientzle Exp $
  *
  */
 
diff --git a/lib/libarchive/archive_string_sprintf.c b/lib/libarchive/archive_string_sprintf.c
index 4401e9a12773b..763e75dcd84ea 100644
--- a/lib/libarchive/archive_string_sprintf.c
+++ b/lib/libarchive/archive_string_sprintf.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.9 2007/07/15 19:13:59 kientzle Exp $");
 
 /*
  * The use of printf()-family functions can be troublesome
diff --git a/lib/libarchive/archive_util.3 b/lib/libarchive/archive_util.3
index e9af8b47f6b94..b8a030e49322a 100644
--- a/lib/libarchive/archive_util.3
+++ b/lib/libarchive/archive_util.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.7 2007/05/29 01:00:19 kientzle Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_util 3
diff --git a/lib/libarchive/archive_util.c b/lib/libarchive/archive_util.c
index fbb0a9f60ca2b..d73366357d003 100644
--- a/lib/libarchive/archive_util.c
+++ b/lib/libarchive/archive_util.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.15 2007/07/06 15:36:38 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_virtual.c b/lib/libarchive/archive_virtual.c
index 6b7b12e9505dd..a431058c67179 100644
--- a/lib/libarchive/archive_virtual.c
+++ b/lib/libarchive/archive_virtual.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_virtual.c,v 1.1 2007/03/03 07:37:36 kientzle Exp $");
 
 #include "archive.h"
 #include "archive_entry.h"
diff --git a/lib/libarchive/archive_write.3 b/lib/libarchive/archive_write.3
index 3481acb6c94ac..c07b6b570ea1a 100644
--- a/lib/libarchive/archive_write.3
+++ b/lib/libarchive/archive_write.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.22 2007/05/29 01:00:19 kientzle Exp $
 .\"
 .Dd August 19, 2006
 .Dt archive_write 3
diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index c9d40b0a8ac1c..2977063979d5f 100644
--- a/lib/libarchive/archive_write.c
+++ b/lib/libarchive/archive_write.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.26 2007/05/29 01:00:19 kientzle Exp $");
 
 /*
  * This file contains the "essential" portions of the write API, that
diff --git a/lib/libarchive/archive_write_disk.3 b/lib/libarchive/archive_write_disk.3
index 6b58d9c729c21..880a399b949e1 100644
--- a/lib/libarchive/archive_write_disk.3
+++ b/lib/libarchive/archive_write_disk.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.1 2007/03/03 07:37:36 kientzle Exp $
 .\"
 .Dd March 2, 2007
 .Dt archive_write_disk 3
diff --git a/lib/libarchive/archive_write_disk.c b/lib/libarchive/archive_write_disk.c
index 435522ceac61c..bc0f4c1919ca6 100644
--- a/lib/libarchive/archive_write_disk.c
+++ b/lib/libarchive/archive_write_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.17 2007/09/21 04:52:42 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_disk_private.h b/lib/libarchive/archive_write_disk_private.h
index 562229b2e53d5..1e8ad6922ef22 100644
--- a/lib/libarchive/archive_write_disk_private.h
+++ b/lib/libarchive/archive_write_disk_private.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_write_disk_private.h,v 1.1 2007/03/03 07:37:36 kientzle Exp $
  */
 
 #ifndef ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_write_disk_set_standard_lookup.c b/lib/libarchive/archive_write_disk_set_standard_lookup.c
index 39f58910bad69..427b87615a084 100644
--- a/lib/libarchive/archive_write_disk_set_standard_lookup.c
+++ b/lib/libarchive/archive_write_disk_set_standard_lookup.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.4 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_open_fd.c b/lib/libarchive/archive_write_open_fd.c
index f4cc6ac1c54ed..35e258c4cc236 100644
--- a/lib/libarchive/archive_write_open_fd.c
+++ b/lib/libarchive/archive_write_open_fd.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_fd.c,v 1.9 2007/01/09 08:05:56 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_write_open_file.c b/lib/libarchive/archive_write_open_file.c
index c99414fd1e5ad..5c0c737f8580d 100644
--- a/lib/libarchive/archive_write_open_file.c
+++ b/lib/libarchive/archive_write_open_file.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.19 2007/01/09 08:05:56 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_write_open_filename.c b/lib/libarchive/archive_write_open_filename.c
index e6c92bc929fab..fcaaaca4a6841 100644
--- a/lib/libarchive/archive_write_open_filename.c
+++ b/lib/libarchive/archive_write_open_filename.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_filename.c,v 1.19 2007/01/09 08:05:56 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_write_open_memory.c b/lib/libarchive/archive_write_open_memory.c
index 02c00227e3cb6..d235ca01dc8ce 100644
--- a/lib/libarchive/archive_write_open_memory.c
+++ b/lib/libarchive/archive_write_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_memory.c,v 1.3 2007/01/09 08:05:56 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write_private.h b/lib/libarchive/archive_write_private.h
index 7764fdd9b4d98..82935f4627a05 100644
--- a/lib/libarchive/archive_write_private.h
+++ b/lib/libarchive/archive_write_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_write_private.h,v 1.2 2007/05/29 01:00:19 kientzle Exp $
  */
 
 #ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_write_set_compression_bzip2.c b/lib/libarchive/archive_write_set_compression_bzip2.c
index 58cd8a6536fc2..0883ea1de2f82 100644
--- a/lib/libarchive/archive_write_set_compression_bzip2.c
+++ b/lib/libarchive/archive_write_set_compression_bzip2.c
@@ -28,7 +28,7 @@
 /* Don't compile this if we don't have bzlib. */
 #if HAVE_BZLIB_H
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.12 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_gzip.c b/lib/libarchive/archive_write_set_compression_gzip.c
index 8c6d427003d90..56a0a11fd9273 100644
--- a/lib/libarchive/archive_write_set_compression_gzip.c
+++ b/lib/libarchive/archive_write_set_compression_gzip.c
@@ -28,7 +28,7 @@
 /* Don't compile this if we don't have zlib. */
 #if HAVE_ZLIB_H
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.14 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_none.c b/lib/libarchive/archive_write_set_compression_none.c
index 1fc8f117ed7cf..0ad962a50077b 100644
--- a/lib/libarchive/archive_write_set_compression_none.c
+++ b/lib/libarchive/archive_write_set_compression_none.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.15 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_program.c b/lib/libarchive/archive_write_set_compression_program.c
index 4f28a0feff279..fc1481dbcd99f 100644
--- a/lib/libarchive/archive_write_set_compression_program.c
+++ b/lib/libarchive/archive_write_set_compression_program.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_program.c,v 1.1 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
diff --git a/lib/libarchive/archive_write_set_format.c b/lib/libarchive/archive_write_set_format.c
index 5b879bde4dc74..e5f89211a2cc5 100644
--- a/lib/libarchive/archive_write_set_format.c
+++ b/lib/libarchive/archive_write_set_format.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.5 2007/06/22 05:47:00 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_set_format_ar.c b/lib/libarchive/archive_write_set_format_ar.c
index 1b17282be1bc2..bf3ea4de5d7ce 100644
--- a/lib/libarchive/archive_write_set_format_ar.c
+++ b/lib/libarchive/archive_write_set_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.3 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_by_name.c b/lib/libarchive/archive_write_set_format_by_name.c
index 00f7242c15a42..0d7cae4867dee 100644
--- a/lib/libarchive/archive_write_set_format_by_name.c
+++ b/lib/libarchive/archive_write_set_format_by_name.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.7 2007/06/22 05:47:00 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_set_format_cpio.c b/lib/libarchive/archive_write_set_format_cpio.c
index ba23f3218055d..42cc68a770d88 100644
--- a/lib/libarchive/archive_write_set_format_cpio.c
+++ b/lib/libarchive/archive_write_set_format_cpio.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.11.2.1 2007/10/21 22:17:25 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_cpio_newc.c b/lib/libarchive/archive_write_set_format_cpio_newc.c
index 37dd35af63135..f10aee5e33985 100644
--- a/lib/libarchive/archive_write_set_format_cpio_newc.c
+++ b/lib/libarchive/archive_write_set_format_cpio_newc.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio_newc.c,v 1.1.4.1 2007/10/21 22:17:25 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_pax.c b/lib/libarchive/archive_write_set_format_pax.c
index 0007e3a7c6076..471feb8307e83 100644
--- a/lib/libarchive/archive_write_set_format_pax.c
+++ b/lib/libarchive/archive_write_set_format_pax.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.41 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_shar.c b/lib/libarchive/archive_write_set_format_shar.c
index f832ec2a8b4f5..f26ba028ea5a7 100644
--- a/lib/libarchive/archive_write_set_format_shar.c
+++ b/lib/libarchive/archive_write_set_format_shar.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.18 2007/05/29 01:00:19 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_ustar.c b/lib/libarchive/archive_write_set_format_ustar.c
index 390b1a0c56976..61c90d5041533 100644
--- a/lib/libarchive/archive_write_set_format_ustar.c
+++ b/lib/libarchive/archive_write_set_format_ustar.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.24 2007/06/11 05:17:30 kientzle Exp $");
 
 
 #ifdef HAVE_ERRNO_H
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index 90c54f87ab494..1b9126058aa7c 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.5 2007/05/29 01:00:20 kientzle Exp $
  */
 
 /* FreeBSD 5.0 and later have ACL support. */
diff --git a/lib/libarchive/filter_fork.c b/lib/libarchive/filter_fork.c
index a7ee48b463094..ac3f75c5d9af6 100644
--- a/lib/libarchive/filter_fork.c
+++ b/lib/libarchive/filter_fork.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/filter_fork.c,v 1.1 2007/05/29 01:00:20 kientzle Exp $");
 
 #if defined(HAVE_POLL)
 #  if defined(HAVE_POLL_H)
diff --git a/lib/libarchive/filter_fork.h b/lib/libarchive/filter_fork.h
index d34ae22c36c19..685efda09fcd8 100644
--- a/lib/libarchive/filter_fork.h
+++ b/lib/libarchive/filter_fork.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/filter_fork.h,v 1.1 2007/05/29 01:00:20 kientzle Exp $
  */
 
 #ifndef FILTER_FORK_H
diff --git a/lib/libarchive/libarchive-formats.5 b/lib/libarchive/libarchive-formats.5
index 52e2e366214b1..cd34622b2c54a 100644
--- a/lib/libarchive/libarchive-formats.5
+++ b/lib/libarchive/libarchive-formats.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive-formats.5,v 1.14 2007/04/05 05:07:53 kientzle Exp $
 .\"
 .Dd April 27, 2004
 .Dt libarchive-formats 3
diff --git a/lib/libarchive/libarchive.3 b/lib/libarchive/libarchive.3
index 5552eec0b8354..8c19d008a90f1 100644
--- a/lib/libarchive/libarchive.3
+++ b/lib/libarchive/libarchive.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive.3,v 1.11 2007/01/09 08:05:56 kientzle Exp $
 .\"
 .Dd August 19, 2006
 .Dt LIBARCHIVE 3
diff --git a/lib/libarchive/libarchive_internals.3 b/lib/libarchive/libarchive_internals.3
index c8f79ffac5694..1161f65fb4e41 100644
--- a/lib/libarchive/libarchive_internals.3
+++ b/lib/libarchive/libarchive_internals.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive_internals.3,v 1.1 2007/05/29 01:00:20 kientzle Exp $
 .\"
 .Dd April 16, 2007
 .Dt LIBARCHIVE 3
diff --git a/lib/libarchive/tar.5 b/lib/libarchive/tar.5
index ff52fd55ddc2d..ab39df3338ad0 100644
--- a/lib/libarchive/tar.5
+++ b/lib/libarchive/tar.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.17 2007/01/09 08:05:56 kientzle Exp $
 .\"
 .Dd May 20, 2004
 .Dt TAR 5
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index 6c1fb485d7d26..ec23d63ae412f 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.11 2007/07/13 15:14:35 kientzle Exp $
 
 TESTS= \
 	test_acl_basic.c			\
diff --git a/lib/libarchive/test/README b/lib/libarchive/test/README
index 011aa8ec47216..74aedd3b68e92 100644
--- a/lib/libarchive/test/README
+++ b/lib/libarchive/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/README,v 1.2 2007/05/29 01:00:20 kientzle Exp $
 
 This is the test harness for libarchive.
 
diff --git a/lib/libarchive/test/main.c b/lib/libarchive/test/main.c
index b64fe75614b87..9dd852ffa7539 100644
--- a/lib/libarchive/test/main.c
+++ b/lib/libarchive/test/main.c
@@ -32,7 +32,7 @@
 #include <time.h>
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.8 2007/07/31 05:03:27 kientzle Exp $");
 
 /* Interix doesn't define these in a standard header. */
 #if __INTERIX__
diff --git a/lib/libarchive/test/read_open_memory.c b/lib/libarchive/test/read_open_memory.c
index 6e1fc76794d70..2729e1fdaaf5e 100644
--- a/lib/libarchive/test/read_open_memory.c
+++ b/lib/libarchive/test/read_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/read_open_memory.c,v 1.1 2007/07/13 15:12:52 kientzle Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/test/test.h b/lib/libarchive/test/test.h
index e867ea3600e66..c4a110c7199de 100644
--- a/lib/libarchive/test/test.h
+++ b/lib/libarchive/test/test.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/test/test.h,v 1.6 2007/07/14 17:52:01 kientzle Exp $
  */
 
 /* Every test program should #include "test.h" as the first thing. */
diff --git a/lib/libarchive/test/test_acl_basic.c b/lib/libarchive/test/test_acl_basic.c
index f07e74d8169cb..effcfb78c48a9 100644
--- a/lib/libarchive/test/test_acl_basic.c
+++ b/lib/libarchive/test/test_acl_basic.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $");
 
 /*
  * Exercise the system-independent portion of the ACL support.
diff --git a/lib/libarchive/test/test_acl_pax.c b/lib/libarchive/test/test_acl_pax.c
index eacad6aa7e2e1..abf7469496c40 100644
--- a/lib/libarchive/test/test_acl_pax.c
+++ b/lib/libarchive/test/test_acl_pax.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $");
 
 /*
  * Exercise the system-independent portion of the ACL support.
diff --git a/lib/libarchive/test/test_archive_api_feature.c b/lib/libarchive/test/test_archive_api_feature.c
index 32a51fba2d12b..432d902b6a55a 100644
--- a/lib/libarchive/test/test_archive_api_feature.c
+++ b/lib/libarchive/test/test_archive_api_feature.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
 
 DEFINE_TEST(test_archive_api_feature)
 {
diff --git a/lib/libarchive/test/test_bad_fd.c b/lib/libarchive/test/test_bad_fd.c
index dc83d185ae05b..1903cd07ee4b8 100644
--- a/lib/libarchive/test/test_bad_fd.c
+++ b/lib/libarchive/test/test_bad_fd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_bad_fd.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 /* Verify that attempting to open an invalid fd returns correct error. */
 DEFINE_TEST(test_bad_fd)
diff --git a/lib/libarchive/test/test_entry.c b/lib/libarchive/test/test_entry.c
index e829b2589906b..cb66a85a8c00b 100644
--- a/lib/libarchive/test/test_entry.c
+++ b/lib/libarchive/test/test_entry.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $");
 
 /*
  * Most of these tests are system-independent, though a few depend on
diff --git a/lib/libarchive/test/test_read_compress_program.c b/lib/libarchive/test/test_read_compress_program.c
index 012797046ce01..ec688e629999f 100644
--- a/lib/libarchive/test/test_read_compress_program.c
+++ b/lib/libarchive/test/test_read_compress_program.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_compress_program.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
diff --git a/lib/libarchive/test/test_read_data_large.c b/lib/libarchive/test/test_read_data_large.c
index 0361d5ef3e0da..a690b7b0daa8f 100644
--- a/lib/libarchive/test/test_read_data_large.c
+++ b/lib/libarchive/test/test_read_data_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_data_large.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $");
 
 /*
  * Test read/write of a 10M block of data in a single operation.
diff --git a/lib/libarchive/test/test_read_extract.c b/lib/libarchive/test/test_read_extract.c
index 5a32eedf916d1..bd42fd0c96777 100644
--- a/lib/libarchive/test/test_read_extract.c
+++ b/lib/libarchive/test/test_read_extract.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_extract.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $");
 
 #define BUFF_SIZE 1000000
 #define FILE_BUFF_SIZE 100000
diff --git a/lib/libarchive/test/test_read_format_ar.c b/lib/libarchive/test/test_read_format_ar.c
index 36c9c2ac9fb23..306da6fa1cb3f 100644
--- a/lib/libarchive/test/test_read_format_ar.c
+++ b/lib/libarchive/test/test_read_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_ar.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 /*
diff --git a/lib/libarchive/test/test_read_format_cpio_bin.c b/lib/libarchive/test/test_read_format_cpio_bin.c
index dc840c462e22a..b188228fb6e8f 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 199,'q',21,4,177,'y',237,'A',232,3,232,3,2,0,0,0,'p','C',244,'M',2,0,0,0,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_Z.c b/lib/libarchive/test/test_read_format_cpio_bin_Z.c
index a22c259bcf280..1dcebd33b44f8 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_Z.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_Z.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_Z.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,157,144,199,226,'T',' ',16,'+','O',187,' ',232,6,'$',20,0,160,'!',156,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
index 4aeb70a7768e9..e2841a7ce03f7 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',134,'J',208,'4',0,0,30,246,141,253,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_gz.c b/lib/libarchive/test/test_read_format_cpio_bin_gz.c
index cefa0b3471e83..efabf3196b90e 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_gz.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,244,'M','p','C',0,3,';','^','(',202,178,177,242,173,227,11,230,
diff --git a/lib/libarchive/test/test_read_format_cpio_odc.c b/lib/libarchive/test/test_read_format_cpio_odc.c
index de4d8d5309806..d722c5eb930fe 100644
--- a/lib/libarchive/test/test_read_format_cpio_odc.c
+++ b/lib/libarchive/test/test_read_format_cpio_odc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_odc.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 '0','7','0','7','0','7','0','0','2','0','2','5','0','7','4','6','6','1','0',
diff --git a/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c b/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
index e46f0f824e905..0bd8296da5e40 100644
--- a/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,236,'c',217,'D',0,3,'3','0','7','0','7','0','4','0','0',181,'0',
diff --git a/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c b/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
index bc89c8f343f57..d6158a8ca1f29 100644
--- a/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
+++ b/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,157,144,'0','n',4,132,'!',3,6,140,26,'8','n',228,16,19,195,160,'A',26,
diff --git a/lib/libarchive/test/test_read_format_empty.c b/lib/libarchive/test/test_read_format_empty.c
index 761b2a9cd4e3b..f6f3e23784266 100644
--- a/lib/libarchive/test/test_read_format_empty.c
+++ b/lib/libarchive/test/test_read_format_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_empty.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = { };
 
diff --git a/lib/libarchive/test/test_read_format_gtar_gz.c b/lib/libarchive/test/test_read_format_gtar_gz.c
index 5ea549a1f9d80..307d1d8c72d76 100644
--- a/lib/libarchive/test/test_read_format_gtar_gz.c
+++ b/lib/libarchive/test/test_read_format_gtar_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_gz.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,'+','e',217,'D',0,3,211,211,'g',160,'9','0',0,2,'s','S','S',16,
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse.c b/lib/libarchive/test/test_read_format_gtar_sparse.c
index 66824d02f3abf..7f8e01eba9dbf 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse.c
+++ b/lib/libarchive/test/test_read_format_gtar_sparse.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.6 2007/08/18 21:53:25 kientzle Exp $");
 
 
 struct contents {
diff --git a/lib/libarchive/test/test_read_format_iso_gz.c b/lib/libarchive/test/test_read_format_iso_gz.c
index fd8f60e1e6296..92ada131d2c15 100644
--- a/lib/libarchive/test/test_read_format_iso_gz.c
+++ b/lib/libarchive/test/test_read_format_iso_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_iso_gz.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,139,8,8,201,'R','p','C',0,3,'t','e','s','t','-','r','e','a','d','_','f',
diff --git a/lib/libarchive/test/test_read_format_isorr_bz2.c b/lib/libarchive/test/test_read_format_isorr_bz2.c
index a0859f9e1449a..f9a70768471eb 100644
--- a/lib/libarchive/test/test_read_format_isorr_bz2.c
+++ b/lib/libarchive/test/test_read_format_isorr_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.c,v 1.2 2007/05/29 01:00:21 kientzle Exp $");
 
 /*
 Execute the following to rebuild the data for this program:
diff --git a/lib/libarchive/test/test_read_format_pax_bz2.c b/lib/libarchive/test/test_read_format_pax_bz2.c
index 039bd53b2b175..186d5f9d5ba19 100644
--- a/lib/libarchive/test/test_read_format_pax_bz2.c
+++ b/lib/libarchive/test/test_read_format_pax_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_pax_bz2.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',152,180,30,185,0,0,140,127,176,212,
diff --git a/lib/libarchive/test/test_read_format_tar.c b/lib/libarchive/test/test_read_format_tar.c
index 8f8b83bcf5431..c3b5212d8e7c2 100644
--- a/lib/libarchive/test/test_read_format_tar.c
+++ b/lib/libarchive/test/test_read_format_tar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar.c,v 1.2 2007/07/14 05:35:17 kientzle Exp $");
 
 /*
  * Each of these archives is a short archive with a single entry.  The
diff --git a/lib/libarchive/test/test_read_format_tbz.c b/lib/libarchive/test/test_read_format_tbz.c
index 17f24ea1070f9..3d135eb6df6c9 100644
--- a/lib/libarchive/test/test_read_format_tbz.c
+++ b/lib/libarchive/test/test_read_format_tbz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tbz.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',237,7,140,'W',0,0,27,251,144,208,
diff --git a/lib/libarchive/test/test_read_format_tgz.c b/lib/libarchive/test/test_read_format_tgz.c
index 4235358b03481..ce61aa67971e3 100644
--- a/lib/libarchive/test/test_read_format_tgz.c
+++ b/lib/libarchive/test/test_read_format_tgz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tgz.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
diff --git a/lib/libarchive/test/test_read_format_tz.c b/lib/libarchive/test/test_read_format_tz.c
index d7a91e225497c..337b96dfc177a 100644
--- a/lib/libarchive/test/test_read_format_tz.c
+++ b/lib/libarchive/test/test_read_format_tz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tz.c,v 1.1 2007/03/03 07:37:37 kientzle Exp $");
 
 static unsigned char archive[] = {
 31,157,144,'.',0,8,28,'H',176,160,193,131,8,19,'*','\\',200,176,'!','B',24,
diff --git a/lib/libarchive/test/test_read_format_zip.c b/lib/libarchive/test/test_read_format_zip.c
index 96caf8593b0d8..08a4d6f552981 100644
--- a/lib/libarchive/test/test_read_format_zip.c
+++ b/lib/libarchive/test/test_read_format_zip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.2 2007/05/29 01:00:21 kientzle Exp $");
 
 static unsigned char archive[] = {
 'P','K',3,4,10,0,0,0,0,0,'Y','f',179,'6',0,0,0,0,0,0,0,0,0,0,0,0,4,0,21,0,
diff --git a/lib/libarchive/test/test_read_large.c b/lib/libarchive/test/test_read_large.c
index 44a2b388a06b8..d0342407cd89f 100644
--- a/lib/libarchive/test/test_read_large.c
+++ b/lib/libarchive/test/test_read_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_large.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $");
 
 static unsigned char testdata[10 * 1024 * 1024];
 static unsigned char testdatacopy[10 * 1024 * 1024];
diff --git a/lib/libarchive/test/test_read_pax_truncated.c b/lib/libarchive/test/test_read_pax_truncated.c
index 25db36114ce47..c8873d84372b3 100644
--- a/lib/libarchive/test/test_read_pax_truncated.c
+++ b/lib/libarchive/test/test_read_pax_truncated.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_pax_truncated.c,v 1.1 2007/07/13 15:14:35 kientzle Exp $");
 
 DEFINE_TEST(test_read_pax_truncated)
 {
diff --git a/lib/libarchive/test/test_read_position.c b/lib/libarchive/test/test_read_position.c
index d35766cbe332d..3675e11a4b91b 100644
--- a/lib/libarchive/test/test_read_position.c
+++ b/lib/libarchive/test/test_read_position.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_position.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $");
 
 static unsigned char nulls[10000000];
 static unsigned char buff[10000000];
diff --git a/lib/libarchive/test/test_read_truncated.c b/lib/libarchive/test/test_read_truncated.c
index 1cc62b2780e6a..726984c58c48e 100644
--- a/lib/libarchive/test/test_read_truncated.c
+++ b/lib/libarchive/test/test_read_truncated.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_truncated.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $");
 
 char buff[1000000];
 char buff2[100000];
diff --git a/lib/libarchive/test/test_tar_filenames.c b/lib/libarchive/test/test_tar_filenames.c
index 1678f7a7ed8cf..b75ac7f0cae3e 100644
--- a/lib/libarchive/test/test_tar_filenames.c
+++ b/lib/libarchive/test/test_tar_filenames.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.7 2007/07/14 17:52:01 kientzle Exp $");
 
 /*
  * Exercise various lengths of filenames in tar archives,
diff --git a/lib/libarchive/test/test_write_compress_program.c b/lib/libarchive/test/test_write_compress_program.c
index 4376a53cd8444..666bbf9231d85 100644
--- a/lib/libarchive/test/test_write_compress_program.c
+++ b/lib/libarchive/test/test_write_compress_program.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_program.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $");
 
 char buff[1000000];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_disk.c b/lib/libarchive/test/test_write_disk.c
index fb805ff8a3938..4cac97681a7fd 100644
--- a/lib/libarchive/test/test_write_disk.c
+++ b/lib/libarchive/test/test_write_disk.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.6 2007/09/21 04:52:43 kientzle Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 
diff --git a/lib/libarchive/test/test_write_disk_perms.c b/lib/libarchive/test/test_write_disk_perms.c
index accd7541460d6..af568a0b28382 100644
--- a/lib/libarchive/test/test_write_disk_perms.c
+++ b/lib/libarchive/test/test_write_disk_perms.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_perms.c,v 1.7 2007/08/12 17:35:05 kientzle Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 
diff --git a/lib/libarchive/test/test_write_disk_secure.c b/lib/libarchive/test/test_write_disk_secure.c
index a32bc136af5d8..80876b46c4c25 100644
--- a/lib/libarchive/test/test_write_disk_secure.c
+++ b/lib/libarchive/test/test_write_disk_secure.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
 
 #define UMASK 022
 
diff --git a/lib/libarchive/test/test_write_format_ar.c b/lib/libarchive/test/test_write_format_ar.c
index aff781b214534..2de670f68efd5 100644
--- a/lib/libarchive/test/test_write_format_ar.c
+++ b/lib/libarchive/test/test_write_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.5 2007/07/06 15:43:11 kientzle Exp $");
 
 char buff[4096];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_format_cpio.c b/lib/libarchive/test/test_write_format_cpio.c
index 2ea40a36b4453..6677b5e1b5793 100644
--- a/lib/libarchive/test/test_write_format_cpio.c
+++ b/lib/libarchive/test/test_write_format_cpio.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $");
 
 /* The version stamp macro was introduced after cpio write support. */
 #if ARCHIVE_VERSION_STAMP >= 1009000
diff --git a/lib/libarchive/test/test_write_format_cpio_empty.c b/lib/libarchive/test/test_write_format_cpio_empty.c
index 9f50e77b0afa7..61c49211d0706 100644
--- a/lib/libarchive/test/test_write_format_cpio_empty.c
+++ b/lib/libarchive/test/test_write_format_cpio_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_empty.c,v 1.2 2007/05/29 01:00:21 kientzle Exp $");
 
 /*
  * Check that an "empty" cpio archive is correctly created.
diff --git a/lib/libarchive/test/test_write_format_shar_empty.c b/lib/libarchive/test/test_write_format_shar_empty.c
index 0af57dda6acf5..c43e23b3c56e6 100644
--- a/lib/libarchive/test/test_write_format_shar_empty.c
+++ b/lib/libarchive/test/test_write_format_shar_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_shar_empty.c,v 1.2 2007/05/29 01:00:21 kientzle Exp $");
 
 /*
  * Check that an "empty" shar archive is correctly created as an empty file.
diff --git a/lib/libarchive/test/test_write_format_tar.c b/lib/libarchive/test/test_write_format_tar.c
index 8b498952526fb..a23d05ca20933 100644
--- a/lib/libarchive/test/test_write_format_tar.c
+++ b/lib/libarchive/test/test_write_format_tar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $");
 
 char buff[1000000];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_format_tar_empty.c b/lib/libarchive/test/test_write_format_tar_empty.c
index 86bdebc43f14e..1d4d35449d54a 100644
--- a/lib/libarchive/test/test_write_format_tar_empty.c
+++ b/lib/libarchive/test/test_write_format_tar_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_empty.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
 
 /*
  * Check that an "empty" tar archive is correctly created.
diff --git a/lib/libarchive/test/test_write_open_memory.c b/lib/libarchive/test/test_write_open_memory.c
index 90428766bfce6..2e58fff4af54b 100644
--- a/lib/libarchive/test/test_write_open_memory.c
+++ b/lib/libarchive/test/test_write_open_memory.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_open_memory.c,v 1.3 2007/05/29 01:00:21 kientzle Exp $");
 
 /* Try to force archive_write_open_memory.c to write past the end of an array. */
 static unsigned char buff[16384];
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index 921d3ff758bb7..b5a9fe3dc1d67 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libatm/Makefile,v 1.14 2007/05/21 02:49:02 deischen Exp $
 
 LIB=	atm
 SHLIB_MAJOR= 5
diff --git a/lib/libatm/atm_addr.c b/lib/libatm/atm_addr.c
index f4c65f2b25f4e..771e0dec4d0cd 100644
--- a/lib/libatm/atm_addr.c
+++ b/lib/libatm/atm_addr.c
@@ -30,7 +30,7 @@ static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.12 2003/07/29 13:51:27 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/cache_key.c b/lib/libatm/cache_key.c
index 7bfeac2105440..9e91633941d15 100644
--- a/lib/libatm/cache_key.c
+++ b/lib/libatm/cache_key.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.10 2007/04/04 03:24:01 kan Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/ioctl_subr.c b/lib/libatm/ioctl_subr.c
index f7b15f1178bcc..5610c3c9eba01 100644
--- a/lib/libatm/ioctl_subr.c
+++ b/lib/libatm/ioctl_subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.11 2004/02/21 16:29:10 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/ip_addr.c b/lib/libatm/ip_addr.c
index d3a52765011b8..2b76476237a9a 100644
--- a/lib/libatm/ip_addr.c
+++ b/lib/libatm/ip_addr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.12 2004/02/21 16:29:10 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/ip_checksum.c b/lib/libatm/ip_checksum.c
index 2881c24a16b00..8171c445c8159 100644
--- a/lib/libatm/ip_checksum.c
+++ b/lib/libatm/ip_checksum.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.9 2003/07/29 13:35:03 harti Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libatm/libatm.h b/lib/libatm/libatm.h
index 1c2088fa0784c..bbd7b5db84a10 100644
--- a/lib/libatm/libatm.h
+++ b/lib/libatm/libatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.7 2003/07/29 13:35:03 harti Exp $
  *
  */
 
diff --git a/lib/libatm/timer.c b/lib/libatm/timer.c
index 1870e55c017bf..3b69bd9289671 100644
--- a/lib/libatm/timer.c
+++ b/lib/libatm/timer.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $");
 
 /*
  * User Space Library Functions
diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile
index 889e971ab04c9..d27e74e69b10f 100644
--- a/lib/libautofs/Makefile
+++ b/lib/libautofs/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2004/09/08 08:12:21 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libautofs/Makefile,v 1.5 2007/05/21 02:49:02 deischen Exp $
 
 LIB=	autofs
 SHLIB_MAJOR= 2
diff --git a/lib/libautofs/libautofs.3 b/lib/libautofs/libautofs.3
index f4e07a90a9f64..b651a775dd682 100644
--- a/lib/libautofs/libautofs.3
+++ b/lib/libautofs/libautofs.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.8 2005/07/31 03:30:43 keramida Exp $
 .Dd September 9, 2004
 .Dt LIBAUTOFS 3
 .Os
diff --git a/lib/libautofs/libautofs.c b/lib/libautofs/libautofs.c
index 459b32d2048ba..0bbc5dc4b6f07 100644
--- a/lib/libautofs/libautofs.c
+++ b/lib/libautofs/libautofs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libautofs/libautofs.c,v 1.5 2004/09/09 01:23:27 alfred Exp $
  * $Id: libautofs.c,v 1.5 2004/09/08 08:44:12 bright Exp $
  */
 #include <err.h>
diff --git a/lib/libautofs/libautofs.h b/lib/libautofs/libautofs.h
index f391bad3096f0..0526b9657bcbf 100644
--- a/lib/libautofs/libautofs.h
+++ b/lib/libautofs/libautofs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libautofs/libautofs.h,v 1.3 2004/09/09 01:23:27 alfred Exp $
  * $Id: libautofs.h,v 1.4 2004/09/08 08:12:21 bright Exp $
  */
 #ifndef _LIBAUTOFS_H
diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile
index 95739bb3af7e9..ea342f81d9054 100644
--- a/lib/libbegemot/Makefile
+++ b/lib/libbegemot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbegemot/Makefile,v 1.4 2007/05/21 02:49:02 deischen Exp $
 
 LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
 
diff --git a/lib/libbluetooth/Makefile b/lib/libbluetooth/Makefile
index 0f85eff47fdf3..1d7b7fe807670 100644
--- a/lib/libbluetooth/Makefile
+++ b/lib/libbluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.3 2007/05/21 02:49:02 deischen Exp $
 
 LIB=		bluetooth
 MAN=		bluetooth.3
diff --git a/lib/libbluetooth/bluetooth.3 b/lib/libbluetooth/bluetooth.3
index d6adb260392f8..910c1269b9c68 100644
--- a/lib/libbluetooth/bluetooth.3
+++ b/lib/libbluetooth/bluetooth.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.7 2005/01/21 10:26:11 ru Exp $
 .\"
 .Dd May 7, 2003
 .Dt BLUETOOTH 3
diff --git a/lib/libbluetooth/bluetooth.c b/lib/libbluetooth/bluetooth.c
index f206aeeee4d8e..04b4c6f5c17a8 100644
--- a/lib/libbluetooth/bluetooth.c
+++ b/lib/libbluetooth/bluetooth.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bluetooth.c,v 1.3 2003/05/20 23:04:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libbluetooth/bluetooth.c,v 1.2 2004/03/05 08:10:17 markm Exp $
  */
 
 #include <bluetooth.h>
diff --git a/lib/libbluetooth/bluetooth.h b/lib/libbluetooth/bluetooth.h
index d9797876e7909..a46fa858df633 100644
--- a/lib/libbluetooth/bluetooth.h
+++ b/lib/libbluetooth/bluetooth.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.2 2005/03/17 21:39:44 emax Exp $
  */
 
 #ifndef _BLUETOOTH_H_
diff --git a/lib/libbsm/Makefile b/lib/libbsm/Makefile
index 8f3b8284ba4fe..83ac0c10b74a1 100644
--- a/lib/libbsm/Makefile
+++ b/lib/libbsm/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsm/Makefile,v 1.7.2.1 2007/10/27 16:35:46 rwatson Exp $
 #
 
 OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile
index 22821c7bcb5ab..05bd682f58bac 100644
--- a/lib/libbsnmp/Makefile
+++ b/lib/libbsnmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/Makefile,v 1.3 2005/03/14 17:32:15 harti Exp $
 
 SUBDIR=	libbsnmp
 
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index de9dd2b67ce3b..b3701848c3b7d 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.7 2007/06/18 18:47:54 rafan Exp $
 
 SHLIB_MAJOR=	4
 WARNS?=		6
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 91351c0201e68..507b7b20a20ac 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbsnmp/libbsnmp/Makefile,v 1.6 2005/10/04 15:02:07 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 76ef0bd717676..c3995f8528156 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libbz2/Makefile,v 1.7 2007/05/21 02:49:03 deischen Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 2caf0a1ff2688..4aaa1c40ef405 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
 
 SHLIBDIR?= /lib
 
diff --git a/lib/libc/Versions.def b/lib/libc/Versions.def
index 2cbfec18cdb6e..b280e9a11e378 100644
--- a/lib/libc/Versions.def
+++ b/lib/libc/Versions.def
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $
 
 # This is our first version; it depends on no other.
 FBSD_1.0 {
diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/amd64/Makefile.inc
index e3f0c4879b4c8..dcceb00e547b1 100644
--- a/lib/libc/amd64/Makefile.inc
+++ b/lib/libc/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.5 2006/03/16 14:22:19 ru Exp $
 #
 # Machine dependent definitions for the amd64 architecture.
 #
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index ef75377de236a..505a6e118214e 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.29 2007/07/04 23:18:38 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
index ab8578150c26b..03cdcbd1f4098 100644
--- a/lib/libc/amd64/Symbol.map
+++ b/lib/libc/amd64/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.4 2007/05/31 13:01:32 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/amd64/_fpmath.h b/lib/libc/amd64/_fpmath.h
index 8f8cf6fb8075f..801ec809ccadd 100644
--- a/lib/libc/amd64/_fpmath.h
+++ b/lib/libc/amd64/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.6 2005/03/07 04:55:21 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/amd64/arith.h b/lib/libc/amd64/arith.h
index ecb1a33fccb0e..8d3b5f6268929 100644
--- a/lib/libc/amd64/arith.h
+++ b/lib/libc/amd64/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/amd64/gd_qnan.h b/lib/libc/amd64/gd_qnan.h
index 17b439f131cc6..75ee81e89e902 100644
--- a/lib/libc/amd64/gd_qnan.h
+++ b/lib/libc/amd64/gd_qnan.h
@@ -4,7 +4,7 @@
  * This file can be generated by compiling and running contrib/gdtoa/qnan.c
  * on the target architecture after arith.h has been generated.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/amd64/gd_qnan.h,v 1.1 2007/01/03 05:00:02 das Exp $
  */
 
 #define f_QNAN 0xffc00000
diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/amd64/gen/Makefile.inc
index 38fe7e1a8ce39..53ab073a15491 100644
--- a/lib/libc/amd64/gen/Makefile.inc
+++ b/lib/libc/amd64/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.29 2005/03/15 15:53:38 das Exp $
 
 SRCS+=	_setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \
 	fabs.S modf.S \
diff --git a/lib/libc/amd64/gen/_set_tp.c b/lib/libc/amd64/gen/_set_tp.c
index 02e5e14603025..3cfffab2c4f9a 100644
--- a/lib/libc/amd64/gen/_set_tp.c
+++ b/lib/libc/amd64/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/amd64/gen/_set_tp.c,v 1.1 2004/08/15 16:18:02 dfr Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 3998fbebdc397..a29f0fb3ddfb4 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.19 2007/01/09 00:27:48 imp Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/amd64/gen/fabs.S b/lib/libc/amd64/gen/fabs.S
index 59cd910414bad..0fb3c43bb53d7 100644
--- a/lib/libc/amd64/gen/fabs.S
+++ b/lib/libc/amd64/gen/fabs.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.3 2004/02/08 21:21:45 peter Exp $");
 
 /*
  * Return floating point absolute value of a double.
diff --git a/lib/libc/amd64/gen/flt_rounds.c b/lib/libc/amd64/gen/flt_rounds.c
index c0ce81f6dfa9b..c4eb847298066 100644
--- a/lib/libc/amd64/gen/flt_rounds.c
+++ b/lib/libc/amd64/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
 
 #include <float.h>
 
diff --git a/lib/libc/amd64/gen/fpgetmask.c b/lib/libc/amd64/gen/fpgetmask.c
index 03bb2741ef6ab..979c4b1171faf 100644
--- a/lib/libc/amd64/gen/fpgetmask.c
+++ b/lib/libc/amd64/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetmask.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpgetprec.c b/lib/libc/amd64/gen/fpgetprec.c
index 22d21480566a1..051c32f93f2f3 100644
--- a/lib/libc/amd64/gen/fpgetprec.c
+++ b/lib/libc/amd64/gen/fpgetprec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetprec.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpgetround.c b/lib/libc/amd64/gen/fpgetround.c
index 9c066b149ca22..31271a2d9996b 100644
--- a/lib/libc/amd64/gen/fpgetround.c
+++ b/lib/libc/amd64/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetround.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpgetsticky.c b/lib/libc/amd64/gen/fpgetsticky.c
index c3acb91d63e5c..09cb5554a372f 100644
--- a/lib/libc/amd64/gen/fpgetsticky.c
+++ b/lib/libc/amd64/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpgetsticky.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpsetmask.c b/lib/libc/amd64/gen/fpsetmask.c
index 996e167ac1d96..3e9ebbe5eef4c 100644
--- a/lib/libc/amd64/gen/fpsetmask.c
+++ b/lib/libc/amd64/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetmask.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpsetprec.c b/lib/libc/amd64/gen/fpsetprec.c
index 5898de7e0e82a..0e256911ff397 100644
--- a/lib/libc/amd64/gen/fpsetprec.c
+++ b/lib/libc/amd64/gen/fpsetprec.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetprec.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/fpsetround.c b/lib/libc/amd64/gen/fpsetround.c
index 6f13367510d6d..f17f2e9d3b290 100644
--- a/lib/libc/amd64/gen/fpsetround.c
+++ b/lib/libc/amd64/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/amd64/gen/fpsetround.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */
 #define __IEEEFP_NOINLINES__ 1
 #include <ieeefp.h>
 
diff --git a/lib/libc/amd64/gen/infinity.c b/lib/libc/amd64/gen/infinity.c
index 464b4029b35ae..7b42ae8777a11 100644
--- a/lib/libc/amd64/gen/infinity.c
+++ b/lib/libc/amd64/gen/infinity.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/amd64/gen/ldexp.c b/lib/libc/amd64/gen/ldexp.c
index 43107fc297a8c..00004d6c667b8 100644
--- a/lib/libc/amd64/gen/ldexp.c
+++ b/lib/libc/amd64/gen/ldexp.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ldexp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/ldexp.c,v 1.14 2007/01/09 00:38:24 imp Exp $");
 
 /*
  * ldexp(value, exp): return value * (2 ** exp).
diff --git a/lib/libc/amd64/gen/makecontext.c b/lib/libc/amd64/gen/makecontext.c
index 15f10b50ded46..0999a18059c40 100644
--- a/lib/libc/amd64/gen/makecontext.c
+++ b/lib/libc/amd64/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.4 2004/07/31 01:41:41 davidxu Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/amd64/gen/modf.S b/lib/libc/amd64/gen/modf.S
index 63eec8c53d869..3339096ae9a7f 100644
--- a/lib/libc/amd64/gen/modf.S
+++ b/lib/libc/amd64/gen/modf.S
@@ -36,7 +36,7 @@
 #if defined(LIBC_SCCS)
 	RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $")
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.3 2007/01/09 00:27:48 imp Exp $");
 
 /*
  * modf(value, iptr): return fractional part of value, and stores the
diff --git a/lib/libc/amd64/gen/rfork_thread.S b/lib/libc/amd64/gen/rfork_thread.S
index aa7001c5d5873..cb3cf644d32ee 100644
--- a/lib/libc/amd64/gen/rfork_thread.S
+++ b/lib/libc/amd64/gen/rfork_thread.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/rfork_thread.S,v 1.1 2003/10/13 20:32:33 alc Exp $");
 
 /*
  * With thanks to John Dyson for the original version of this.
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 7d11384ac4eca..66298911c8eb5 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.27 2007/01/09 00:27:48 imp Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/amd64/gen/signalcontext.c b/lib/libc/amd64/gen/signalcontext.c
index 1a2621aa7229c..b7efc18708968 100644
--- a/lib/libc/amd64/gen/signalcontext.c
+++ b/lib/libc/amd64/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.5 2004/07/28 13:08:24 davidxu Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 718edf9540646..18e81408f35c1 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -37,7 +37,7 @@
 	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.29 2007/01/09 00:27:48 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/stdlib/Makefile.inc b/lib/libc/amd64/stdlib/Makefile.inc
index 5b7e675ede0d5..20873587f8c7b 100644
--- a/lib/libc/amd64/stdlib/Makefile.inc
+++ b/lib/libc/amd64/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/stdlib/Makefile.inc,v 1.1 2007/04/04 01:19:54 jkim Exp $
 
 MDSRCS+=div.S ldiv.S lldiv.S
diff --git a/lib/libc/amd64/stdlib/div.S b/lib/libc/amd64/stdlib/div.S
index f8595f91b295e..c563eb27cea90 100644
--- a/lib/libc/amd64/stdlib/div.S
+++ b/lib/libc/amd64/stdlib/div.S
@@ -6,7 +6,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/div.S,v 1.1 2007/04/04 01:19:54 jkim Exp $");
 
 ENTRY(div)
 	movl	%edi,%eax
diff --git a/lib/libc/amd64/stdlib/ldiv.S b/lib/libc/amd64/stdlib/ldiv.S
index de952f05ee609..a15fcf1690e3e 100644
--- a/lib/libc/amd64/stdlib/ldiv.S
+++ b/lib/libc/amd64/stdlib/ldiv.S
@@ -6,7 +6,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/ldiv.S,v 1.1 2007/04/04 01:19:54 jkim Exp $");
 
 ENTRY(ldiv)
 	movq	%rdi,%rax
diff --git a/lib/libc/amd64/stdlib/lldiv.S b/lib/libc/amd64/stdlib/lldiv.S
index 7353754a48b8f..e936a65430220 100644
--- a/lib/libc/amd64/stdlib/lldiv.S
+++ b/lib/libc/amd64/stdlib/lldiv.S
@@ -6,7 +6,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/lldiv.S,v 1.1 2007/04/04 01:19:54 jkim Exp $");
 
 ENTRY(lldiv)
 	movq	%rdi,%rax
diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc
index f5d69d60fbc5d..ac585a470e01d 100644
--- a/lib/libc/amd64/string/Makefile.inc
+++ b/lib/libc/amd64/string/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/string/Makefile.inc,v 1.5 2005/04/10 18:58:49 alc Exp $
 
 MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
 	strcat.S strcmp.S strcpy.S
diff --git a/lib/libc/amd64/string/bcmp.S b/lib/libc/amd64/string/bcmp.S
index 36a0c7e8419c1..0ac411f4ef969 100644
--- a/lib/libc/amd64/string/bcmp.S
+++ b/lib/libc/amd64/string/bcmp.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcmp.S,v 1.2 2005/04/10 18:12:06 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcmp.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $")
diff --git a/lib/libc/amd64/string/bcopy.S b/lib/libc/amd64/string/bcopy.S
index d58f5918ee596..f95ac07651c73 100644
--- a/lib/libc/amd64/string/bcopy.S
+++ b/lib/libc/amd64/string/bcopy.S
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.2 2005/04/08 05:10:18 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcopy.S,v 1.2 2003/08/07 16:42:36 agc Exp $")
diff --git a/lib/libc/amd64/string/bzero.S b/lib/libc/amd64/string/bzero.S
index d9d2a451a0d7c..9b3dae75370d1 100644
--- a/lib/libc/amd64/string/bzero.S
+++ b/lib/libc/amd64/string/bzero.S
@@ -5,7 +5,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bzero.S,v 1.2 2005/04/07 05:46:46 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: bzero.S,v 1.2 2003/07/26 19:24:38 salo Exp $")
diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/amd64/string/memcmp.S
index 28194f82e7a0e..8406f0ab5138f 100644
--- a/lib/libc/amd64/string/memcmp.S
+++ b/lib/libc/amd64/string/memcmp.S
@@ -5,7 +5,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/memcmp.S,v 1.1 2005/04/08 05:15:55 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: memcmp.S,v 1.2 2003/07/26 19:24:39 salo Exp $")
diff --git a/lib/libc/amd64/string/memcpy.S b/lib/libc/amd64/string/memcpy.S
index bd1e8422ad847..5b0762f5f9d88 100644
--- a/lib/libc/amd64/string/memcpy.S
+++ b/lib/libc/amd64/string/memcpy.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: memcpy.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/lib/libc/amd64/string/memcpy.S,v 1.1 2005/04/07 03:56:03 alc Exp $ */
 
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/amd64/string/memmove.S
index 85beb262f8d9a..93d8693585862 100644
--- a/lib/libc/amd64/string/memmove.S
+++ b/lib/libc/amd64/string/memmove.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: memmove.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/lib/libc/amd64/string/memmove.S,v 1.1 2005/04/07 03:56:03 alc Exp $ */
 
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/amd64/string/memset.S b/lib/libc/amd64/string/memset.S
index 142387aebd866..51d90a7445992 100644
--- a/lib/libc/amd64/string/memset.S
+++ b/lib/libc/amd64/string/memset.S
@@ -5,7 +5,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/memset.S,v 1.1 2005/04/07 03:56:03 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: memset.S,v 1.3 2004/02/26 20:50:06 drochner Exp $")
diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S
index 78a1b5645eef7..9f1002b20f824 100644
--- a/lib/libc/amd64/string/strcat.S
+++ b/lib/libc/amd64/string/strcat.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/strcat.S,v 1.1 2005/04/10 18:58:49 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $")
diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S
index a7d2523769782..9a5f25b92324d 100644
--- a/lib/libc/amd64/string/strcmp.S
+++ b/lib/libc/amd64/string/strcmp.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/strcmp.S,v 1.1 2005/04/09 20:47:08 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
diff --git a/lib/libc/amd64/string/strcpy.S b/lib/libc/amd64/string/strcpy.S
index 04676fa1170a7..db4438cda29cd 100644
--- a/lib/libc/amd64/string/strcpy.S
+++ b/lib/libc/amd64/string/strcpy.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/strcpy.S,v 1.2 2005/04/23 18:45:36 alc Exp $");
 
 #if 0
 	RCSID("$NetBSD: strcpy.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index 5115819c826a9..d5a9f39651d65 100644
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.30 2007/07/04 23:23:00 peter Exp $
 
 SRCS+=	amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c amd64_set_gsbase.c
 
diff --git a/lib/libc/amd64/sys/amd64_get_fsbase.c b/lib/libc/amd64/sys/amd64_get_fsbase.c
index ff5eb8f305ae5..d9201eae2b07a 100644
--- a/lib/libc/amd64/sys/amd64_get_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/amd64_get_gsbase.c b/lib/libc/amd64/sys/amd64_get_gsbase.c
index ddbf977f5dd18..566644bf27a22 100644
--- a/lib/libc/amd64/sys/amd64_get_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/amd64_set_fsbase.c b/lib/libc/amd64/sys/amd64_set_fsbase.c
index e0914859a1ae6..c3c9af6b76bcd 100644
--- a/lib/libc/amd64/sys/amd64_set_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/amd64_set_gsbase.c b/lib/libc/amd64/sys/amd64_set_gsbase.c
index f8963288ac073..b8829bfcc5b7b 100644
--- a/lib/libc/amd64/sys/amd64_set_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/amd64/sys/brk.S b/lib/libc/amd64/sys/brk.S
index 42168d8910311..f42b3319baee9 100644
--- a/lib/libc/amd64/sys/brk.S
+++ b/lib/libc/amd64/sys/brk.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/brk.S,v 1.14 2007/01/09 00:27:48 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/amd64/sys/cerror.S
index 547a18c0bd87d..924cd9ba0530b 100644
--- a/lib/libc/amd64/sys/cerror.S
+++ b/lib/libc/amd64/sys/cerror.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.15 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/amd64/sys/exect.S
index 570cd5bb72a4c..fd0bd655ac6c3 100644
--- a/lib/libc/amd64/sys/exect.S
+++ b/lib/libc/amd64/sys/exect.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/exect.S,v 1.12 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 #include <machine/psl.h>
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libc/amd64/sys/getcontext.S
index 9fa95fa09b18b..06b78c68294ce 100644
--- a/lib/libc/amd64/sys/getcontext.S
+++ b/lib/libc/amd64/sys/getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/getcontext.S,v 1.2 2003/09/04 00:31:45 peter Exp $");
 
 #include <SYS.h>
 
diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S
index d97f0b842a5a9..ad9bc7b9f13c7 100644
--- a/lib/libc/amd64/sys/pipe.S
+++ b/lib/libc/amd64/sys/pipe.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/pipe.S,v 1.14 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/ptrace.S b/lib/libc/amd64/sys/ptrace.S
index 2bb58e8892413..b11d2d6fb82b6 100644
--- a/lib/libc/amd64/sys/ptrace.S
+++ b/lib/libc/amd64/sys/ptrace.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/ptrace.S,v 1.12 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/amd64/sys/reboot.S
index 8495b914984d0..56dbcf6ad6012 100644
--- a/lib/libc/amd64/sys/reboot.S
+++ b/lib/libc/amd64/sys/reboot.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/reboot.S,v 1.10 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/sbrk.S b/lib/libc/amd64/sys/sbrk.S
index c5cdd265f7aea..00ef55a0bd9ac 100644
--- a/lib/libc/amd64/sys/sbrk.S
+++ b/lib/libc/amd64/sys/sbrk.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/sbrk.S,v 1.14 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/setlogin.S b/lib/libc/amd64/sys/setlogin.S
index 24f957b87f584..6454b29f047bd 100644
--- a/lib/libc/amd64/sys/setlogin.S
+++ b/lib/libc/amd64/sys/setlogin.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/setlogin.S,v 1.13 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/amd64/sys/sigreturn.S
index 28dc227e4ac31..a0691f64b8352 100644
--- a/lib/libc/amd64/sys/sigreturn.S
+++ b/lib/libc/amd64/sys/sigreturn.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/sigreturn.S,v 1.13 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index eb843ff76872d..9bb301e20a930 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.23 2007/01/09 00:27:49 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/arm/Makefile.inc b/lib/libc/arm/Makefile.inc
index 666cadc276d4f..ff5fedf156947 100644
--- a/lib/libc/arm/Makefile.inc
+++ b/lib/libc/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/Makefile.inc,v 1.4 2006/03/13 01:14:55 deischen Exp $
 #
 # Machine dependent definitions for the arm architecture.
 #
diff --git a/lib/libc/arm/SYS.h b/lib/libc/arm/SYS.h
index 584c151384828..52ad3861ef2a4 100644
--- a/lib/libc/arm/SYS.h
+++ b/lib/libc/arm/SYS.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/SYS.h,v 1.6 2007/07/05 17:42:00 peter Exp $
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index c85a6209d1f8f..cef24c47540b2 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.6 2007/05/31 13:01:33 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/arm/_fpmath.h b/lib/libc/arm/_fpmath.h
index 98d78327dec6d..79e4346e2031f 100644
--- a/lib/libc/arm/_fpmath.h
+++ b/lib/libc/arm/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/_fpmath.h,v 1.4 2005/03/20 00:53:52 cognet Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/arm/arith.h b/lib/libc/arm/arith.h
index e6f1da00a4cb3..e8000b8e886dd 100644
--- a/lib/libc/arm/arith.h
+++ b/lib/libc/arm/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/arith.h,v 1.2 2006/11/06 20:49:23 cognet Exp $
  */
 
 /*
diff --git a/lib/libc/arm/gd_qnan.h b/lib/libc/arm/gd_qnan.h
index 13e26dde35f9f..05fa521405deb 100644
--- a/lib/libc/arm/gd_qnan.h
+++ b/lib/libc/arm/gd_qnan.h
@@ -6,7 +6,7 @@
  *
  * XXX I don't have ARM hardware, so I just guessed.  --das
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/arm/gd_qnan.h,v 1.1 2007/01/03 05:00:02 das Exp $
  */
 
 #define f_QNAN 0xffc00000
diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc
index bbe2257278896..f8dbaa69fbb0d 100644
--- a/lib/libc/arm/gen/Makefile.inc
+++ b/lib/libc/arm/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.4 2004/09/23 23:12:57 cognet Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
 	infinity.c ldexp.c makecontext.c modf.c \
diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S
index fbde35709e637..7958ab4b12870 100644
--- a/lib/libc/arm/gen/_ctx_start.S
+++ b/lib/libc/arm/gen/_ctx_start.S
@@ -1,6 +1,6 @@
 #include <machine/asm.h>
 
-.ident	"$FreeBSD$"
+.ident	"$FreeBSD: src/lib/libc/arm/gen/_ctx_start.S,v 1.2 2004/11/05 23:53:02 cognet Exp $"
 ENTRY(_ctx_start)
 	mov	lr, pc
 	mov	pc, r4
diff --git a/lib/libc/arm/gen/_set_tp.c b/lib/libc/arm/gen/_set_tp.c
index 4c26dffa0114a..faaaee60e9157 100644
--- a/lib/libc/arm/gen/_set_tp.c
+++ b/lib/libc/arm/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/arm/gen/_set_tp.c,v 1.1 2004/09/23 23:12:57 cognet Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S
index b9384051d9ec0..d64eef9de0e00 100644
--- a/lib/libc/arm/gen/_setjmp.S
+++ b/lib/libc/arm/gen/_setjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/arm/gen/alloca.S b/lib/libc/arm/gen/alloca.S
index 9569d86d0ba79..e79869d773fff 100644
--- a/lib/libc/arm/gen/alloca.S
+++ b/lib/libc/arm/gen/alloca.S
@@ -35,7 +35,7 @@
 /* like alloc, but automatic automatic free in return */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/alloca.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(alloca)
 	add	r0, r0, #0x00000007	/* round up to next 8 byte alignment */
diff --git a/lib/libc/arm/gen/divsi3.S b/lib/libc/arm/gen/divsi3.S
index 104a958900be7..5e6b8c576a900 100644
--- a/lib/libc/arm/gen/divsi3.S
+++ b/lib/libc/arm/gen/divsi3.S
@@ -15,7 +15,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/divsi3.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 /* 
  * stack is aligned as there's a possibility of branching to L_overflow
diff --git a/lib/libc/arm/gen/fabs.c b/lib/libc/arm/gen/fabs.c
index 8bb15025aeada..c37cc283c77ce 100644
--- a/lib/libc/arm/gen/fabs.c
+++ b/lib/libc/arm/gen/fabs.c
@@ -35,7 +35,7 @@
  * fabs(x) returns the absolute value of x.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/fabs.c,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 double
 fabs(double x)
diff --git a/lib/libc/arm/gen/infinity.c b/lib/libc/arm/gen/infinity.c
index 60faf42a7ea39..0c374dd3d925a 100644
--- a/lib/libc/arm/gen/infinity.c
+++ b/lib/libc/arm/gen/infinity.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/infinity.c,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c
index 4fd3953ac51a4..595a4f35efa25 100644
--- a/lib/libc/arm/gen/makecontext.c
+++ b/lib/libc/arm/gen/makecontext.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/makecontext.c,v 1.2 2004/11/05 23:53:02 cognet Exp $");
 
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/lib/libc/arm/gen/modf.c b/lib/libc/arm/gen/modf.c
index 347090cf1fe7f..42d2a31dc5b9d 100644
--- a/lib/libc/arm/gen/modf.c
+++ b/lib/libc/arm/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/modf.c,v 1.1 2004/05/14 12:04:30 cognet Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S
index f0e9cfa7a4dc3..3e753b11b9db2 100644
--- a/lib/libc/arm/gen/setjmp.S
+++ b/lib/libc/arm/gen/setjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.4 2004/11/09 16:49:14 cognet Exp $");
 /*
  * C library -- setjmp, longjmp
  *
diff --git a/lib/libc/arm/gen/signalcontext.c b/lib/libc/arm/gen/signalcontext.c
index bb9a54dbe1155..c71e71dbbb51b 100644
--- a/lib/libc/arm/gen/signalcontext.c
+++ b/lib/libc/arm/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/signalcontext.c,v 1.2 2004/11/05 23:53:02 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/arm/gen/sigsetjmp.S b/lib/libc/arm/gen/sigsetjmp.S
index 09ec2561029b9..d4ba16d739d0e 100644
--- a/lib/libc/arm/gen/sigsetjmp.S
+++ b/lib/libc/arm/gen/sigsetjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/sigsetjmp.S,v 1.2 2004/11/09 16:44:57 cognet Exp $");
 
 /*
  * C library -- sigsetjmp, siglongjmp
diff --git a/lib/libc/arm/softfloat/arm-gcc.h b/lib/libc/arm/softfloat/arm-gcc.h
index 1204108250f72..d2c26141ff981 100644
--- a/lib/libc/arm/softfloat/arm-gcc.h
+++ b/lib/libc/arm/softfloat/arm-gcc.h
@@ -1,5 +1,5 @@
 /* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/arm/softfloat/arm-gcc.h,v 1.1 2004/05/14 12:04:30 cognet Exp $ */
 
 /*
 -------------------------------------------------------------------------------
diff --git a/lib/libc/arm/softfloat/milieu.h b/lib/libc/arm/softfloat/milieu.h
index 54775c768b915..87f9d3219b196 100644
--- a/lib/libc/arm/softfloat/milieu.h
+++ b/lib/libc/arm/softfloat/milieu.h
@@ -1,5 +1,5 @@
 /* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/arm/softfloat/milieu.h,v 1.1 2004/05/14 12:04:30 cognet Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/arm/softfloat/softfloat.h b/lib/libc/arm/softfloat/softfloat.h
index 50b5fa6fb4660..a2dd2473dd3ad 100644
--- a/lib/libc/arm/softfloat/softfloat.h
+++ b/lib/libc/arm/softfloat/softfloat.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/arm/softfloat/softfloat.h,v 1.2 2007/05/19 04:34:42 kan Exp $ */
 
 /* This is a derivative work. */
 
diff --git a/lib/libc/arm/stdlib/Makefile.inc b/lib/libc/arm/stdlib/Makefile.inc
index 1814a0a9c9dc0..582ef24f93835 100644
--- a/lib/libc/arm/stdlib/Makefile.inc
+++ b/lib/libc/arm/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/stdlib/Makefile.inc,v 1.1 2004/05/14 12:04:31 cognet Exp $
 
 MDSRCS+=abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc
index 6658ce788f807..1ea9f42941146 100644
--- a/lib/libc/arm/string/Makefile.inc
+++ b/lib/libc/arm/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/string/Makefile.inc,v 1.2 2005/10/03 14:21:49 cognet Exp $
 
 MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S index.c memchr.c memcmp.S memcpy.S \
 	memmove.S memset.S rindex.c strcat.c strchr.c strcmp.S strcpy.c \
diff --git a/lib/libc/arm/string/bcopy.S b/lib/libc/arm/string/bcopy.S
index f2583fc7ffc83..3b83b7afc2ca1 100644
--- a/lib/libc/arm/string/bcopy.S
+++ b/lib/libc/arm/string/bcopy.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: bcopy.S,v 1.3 2003/10/14 07:51:45 scw Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/bcopy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #define _BCOPY
 #include "memmove.S"
diff --git a/lib/libc/arm/string/bzero.S b/lib/libc/arm/string/bzero.S
index 008c48504dfcd..20c456323d932 100644
--- a/lib/libc/arm/string/bzero.S
+++ b/lib/libc/arm/string/bzero.S
@@ -38,7 +38,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/bzero.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 
 #define _BZERO
 #include "memset.S"
diff --git a/lib/libc/arm/string/ffs.S b/lib/libc/arm/string/ffs.S
index 223d55d692360..1640104278e25 100644
--- a/lib/libc/arm/string/ffs.S
+++ b/lib/libc/arm/string/ffs.S
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
 
 /*
  * ffs - find first set bit, this algorithm isolates the first set
diff --git a/lib/libc/arm/string/memcmp.S b/lib/libc/arm/string/memcmp.S
index a81c9603edf46..2279fa2d25398 100644
--- a/lib/libc/arm/string/memcmp.S
+++ b/lib/libc/arm/string/memcmp.S
@@ -64,7 +64,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(memcmp)
 	mov	ip, r0
diff --git a/lib/libc/arm/string/memcpy.S b/lib/libc/arm/string/memcpy.S
index 1d17b93e56231..b814e5a7e9b35 100644
--- a/lib/libc/arm/string/memcpy.S
+++ b/lib/libc/arm/string/memcpy.S
@@ -1,7 +1,7 @@
 /*	$NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #if !defined(__XSCALE__) || defined(_STANDALONE)
 #include "memcpy_arm.S"
 #else
diff --git a/lib/libc/arm/string/memcpy_arm.S b/lib/libc/arm/string/memcpy_arm.S
index 005c8c29c3c4d..1455263776a92 100644
--- a/lib/libc/arm/string/memcpy_arm.S
+++ b/lib/libc/arm/string/memcpy_arm.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_arm.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 /*
  * This is one fun bit of code ...
  * Some easy listening music is suggested while trying to understand this
diff --git a/lib/libc/arm/string/memcpy_xscale.S b/lib/libc/arm/string/memcpy_xscale.S
index 02cca5e129a46..4902cb3edcb59 100644
--- a/lib/libc/arm/string/memcpy_xscale.S
+++ b/lib/libc/arm/string/memcpy_xscale.S
@@ -36,7 +36,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_xscale.S,v 1.2 2004/09/23 23:11:32 cognet Exp $");
 
 /* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
 ENTRY(memcpy)
diff --git a/lib/libc/arm/string/memmove.S b/lib/libc/arm/string/memmove.S
index f65a2544f372f..db7277dc9b6da 100644
--- a/lib/libc/arm/string/memmove.S
+++ b/lib/libc/arm/string/memmove.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memmove.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 #ifndef _BCOPY
 /* LINTSTUB: Func: void *memmove(void *, const void *, size_t) */
diff --git a/lib/libc/arm/string/memset.S b/lib/libc/arm/string/memset.S
index 1e978460b68d2..1f96ee618bc36 100644
--- a/lib/libc/arm/string/memset.S
+++ b/lib/libc/arm/string/memset.S
@@ -67,7 +67,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 /*
  * memset: Sets a block of memory to the specified value
diff --git a/lib/libc/arm/string/strcmp.S b/lib/libc/arm/string/strcmp.S
index e5cba7d2d6655..f3599ee797062 100644
--- a/lib/libc/arm/string/strcmp.S
+++ b/lib/libc/arm/string/strcmp.S
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/strcmp.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(strcmp)
 1:
diff --git a/lib/libc/arm/string/strlen.S b/lib/libc/arm/string/strlen.S
index 378257d45dc99..2b6163bd28aeb 100644
--- a/lib/libc/arm/string/strlen.S
+++ b/lib/libc/arm/string/strlen.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/strlen.S,v 1.2 2005/10/03 14:43:27 cognet Exp $");
 
 ENTRY(strlen)
 	mov	r1, #0
diff --git a/lib/libc/arm/string/strncmp.S b/lib/libc/arm/string/strncmp.S
index d172264bd8686..eb9fbd896dc3a 100644
--- a/lib/libc/arm/string/strncmp.S
+++ b/lib/libc/arm/string/strncmp.S
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/strncmp.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 
 ENTRY(strncmp)
 /* if ((len - 1) < 0) return 0 */
diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc
index 6c38e7de02f15..d605578ccd935 100644
--- a/lib/libc/arm/sys/Makefile.inc
+++ b/lib/libc/arm/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.3 2007/07/04 23:23:00 peter Exp $
 
 MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
 
diff --git a/lib/libc/arm/sys/Ovfork.S b/lib/libc/arm/sys/Ovfork.S
index 0082bbc5217b5..ac754b8e5832f 100644
--- a/lib/libc/arm/sys/Ovfork.S
+++ b/lib/libc/arm/sys/Ovfork.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/Ovfork.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 WARN_REFERENCES(vfork, \
diff --git a/lib/libc/arm/sys/brk.S b/lib/libc/arm/sys/brk.S
index 5fdf90c2bd3a3..b52184b0ab5a5 100644
--- a/lib/libc/arm/sys/brk.S
+++ b/lib/libc/arm/sys/brk.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/brk.S,v 1.3 2007/05/19 04:36:34 kan Exp $");
 #include "SYS.h"
 
 	.globl	_C_LABEL(_end)
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libc/arm/sys/cerror.S
index e807285f81b12..030a24ed06685 100644
--- a/lib/libc/arm/sys/cerror.S
+++ b/lib/libc/arm/sys/cerror.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/cerror.S,v 1.3 2006/11/09 01:28:16 cognet Exp $");
 #include "SYS.h"
 
 .globl  _C_LABEL(__error)
diff --git a/lib/libc/arm/sys/fork.S b/lib/libc/arm/sys/fork.S
index a5ae1f0aa4196..2cff9000f374c 100644
--- a/lib/libc/arm/sys/fork.S
+++ b/lib/libc/arm/sys/fork.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/fork.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/arm/sys/pipe.S b/lib/libc/arm/sys/pipe.S
index 83518fc2cbbad..1ab2a1c94b66d 100644
--- a/lib/libc/arm/sys/pipe.S
+++ b/lib/libc/arm/sys/pipe.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/pipe.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
 #include "SYS.h"
 
 #ifdef WEAK_ALIAS
diff --git a/lib/libc/arm/sys/ptrace.S b/lib/libc/arm/sys/ptrace.S
index 3cc13f3b6f6ba..946bd3a07272a 100644
--- a/lib/libc/arm/sys/ptrace.S
+++ b/lib/libc/arm/sys/ptrace.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/ptrace.S,v 1.3 2006/11/09 01:28:16 cognet Exp $");
 #include "SYS.h"
 
 ENTRY(ptrace)
diff --git a/lib/libc/arm/sys/sbrk.S b/lib/libc/arm/sys/sbrk.S
index d76e85a47f50f..51603dc08d211 100644
--- a/lib/libc/arm/sys/sbrk.S
+++ b/lib/libc/arm/sys/sbrk.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.3 2007/06/27 02:45:37 kan Exp $");
 #include "SYS.h"
 
 	.globl	_C_LABEL(_end)
diff --git a/lib/libc/arm/sys/shmat.S b/lib/libc/arm/sys/shmat.S
index 3fc3d02c6e47c..75833d0b12940 100644
--- a/lib/libc/arm/sys/shmat.S
+++ b/lib/libc/arm/sys/shmat.S
@@ -1,7 +1,7 @@
 /*	$NetBSD: shmat.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/shmat.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 RSYSCALL(shmat)
diff --git a/lib/libc/arm/sys/sigreturn.S b/lib/libc/arm/sys/sigreturn.S
index 1e0f245a5efce..3946e39fa4cef 100644
--- a/lib/libc/arm/sys/sigreturn.S
+++ b/lib/libc/arm/sys/sigreturn.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sigreturn.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/arm/sys/syscall.S b/lib/libc/arm/sys/syscall.S
index 73e6b83181828..1f670f3b9ab3d 100644
--- a/lib/libc/arm/sys/syscall.S
+++ b/lib/libc/arm/sys/syscall.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/arm/sys/syscall.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
 #include "SYS.h"
 
 RSYSCALL(syscall)
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index 836f0a60ca505..66fbf66ea52a4 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.13 2006/03/13 01:14:55 deischen Exp $
 
 # compat-43 sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43
diff --git a/lib/libc/compat-43/Symbol.map b/lib/libc/compat-43/Symbol.map
index e859a310cb0f2..40a6418b2af16 100644
--- a/lib/libc/compat-43/Symbol.map
+++ b/lib/libc/compat-43/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/compat-43/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/compat-43/creat.2 b/lib/libc/compat-43/creat.2
index 3b1d03b31f868..50acae469d87a 100644
--- a/lib/libc/compat-43/creat.2
+++ b/lib/libc/compat-43/creat.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)creat.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/creat.2,v 1.11 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd June 2, 1993
 .Dt CREAT 2
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index fc3be060bf602..2ee5dd4ce9924 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)creat.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/creat.c,v 1.8 2007/01/09 00:27:49 imp Exp $");
 
 #include "namespace.h"
 #include <fcntl.h>
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index faaee563a8ff0..472dca641d9df 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostid.3	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/gethostid.3,v 1.14 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd June 2, 1993
 .Dt GETHOSTID 3
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
index 6c33850014dee..3a7da2224f5c7 100644
--- a/lib/libc/compat-43/gethostid.c
+++ b/lib/libc/compat-43/gethostid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/gethostid.c,v 1.5 2007/01/09 00:27:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index 98fceaff2a484..3ed8490da4a04 100644
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getwd.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/getwd.c,v 1.6 2007/01/09 00:27:49 imp Exp $");
 
 #include <sys/param.h>
 #include <unistd.h>
diff --git a/lib/libc/compat-43/killpg.2 b/lib/libc/compat-43/killpg.2
index 6793e41d52674..97bc9b1199452 100644
--- a/lib/libc/compat-43/killpg.2
+++ b/lib/libc/compat-43/killpg.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)killpg.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.14 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd October 10, 2006
 .Dt KILLPG 2
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
index a8e36ae2b7950..ca8097e3aa747 100644
--- a/lib/libc/compat-43/killpg.c
+++ b/lib/libc/compat-43/killpg.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)killpg.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/killpg.c,v 1.5 2007/01/09 00:27:49 imp Exp $");
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
index 95c833343ba96..8f36a98d36c90 100644
--- a/lib/libc/compat-43/sethostid.c
+++ b/lib/libc/compat-43/sethostid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)sethostid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/sethostid.c,v 1.5 2007/01/09 00:27:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
index 39713d2966ebf..011f7bc580f4c 100644
--- a/lib/libc/compat-43/setpgrp.c
+++ b/lib/libc/compat-43/setpgrp.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)setpgrp.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/setpgrp.c,v 1.5 2007/01/09 00:27:49 imp Exp $");
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
index f006c76b69938..94e57ec3f2d58 100644
--- a/lib/libc/compat-43/setrgid.c
+++ b/lib/libc/compat-43/setrgid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)setrgid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/setrgid.c,v 1.4 2007/01/09 00:27:49 imp Exp $");
 
 #include <unistd.h>
 
diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3
index 22584cf0293aa..f738d3c56ba28 100644
--- a/lib/libc/compat-43/setruid.3
+++ b/lib/libc/compat-43/setruid.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setruid.3	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/setruid.3,v 1.12 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd June 2, 1993
 .Dt SETRUID 3
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
index 33c9db13da340..1a2a5c8cc24e2 100644
--- a/lib/libc/compat-43/setruid.c
+++ b/lib/libc/compat-43/setruid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)setruid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/setruid.c,v 1.4 2007/01/09 00:27:49 imp Exp $");
 
 #include <unistd.h>
 
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 6280183238fd1..4198d7b81e589 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)sigcompat.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/compat-43/sigcompat.c,v 1.11 2007/01/09 00:27:49 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/compat-43/sigpause.2 b/lib/libc/compat-43/sigpause.2
index 39edb0b5c1847..b98b4144c2eb1 100644
--- a/lib/libc/compat-43/sigpause.2
+++ b/lib/libc/compat-43/sigpause.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigpause.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.14 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd June 2, 1993
 .Dt SIGPAUSE 2
diff --git a/lib/libc/compat-43/sigsetmask.2 b/lib/libc/compat-43/sigsetmask.2
index 8894a1e570925..5b77bd52888a8 100644
--- a/lib/libc/compat-43/sigsetmask.2
+++ b/lib/libc/compat-43/sigsetmask.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigsetmask.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/sigsetmask.2,v 1.14 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd June 2, 1993
 .Dt SIGSETMASK 2
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index d15c0237d6114..7835ce284bc8b 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigvec.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.26 2007/01/09 00:27:49 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt SIGVEC 2
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index bbfb7e77f7f99..20a6597cc2a14 100644
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.5 2006/03/13 01:14:56 deischen Exp $
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
diff --git a/lib/libc/db/Symbol.map b/lib/libc/db/Symbol.map
index 14df29f1ecc8f..e16b35f9bf026 100644
--- a/lib/libc/db/Symbol.map
+++ b/lib/libc/db/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
index 76c2238300279..97d3336c18e35 100644
--- a/lib/libc/db/btree/Makefile.inc
+++ b/lib/libc/db/btree/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/btree
 
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 46abf07a3b6f5..97a44316bda9b 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_close.c,v 1.9 2007/01/09 00:27:50 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index 1f13faaeb015b..c1d474f035fb2 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_conv.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
index 19ccaca492886..37b16edb9973c 100644
--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index f520f78191a0b..f1f5eee8e0abf 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_delete.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
index 95d8e00462dba..e320972d28e75 100644
--- a/lib/libc/db/btree/bt_get.c
+++ b/lib/libc/db/btree/bt_get.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_get.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index 92ac140bc5b9b..89131339d948d 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.12 2007/01/09 00:27:50 imp Exp $");
 
 /*
  * Implementation of btree access method for 4.4BSD.
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
index 4058ca95dc076..8311ea6c16d4d 100644
--- a/lib/libc/db/btree/bt_overflow.c
+++ b/lib/libc/db/btree/bt_overflow.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_overflow.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
index 67aedf641f2eb..3996efc1f09c6 100644
--- a/lib/libc/db/btree/bt_page.c
+++ b/lib/libc/db/btree/bt_page.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_page.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index f1416e78b74c0..bd8f9ea42ac62 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.5 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index 9413e6e0641b6..7f42f628498b3 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_search.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index 51cd6e9330942..bc1e1866a1a58 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_seq.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index dc2791762af01..66dab16003a5c 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_split.c	8.9 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.8 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index e32854f20efcd..f2587d3d12afe 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_utils.c,v 1.4 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 7d164622c8c38..b4e0f5ba54026 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)btree.h	8.11 (Berkeley) 8/17/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/btree/btree.h,v 1.4 2007/01/09 00:27:50 imp Exp $
  */
 
 /* Macros to set/clear/test flags. */
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index 0abd594cacc8a..2edf1c1dfde41 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.10 (Berkeley) 7/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/btree/extern.h,v 1.4 2007/01/09 00:27:50 imp Exp $
  */
 
 int	 __bt_close(DB *);
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
index 2bbac4e702506..db5340ecc2005 100644
--- a/lib/libc/db/db/Makefile.inc
+++ b/lib/libc/db/db/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/db
 
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
index 287def0b8ee39..0c5f939a856f6 100644
--- a/lib/libc/db/db/db.c
+++ b/lib/libc/db/db/db.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/db/db.c,v 1.3 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps
index 3a0cf444b1acc..fe87f1d7f6834 100644
--- a/lib/libc/db/docs/hash.usenix.ps
+++ b/lib/libc/db/docs/hash.usenix.ps
@@ -7,7 +7,7 @@
 % lib/psdit.pro -- prolog for psdit (ditroff) files
 % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
 % last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD$
+% RCSID: $FreeBSD: src/lib/libc/db/docs/hash.usenix.ps,v 1.2 1999/08/28 05:03:14 peter Exp $
 
 % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
 % 17 Feb, 87.
diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps
index b7e441a5755ee..10a28cd30817b 100644
--- a/lib/libc/db/docs/libtp.usenix.ps
+++ b/lib/libc/db/docs/libtp.usenix.ps
@@ -7,7 +7,7 @@
 % lib/psdit.pro -- prolog for psdit (ditroff) files
 % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
 % last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD$
+% RCSID: $FreeBSD: src/lib/libc/db/docs/libtp.usenix.ps,v 1.2 1999/08/28 05:03:15 peter Exp $
 
 % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
 % 17 Feb, 87.
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
index 2ecb81763f248..0ebdde956026f 100644
--- a/lib/libc/db/hash/Makefile.inc
+++ b/lib/libc/db/hash/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/hash
 
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index c75c0ac66fc41..9c0afafa00721 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/hash/extern.h,v 1.4 2007/01/09 00:27:50 imp Exp $
  */
 
 BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index 6b71d4a7c30f9..d86ceac3a9af6 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.14 2007/05/25 09:57:48 delphij Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
index 66f86aa3d72c4..cabcc63735911 100644
--- a/lib/libc/db/hash/hash.h
+++ b/lib/libc/db/hash/hash.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.7 2007/01/09 00:27:50 imp Exp $
  */
 
 /* Operations */
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index 3a28ae5abd566..a9b41ed9bc6b1 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.6 2007/01/09 00:27:50 imp Exp $");
 
 /*
  * PACKAGE: hash
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index db8ad1a3db247..f36f77922a7bd 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.8 2007/01/09 00:27:50 imp Exp $");
 
 /*
  * PACKAGE: hash
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index 2ca0a483180f1..88d21f7a4413f 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.6 2007/01/09 00:27:50 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index cbbfdc8419b4f..bae5648441b4e 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_log2.c,v 1.3 2007/01/09 00:27:51 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index daeb18ed0c4e9..9d30880b81e76 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.9 2007/01/09 00:27:51 imp Exp $");
 
 /*
  * PACKAGE:  hashing
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index 42ffb1b50ab7b..8c23b795c6347 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ndbm.c	8.4 (Berkeley) 7/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/ndbm.c,v 1.7 2007/01/09 00:27:51 imp Exp $");
 
 /*
  * This package provides a dbm compatible interface to the new hashing
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
index 8155035e70d0d..0292d3dfb0e9d 100644
--- a/lib/libc/db/hash/page.h
+++ b/lib/libc/db/hash/page.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)page.h	8.2 (Berkeley) 5/31/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/hash/page.h,v 1.3 2007/01/09 00:27:51 imp Exp $
  */
 
 /*
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 349b029482191..2a0364adc9ac2 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
 
 .PATH: ${.CURDIR}/db/man
 
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 42fc254dd615f..d886f97460f5a 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.9 2007/01/09 00:27:51 imp Exp $
 .\"
 .Dd August 18, 1994
 .Dt BTREE 3
diff --git a/lib/libc/db/man/dbm.3 b/lib/libc/db/man/dbm.3
index 16becc6dc5887..938b609cd3fc2 100644
--- a/lib/libc/db/man/dbm.3
+++ b/lib/libc/db/man/dbm.3
@@ -13,7 +13,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.9 2006/04/16 16:33:26 maxim Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index 7ef7ae79afec5..f976042ab28b9 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.13 2007/01/09 00:27:51 imp Exp $
 .\"
 .Dd January 2, 1994
 .Dt DBOPEN 3
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index 6724042101950..ea8db0526b1bc 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/hash.3,v 1.9 2007/01/09 00:27:51 imp Exp $
 .\"
 .Dd August 18, 1994
 .Dt HASH 3
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
index e9918a9f0fdf4..d5c51aea15eb9 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/mpool.3,v 1.15 2007/01/09 00:27:51 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MPOOL 3
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 22d5567a7a9b8..ff32fed6b4c50 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/db/man/recno.3,v 1.9 2007/01/09 00:27:51 imp Exp $
 .\"
 .Dd August 18, 1994
 .Dt RECNO 3
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
index 9fef71262b6db..0361f3f160ff7 100644
--- a/lib/libc/db/mpool/Makefile.inc
+++ b/lib/libc/db/mpool/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
 .PATH: ${.CURDIR}/db/mpool
 
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index aedf1fd0115f7..9b74fd07e877d 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)mpool.c	8.5 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.13 2007/01/09 00:27:51 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp
index bcd827dce29db..0d823684aa234 100644
--- a/lib/libc/db/mpool/mpool.libtp
+++ b/lib/libc/db/mpool/mpool.libtp
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-VERSION $FreeBSD$
+VERSION $FreeBSD: src/lib/libc/db/mpool/mpool.libtp,v 1.4 1999/08/27 23:58:23 peter Exp $
 PACKAGE: 	User Level Shared Memory Manager
 
 DESCRIPTION: 	
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
index 6e08e3f303bdc..5492f0bffacf9 100644
--- a/lib/libc/db/recno/Makefile.inc
+++ b/lib/libc/db/recno/Makefile.inc
@@ -1,5 +1,5 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
 .PATH: ${.CURDIR}/db/recno
 
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
index 53916bd4861a5..ad008054cc991 100644
--- a/lib/libc/db/recno/extern.h
+++ b/lib/libc/db/recno/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 6/4/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/recno/extern.h,v 1.3 2007/01/09 00:27:51 imp Exp $
  */
 
 #include "../btree/extern.h"
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
index 7da037657ace7..462020c1179b5 100644
--- a/lib/libc/db/recno/rec_close.c
+++ b/lib/libc/db/recno/rec_close.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.8 2007/01/09 00:27:51 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index 8036013a80255..40b70c70bd227 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_delete.c,v 1.3 2007/01/09 00:27:51 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
index e28c2a10a1a18..288d967891f8e 100644
--- a/lib/libc/db/recno/rec_get.c
+++ b/lib/libc/db/recno/rec_get.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_get.c,v 1.6 2007/01/09 00:27:51 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index f7119b2f8409e..2806da65a8033 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_open.c,v 1.7 2007/01/09 00:27:51 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index 336f47469f4fb..d1ca1725655c3 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_put.c,v 1.7 2007/01/09 00:27:51 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index 377a59baafa91..dd3de1e4b2df3 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_search.c,v 1.5 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
index 85465fac592f9..55716474a7495 100644
--- a/lib/libc/db/recno/rec_seq.c
+++ b/lib/libc/db/recno/rec_seq.c
@@ -32,7 +32,7 @@
 /* XXX use __SCCSID */
 static char sccsid[] __unused = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.6 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
index 885ef712f572b..a4d9c9b34363f 100644
--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_utils.c,v 1.3 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
index 5c561703637a2..d5e10f0e5858e 100644
--- a/lib/libc/db/recno/recno.h
+++ b/lib/libc/db/recno/recno.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)recno.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/db/recno/recno.h,v 1.3 2007/01/09 00:27:52 imp Exp $
  */
 
 enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
diff --git a/lib/libc/db/test/Makefile b/lib/libc/db/test/Makefile
index 712ad62583764..0b97a58e17c33 100644
--- a/lib/libc/db/test/Makefile
+++ b/lib/libc/db/test/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.15 (Berkeley) 7/28/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/db/test/Makefile,v 1.3 2001/08/03 21:43:26 bde Exp $
 
 PROG=	dbtest
 OBJS=	dbtest.o strerror.o
diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c
index e31b5d983958e..295c764528c41 100644
--- a/lib/libc/db/test/btree.tests/main.c
+++ b/lib/libc/db/test/btree.tests/main.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/btree.tests/main.c,v 1.5 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/param.h>
 #include <fcntl.h>
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index 26a5eaf58d432..066d8874b1e02 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -37,7 +37,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)dbtest.c	8.17 (Berkeley) 9/1/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.11 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c
index 1c5a13093c748..06775d0194650 100644
--- a/lib/libc/db/test/hash.tests/driver2.c
+++ b/lib/libc/db/test/hash.tests/driver2.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)driver2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/driver2.c,v 1.4 2007/01/09 00:27:52 imp Exp $");
 
 /*
  * Test driver, to try to tackle the large ugly-split problem.
diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c
index 6ba3c07a8aa54..b5548ef597019 100644
--- a/lib/libc/db/test/hash.tests/tcreat3.c
+++ b/lib/libc/db/test/hash.tests/tcreat3.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tcreat3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tcreat3.c,v 1.4 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c
index 1d7e424f7acc5..f25fe89859a6c 100644
--- a/lib/libc/db/test/hash.tests/tdel.c
+++ b/lib/libc/db/test/hash.tests/tdel.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tdel.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tdel.c,v 1.4 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c
index 02f6832ba423c..f122a4ce478f7 100644
--- a/lib/libc/db/test/hash.tests/thash4.c
+++ b/lib/libc/db/test/hash.tests/thash4.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)thash4.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/thash4.c,v 1.4 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c
index fdcaab3100d1a..4569534c98ef0 100644
--- a/lib/libc/db/test/hash.tests/tread2.c
+++ b/lib/libc/db/test/hash.tests/tread2.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tread2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tread2.c,v 1.3 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c
index 3aac7d57488b4..f036ac6f00e9a 100644
--- a/lib/libc/db/test/hash.tests/tseq.c
+++ b/lib/libc/db/test/hash.tests/tseq.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tseq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tseq.c,v 1.4 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c
index fb8ee3328e06e..95208708776d4 100644
--- a/lib/libc/db/test/hash.tests/tverify.c
+++ b/lib/libc/db/test/hash.tests/tverify.c
@@ -40,7 +40,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)tverify.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/db/test/hash.tests/tverify.c,v 1.3 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index dce7dc37b11e4..23dce59a066c6 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $
 
 # netlib gdtoa sources
 .PATH: ${.CURDIR}/gdtoa
diff --git a/lib/libc/gdtoa/Symbol.map b/lib/libc/gdtoa/Symbol.map
index 157d557068cfe..641003b81b224 100644
--- a/lib/libc/gdtoa/Symbol.map
+++ b/lib/libc/gdtoa/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.4.2.1 2007/10/24 23:53:20 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
index 5e8a1835cf7c4..9480a6cfaf69c 100644
--- a/lib/libc/gdtoa/_hdtoa.c
+++ b/lib/libc/gdtoa/_hdtoa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $");
 
 #include <float.h>
 #include <limits.h>
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
index 750a25226c122..ededc68d217c2 100644
--- a/lib/libc/gdtoa/_ldtoa.c
+++ b/lib/libc/gdtoa/_ldtoa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.2 2004/01/18 07:53:49 das Exp $");
 
 #include <float.h>
 #include <inttypes.h>
diff --git a/lib/libc/gdtoa/glue.c b/lib/libc/gdtoa/glue.c
index 39e491a7a277e..5178f593728f4 100644
--- a/lib/libc/gdtoa/glue.c
+++ b/lib/libc/gdtoa/glue.c
@@ -2,7 +2,7 @@
  * Machine-independent glue to integrate David Gay's gdtoa
  * package into libc.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.2 2003/06/21 08:20:14 das Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc/gdtoa/machdep_ldisQ.c b/lib/libc/gdtoa/machdep_ldisQ.c
index e5cf6e63ad9d5..fca9c291e898e 100644
--- a/lib/libc/gdtoa/machdep_ldisQ.c
+++ b/lib/libc/gdtoa/machdep_ldisQ.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $");
 
 #include "gdtoaimp.h"
 
diff --git a/lib/libc/gdtoa/machdep_ldisd.c b/lib/libc/gdtoa/machdep_ldisd.c
index e2dbb609c3595..2e20e1754c640 100644
--- a/lib/libc/gdtoa/machdep_ldisd.c
+++ b/lib/libc/gdtoa/machdep_ldisd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisd.c,v 1.1 2003/03/12 20:29:58 das Exp $");
 
 #include "gdtoaimp.h"
 
diff --git a/lib/libc/gdtoa/machdep_ldisx.c b/lib/libc/gdtoa/machdep_ldisx.c
index 0b61de653f7c0..0ceea1b29de95 100644
--- a/lib/libc/gdtoa/machdep_ldisx.c
+++ b/lib/libc/gdtoa/machdep_ldisx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $");
 
 #include "gdtoaimp.h"
 
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 68258da45639a..289098e5378ae 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 697775a7e9134..545371d0f809a 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.6 2007/05/31 13:01:33 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/gen/__getosreldate.c b/lib/libc/gen/__getosreldate.c
index 69aac07ea7f58..76a485c589bf6 100644
--- a/lib/libc/gen/__getosreldate.c
+++ b/lib/libc/gen/__getosreldate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/__getosreldate.c,v 1.1 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index cf8b21f516cac..c93e1eebc3632 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -31,7 +31,7 @@
 /*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.13 2007/01/09 00:27:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
index a3e55b085ee04..72c660c894ddd 100644
--- a/lib/libc/gen/_pthread_stubs.c
+++ b/lib/libc/gen/_pthread_stubs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.13 2006/03/05 18:10:27 deischen Exp $");
 
 #include <signal.h>
 #include <pthread.h>
diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c
index 279bbc3623943..4dbf0d7681f85 100644
--- a/lib/libc/gen/_rand48.c
+++ b/lib/libc/gen/_rand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_rand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
index a130c8e46e84b..3a54c3315345a 100644
--- a/lib/libc/gen/_spinlock_stub.c
+++ b/lib/libc/gen/_spinlock_stub.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.10 2007/01/12 07:31:30 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
index acaf65cf518c1..afcd8563c3204 100644
--- a/lib/libc/gen/_thread_init.c
+++ b/lib/libc/gen/_thread_init.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index 70e7c6e739a48..0139e0c46868a 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)alarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/alarm.3,v 1.17 2007/01/09 00:27:52 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt ALARM 3
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index 318be4c0f21d5..6846af3af83c8 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/alarm.c,v 1.3 2007/01/09 00:27:53 imp Exp $");
 
 /*
  * Backwards compatible alarm.
diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
index 27c6fd16c9870..3e2aaa38c862b 100644
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" Manual page, using -mandoc macros
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.16 2003/07/31 06:18:24 das Exp $
 .\"
 .Dd April 15, 1997
 .Dt ARC4RANDOM 3
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index 21dd09fb73e30..b2db08da2fc50 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.12 2007/05/25 10:40:33 delphij Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index 73e199ce7e417..3e380c3a878d9 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.8 2007/01/09 00:27:53 imp Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index 33a0a717d910b..32dd14f03a70b 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -25,7 +25,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $
 .\"
 .Dd October 12, 2006
 .Dt BASENAME 3
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index 9552ab3486660..c5da4636d5022 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -31,7 +31,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
 
 #include <errno.h>
 #include <libgen.h>
diff --git a/lib/libc/gen/check_utility_compat.3 b/lib/libc/gen/check_utility_compat.3
index 7a96bac15c5c4..70242831902c0 100644
--- a/lib/libc/gen/check_utility_compat.3
+++ b/lib/libc/gen/check_utility_compat.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/check_utility_compat.3,v 1.3 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd October 27, 2002
 .Os
diff --git a/lib/libc/gen/check_utility_compat.c b/lib/libc/gen/check_utility_compat.c
index 0ccdec115a871..716f5b2679d24 100644
--- a/lib/libc/gen/check_utility_compat.c
+++ b/lib/libc/gen/check_utility_compat.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.3 2003/05/01 19:03:13 nectar Exp $");
 
 /*
  * I din't use "namespace.h" here because none of the relevant utilities
diff --git a/lib/libc/gen/clock.3 b/lib/libc/gen/clock.3
index 6a585e57df7e5..a1fbd75b3e19e 100644
--- a/lib/libc/gen/clock.3
+++ b/lib/libc/gen/clock.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)clock.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/clock.3,v 1.12 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt CLOCK 3
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
index b405cda027234..8a4ec9e064663 100644
--- a/lib/libc/gen/clock.c
+++ b/lib/libc/gen/clock.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)clock.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/clock.c,v 1.4 2007/01/09 00:27:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index 9d45529bac013..dd8ccb8392a91 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.11 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index e97505f07de6b..8b8da39f456b1 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.15 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd December 3, 2006
 .Dt CONFSTR 3
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
index 2f9a061696c84..386c635b4463e 100644
--- a/lib/libc/gen/confstr.c
+++ b/lib/libc/gen/confstr.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)confstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.10 2007/01/09 00:27:53 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index ab1a799012253..bd15c7b507eab 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -35,7 +35,7 @@
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index 3402d1d5b0f71..dfc28c3759dfe 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctermid.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ctermid.3,v 1.12 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt CTERMID 3
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index f88b1f5781989..d5177190c6a00 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)ctermid.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ctermid.c,v 1.4 2007/01/09 00:27:53 imp Exp $");
 
 #include <stdio.h>
 #include <paths.h>
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
index 34db96603839c..4d0b5b775da2b 100644
--- a/lib/libc/gen/daemon.3
+++ b/lib/libc/gen/daemon.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)daemon.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/daemon.3,v 1.15 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt DAEMON 3
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
index ba2a542bfb78a..451bcb8d9fa43 100644
--- a/lib/libc/gen/daemon.c
+++ b/lib/libc/gen/daemon.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.8 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/gen/devname.3 b/lib/libc/gen/devname.3
index c05d0bac47819..65535564b9045 100644
--- a/lib/libc/gen/devname.3
+++ b/lib/libc/gen/devname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)devname.3	8.2 (Berkeley) 4/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.19 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd February 22, 2005
 .Dt DEVNAME 3
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index 21e46e6b0e04c..1b4743e2111a3 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.11 2007/01/09 00:27:53 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index 353def2651ed9..f80d8c9b5e5db 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.16 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt DIRECTORY 3
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index cb821ce7f0b1e..61a6a0b10461a 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -25,7 +25,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $
 .\"
 .Dd October 12, 2006
 .Dt DIRNAME 3
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
index 56b75f63716ea..8a4e1c948b40f 100644
--- a/lib/libc/gen/dirname.c
+++ b/lib/libc/gen/dirname.c
@@ -31,7 +31,7 @@ static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
 
 #include <errno.h>
 #include <libgen.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index bd15a47318e0a..1fcbada82228e 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.17 2007/01/09 00:27:53 imp Exp $");
 
 #include <sys/param.h>
 #define DKTYPENAMES
diff --git a/lib/libc/gen/dladdr.3 b/lib/libc/gen/dladdr.3
index 414fa49a3e90a..0bb62759a6243 100644
--- a/lib/libc/gen/dladdr.3
+++ b/lib/libc/gen/dladdr.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dladdr.3,v 1.8 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd February 5, 1998
 .Os
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index 39ba141a33085..89f29fcfa0318 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.14 2007/04/03 18:35:20 kan Exp $");
 
 /*
  * Linkage to services provided by the dynamic linker.
diff --git a/lib/libc/gen/dlfunc.c b/lib/libc/gen/dlfunc.c
index 72a683a055d1e..933ea19c62bd0 100644
--- a/lib/libc/gen/dlfunc.c
+++ b/lib/libc/gen/dlfunc.c
@@ -2,7 +2,7 @@
  * This source file is in the public domain.
  * Garrett A. Wollman, 2002-05-28.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.3 2002/09/11 05:05:48 mike Exp $
  */
 
 #include <dlfcn.h>
diff --git a/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3
index 9433fb6e9d126..37195beca1e61 100644
--- a/lib/libc/gen/dlinfo.3
+++ b/lib/libc/gen/dlinfo.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.9 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd February 14, 2003
 .Os
diff --git a/lib/libc/gen/dllockinit.3 b/lib/libc/gen/dllockinit.3
index 98d10749485ed..99811ab2724ae 100644
--- a/lib/libc/gen/dllockinit.3
+++ b/lib/libc/gen/dllockinit.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dllockinit.3,v 1.14 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd July 5, 2000
 .Os
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 118e165ba4333..3a3c87874f47a 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -30,7 +30,7 @@
 .\" Copyright (c) 1991 Sun Microsystems, Inc.
 .\"
 .\" @(#) dlopen.3 1.6 90/01/31 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.28 2004/06/03 10:13:26 roam Exp $
 .\"
 .Dd September 10, 2002
 .Os
diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c
index 672b5eef6b198..92aeb80f9ca22 100644
--- a/lib/libc/gen/drand48.c
+++ b/lib/libc/gen/drand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/drand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c
index cdb3ec85052b4..4b0c1dfe989bd 100644
--- a/lib/libc/gen/erand48.c
+++ b/lib/libc/gen/erand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/erand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 7c7720b71e194..6da3ed6146d53 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.23 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd March 6, 1999
 .Dt ERR 3
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index cf4d0f0e8df43..ba59bb5c2dc5c 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.14 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <err.h>
diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
index bc3e0c98f3f46..a2f98237ff806 100644
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index 02e0351badc23..7d98857d63637 100644
--- a/lib/libc/gen/errno.c
+++ b/lib/libc/gen/errno.c
@@ -25,6 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errno.c,v 1.1 2002/10/09 08:04:24 peter Exp $");
 
 int errno;
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index daeccd10bf473..cc25bef9b4882 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.26 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd January 24, 1994
 .Dt EXEC 3
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index 2cf7a36de1639..6b85651af6e33 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.23 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/fmtcheck.3 b/lib/libc/gen/fmtcheck.3
index 366355849fdbb..1a5bb54682997 100644
--- a/lib/libc/gen/fmtcheck.3
+++ b/lib/libc/gen/fmtcheck.3
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fmtcheck.3,v 1.9 2004/07/02 23:52:10 ru Exp $
 .Dd October 16, 2002
 .Os
 .Dt FMTCHECK 3
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
index ca93983d9e0d5..f6673aa8f69d2 100644
--- a/lib/libc/gen/fmtcheck.c
+++ b/lib/libc/gen/fmtcheck.c
@@ -35,7 +35,7 @@
 
 /*	$NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.8 2005/03/21 08:00:55 das Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/gen/fmtmsg.3 b/lib/libc/gen/fmtmsg.3
index 7995d7bd31c50..3320bd045e7bd 100644
--- a/lib/libc/gen/fmtmsg.3
+++ b/lib/libc/gen/fmtmsg.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fmtmsg.3,v 1.4 2002/12/04 18:57:44 ru Exp $
 .\"
 .Dd August 5, 2002
 .Dt FMTMSG 3
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
index 6caabbbb884d1..4db35dc9c102f 100644
--- a/lib/libc/gen/fmtmsg.c
+++ b/lib/libc/gen/fmtmsg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $");
 
 #include <fmtmsg.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index 489b2a80c5d9c..0ff709b29f90d 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.19 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd July 18, 2004
 .Dt FNMATCH 3
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index e697bdcedf20e..18d6817bee4bd 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.18 2007/01/09 00:27:53 imp Exp $");
 
 /*
  * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
diff --git a/lib/libc/gen/fpclassify.3 b/lib/libc/gen/fpclassify.3
index a547eeb454660..decb473f457d0 100644
--- a/lib/libc/gen/fpclassify.3
+++ b/lib/libc/gen/fpclassify.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.6 2005/01/27 05:46:16 das Exp $
 .\"
 .Dd January 26, 2005
 .Dt FPCLASSIFY 3
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index 754a1df50a2f7..1dafcfc74c635 100644
--- a/lib/libc/gen/fpclassify.c
+++ b/lib/libc/gen/fpclassify.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/fpclassify.c,v 1.2 2005/02/06 03:23:31 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/gen/frexp.3 b/lib/libc/gen/frexp.3
index 390da750d790c..fd5b6aeeb0e98 100644
--- a/lib/libc/gen/frexp.3
+++ b/lib/libc/gen/frexp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)frexp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/frexp.3,v 1.13 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd March 4, 2005
 .Dt FREXP 3
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index 53483da885688..24e10697e5cc3 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/frexp.c,v 1.1 2004/07/18 21:23:39 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 9dac476c4c67f..69eb70bc53c5c 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)fstab.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fstab.c,v 1.15 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index a1c7dde545892..436b77e8375fd 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ftok.3,v 1.16 2004/07/02 23:52:10 ru Exp $
 .Dd June 24, 1994
 .Os
 .Dt FTOK 3
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 4269e370c9f43..6c7157ae70b95 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ftok.c,v 1.7 2004/06/01 06:53:07 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/fts-compat.c b/lib/libc/gen/fts-compat.c
index 83f9c67a20315..1d4834fb537a4 100644
--- a/lib/libc/gen/fts-compat.c
+++ b/lib/libc/gen/fts-compat.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts-compat.c,v 1.29 2007/08/23 05:09:31 yar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/fts-compat.h b/lib/libc/gen/fts-compat.h
index 7eb03a6499433..a95750f49deb6 100644
--- a/lib/libc/gen/fts-compat.h
+++ b/lib/libc/gen/fts-compat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/fts-compat.h,v 1.12 2007/08/23 05:09:31 yar Exp $
  */
 
 #ifndef	_FTS_H_
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index ad6e513b5d201..34b61407674af 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.23 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd January 7, 2005
 .Dt FTS 3
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 83f9c67a20315..3b6c6f461e9fc 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.28 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3
index ba8859b4a3302..1458baeb5c7be 100644
--- a/lib/libc/gen/ftw.3
+++ b/lib/libc/gen/ftw.3
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ftw.3,v 1.3 2005/11/23 15:41:36 ru Exp $
 .\"
 .Dd July 5, 2004
 .Dt FTW 3
diff --git a/lib/libc/gen/ftw.c b/lib/libc/gen/ftw.c
index 0177712143ee1..959c9cc680a1e 100644
--- a/lib/libc/gen/ftw.c
+++ b/lib/libc/gen/ftw.c
@@ -27,7 +27,7 @@ static const char rcsid[] = "$OpenBSD: ftw.c,v 1.4 2004/07/07 16:05:23 millert E
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ftw.c,v 1.4 2004/08/24 13:00:55 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/getbootfile.3 b/lib/libc/gen/getbootfile.3
index 5130c64ba6b90..eb3d6a62e3d73 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getbootfile.3,v 1.14 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd September 23, 1994
 .Dt GETBOOTFILE 3
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index aa23247f90b8e..09823caef8fc9 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index 1407051e1204b..55d33485637a5 100644
--- a/lib/libc/gen/getbsize.3
+++ b/lib/libc/gen/getbsize.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getbsize.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.11 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETBSIZE 3
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index 277eeb454aee6..afadbe0e84cae 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getbsize.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.8 2007/01/09 00:27:53 imp Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index c6401f8c8acec..60c383aeb0f0f 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getcap.3	8.4 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.30 2007/02/11 18:14:49 maxim Exp $
 .\"
 .Dd March 22, 2002
 .Dt GETCAP 3
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index 0f0bb207a8d1b..1df85b4d94195 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.20 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/getcontext.3 b/lib/libc/gen/getcontext.3
index 2fda6b8ced42e..c2963adebd961 100644
--- a/lib/libc/gen/getcontext.3
+++ b/lib/libc/gen/getcontext.3
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcontext.3,v 1.3 2004/12/03 14:10:04 rse Exp $
 .\"
 .Dd September 10, 2002
 .Dt GETCONTEXT 3
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 12a2bd664afd6..17f039ea0d50f 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getcwd.3,v 1.17 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd November 24, 1997
 .Dt GETCWD 3
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 0cd320853912c..d06210b5d0dc4 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.29 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getdiskbyname.3 b/lib/libc/gen/getdiskbyname.3
index ed13539c27f4d..d6558f4f89366 100644
--- a/lib/libc/gen/getdiskbyname.3
+++ b/lib/libc/gen/getdiskbyname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdiskbyname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getdiskbyname.3,v 1.10 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETDISKBYNAME 3
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 480c746ae80f3..246ddbf2380a1 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getdomainname.3,v 1.21 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd May 6, 1994
 .Dt GETDOMAINNAME 3
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index 21eb66def4b15..5b19f7b3456ab 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getdomainname.c,v 1.8 2007/01/09 00:27:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index 306db64135c3a..a2217264e2e2e 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getfsent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.17 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd April 7, 2003
 .Dt GETFSENT 3
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index da2ed8ccbcbdb..670c953831f68 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.28 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd April 16, 2003
 .Dt GETGRENT 3
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 7da84f7ae329e..32c501cc42c18 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -31,7 +31,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
index 3f7faa2431abd..18cb9c890b642 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgrouplist.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getgrouplist.3,v 1.9 2007/01/09 00:27:53 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETGROUPLIST 3
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index 3510a311161ec..88333419eab35 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.15 2007/01/09 00:27:53 imp Exp $");
 
 /*
  * get credential
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 00853ef1b32e3..d48103bb2894f 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/gethostname.3,v 1.17 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd August 18, 2003
 .Dt GETHOSTNAME 3
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index c83805e5ccb77..65af7160aeee6 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/gethostname.c,v 1.8 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3
index 5a77ecbd149ec..05bbebdeea891 100644
--- a/lib/libc/gen/getloadavg.3
+++ b/lib/libc/gen/getloadavg.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getloadavg.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getloadavg.3,v 1.9 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETLOADAVG 3
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index 127d3e8de0942..a38093fdad7d3 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getloadavg.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getloadavg.c,v 1.3 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index dc85d3a6952ac..294aef8a2386e 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getlogin.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getlogin.c,v 1.10 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index dc83e377e17e1..e5b6f179935d7 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getmntinfo.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getmntinfo.3,v 1.13 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETMNTINFO 3
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index 2b532f642c8a4..24b7886c6da78 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getmntinfo.c,v 1.5 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3
index 4cc2a2126b52d..6fe027136f48a 100644
--- a/lib/libc/gen/getnetgrent.3
+++ b/lib/libc/gen/getnetgrent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getnetgrent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getnetgrent.3,v 1.13 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETNETGRENT 3
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index ca75d9b8d6c9f..773cdd10e1073 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.35 2007/01/09 00:27:54 imp Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getosreldate.3 b/lib/libc/gen/getosreldate.3
index ff4d10e6854af..dc4adcec5aabd 100644
--- a/lib/libc/gen/getosreldate.3
+++ b/lib/libc/gen/getosreldate.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.3 2005/12/03 05:11:07 ambrisko Exp $
 .\"
 .Dd December 2, 2005
 .Dt GETOSRELDATE 3
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index 086da6a703300..547b10a7089ee 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getosreldate.c,v 1.9 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpagesize.3 b/lib/libc/gen/getpagesize.3
index 8369a854c434c..2c10efd96ddd6 100644
--- a/lib/libc/gen/getpagesize.3
+++ b/lib/libc/gen/getpagesize.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpagesize.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpagesize.3,v 1.12 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPAGESIZE 3
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
index d796b9d77a048..1467ca87d8a2c 100644
--- a/lib/libc/gen/getpagesize.c
+++ b/lib/libc/gen/getpagesize.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getpagesize.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpagesize.c,v 1.6 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
index 85dcdced2fe73..62d20a7351c8c 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpass.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpass.3,v 1.12 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPASS 3
diff --git a/lib/libc/gen/getpeereid.3 b/lib/libc/gen/getpeereid.3
index 12999e501b092..6b5aed038870a 100644
--- a/lib/libc/gen/getpeereid.3
+++ b/lib/libc/gen/getpeereid.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpeereid.3,v 1.6 2002/12/18 10:13:54 ru Exp $
 .\"
 .Dd July 15, 2001
 .Dt GETPEEREID 3
diff --git a/lib/libc/gen/getpeereid.c b/lib/libc/gen/getpeereid.c
index 5ecb243b53c5d..5608c48932306 100644
--- a/lib/libc/gen/getpeereid.c
+++ b/lib/libc/gen/getpeereid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpeereid.c,v 1.6 2002/12/16 13:42:13 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/gen/getprogname.3 b/lib/libc/gen/getprogname.3
index 53d39a60526b8..5ea703ef8ed34 100644
--- a/lib/libc/gen/getprogname.3
+++ b/lib/libc/gen/getprogname.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getprogname.3,v 1.5 2001/10/01 16:08:51 ru Exp $
 .\"
 .Dd May 1, 2001
 .Dt GETPROGNAME 3
diff --git a/lib/libc/gen/getprogname.c b/lib/libc/gen/getprogname.c
index fd51d1322517d..4be82e32152ad 100644
--- a/lib/libc/gen/getprogname.c
+++ b/lib/libc/gen/getprogname.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getprogname.c,v 1.4 2002/03/29 22:43:41 markm Exp $");
 
 #include "namespace.h"
 #include <stdlib.h>
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 65092abab1fb4..0c094aa840354 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getpwent.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.30 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd April 16, 2003
 .Dt GETPWENT 3
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index f729cdf1d4175..afd195f11f197 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -31,7 +31,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.90 2006/04/28 12:03:35 ume Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
index 0be79910013e5..4dab0b8e10127 100644
--- a/lib/libc/gen/getttyent.3
+++ b/lib/libc/gen/getttyent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getttyent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getttyent.3,v 1.15 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd November 17, 1996
 .Dt GETTTYENT 3
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 8249fada84fc3..4a3d3feecce38 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.16 2007/01/09 00:27:54 imp Exp $");
 
 #include <ttyent.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index 1559519c88f68..7648f89a68649 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getusershell.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getusershell.3,v 1.12 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd January 16, 1999
 .Dt GETUSERSHELL 3
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index b0da2a1d5cdc9..6e2fd6fbeb917 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -32,7 +32,7 @@ static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 /*	$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getusershell.c,v 1.10 2007/01/09 00:27:54 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3
index 65da50ba9dee3..e2b4d55326da3 100644
--- a/lib/libc/gen/getvfsbyname.3
+++ b/lib/libc/gen/getvfsbyname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getvfsbyname.3	8.3 (Berkeley) 5/4/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/getvfsbyname.3,v 1.18 2007/04/05 21:17:52 pjd Exp $
 .\"
 .Dd April 5, 2007
 .Dt GETVFSBYNAME 3
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 0d896bbe63000..b7c7e2ab38b8f 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsbyname.c,v 1.11 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 4c912bbdddc91..4473427b55a05 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.32 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd September 1, 2004
 .Dt GLOB 3
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index c75f6efb7f9d3..d0a1a2ad899c7 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.26 2007/01/09 00:27:54 imp Exp $");
 
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
diff --git a/lib/libc/gen/initgroups.3 b/lib/libc/gen/initgroups.3
index 2fe2dd984e16e..6bcde647c37ed 100644
--- a/lib/libc/gen/initgroups.3
+++ b/lib/libc/gen/initgroups.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)initgroups.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/initgroups.3,v 1.13 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt INITGROUPS 3
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index 299ae503556c3..2cb8c33846f5f 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.9 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index 076b824a44091..e6153ac69876b 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)isatty.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/isatty.c,v 1.6 2007/01/09 00:27:54 imp Exp $");
 
 #include <termios.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/isgreater.3 b/lib/libc/gen/isgreater.3
index 010615530810b..3f37cf59dc70c 100644
--- a/lib/libc/gen/isgreater.3
+++ b/lib/libc/gen/isgreater.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.3 2005/02/06 03:23:31 das Exp $
 .\"
 .Dd February 12, 2003
 .Dt ISGREATER 3
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index 4a4152a5a032d..932675dc33dd9 100644
--- a/lib/libc/gen/isinf.c
+++ b/lib/libc/gen/isinf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/isinf.c,v 1.2 2004/07/10 15:52:26 marcel Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index ec81362f4f99c..fd9f029f14e89 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/isnan.c,v 1.2 2004/09/24 06:33:22 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c
index 17076205559a2..f47bf2aa0a3fa 100644
--- a/lib/libc/gen/jrand48.c
+++ b/lib/libc/gen/jrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/jrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c
index ab0d1f762d80f..8b11e08c57c46 100644
--- a/lib/libc/gen/lcong48.c
+++ b/lib/libc/gen/lcong48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lcong48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/ldexp.3 b/lib/libc/gen/ldexp.3
index e8e4fbac5ebb1..8d67766a1aa21 100644
--- a/lib/libc/gen/ldexp.3
+++ b/lib/libc/gen/ldexp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ldexp.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ldexp.3,v 1.11 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd March 4, 2005
 .Dt LDEXP 3
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c
index 887f673ee9a5e..3d59050ebdadd 100644
--- a/lib/libc/gen/ldexp.c
+++ b/lib/libc/gen/ldexp.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ldexp.c,v 1.1 2005/01/22 06:03:40 das Exp $");
 
 #include <sys/types.h>
 #include <machine/endian.h>
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index cb3b8ef39d464..bf6b7b1ca6230 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/lockf.3,v 1.13 2004/07/02 23:52:10 ru Exp $
 .\"
 .Dd December 19, 1997
 .Dt LOCKF 3
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index c448f18040729..375b2ce4d50e0 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -36,7 +36,7 @@
 
 /*	$NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c
index 44a7f5d0e924c..948b923a529d8 100644
--- a/lib/libc/gen/lrand48.c
+++ b/lib/libc/gen/lrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/makecontext.3 b/lib/libc/gen/makecontext.3
index ad55e7abcb476..36e3ce811b2e6 100644
--- a/lib/libc/gen/makecontext.3
+++ b/lib/libc/gen/makecontext.3
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/makecontext.3,v 1.4 2002/12/19 09:40:21 ru Exp $
 .\"
 .Dd September 10, 2002
 .Dt MAKECONTEXT 3
diff --git a/lib/libc/gen/modf.3 b/lib/libc/gen/modf.3
index f406cedc4ffa6..37c2a55a547a0 100644
--- a/lib/libc/gen/modf.3
+++ b/lib/libc/gen/modf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/modf.3,v 1.9 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MODF 3
diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c
index ef20fb87bf507..f65ed779088ab 100644
--- a/lib/libc/gen/mrand48.c
+++ b/lib/libc/gen/mrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/mrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index 79787255395c5..ca0578b1f3da0 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $
 .\"/
 .Dd November 24, 1997
 .Dt MSGCTL 3
diff --git a/lib/libc/gen/msgget.3 b/lib/libc/gen/msgget.3
index e257c607d1ee8..d87574734d740 100644
--- a/lib/libc/gen/msgget.3
+++ b/lib/libc/gen/msgget.3
@@ -28,7 +28,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgget.3,v 1.13 2002/12/18 10:13:54 ru Exp $
 .\"
 .\"/
 .Dd August 17, 1995
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index e554dcdf4ba1a..25a56905e260b 100644
--- a/lib/libc/gen/msgrcv.3
+++ b/lib/libc/gen/msgrcv.3
@@ -28,7 +28,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.20 2005/06/14 10:56:02 ru Exp $
 .\"
 .\"/
 .Dd June 15, 2005
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index fc802b38ba7be..5825c3aa694b6 100644
--- a/lib/libc/gen/msgsnd.3
+++ b/lib/libc/gen/msgsnd.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $
 .\"
 .Dd October 12, 2006
 .Dt MSGSND 3
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
index 43110c1a3b4a8..01b099a6871cf 100644
--- a/lib/libc/gen/nftw.c
+++ b/lib/libc/gen/nftw.c
@@ -27,7 +27,7 @@ static const char rcsid[] = "$OpenBSD: nftw.c,v 1.4 2004/07/07 16:05:23 millert
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nftw.c,v 1.1 2004/08/24 13:00:55 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index 9c39b78d341f0..2bb58a33b04b6 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nice.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/nice.3,v 1.12 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt NICE 3
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index e8375e891539f..f24d12d117e6a 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nice.c,v 1.4 2007/01/09 00:27:54 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/nlist.3 b/lib/libc/gen/nlist.3
index 5bcd72a0f97d5..d5d3c48e1f8b6 100644
--- a/lib/libc/gen/nlist.3
+++ b/lib/libc/gen/nlist.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nlist.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/nlist.3,v 1.8 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt NLIST 3
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 690e0b0a7c0cf..8dcf82b0170f2 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.20 2007/01/09 00:27:54 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c
index 16c8ca111b5e5..3a21c3f2a546f 100644
--- a/lib/libc/gen/nrand48.c
+++ b/lib/libc/gen/nrand48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/nrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index c5386d5c6410a..4266b76c82b20 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.23 2007/01/09 00:27:54 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3
index ce715d2b4cb15..b7ddcaee47ea4 100644
--- a/lib/libc/gen/pause.3
+++ b/lib/libc/gen/pause.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pause.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pause.3,v 1.9 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt PAUSE 3
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index 86d3643435d32..4847760bb2172 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pause.c,v 1.7 2007/01/09 00:27:54 imp Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/pmadvise.c b/lib/libc/gen/pmadvise.c
index 60cef637bf166..744c6e560e47c 100644
--- a/lib/libc/gen/pmadvise.c
+++ b/lib/libc/gen/pmadvise.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pmadvise.c,v 1.3 2003/08/09 03:23:24 bms Exp $");
 
 #include <sys/mman.h>
 
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index 90297e46f7288..a493079bf419b 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)popen.3	8.2 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.18 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd May 3, 1995
 .Dt POPEN 3
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 9e597b95e5d24..1cf2f16feebb2 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.19 2007/01/09 00:27:54 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/posixshm.c b/lib/libc/gen/posixshm.c
index 05fc1c9bf4035..0baa7006950a0 100644
--- a/lib/libc/gen/posixshm.c
+++ b/lib/libc/gen/posixshm.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/posixshm.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/pselect.3 b/lib/libc/gen/pselect.3
index a56a0a80a884a..4b12fb7374cb1 100644
--- a/lib/libc/gen/pselect.3
+++ b/lib/libc/gen/pselect.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pselect.3,v 1.4 2002/12/18 10:13:54 ru Exp $
 .\"
 .Dd June 16, 2002
 .Dt PSELECT 3
diff --git a/lib/libc/gen/pselect.c b/lib/libc/gen/pselect.c
index 28066a204aa4c..13b25538e22ee 100644
--- a/lib/libc/gen/pselect.c
+++ b/lib/libc/gen/pselect.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pselect.c,v 1.6 2002/10/12 16:13:37 mike Exp $");
 
 #include "namespace.h"
 #include <sys/select.h>
diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3
index 5ad6ee2b3681f..c59d79ef9853a 100644
--- a/lib/libc/gen/psignal.3
+++ b/lib/libc/gen/psignal.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)psignal.3	8.2 (Berkeley) 2/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/psignal.3,v 1.17 2007/01/09 00:27:54 imp Exp $
 .\"
 .Dd February 27, 1995
 .Dt PSIGNAL 3
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index 6fca4b18aabbe..8894b1b2c8c3e 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/psignal.c,v 1.8 2007/01/09 00:27:54 imp Exp $");
 
 /*
  * Print the name of the signal indicated
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index 9242dd054244e..88904969dfa93 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pw_scan.c,v 1.26 2007/01/09 00:27:55 imp Exp $");
 
 /*
  * This module is used to "verify" password entries by chpass(1) and
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
index 468096c55e70b..86c54c2df090a 100644
--- a/lib/libc/gen/pw_scan.h
+++ b/lib/libc/gen/pw_scan.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/pw_scan.h,v 1.7 2007/01/09 00:27:55 imp Exp $
  */
 
 #define _PWSCAN_MASTER 0x01
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 39100822d8c05..6dfa6eec83998 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwcache.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/pwcache.3,v 1.15 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd March 22, 2002
 .Dt PWCACHE 3
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index 501d6ba9cd73a..3c02e8809e122 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)pwcache.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pwcache.c,v 1.11 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/gen/raise.3 b/lib/libc/gen/raise.3
index 5f422c5f07204..dbdff26825a38 100644
--- a/lib/libc/gen/raise.3
+++ b/lib/libc/gen/raise.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)raise.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/raise.3,v 1.8 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt RAISE 3
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index 12bd31fc7f130..e9665e8f5e860 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)raise.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/raise.c,v 1.5 2007/01/09 00:27:55 imp Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3
index a703ba08813f4..d67f16347c2a1 100644
--- a/lib/libc/gen/rand48.3
+++ b/lib/libc/gen/rand48.3
@@ -10,7 +10,7 @@
 .\" to anyone/anything when using this software.
 .\"
 .\"     @(#)rand48.3 V1.0 MB 8 Oct 1993
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/rand48.3,v 1.17 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd October 8, 1993
 .Dt RAND48 3
diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h
index b6602dc5a9f70..0a3d83d3c0c73 100644
--- a/lib/libc/gen/rand48.h
+++ b/lib/libc/gen/rand48.h
@@ -10,7 +10,7 @@
  * of any kind. I shall in no event be liable for anything that happens
  * to anyone/anything when using this software.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/rand48.h,v 1.2 2002/02/01 01:32:19 obrien Exp $
  */
 
 #ifndef _RAND48_H_
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index 8bdc6ce695ea0..3f8ed0c449041 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.13 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/readpassphrase.3 b/lib/libc/gen/readpassphrase.3
index 0d6a7ff38f165..3bd3617424690 100644
--- a/lib/libc/gen/readpassphrase.3
+++ b/lib/libc/gen/readpassphrase.3
@@ -25,7 +25,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/readpassphrase.3,v 1.7 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd December 7, 2001
 .Dt READPASSPHRASE 3
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
index 983e01d893068..d100be4085238 100644
--- a/lib/libc/gen/readpassphrase.c
+++ b/lib/libc/gen/readpassphrase.c
@@ -31,7 +31,7 @@
 static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readpassphrase.c,v 1.6 2002/03/09 03:16:41 green Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 45e450d856baa..bdbb33e68d359 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/rewinddir.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/lib/libc/gen/rfork_thread.3 b/lib/libc/gen/rfork_thread.3
index e985e1c99e7f0..bd03d93d2e6cc 100644
--- a/lib/libc/gen/rfork_thread.3
+++ b/lib/libc/gen/rfork_thread.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.7 2003/04/27 21:07:27 robert Exp $
 .\"
 .Dd July 29, 2000
 .Dt RFORK_THREAD 3
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index 42ccac2465ca2..507fbde6dd5ac 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)scandir.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/scandir.3,v 1.9 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SCANDIR 3
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index cfe765d27b77e..cbecd4a28eaf9 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/scandir.c,v 1.8 2007/01/09 00:27:55 imp Exp $");
 
 /*
  * Scan the directory dirname calling select to make a list of selected
diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c
index 5339b8c0c4e9b..94167a7b11978 100644
--- a/lib/libc/gen/seed48.c
+++ b/lib/libc/gen/seed48.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/seed48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
 
 #include "rand48.h"
 
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index c2db06d93e2d7..46f79b30e7b3c 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c
index 439f0fe5c41c4..fef18f6ece964 100644
--- a/lib/libc/gen/sem.c
+++ b/lib/libc/gen/sem.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/sem.c,v 1.15 2005/10/18 17:24:03 stefanf Exp $
  */
 
 /*
diff --git a/lib/libc/gen/sem_destroy.3 b/lib/libc/gen/sem_destroy.3
index f488b4efe08d2..c10dbf3291d19 100644
--- a/lib/libc/gen/sem_destroy.3
+++ b/lib/libc/gen/sem_destroy.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sem_destroy.3,v 1.14 2004/07/02 16:45:56 ru Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_DESTROY 3
diff --git a/lib/libc/gen/sem_getvalue.3 b/lib/libc/gen/sem_getvalue.3
index a8dd177ea381f..ff5ab2711e081 100644
--- a/lib/libc/gen/sem_getvalue.3
+++ b/lib/libc/gen/sem_getvalue.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sem_getvalue.3,v 1.14 2004/07/02 16:45:56 ru Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_GETVALUE 3
diff --git a/lib/libc/gen/sem_init.3 b/lib/libc/gen/sem_init.3
index d765a574e67b7..9add88deb8fa7 100644
--- a/lib/libc/gen/sem_init.3
+++ b/lib/libc/gen/sem_init.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.18 2005/07/13 13:15:21 rwatson Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_INIT 3
diff --git a/lib/libc/gen/sem_open.3 b/lib/libc/gen/sem_open.3
index 772bdfb70dac9..be53c1198b010 100644
--- a/lib/libc/gen/sem_open.3
+++ b/lib/libc/gen/sem_open.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.12.22.1 2008/01/07 21:29:29 jhb Exp $
 .\"
 .Dd January 15, 2003
 .Dt SEM_OPEN 3
diff --git a/lib/libc/gen/sem_post.3 b/lib/libc/gen/sem_post.3
index 67559cc541bdc..4f10c6ae34695 100644
--- a/lib/libc/gen/sem_post.3
+++ b/lib/libc/gen/sem_post.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.15 2005/07/13 13:15:21 rwatson Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_POST 3
diff --git a/lib/libc/gen/sem_wait.3 b/lib/libc/gen/sem_wait.3
index 43d6fad34d34d..e616e958572ac 100644
--- a/lib/libc/gen/sem_wait.3
+++ b/lib/libc/gen/sem_wait.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $
 .\"
 .Dd February 15, 2000
 .Dt SEM_WAIT 3
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
index 4b5283f897c89..4c0b249f6d801 100644
--- a/lib/libc/gen/semctl.c
+++ b/lib/libc/gen/semctl.c
@@ -27,7 +27,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.9 2003/02/16 17:29:09 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/ipc.h>
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index cba67a759a7d7..9e8eaf178767c 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setdomainname.c,v 1.8 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index 466ff577b29b8..af1a129f1e2d5 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sethostname.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
index 5c995f0ae6777..94749cc067265 100644
--- a/lib/libc/gen/setjmp.3
+++ b/lib/libc/gen/setjmp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setjmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/setjmp.3,v 1.13 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETJMP 3
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
index 3cfeb55e04c63..98820f5fb9f42 100644
--- a/lib/libc/gen/setjmperr.c
+++ b/lib/libc/gen/setjmperr.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)setjmperr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setjmperr.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
 
 /*
  * This routine is called from longjmp() when an error occurs.
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
index 5cab44a9326f5..94fd5d16823ca 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/setmode.3,v 1.12 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd April 28, 1995
 .Dt SETMODE 3
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 3966fd0e60a72..4c1e5a0dca48b 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.11 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index fe9f19acde6ef..8792110b1c304 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/setproctitle.3,v 1.25 2004/07/02 23:52:10 ru Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd December 16, 1995
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index cd705fb609466..433bba233e2e3 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setproctitle.c,v 1.18 2003/07/01 09:45:35 alfred Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/setprogname.c b/lib/libc/gen/setprogname.c
index 29a6cd025ec89..654bef4161b8e 100644
--- a/lib/libc/gen/setprogname.c
+++ b/lib/libc/gen/setprogname.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/setprogname.c,v 1.8 2002/03/29 22:43:41 markm Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/gen/shm_open.3 b/lib/libc/gen/shm_open.3
index b68e85b6bb49a..e2567a3a8b115 100644
--- a/lib/libc/gen/shm_open.3
+++ b/lib/libc/gen/shm_open.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/shm_open.3,v 1.12 2005/01/20 09:17:02 ru Exp $
 .\"
 .Dd March 24, 2000
 .Dt SHM_OPEN 3
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index e5eae626014f6..aae9120aa067d 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)siginterrupt.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/siginterrupt.3,v 1.15 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGINTERRUPT 3
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index dde474c43e0c8..8620ebed5bfe8 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/siginterrupt.c,v 1.5 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <signal.h>
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index 1ff1337d5fa3e..d3de563b80152 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.6 2007/01/20 08:24:01 maxim Exp $");
 
 #include <signal.h>
 
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 4086f68708053..8cfb6257b0d43 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)signal.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.42 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 7, 2004
 .Dt SIGNAL 3
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index c93633e23bbb9..6407da3b4e7d2 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)signal.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/signal.c,v 1.4 2007/01/09 00:27:55 imp Exp $");
 
 /*
  * Almost backwards compatible signal.
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
index 88affad61fdba..66289af6f03fc 100644
--- a/lib/libc/gen/sigsetops.3
+++ b/lib/libc/gen/sigsetops.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigsetops.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sigsetops.3,v 1.10 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd December 16, 2004
 .Dt SIGSETOPS 3
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index cf7e688fa1006..efc9192352d41 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sigsetops.c,v 1.9 2007/01/09 00:27:55 imp Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
index ecfa237ad2ceb..a3c42fcdc1fb9 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sleep.3,v 1.17 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd February 13, 1998
 .Dt SLEEP 3
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index cdf5828404a1b..735306b54e7f8 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sleep.c,v 1.32 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/gen/statvfs.3 b/lib/libc/gen/statvfs.3
index f9c7430f6e99b..82e4d0f83723d 100644
--- a/lib/libc/gen/statvfs.3
+++ b/lib/libc/gen/statvfs.3
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.7 2003/06/08 10:01:51 charnier Exp $
 .\"
 .Dd July 13, 2002
 .Dt STATVFS 3
diff --git a/lib/libc/gen/statvfs.c b/lib/libc/gen/statvfs.c
index fe9462bd307be..303950bbfab8f 100644
--- a/lib/libc/gen/statvfs.c
+++ b/lib/libc/gen/statvfs.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.2 2002/09/06 11:23:40 tjr Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/stringlist.3 b/lib/libc/gen/stringlist.3
index 30dd299a7a448..d1dd2f43cf16a 100644
--- a/lib/libc/gen/stringlist.3
+++ b/lib/libc/gen/stringlist.3
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/stringlist.3,v 1.11 2005/02/13 23:45:46 ru Exp $
 .\"
 .Dd November 28, 1999
 .Os
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
index e0db3b6759421..a4ad68a51effa 100644
--- a/lib/libc/gen/stringlist.c
+++ b/lib/libc/gen/stringlist.c
@@ -30,7 +30,7 @@
 static char *rcsid = "$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/stringlist.c,v 1.8 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/gen/strtofflags.3 b/lib/libc/gen/strtofflags.3
index 38c2ff5f93dc9..42bd104ec2ef6 100644
--- a/lib/libc/gen/strtofflags.3
+++ b/lib/libc/gen/strtofflags.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/strtofflags.3,v 1.8 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd January 1, 2000
 .Dt STRTOFFLAGS 3
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index 12db2b4109094..1f6718d8aa590 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.24 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/swapcontext.c b/lib/libc/gen/swapcontext.c
index c34cb235cffb2..1725068a3e180 100644
--- a/lib/libc/gen/swapcontext.c
+++ b/lib/libc/gen/swapcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/swapcontext.c,v 1.5 2002/09/20 08:13:21 mini Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index b17d8a80d5e08..5fca1ba8ade7f 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sysconf.3,v 1.25 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd December 14, 2006
 .Dt SYSCONF 3
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index 8ea61afe1ac9f..b7bd2683a3fba 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.25 2007/04/14 13:06:57 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 1f0807b7c3805..98a5f02d1074b 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.69 2007/04/10 11:19:52 ru Exp $
 .\"
 .Dd April 10, 2007
 .Dt SYSCTL 3
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index eb6418e74640e..66d82d04c7150 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
index 4510fe050c9e9..e949a5cde122e 100644
--- a/lib/libc/gen/sysctlbyname.c
+++ b/lib/libc/gen/sysctlbyname.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlbyname.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
index 1515784a5becc..1a932ec465047 100644
--- a/lib/libc/gen/sysctlnametomib.c
+++ b/lib/libc/gen/sysctlnametomib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.4 2003/01/04 00:11:11 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 91404a3f2e129..865690f61f362 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/syslog.3,v 1.25 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd December 30, 2004
 .Dt SYSLOG 3
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 594fb97d6fff6..14e255a85908e 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.39 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/tcgetpgrp.3 b/lib/libc/gen/tcgetpgrp.3
index ba4d08432dd02..b4e58b876c56d 100644
--- a/lib/libc/gen/tcgetpgrp.3
+++ b/lib/libc/gen/tcgetpgrp.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcgetpgrp.3,v 1.9 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt TCGETPGRP 3
diff --git a/lib/libc/gen/tcsendbreak.3 b/lib/libc/gen/tcsendbreak.3
index a7e86d0aed5b9..ee96504a747cc 100644
--- a/lib/libc/gen/tcsendbreak.3
+++ b/lib/libc/gen/tcsendbreak.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsendbreak.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcsendbreak.3,v 1.10 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt TCSENDBREAK 3
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index 01628d3d330ad..5eee84f8b55ad 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsetattr.3	8.3 (Berkeley) 1/2/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcsetattr.3,v 1.14 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd January 2, 1994
 .Dt TCSETATTR 3
diff --git a/lib/libc/gen/tcsetpgrp.3 b/lib/libc/gen/tcsetpgrp.3
index 494731c4cae50..9e139b8b19ca2 100644
--- a/lib/libc/gen/tcsetpgrp.3
+++ b/lib/libc/gen/tcsetpgrp.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsetpgrp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tcsetpgrp.3,v 1.10 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt TCSETPGRP 3
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 77ebcbbc2bd40..b1115a0f9d8dc 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.9 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gen/telldir.h b/lib/libc/gen/telldir.h
index 4fb4cb6ca8aa9..82cf9c1b792b8 100644
--- a/lib/libc/gen/telldir.h
+++ b/lib/libc/gen/telldir.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/telldir.h,v 1.2 2001/01/24 12:59:24 deischen Exp $
  */
 
 #ifndef _TELLDIR_H_
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index 333dff4cb62f0..bb30810ec91de 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.14 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index 2770e49f3860f..6b63883b2b023 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/time.3,v 1.15 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd July 18, 2003
 .Dt TIME 3
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index 840f9b6b7bcc6..4ab423891734e 100644
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/time.c,v 1.5 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/times.3 b/lib/libc/gen/times.3
index 9775387afb6b1..05dff8c192998 100644
--- a/lib/libc/gen/times.3
+++ b/lib/libc/gen/times.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)times.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/times.3,v 1.11 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt TIMES 3
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index 936511e1e4397..2dfc83fb1b3c4 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/times.c,v 1.4 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
index dcf2665aba0fc..450c5b2cdcc57 100644
--- a/lib/libc/gen/timezone.3
+++ b/lib/libc/gen/timezone.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)timezone.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/timezone.3,v 1.10 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt TIMEZONE 3
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index c59ae6b608771..3b2696767654e 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/timezone.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index a669f99a9c837..c394867e195dc 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/gen/tls.c,v 1.14 2007/02/25 21:23:50 kientzle Exp $
  */
 
 /*
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index ada580f6e978b..a6577a95b4746 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ttyname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ttyname.3,v 1.14 2007/01/09 00:27:55 imp Exp $
 .\"
 .Dd May 14, 2005
 .Dt TTYNAME 3
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 65436046f6b4e..017320ab92fb3 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)ttyname.c	8.2 (Berkeley) 1/27/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.24 2007/01/09 00:27:55 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index a4346267fb304..635e6495fb750 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ttyslot.c,v 1.5 2007/01/09 00:27:56 imp Exp $");
 
 #include <ttyent.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 34ca238e1c1ea..7aa92439e0144 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tzset.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.16 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd November 17, 1993
 .Dt TZSET 3
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index 47575cf73f776..4b02cd9b16d77 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ualarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.20 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt UALARM 3
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index bf75775bb853f..23e8161878401 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.5 2007/01/09 00:27:56 imp Exp $");
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/ucontext.3 b/lib/libc/gen/ucontext.3
index 05743224a82b5..86210de24bf09 100644
--- a/lib/libc/gen/ucontext.3
+++ b/lib/libc/gen/ucontext.3
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ucontext.3,v 1.3 2004/07/03 22:30:08 ru Exp $
 .\"
 .Dd September 10, 2002
 .Dt UCONTEXT 3
diff --git a/lib/libc/gen/ulimit.3 b/lib/libc/gen/ulimit.3
index e4c2d769323ca..3dc745f52643d 100644
--- a/lib/libc/gen/ulimit.3
+++ b/lib/libc/gen/ulimit.3
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/ulimit.3,v 1.5 2003/01/04 01:11:49 tjr Exp $
 .\"
 .Dd January 4, 2003
 .Dt ULIMIT 3
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
index e1bc020662092..d25ff4799ea60 100644
--- a/lib/libc/gen/ulimit.c
+++ b/lib/libc/gen/ulimit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gen/ulimit.c,v 1.3 2003/01/04 01:11:49 tjr Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index a906e79d34895..780e559ea9071 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.3	8.1 (Berkeley) 1/4/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/uname.3,v 1.14 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd December 2, 2005
 .Dt UNAME 3
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index 5a7baf7c32105..ba41ff743db11 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/uname.c,v 1.10 2007/01/09 00:27:56 imp Exp $");
 
 #define uname wrapped_uname
 #include <sys/param.h>
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index 9164f792db830..cee1e61b83893 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/unvis.3,v 1.18 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt UNVIS 3
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
index 9069e5545a4f2..e9c045fcb61f2 100644
--- a/lib/libc/gen/unvis.c
+++ b/lib/libc/gen/unvis.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.10 2007/01/09 00:27:56 imp Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index a17468b332e7c..dc6109689bd0e 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)usleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.19 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd February 13, 1998
 .Dt USLEEP 3
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 0454665b280dc..d1691a9429c05 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.30 2007/01/09 00:27:56 imp Exp $");
 
 #include "namespace.h"
 #include <time.h>
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index 1951613d9afb5..875fc83feb32e 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/utime.3,v 1.14 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt UTIME 3
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 97bf8787956ac..f5a5d8a60a337 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/utime.c,v 1.3 2007/01/09 00:27:56 imp Exp $");
 
 #include <sys/time.h>
 
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index de58304f86a0a..66f47f717c540 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)valloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.14 2007/03/28 18:55:44 jasone Exp $
 .\"
 .Dd September 13, 2005
 .Dt VALLOC 3
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index a5b0f75eb6943..9eadd9d2debe5 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)valloc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.5 2007/01/09 00:27:56 imp Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 8ec16eb7c0946..2fa771c335237 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)vis.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.30 2007/01/09 00:27:56 imp Exp $
 .\"
 .Dd April 9, 2006
 .Dt VIS 3
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 362f4dc36c6f3..94d1b22f0c8a6 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 7/19/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.14 2007/01/09 00:27:56 imp Exp $");
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index 2169b9d105c49..46e7f72df66e9 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)wait.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wait.c,v 1.7 2007/01/09 00:27:56 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index 6098773326597..0aca311719233 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)wait3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wait3.c,v 1.4 2007/01/09 00:27:56 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index b00183746b8a3..47a06e8eb356a 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/waitpid.c,v 1.7 2007/01/09 00:27:56 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/gen/wordexp.3 b/lib/libc/gen/wordexp.3
index 02fc25312fe0f..81254a4ec24a1 100644
--- a/lib/libc/gen/wordexp.3
+++ b/lib/libc/gen/wordexp.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.9 2006/04/18 21:37:24 ceri Exp $
 .\"
 .Dd July 29, 2004
 .Dt WORDEXP 3
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
index a437543bca403..b09d397624ef2 100644
--- a/lib/libc/gen/wordexp.c
+++ b/lib/libc/gen/wordexp.c
@@ -37,7 +37,7 @@
 #include <wordexp.h>
 #include "un-namespace.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.6 2004/06/30 13:55:08 tjr Exp $");
 
 static int	we_askshell(const char *, wordexp_t *, int);
 static int	we_check(const char *, int);
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index 98c73953319a7..4d2377563c50b 100644
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.12 2006/10/28 13:34:35 bde Exp $
 
 # gmon sources
 .PATH: ${.CURDIR}/gmon
diff --git a/lib/libc/gmon/Symbol.map b/lib/libc/gmon/Symbol.map
index 822789972ebf9..a312d9be27a28 100644
--- a/lib/libc/gmon/Symbol.map
+++ b/lib/libc/gmon/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index dd85eec48c191..33508f97b5da2 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.22 2007/01/09 00:27:58 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 02f3efd84b3d1..b77f598cb2fec 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.22 2007/01/09 00:27:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
index 7979a71c9fe8b..1e50864cb5046 100644
--- a/lib/libc/gmon/moncontrol.3
+++ b/lib/libc/gmon/moncontrol.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)moncontrol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.17 2007/01/09 00:27:58 imp Exp $
 .\"
 .Dd June 14, 2004
 .Dt MONCONTROL 3
diff --git a/lib/libc/i386/Makefile.inc b/lib/libc/i386/Makefile.inc
index 05b07ccff5771..bbd069c2f8a21 100644
--- a/lib/libc/i386/Makefile.inc
+++ b/lib/libc/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.2 2006/03/13 01:14:57 deischen Exp $
 
 # Long double is 80 bits
 GDTOASRCS+=strtopx.c
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 2f8a29340a2e0..de1da18f6db5a 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/SYS.h,v 1.26 2007/07/04 23:18:38 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
index 9fd9dc2051d4b..a1e6da21a1b21 100644
--- a/lib/libc/i386/Symbol.map
+++ b/lib/libc/i386/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.5 2007/05/31 13:01:33 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/i386/_fpmath.h b/lib/libc/i386/_fpmath.h
index 80e764f8eacf2..92719d9a8f1e4 100644
--- a/lib/libc/i386/_fpmath.h
+++ b/lib/libc/i386/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/i386/arith.h b/lib/libc/i386/arith.h
index 2d65061e82a7c..c55a4df3ab29c 100644
--- a/lib/libc/i386/arith.h
+++ b/lib/libc/i386/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/i386/gd_qnan.h b/lib/libc/i386/gd_qnan.h
index 17b439f131cc6..e24d0c75b8fa1 100644
--- a/lib/libc/i386/gd_qnan.h
+++ b/lib/libc/i386/gd_qnan.h
@@ -4,7 +4,7 @@
  * This file can be generated by compiling and running contrib/gdtoa/qnan.c
  * on the target architecture after arith.h has been generated.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/i386/gd_qnan.h,v 1.1 2007/01/03 05:00:03 das Exp $
  */
 
 #define f_QNAN 0xffc00000
diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc
index 89319c85fd7d1..b871096c848bd 100644
--- a/lib/libc/i386/gen/Makefile.inc
+++ b/lib/libc/i386/gen/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.23 2006/09/05 16:21:26 ru Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c fabs.S \
 	flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \
diff --git a/lib/libc/i386/gen/_ctx_start.S b/lib/libc/i386/gen/_ctx_start.S
index a990035929b6b..754a2a6d51bab 100644
--- a/lib/libc/i386/gen/_ctx_start.S
+++ b/lib/libc/i386/gen/_ctx_start.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.4 2006/06/05 14:59:33 kib Exp $");
 
 /*
  * _ctx_start((void *func)(int arg1, ..., argn),
diff --git a/lib/libc/i386/gen/_set_tp.c b/lib/libc/i386/gen/_set_tp.c
index 8a6c9295f5f28..5e3f91b2e1a16 100644
--- a/lib/libc/i386/gen/_set_tp.c
+++ b/lib/libc/i386/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.7 2005/09/12 19:52:41 stefanf Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index fabc8b9f0bb5c..e063da030f6b1 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.17 2007/01/09 00:27:58 imp Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 108e1b2fbb2db..7a26ed1b55acd 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)fabs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.10 2007/01/09 00:27:58 imp Exp $");
 
 ENTRY(fabs)
 	fldl	4(%esp)
diff --git a/lib/libc/i386/gen/flt_rounds.c b/lib/libc/i386/gen/flt_rounds.c
index 16417ffd46e20..2856636eb010a 100644
--- a/lib/libc/i386/gen/flt_rounds.c
+++ b/lib/libc/i386/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
 
 #include <float.h>
 
diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c
index 464b4029b35ae..dd54481e16f87 100644
--- a/lib/libc/i386/gen/infinity.c
+++ b/lib/libc/i386/gen/infinity.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c
index 88bbb048f3efc..8c4f755ea6ef5 100644
--- a/lib/libc/i386/gen/ldexp.c
+++ b/lib/libc/i386/gen/ldexp.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ldexp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.13 2007/01/09 00:27:58 imp Exp $");
 
 #include <math.h>
 
diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c
index 167cb12893dc6..27e7f7333c52c 100644
--- a/lib/libc/i386/gen/makecontext.c
+++ b/lib/libc/i386/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.5 2004/12/05 21:22:08 deischen Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S
index 8310a0af29619..7c5b8dbbc2b66 100644
--- a/lib/libc/i386/gen/modf.S
+++ b/lib/libc/i386/gen/modf.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)modf.s	5.5 (Berkeley) 3/18/91"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.11 2007/01/09 00:27:58 imp Exp $");
 
 /*
  * modf(value, iptr): return fractional part of value, and stores the
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libc/i386/gen/rfork_thread.S
index c0fc624f0ae36..04ad5495033af 100644
--- a/lib/libc/i386/gen/rfork_thread.S
+++ b/lib/libc/i386/gen/rfork_thread.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $");
 
 /*
  * With thanks to John Dyson for the original version of this.
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index a205c2866f236..a2584ffadfaf8 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.23 2007/01/09 00:27:58 imp Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/i386/gen/signalcontext.c b/lib/libc/i386/gen/signalcontext.c
index 877b6556a3f2e..6beb809944b45 100644
--- a/lib/libc/i386/gen/signalcontext.c
+++ b/lib/libc/i386/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.7 2004/07/02 23:20:05 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 7c1f85cbe783e..30e58bc9fe7bd 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -37,7 +37,7 @@
 	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.25 2007/01/09 00:27:58 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc
index 0a6a6a89237c3..1bb5c21e49e12 100644
--- a/lib/libc/i386/stdlib/Makefile.inc
+++ b/lib/libc/i386/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/stdlib/Makefile.inc,v 1.7 1999/08/27 23:59:26 peter Exp $
 
 MDSRCS+=abs.S div.S labs.S ldiv.S
diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S
index 861b66f7eb0b0..1289c8e704d25 100644
--- a/lib/libc/i386/stdlib/abs.S
+++ b/lib/libc/i386/stdlib/abs.S
@@ -35,7 +35,7 @@
 	.asciz "@(#)abs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.10 2007/01/09 00:27:59 imp Exp $");
 
 
 ENTRY(abs)
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index 4ef75dbdaa311..209c4cf6a1aff 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.11 2007/01/09 00:27:59 imp Exp $");
 
 ENTRY(div)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
index 28487af1f8e66..ed4b2a55c54ec 100644
--- a/lib/libc/i386/stdlib/labs.S
+++ b/lib/libc/i386/stdlib/labs.S
@@ -35,7 +35,7 @@
 	.asciz "@(#)abs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.10 2007/01/09 00:27:59 imp Exp $");
 
 
 ENTRY(labs)
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index 578eff0fe0fde..91e132a419342 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.10 2002/12/22 06:41:09 kan Exp $");
 
 ENTRY(ldiv)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index cd908a6225979..753cc9829d8f0 100644
--- a/lib/libc/i386/string/Makefile.inc
+++ b/lib/libc/i386/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/string/Makefile.inc,v 1.13 2003/04/05 04:17:05 tjr Exp $
 
 MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S memcpy.S \
 	memmove.S memset.S rindex.S strcat.S strchr.S strcmp.S strcpy.S \
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
index aa6a6ab90d9bc..5a09d7b6c44c2 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.9 2005/04/21 23:07:20 alc Exp $");
 
 /*
  * bcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S
index 1a3d588a7d536..2c5261db06b46 100644
--- a/lib/libc/i386/string/bcopy.S
+++ b/lib/libc/i386/string/bcopy.S
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcopy.S,v 1.11 2007/01/09 00:27:59 imp Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $")
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index f66bd780a8beb..fb842011f0326 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.9 2002/06/02 20:05:36 schweikh Exp $");
 
 /*
  * bzero (void *b, size_t len)
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
index 450f586c9eba9..b64411d406c5d 100644
--- a/lib/libc/i386/string/ffs.S
+++ b/lib/libc/i386/string/ffs.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * ffs(value)
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
index db0a162b2dab5..4bdde0815e5eb 100644
--- a/lib/libc/i386/string/index.S
+++ b/lib/libc/i386/string/index.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/index.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * index(s, c)
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index 639077d2696ce..5f4951a39a6a4 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.12 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * memchr (b, c, len)
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index 8aa2f4ea0413f..27c479c904c64 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.8 2002/03/23 02:44:19 obrien Exp $");
 
 /*
  * memcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/memcpy.S b/lib/libc/i386/string/memcpy.S
index f85a1a5b80213..5102bc7148e72 100644
--- a/lib/libc/i386/string/memcpy.S
+++ b/lib/libc/i386/string/memcpy.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcpy.S,v 1.2 2002/03/23 02:44:19 obrien Exp $");
 
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/i386/string/memmove.S b/lib/libc/i386/string/memmove.S
index 02330c44414bd..42b526384db24 100644
--- a/lib/libc/i386/string/memmove.S
+++ b/lib/libc/i386/string/memmove.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memmove.S,v 1.7 2002/03/23 02:44:19 obrien Exp $");
 
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index 52f0485e6368c..27eca36127201 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/memset.S,v 1.8 2002/03/23 02:44:19 obrien Exp $");
 
 /*
  * memset(void *b, int c, size_t len)
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
index f0d99f1569db1..c76cf8f499c3c 100644
--- a/lib/libc/i386/string/rindex.S
+++ b/lib/libc/i386/string/rindex.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * rindex(s, c)
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index 3a667cac2bd81..a175d5b8eac79 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strcat(s, append)
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index 19ff5d4ad3eec..87d4fda79f480 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strchr(s, c)
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index 07a87b67a50e4..6e98893f8d907 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strcmp(s1, s2)
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index a474ec1b722bf..237175a97839b 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
 
 /*
  * strcpy (dst, src)
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
index 22d683ef9f468..3f4ee5b953d34 100644
--- a/lib/libc/i386/string/strlen.S
+++ b/lib/libc/i386/string/strlen.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.9 2002/06/02 20:05:38 schweikh Exp $");
 
 /*
  * strlen (s)
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index e5953c520482f..b6c1648528a40 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.9 2002/03/23 02:44:19 obrien Exp $");
 
 /*
  * strncmp(s1, s2, n)
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 8b63ddf73cf10..9547d258076d6 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.9 2002/06/02 20:05:38 schweikh Exp $");
 
 /*
  * strrchr(s, c)
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index 80b2f3c5507cd..40a48a6792411 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/swab.S,v 1.9 2003/01/01 18:48:42 schweikh Exp $");
 
 /*
  * void
diff --git a/lib/libc/i386/string/wcschr.S b/lib/libc/i386/string/wcschr.S
index c020d74177868..588a68b81a967 100644
--- a/lib/libc/i386/string/wcschr.S
+++ b/lib/libc/i386/string/wcschr.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcschr.S,v 1.1 2003/04/05 04:17:05 tjr Exp $");
 
 /*
  * wchar_t *
diff --git a/lib/libc/i386/string/wcscmp.S b/lib/libc/i386/string/wcscmp.S
index aa441404b805e..c609544733aba 100644
--- a/lib/libc/i386/string/wcscmp.S
+++ b/lib/libc/i386/string/wcscmp.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcscmp.S,v 1.1 2003/03/10 10:54:36 tjr Exp $");
 
 /*
  * int
diff --git a/lib/libc/i386/string/wcslen.S b/lib/libc/i386/string/wcslen.S
index 2bebc1e39ed33..bb9c38002fb13 100644
--- a/lib/libc/i386/string/wcslen.S
+++ b/lib/libc/i386/string/wcslen.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcslen.S,v 1.1 2003/03/14 11:01:12 tjr Exp $");
 
 /*
  * size_t
diff --git a/lib/libc/i386/string/wmemchr.S b/lib/libc/i386/string/wmemchr.S
index a4ef081911567..9e0b41af95c4a 100644
--- a/lib/libc/i386/string/wmemchr.S
+++ b/lib/libc/i386/string/wmemchr.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/string/wmemchr.S,v 1.2 2003/03/12 06:46:16 tjr Exp $");
 
 /*
  * wchar_t *
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index 8da2ab834d0f0..3b48b7184d6e7 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.32 2007/07/04 23:23:00 peter Exp $
 
 .if !defined(COMPAT_32BIT)
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c \
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 0ee892b95e228..88256b9117c11 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.20 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S
index 5aa8d751a24a9..7908343894caa 100644
--- a/lib/libc/i386/sys/brk.S
+++ b/lib/libc/i386/sys/brk.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.11 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S
index 3e8d539f52b52..ecf4be9f1c2aa 100644
--- a/lib/libc/i386/sys/cerror.S
+++ b/lib/libc/i386/sys/cerror.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.13 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S
index a9e1e31682961..81afb1a7c9b0a 100644
--- a/lib/libc/i386/sys/exect.S
+++ b/lib/libc/i386/sys/exect.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.10 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 #include <machine/psl.h>
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libc/i386/sys/getcontext.S
index b66ad30a754b4..97f6a01db0f7d 100644
--- a/lib/libc/i386/sys/getcontext.S
+++ b/lib/libc/i386/sys/getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/getcontext.S,v 1.1 2003/09/04 00:20:40 peter Exp $");
 
 #include <SYS.h>
 
diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c
index 721c1b8cc46c3..1b0e935ec3140 100644
--- a/lib/libc/i386/sys/i386_clr_watch.c
+++ b/lib/libc/i386/sys/i386_clr_watch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_clr_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
 
 #include <machine/reg.h>
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_get_fsbase.c b/lib/libc/i386/sys/i386_get_fsbase.c
index 24c47648e4311..bc040d7d15874 100644
--- a/lib/libc/i386/sys/i386_get_fsbase.c
+++ b/lib/libc/i386/sys/i386_get_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_fsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_get_gsbase.c b/lib/libc/i386/sys/i386_get_gsbase.c
index f524f310e02c5..aca573809a2de 100644
--- a/lib/libc/i386/sys/i386_get_gsbase.c
+++ b/lib/libc/i386/sys/i386_get_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_gsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_get_ioperm.2 b/lib/libc/i386/sys/i386_get_ioperm.2
index 4d3bbf18262b4..49023e7047ed3 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.2
+++ b/lib/libc/i386/sys/i386_get_ioperm.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.2,v 1.11 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
index 7bc27f8126543..fb3f48b607851 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.c,v 1.8 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index d6bf872faa601..f5c5ebc644457 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.24 2007/01/09 00:27:59 imp Exp $
 .\"
 .Dd October 14, 2006
 .Dt I386_GET_LDT 2
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
index 73d76670bb8bf..51ac9ef585ec6 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.c,v 1.11 2004/01/09 16:52:09 nectar Exp $");
 
 #include <sys/cdefs.h>
 #include <machine/segments.h>
diff --git a/lib/libc/i386/sys/i386_set_fsbase.c b/lib/libc/i386/sys/i386_set_fsbase.c
index 6b5544641749c..733a6584347c8 100644
--- a/lib/libc/i386/sys/i386_set_fsbase.c
+++ b/lib/libc/i386/sys/i386_set_fsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_fsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_set_gsbase.c b/lib/libc/i386/sys/i386_set_gsbase.c
index aaf2312d2882c..4013e9681662b 100644
--- a/lib/libc/i386/sys/i386_set_gsbase.c
+++ b/lib/libc/i386/sys/i386_set_gsbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_gsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index 258e2af417b0b..cb3f7763ce80f 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_ioperm.c,v 1.8 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
index 0bb109aee9706..df65f9fd73521 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_ldt.c,v 1.11 2004/01/09 16:52:09 nectar Exp $");
 
 #include <sys/cdefs.h>
 #include <machine/segments.h>
diff --git a/lib/libc/i386/sys/i386_set_watch.3 b/lib/libc/i386/sys/i386_set_watch.3
index f818ee7656cef..4dc479913627c 100644
--- a/lib/libc/i386/sys/i386_set_watch.3
+++ b/lib/libc/i386/sys/i386_set_watch.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_set_watch.3,v 1.9 2006/09/17 21:27:33 ru Exp $
 .\"
 .Dd August 24, 2000
 .Os
diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c
index cc1b8ed03b7cc..325aff7b2fdd6 100644
--- a/lib/libc/i386/sys/i386_set_watch.c
+++ b/lib/libc/i386/sys/i386_set_watch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
 
 #include <machine/reg.h>
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_vm86.2 b/lib/libc/i386/sys/i386_vm86.2
index 03c1873c89845..56e4f458584d6 100644
--- a/lib/libc/i386/sys/i386_vm86.2
+++ b/lib/libc/i386/sys/i386_vm86.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.15 2003/05/22 13:02:27 ru Exp $
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index c007608e62209..02b3446f78af1 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_vm86.c,v 1.7 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/sysarch.h>
 
diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S
index ff8f99977e547..5e075a92d9106 100644
--- a/lib/libc/i386/sys/pipe.S
+++ b/lib/libc/i386/sys/pipe.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.12 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S
index bf2cf0f23a053..cd74084d5d0a3 100644
--- a/lib/libc/i386/sys/ptrace.S
+++ b/lib/libc/i386/sys/ptrace.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.10 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S
index 806c860e6a33c..22abcb4510212 100644
--- a/lib/libc/i386/sys/reboot.S
+++ b/lib/libc/i386/sys/reboot.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/reboot.S,v 1.8 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S
index 2d6d02409de86..00864e8561a6d 100644
--- a/lib/libc/i386/sys/sbrk.S
+++ b/lib/libc/i386/sys/sbrk.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.12 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S
index c5e0e5ae554c9..56632379702d2 100644
--- a/lib/libc/i386/sys/setlogin.S
+++ b/lib/libc/i386/sys/setlogin.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/setlogin.S,v 1.10 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S
index 28dc227e4ac31..ab38fa4694b9f 100644
--- a/lib/libc/i386/sys/sigreturn.S
+++ b/lib/libc/i386/sys/sigreturn.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sigreturn.S,v 1.13 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S
index 4ac8c78337fb6..0d98b910b2602 100644
--- a/lib/libc/i386/sys/syscall.S
+++ b/lib/libc/i386/sys/syscall.S
@@ -34,7 +34,7 @@
 	.asciz "@(#)syscall.s	5.1 (Berkeley) 4/23/90"
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/syscall.S,v 1.9 2007/01/09 00:27:59 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/Makefile.inc b/lib/libc/ia64/Makefile.inc
index 304377782456a..0c691e7d39dd4 100644
--- a/lib/libc/ia64/Makefile.inc
+++ b/lib/libc/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.7 2006/03/16 14:27:17 ru Exp $
 #
 # Machine dependent definitions for the ia64 architecture.
 #
diff --git a/lib/libc/ia64/SYS.h b/lib/libc/ia64/SYS.h
index eb019a26bc3b1..dbc0855d11d5a 100644
--- a/lib/libc/ia64/SYS.h
+++ b/lib/libc/ia64/SYS.h
@@ -26,7 +26,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/SYS.h,v 1.5 2007/07/04 23:18:38 peter Exp $
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/ia64/Symbol.map b/lib/libc/ia64/Symbol.map
index 97dbf1ea00754..040cbb6c46ab5 100644
--- a/lib/libc/ia64/Symbol.map
+++ b/lib/libc/ia64/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/Symbol.map,v 1.3 2007/05/31 13:01:33 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/ia64/_fpmath.h b/lib/libc/ia64/_fpmath.h
index 7f24e768ff2d5..b0e75ed0a5983 100644
--- a/lib/libc/ia64/_fpmath.h
+++ b/lib/libc/ia64/_fpmath.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/_fpmath.h,v 1.6 2005/03/07 04:55:40 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/ia64/arith.h b/lib/libc/ia64/arith.h
index 67265284dbf0a..2863185bfddd9 100644
--- a/lib/libc/ia64/arith.h
+++ b/lib/libc/ia64/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
  */
 
 /*
diff --git a/lib/libc/ia64/gd_qnan.h b/lib/libc/ia64/gd_qnan.h
index 17b439f131cc6..e4c24694c109d 100644
--- a/lib/libc/ia64/gd_qnan.h
+++ b/lib/libc/ia64/gd_qnan.h
@@ -4,7 +4,7 @@
  * This file can be generated by compiling and running contrib/gdtoa/qnan.c
  * on the target architecture after arith.h has been generated.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/gd_qnan.h,v 1.1 2007/01/03 05:00:03 das Exp $
  */
 
 #define f_QNAN 0xffc00000
diff --git a/lib/libc/ia64/gen/Makefile.inc b/lib/libc/ia64/gen/Makefile.inc
index 5358ea8c8e37d..5d575f08dd723 100644
--- a/lib/libc/ia64/gen/Makefile.inc
+++ b/lib/libc/ia64/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.13 2004/08/25 07:42:34 marcel Exp $
 
 SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
 	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _mcount.S _set_tp.c \
diff --git a/lib/libc/ia64/gen/__divdf3.S b/lib/libc/ia64/gen/__divdf3.S
index 58425d92dbaa3..e81c31d8aaf2e 100644
--- a/lib/libc/ia64/gen/__divdf3.S
+++ b/lib/libc/ia64/gen/__divdf3.S
@@ -26,7 +26,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divdf3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
   .section .text
 
diff --git a/lib/libc/ia64/gen/__divdi3.S b/lib/libc/ia64/gen/__divdi3.S
index 92e29116f6e29..3711e597cbb00 100644
--- a/lib/libc/ia64/gen/__divdi3.S
+++ b/lib/libc/ia64/gen/__divdi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divdi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 .proc __divdi3#
diff --git a/lib/libc/ia64/gen/__divsf3.S b/lib/libc/ia64/gen/__divsf3.S
index fe7bcb4d68eed..8defe7459b690 100644
--- a/lib/libc/ia64/gen/__divsf3.S
+++ b/lib/libc/ia64/gen/__divsf3.S
@@ -26,7 +26,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divsf3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 ENTRY(__divsf3, 0)
 { .mfi
diff --git a/lib/libc/ia64/gen/__divsi3.S b/lib/libc/ia64/gen/__divsi3.S
index 4c82e32ddcf13..44485917453e7 100644
--- a/lib/libc/ia64/gen/__divsi3.S
+++ b/lib/libc/ia64/gen/__divsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__divsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__moddi3.S b/lib/libc/ia64/gen/__moddi3.S
index e15f964c6ff94..6c62375a13e97 100644
--- a/lib/libc/ia64/gen/__moddi3.S
+++ b/lib/libc/ia64/gen/__moddi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__moddi3.S,v 1.3 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__modsi3.S b/lib/libc/ia64/gen/__modsi3.S
index 1939493eff38c..9d5311e1e6de4 100644
--- a/lib/libc/ia64/gen/__modsi3.S
+++ b/lib/libc/ia64/gen/__modsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__modsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__udivdi3.S b/lib/libc/ia64/gen/__udivdi3.S
index 1233e8aa4105e..faaeb2c4e6425 100644
--- a/lib/libc/ia64/gen/__udivdi3.S
+++ b/lib/libc/ia64/gen/__udivdi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__udivdi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 .proc __udivdi3#
diff --git a/lib/libc/ia64/gen/__udivsi3.S b/lib/libc/ia64/gen/__udivsi3.S
index 25959b88a9228..a238ad63ee527 100644
--- a/lib/libc/ia64/gen/__udivsi3.S
+++ b/lib/libc/ia64/gen/__udivsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__udivsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__umoddi3.S b/lib/libc/ia64/gen/__umoddi3.S
index 509c62bb687ea..9697a3a4bd92c 100644
--- a/lib/libc/ia64/gen/__umoddi3.S
+++ b/lib/libc/ia64/gen/__umoddi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__umoddi3.S,v 1.3 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/__umodsi3.S b/lib/libc/ia64/gen/__umodsi3.S
index 697db2e5d8c97..80590f50ccfce 100644
--- a/lib/libc/ia64/gen/__umodsi3.S
+++ b/lib/libc/ia64/gen/__umodsi3.S
@@ -28,7 +28,7 @@
 //
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/__umodsi3.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 .section .text
 
diff --git a/lib/libc/ia64/gen/_mcount.S b/lib/libc/ia64/gen/_mcount.S
index d9e9b76845d86..6c60a3aff1cde 100644
--- a/lib/libc/ia64/gen/_mcount.S
+++ b/lib/libc/ia64/gen/_mcount.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_mcount.S,v 1.1 2004/08/25 07:42:34 marcel Exp $");
 
 	.text
 
diff --git a/lib/libc/ia64/gen/_set_tp.c b/lib/libc/ia64/gen/_set_tp.c
index 901e90166918b..be4cc398c23a7 100644
--- a/lib/libc/ia64/gen/_set_tp.c
+++ b/lib/libc/ia64/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/ia64/gen/_set_tp.c,v 1.2 2006/08/30 00:39:06 marcel Exp $
  */
 
 void
diff --git a/lib/libc/ia64/gen/_setjmp.S b/lib/libc/ia64/gen/_setjmp.S
index 3966e836475f7..02b2e99970c3a 100644
--- a/lib/libc/ia64/gen/_setjmp.S
+++ b/lib/libc/ia64/gen/_setjmp.S
@@ -51,7 +51,7 @@
     .file   "setjmp.s"
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.11 2003/07/25 22:36:48 marcel Exp $");
 
 #define     LOCORE
 #include    <machine/setjmp.h>
diff --git a/lib/libc/ia64/gen/fabs.S b/lib/libc/ia64/gen/fabs.S
index 036d49201321e..3ef9ad9db7af6 100644
--- a/lib/libc/ia64/gen/fabs.S
+++ b/lib/libc/ia64/gen/fabs.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fabs.S,v 1.2 2003/03/03 01:09:45 obrien Exp $");
 
 ENTRY(fabs, 1)
 	fabs	fret0=farg0
diff --git a/lib/libc/ia64/gen/flt_rounds.c b/lib/libc/ia64/gen/flt_rounds.c
index d65096545abc3..759346a4ed4af 100644
--- a/lib/libc/ia64/gen/flt_rounds.c
+++ b/lib/libc/ia64/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
 
 #include <float.h>
 
diff --git a/lib/libc/ia64/gen/fpgetmask.c b/lib/libc/ia64/gen/fpgetmask.c
index ac166e249388c..dcc49365c4696 100644
--- a/lib/libc/ia64/gen/fpgetmask.c
+++ b/lib/libc/ia64/gen/fpgetmask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpgetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/ia64/gen/fpgetround.c b/lib/libc/ia64/gen/fpgetround.c
index 6f5e8cc86c4cf..bbf30d06cc105 100644
--- a/lib/libc/ia64/gen/fpgetround.c
+++ b/lib/libc/ia64/gen/fpgetround.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/gen/fpgetround.c,v 1.1 2003/01/11 07:24:54 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/ia64/gen/fpsetmask.c b/lib/libc/ia64/gen/fpsetmask.c
index d959dc6281aba..46890ea1e2d7f 100644
--- a/lib/libc/ia64/gen/fpsetmask.c
+++ b/lib/libc/ia64/gen/fpsetmask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpsetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/ia64/gen/fpsetround.c b/lib/libc/ia64/gen/fpsetround.c
index db2eef1e49c23..974b02f174b12 100644
--- a/lib/libc/ia64/gen/fpsetround.c
+++ b/lib/libc/ia64/gen/fpsetround.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/gen/fpsetround.c,v 1.1 2003/01/11 07:24:54 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/ia64/gen/infinity.c b/lib/libc/ia64/gen/infinity.c
index 1ae92a804d555..8c46c93cbb09a 100644
--- a/lib/libc/ia64/gen/infinity.c
+++ b/lib/libc/ia64/gen/infinity.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/infinity.c,v 1.7 2003/02/26 16:04:34 mike Exp $");
 
 #include <sys/endian.h>
 #include <math.h>
diff --git a/lib/libc/ia64/gen/makecontext.c b/lib/libc/ia64/gen/makecontext.c
index bee47f11ce579..b3a401db742d2 100644
--- a/lib/libc/ia64/gen/makecontext.c
+++ b/lib/libc/ia64/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/makecontext.c,v 1.3 2004/01/06 19:40:28 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/ia64/gen/modf.c b/lib/libc/ia64/gen/modf.c
index def3aadbad261..2b914baee258c 100644
--- a/lib/libc/ia64/gen/modf.c
+++ b/lib/libc/ia64/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/modf.c,v 1.3 2002/03/22 21:52:14 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/ia64/gen/setjmp.S b/lib/libc/ia64/gen/setjmp.S
index a2b56d6af9f01..785bf948f7116 100644
--- a/lib/libc/ia64/gen/setjmp.S
+++ b/lib/libc/ia64/gen/setjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/setjmp.S,v 1.10 2003/03/05 03:30:54 marcel Exp $");
 
 #define     LOCORE
 #include    <machine/setjmp.h>
diff --git a/lib/libc/ia64/gen/signalcontext.c b/lib/libc/ia64/gen/signalcontext.c
index b47daf37d9ea6..9b7b495505772 100644
--- a/lib/libc/ia64/gen/signalcontext.c
+++ b/lib/libc/ia64/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/signalcontext.c,v 1.2 2004/01/06 19:40:28 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/ia64/gen/sigsetjmp.S b/lib/libc/ia64/gen/sigsetjmp.S
index 9f02a26a5a7ab..ba9a20f3d13be 100644
--- a/lib/libc/ia64/gen/sigsetjmp.S
+++ b/lib/libc/ia64/gen/sigsetjmp.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/sigsetjmp.S,v 1.7 2003/03/03 01:09:45 obrien Exp $");
 
 #define LOCORE
 #include <machine/setjmp.h>
diff --git a/lib/libc/ia64/gen/unwind.c b/lib/libc/ia64/gen/unwind.c
index 7afd0eff496ea..2eb3627680767 100644
--- a/lib/libc/ia64/gen/unwind.c
+++ b/lib/libc/ia64/gen/unwind.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/ia64/gen/unwind.c,v 1.2 2003/11/08 05:29:49 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/ia64/stdlib/Makefile.inc b/lib/libc/ia64/stdlib/Makefile.inc
index dda8c76018d82..bf2bd66872e16 100644
--- a/lib/libc/ia64/stdlib/Makefile.inc
+++ b/lib/libc/ia64/stdlib/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/stdlib/Makefile.inc,v 1.1 2000/10/14 17:01:12 dfr Exp $
 
 MDSRCS+=	abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/ia64/string/Makefile.inc b/lib/libc/ia64/string/Makefile.inc
index 7bbcc8de10e91..47b5fc3f5b10b 100644
--- a/lib/libc/ia64/string/Makefile.inc
+++ b/lib/libc/ia64/string/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/string/Makefile.inc,v 1.1 2000/10/14 17:01:12 dfr Exp $
 
 MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc/ia64/string/bcopy.S b/lib/libc/ia64/string/bcopy.S
index 34aac1984cf4c..ec9851d46f02a 100644
--- a/lib/libc/ia64/string/bcopy.S
+++ b/lib/libc/ia64/string/bcopy.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/bcopy.S,v 1.3 2004/02/10 20:45:28 cperciva Exp $");
 
 /*
  * Not the fastest bcopy in the world.
diff --git a/lib/libc/ia64/string/bzero.S b/lib/libc/ia64/string/bzero.S
index 0963c36aac80d..86c8cc25f98cb 100644
--- a/lib/libc/ia64/string/bzero.S
+++ b/lib/libc/ia64/string/bzero.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/bzero.S,v 1.6 2004/02/10 20:45:28 cperciva Exp $");
 
 ENTRY(bzero, 2)
 	
diff --git a/lib/libc/ia64/string/ffs.S b/lib/libc/ia64/string/ffs.S
index d99d765813417..2f667eb265232 100644
--- a/lib/libc/ia64/string/ffs.S
+++ b/lib/libc/ia64/string/ffs.S
@@ -32,7 +32,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/ffs.S,v 1.3 2003/03/03 01:09:46 obrien Exp $");
 
 ENTRY(ffs, 1)
 	sxt4	r14=in0 ;;
diff --git a/lib/libc/ia64/string/memcpy.S b/lib/libc/ia64/string/memcpy.S
index d7557c1f039f2..9b579c391ac13 100644
--- a/lib/libc/ia64/string/memcpy.S
+++ b/lib/libc/ia64/string/memcpy.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/memcpy.S,v 1.3 2004/09/04 00:04:58 marcel Exp $");
 
 ENTRY(memcpy,3)
 	mov	r8 = in0
diff --git a/lib/libc/ia64/string/memmove.S b/lib/libc/ia64/string/memmove.S
index 19fa8affc3998..07c989569d45a 100644
--- a/lib/libc/ia64/string/memmove.S
+++ b/lib/libc/ia64/string/memmove.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/string/memmove.S,v 1.3 2004/09/04 00:23:15 marcel Exp $");
 
 ENTRY(memmove,3)
 	mov	r8 = in0
diff --git a/lib/libc/ia64/sys/Makefile.inc b/lib/libc/ia64/sys/Makefile.inc
index 0b577b9790c1a..46cb72151a5ae 100644
--- a/lib/libc/ia64/sys/Makefile.inc
+++ b/lib/libc/ia64/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/ia64/sys/Makefile.inc,v 1.9 2007/07/04 23:23:00 peter Exp $
 
 MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \
 	sbrk.S setlogin.S sigreturn.S swapcontext.S
diff --git a/lib/libc/ia64/sys/Ovfork.S b/lib/libc/ia64/sys/Ovfork.S
index 6eb69583f7e91..cdcd776d7c606 100644
--- a/lib/libc/ia64/sys/Ovfork.S
+++ b/lib/libc/ia64/sys/Ovfork.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/Ovfork.S,v 1.6 2003/08/01 22:17:12 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/brk.S b/lib/libc/ia64/sys/brk.S
index fee1728bc0dae..fa7f3d0f2d57d 100644
--- a/lib/libc/ia64/sys/brk.S
+++ b/lib/libc/ia64/sys/brk.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/brk.S,v 1.4 2003/05/16 21:26:39 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/cerror.S b/lib/libc/ia64/sys/cerror.S
index ca0b0c735b1b2..d7a31670a6911 100644
--- a/lib/libc/ia64/sys/cerror.S
+++ b/lib/libc/ia64/sys/cerror.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/cerror.S,v 1.2 2003/03/03 01:09:46 obrien Exp $");
 
 
 ENTRY(.cerror, 0)
diff --git a/lib/libc/ia64/sys/exect.S b/lib/libc/ia64/sys/exect.S
index 817d3b1b38481..fe43441d87cab 100644
--- a/lib/libc/ia64/sys/exect.S
+++ b/lib/libc/ia64/sys/exect.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/exect.S,v 1.2 2003/03/03 01:09:46 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/fork.S b/lib/libc/ia64/sys/fork.S
index 5b09f77118205..601b023e9eca2 100644
--- a/lib/libc/ia64/sys/fork.S
+++ b/lib/libc/ia64/sys/fork.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/fork.S,v 1.6 2003/08/01 22:17:12 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/getcontext.S b/lib/libc/ia64/sys/getcontext.S
index 0ec6f92e4f85a..d2ee8d0af1a75 100644
--- a/lib/libc/ia64/sys/getcontext.S
+++ b/lib/libc/ia64/sys/getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/getcontext.S,v 1.1 2003/08/02 00:49:36 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/pipe.S b/lib/libc/ia64/sys/pipe.S
index a6413dfd464bd..2ac4d239179eb 100644
--- a/lib/libc/ia64/sys/pipe.S
+++ b/lib/libc/ia64/sys/pipe.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/pipe.S,v 1.4 2003/05/16 21:26:39 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/ptrace.S b/lib/libc/ia64/sys/ptrace.S
index b6d3abdedda9d..0a6be54ccb71a 100644
--- a/lib/libc/ia64/sys/ptrace.S
+++ b/lib/libc/ia64/sys/ptrace.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/ptrace.S,v 1.3 2003/03/03 01:09:46 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/sbrk.S b/lib/libc/ia64/sys/sbrk.S
index 98b5ce92c21f7..a554f54a5dc2e 100644
--- a/lib/libc/ia64/sys/sbrk.S
+++ b/lib/libc/ia64/sys/sbrk.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.5 2003/05/16 21:26:39 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/setlogin.S b/lib/libc/ia64/sys/setlogin.S
index 1d29a40664a31..1de787caf5dd3 100644
--- a/lib/libc/ia64/sys/setlogin.S
+++ b/lib/libc/ia64/sys/setlogin.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/setlogin.S,v 1.4 2003/08/01 22:17:12 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/sigreturn.S b/lib/libc/ia64/sys/sigreturn.S
index 2c7a710a14619..da4a329f14b99 100644
--- a/lib/libc/ia64/sys/sigreturn.S
+++ b/lib/libc/ia64/sys/sigreturn.S
@@ -28,7 +28,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sigreturn.S,v 1.3 2003/03/03 01:09:46 obrien Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/ia64/sys/swapcontext.S b/lib/libc/ia64/sys/swapcontext.S
index 210189f6ff4ff..e96751c9d45e5 100644
--- a/lib/libc/ia64/sys/swapcontext.S
+++ b/lib/libc/ia64/sys/swapcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/swapcontext.S,v 1.1 2003/08/02 00:49:36 marcel Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h
index d33cfdc14817e..b252b587fea86 100644
--- a/lib/libc/include/fpmath.h
+++ b/lib/libc/include/fpmath.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/fpmath.h,v 1.3 2005/02/06 03:23:31 das Exp $
  */
 
 #include <sys/endian.h>
diff --git a/lib/libc/include/isc/list.h b/lib/libc/include/isc/list.h
index fef631b4c9cac..ef98e45ea578f 100644
--- a/lib/libc/include/isc/list.h
+++ b/lib/libc/include/isc/list.h
@@ -15,7 +15,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/include/isc/list.h,v 1.3 2007/06/03 18:13:59 ume Exp $ */
 
 #ifndef LIST_H
 #define LIST_H 1
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index de4bbe44151cf..4a173874be131 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.17 2007/07/04 23:27:38 peter Exp $
  *
  * Private definitions for libc, libc_r and libpthread.
  *
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 9ad181e2f4e38..c06c8fc85731a 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/namespace.h,v 1.20 2006/03/28 18:48:49 des Exp $
  */
 
 #ifndef _NAMESPACE_H_
diff --git a/lib/libc/include/nscache.h b/lib/libc/include/nscache.h
index 015c4ec74ffe9..c8bbdb4592105 100644
--- a/lib/libc/include/nscache.h
+++ b/lib/libc/include/nscache.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/nscache.h,v 1.1 2006/04/28 12:03:35 ume Exp $
  */
 
 #ifndef __NS_CACHE_H__
diff --git a/lib/libc/include/nscachedcli.h b/lib/libc/include/nscachedcli.h
index b0f79bd9d05ca..329f42b964b0a 100644
--- a/lib/libc/include/nscachedcli.h
+++ b/lib/libc/include/nscachedcli.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/nscachedcli.h,v 1.1 2006/04/28 12:03:35 ume Exp $
  */
 
 #ifndef __NS_CACHED_CLI_H__
diff --git a/lib/libc/include/nss_tls.h b/lib/libc/include/nss_tls.h
index 13ab367d06b5f..7420f9225f9b6 100644
--- a/lib/libc/include/nss_tls.h
+++ b/lib/libc/include/nss_tls.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/nss_tls.h,v 1.3 2004/03/30 15:56:15 nectar Exp $
  *
  * Macros which generate thread local storage handling code in NSS modules.
  */
diff --git a/lib/libc/include/port_after.h b/lib/libc/include/port_after.h
index 94f3a6431e98f..068916be667ef 100644
--- a/lib/libc/include/port_after.h
+++ b/lib/libc/include/port_after.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/include/port_after.h,v 1.2 2006/03/21 18:31:24 ume Exp $ */
 
 #ifndef _PORT_AFTER_H_
 #define _PORT_AFTER_H_
diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h
index beef71d02607b..9bd12899d3a8e 100644
--- a/lib/libc/include/port_before.h
+++ b/lib/libc/include/port_before.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/include/port_before.h,v 1.1 2006/03/21 15:37:15 ume Exp $ */
 
 #ifndef _PORT_BEFORE_H_
 #define _PORT_BEFORE_H_
diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
index 8ab328bc62797..07af90ab85d0e 100644
--- a/lib/libc/include/reentrant.h
+++ b/lib/libc/include/reentrant.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/reentrant.h,v 1.3 2004/02/25 21:03:45 green Exp $
  */
 
 /*
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index c9facc517d52f..79577edb468b1 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.8 2007/01/12 07:31:30 imp Exp $
  *
  * Lock definitions used in both libc and libpthread.
  *
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
index ccdc2a1f2bb3e..944f237b34c05 100644
--- a/lib/libc/include/un-namespace.h
+++ b/lib/libc/include/un-namespace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.17 2006/03/28 18:48:49 des Exp $
  */
 
 #ifndef _UN_NAMESPACE_H_
diff --git a/lib/libc/inet/Makefile.inc b/lib/libc/inet/Makefile.inc
index 0e6cc395a38d8..b3f3620d43106 100644
--- a/lib/libc/inet/Makefile.inc
+++ b/lib/libc/inet/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/inet/Makefile.inc,v 1.2 2006/03/23 16:55:12 des Exp $
 
 # inet sources
 .PATH: ${.CURDIR}/inet
diff --git a/lib/libc/inet/Symbol.map b/lib/libc/inet/Symbol.map
index f188b137de949..2795ca1d189b8 100644
--- a/lib/libc/inet/Symbol.map
+++ b/lib/libc/inet/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/inet/Symbol.map,v 1.3 2007/06/11 07:21:21 delphij Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
index e606d345b8b1a..a4daa3a156d19 100644
--- a/lib/libc/inet/inet_addr.c
+++ b/lib/libc/inet/inet_addr.c
@@ -69,7 +69,7 @@ static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
 static const char rcsid[] = "$Id: inet_addr.c,v 1.4.18.1 2005/04/27 05:00:52 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_addr.c,v 1.4 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
index b0586ff30ffa2..11f035c6f4d51 100644
--- a/lib/libc/inet/inet_cidr_pton.c
+++ b/lib/libc/inet/inet_cidr_pton.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.5.18.1 2005/04/27 05:00:53 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_cidr_pton.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c
index 7cab8946bba93..44a0835016341 100644
--- a/lib/libc/inet/inet_lnaof.c
+++ b/lib/libc/inet/inet_lnaof.c
@@ -31,7 +31,7 @@
 static const char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_lnaof.c,v 1.4 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c
index 04a37a0347930..0a0e3026a842b 100644
--- a/lib/libc/inet/inet_makeaddr.c
+++ b/lib/libc/inet/inet_makeaddr.c
@@ -31,7 +31,7 @@
 static const char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_makeaddr.c,v 1.4 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c
index 867f441af4b07..890b3aaa27fdf 100644
--- a/lib/libc/inet/inet_net_ntop.c
+++ b/lib/libc/inet/inet_net_ntop.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3.18.2 2006/06/20 02:51:32 marka Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_ntop.c,v 1.4 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c
index 06d1da95124b0..5c6598b89e3f5 100644
--- a/lib/libc/inet/inet_net_pton.c
+++ b/lib/libc/inet/inet_net_pton.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.1 2005/04/27 05:00:53 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_pton.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c
index 72ac549ffe166..3914b8a7de4aa 100644
--- a/lib/libc/inet/inet_neta.c
+++ b/lib/libc/inet/inet_neta.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: inet_neta.c,v 1.2.18.1 2005/04/27 05:00:53 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_neta.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c
index 8931c30fb03ad..8d5256b7e509e 100644
--- a/lib/libc/inet/inet_netof.c
+++ b/lib/libc/inet/inet_netof.c
@@ -31,7 +31,7 @@
 static const char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_netof.c,v 1.4 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c
index 254db41acb2dd..433edbb6e6786 100644
--- a/lib/libc/inet/inet_network.c
+++ b/lib/libc/inet/inet_network.c
@@ -31,7 +31,7 @@
 static const char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_network.c,v 1.4.4.1 2008/01/14 22:55:54 cperciva Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
index f5d69fac583c2..0c189e507d37a 100644
--- a/lib/libc/inet/inet_ntoa.c
+++ b/lib/libc/inet/inet_ntoa.c
@@ -32,7 +32,7 @@ static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: inet_ntoa.c,v 1.1.352.1 2005/04/27 05:00:54 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_ntoa.c,v 1.6 2007/06/14 07:13:28 delphij Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
index 6d210279d516c..1458c87a70654 100644
--- a/lib/libc/inet/inet_ntop.c
+++ b/lib/libc/inet/inet_ntop.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_ntop.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
index ae65099000023..95af6a5461657 100644
--- a/lib/libc/inet/inet_pton.c
+++ b/lib/libc/inet/inet_pton.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_pton.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 #include <sys/param.h>
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
index 29474729b16da..fd34e0ef17f9d 100644
--- a/lib/libc/inet/nsap_addr.c
+++ b/lib/libc/inet/nsap_addr.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: nsap_addr.c,v 1.3.18.2 2005/07/28 07:38:08 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/inet/nsap_addr.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/isc/Makefile.inc b/lib/libc/isc/Makefile.inc
index 48c90f7f66e6e..a7512ab0381c0 100644
--- a/lib/libc/isc/Makefile.inc
+++ b/lib/libc/isc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/isc/Makefile.inc,v 1.1 2006/03/21 15:37:16 ume Exp $
 
 # isc sources
 .PATH: ${.CURDIR}/isc
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
index 06bdfad57376a..bc662b9d0cf13 100644
--- a/lib/libc/isc/ev_streams.c
+++ b/lib/libc/isc/ev_streams.c
@@ -23,7 +23,7 @@
 static const char rcsid[] = "$Id: ev_streams.c,v 1.4.18.1 2005/04/27 05:01:06 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/isc/ev_streams.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 #ifndef _LIBC
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
index 66fc1861007ce..a63764d988d6a 100644
--- a/lib/libc/isc/ev_timers.c
+++ b/lib/libc/isc/ev_timers.c
@@ -23,7 +23,7 @@
 static const char rcsid[] = "$Id: ev_timers.c,v 1.5.18.1 2005/04/27 05:01:06 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/isc/ev_timers.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h
index 951af0038a4cb..872435f3f0b5c 100644
--- a/lib/libc/isc/eventlib_p.h
+++ b/lib/libc/isc/eventlib_p.h
@@ -20,7 +20,7 @@
  * \author vix 09sep95 [initial]
  *
  * $Id: eventlib_p.h,v 1.5.18.4 2006/03/10 00:20:08 marka Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/isc/eventlib_p.h,v 1.5 2007/06/03 17:20:26 ume Exp $
  */
 
 #ifndef _EVENTLIB_P_H
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 24ac904050052..73f322828dbaf 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.61 2006/03/13 01:14:57 deischen Exp $
 
 # locale sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale
diff --git a/lib/libc/locale/Symbol.map b/lib/libc/locale/Symbol.map
index 20d092bb10762..ddb47dbc8e4e3 100644
--- a/lib/libc/locale/Symbol.map
+++ b/lib/libc/locale/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.3.2.1 2007/10/24 14:29:31 rafan Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/locale/big5.5 b/lib/libc/locale/big5.5
index 13d0c7b64e535..8319d9f56d5c2 100644
--- a/lib/libc/locale/big5.5
+++ b/lib/libc/locale/big5.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/big5.5,v 1.3 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt BIG5 5
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c
index 19977d035dc51..af52450100a61 100644
--- a/lib/libc/locale/big5.c
+++ b/lib/libc/locale/big5.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)big5.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17.10.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/locale/btowc.3 b/lib/libc/locale/btowc.3
index 85ee7515f948e..da9d1e5103b52 100644
--- a/lib/libc/locale/btowc.3
+++ b/lib/libc/locale/btowc.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/btowc.3,v 1.2 2002/11/10 11:14:58 tjr Exp $
 .\"
 .Dd August 3, 2002
 .Dt BTOWC 3
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index 2c4d493b89a1f..44b501e28479e 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/btowc.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index 683359800d615..184fac6114096 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.35 2005/02/27 20:31:13 ru Exp $");
 
 #include "namespace.h"
 #include <arpa/inet.h>
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 2f5f5d40eff08..a8d2176b2e264 100644
--- a/lib/libc/locale/collate.h
+++ b/lib/libc/locale/collate.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/collate.h,v 1.15 2005/02/27 20:31:13 ru Exp $
  */
 
 #ifndef _COLLATE_H_
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index 313e04384f2e6..dde67a4e09488 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.18 2005/02/27 14:54:23 phantom Exp $");
 
 #include <string.h>
 #include "collate.h"
diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index fdc135878f7fe..32bf74070ce3f 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.16 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd March 30, 2004
 .Dt CTYPE 3
diff --git a/lib/libc/locale/digittoint.3 b/lib/libc/locale/digittoint.3
index 372e00f2f8d82..b7238a488b4b7 100644
--- a/lib/libc/locale/digittoint.3
+++ b/lib/libc/locale/digittoint.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)digittoint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/digittoint.3,v 1.4 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd April 6, 2001
 .Dt DIGITTOINT 3
diff --git a/lib/libc/locale/euc.5 b/lib/libc/locale/euc.5
index b438ede8ddcdb..03619e7ca5981 100644
--- a/lib/libc/locale/euc.5
+++ b/lib/libc/locale/euc.5
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)euc.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/euc.5,v 1.13 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd November 8, 2003
 .Dt EUC 5
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index 188073e49e38d..b9f6b8406d57d 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)euc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21.10.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
index 2e5bc047d592b..ab08f3f2cbd5c 100644
--- a/lib/libc/locale/fix_grouping.c
+++ b/lib/libc/locale/fix_grouping.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/lib/libc/locale/gb18030.5 b/lib/libc/locale/gb18030.5
index 3a296c017844d..5e708652d3811 100644
--- a/lib/libc/locale/gb18030.5
+++ b/lib/libc/locale/gb18030.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/gb18030.5,v 1.6 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 10, 2003
 .Dt GB18030 5
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
index 1457d3e7540c3..a68b56c24f3bb 100644
--- a/lib/libc/locale/gb18030.c
+++ b/lib/libc/locale/gb18030.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7.10.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/gb2312.5 b/lib/libc/locale/gb2312.5
index 5f1f712097d54..1524462b72ed9 100644
--- a/lib/libc/locale/gb2312.5
+++ b/lib/libc/locale/gb2312.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/gb2312.5,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd November 7, 2003
 .Dt GB2312 5
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
index 74a7bdc3be79a..59761d2570529 100644
--- a/lib/libc/locale/gb2312.c
+++ b/lib/libc/locale/gb2312.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9.10.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <errno.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/gbk.5 b/lib/libc/locale/gbk.5
index cec22c6395408..c1f2539839a51 100644
--- a/lib/libc/locale/gbk.5
+++ b/lib/libc/locale/gbk.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/gbk.5,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 10, 2003
 .Dt GBK 5
diff --git a/lib/libc/locale/gbk.c b/lib/libc/locale/gbk.c
index 802f78e7c1775..524ba2c72bf4c 100644
--- a/lib/libc/locale/gbk.c
+++ b/lib/libc/locale/gbk.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.13.2.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/locale/isalnum.3 b/lib/libc/locale/isalnum.3
index 624a6e2335d70..06ffcfa5cc1af 100644
--- a/lib/libc/locale/isalnum.3
+++ b/lib/libc/locale/isalnum.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isalnum.3,v 1.22 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISALNUM 3
diff --git a/lib/libc/locale/isalpha.3 b/lib/libc/locale/isalpha.3
index 0bd3cda3c72cc..1968a65ece42a 100644
--- a/lib/libc/locale/isalpha.3
+++ b/lib/libc/locale/isalpha.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalpha.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isalpha.3,v 1.21 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISALPHA 3
diff --git a/lib/libc/locale/isascii.3 b/lib/libc/locale/isascii.3
index f7e1325db59d3..8db28e5945291 100644
--- a/lib/libc/locale/isascii.3
+++ b/lib/libc/locale/isascii.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isascii.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isascii.3,v 1.14 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd October 6, 2002
 .Dt ISASCII 3
diff --git a/lib/libc/locale/isblank.3 b/lib/libc/locale/isblank.3
index 4cc6bbbce80eb..3502b209fd4c6 100644
--- a/lib/libc/locale/isblank.3
+++ b/lib/libc/locale/isblank.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isblank.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.23 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISBLANK 3
diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3
index a67e6a42bb616..71bf057fcae46 100644
--- a/lib/libc/locale/iscntrl.3
+++ b/lib/libc/locale/iscntrl.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)iscntrl.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/iscntrl.3,v 1.20 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISCNTRL 3
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index be1b091237fcf..6916c4dde5c8a 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)isctype.c	8.3 (Berkeley) 2/24/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.10.2.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <ctype.h>
 
diff --git a/lib/libc/locale/isdigit.3 b/lib/libc/locale/isdigit.3
index 53b198606e7fc..0aa9f591bb09d 100644
--- a/lib/libc/locale/isdigit.3
+++ b/lib/libc/locale/isdigit.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isdigit.3,v 1.23 2007/05/04 16:01:07 gabor Exp $
 .\"
 .Dd May 4, 2007
 .Dt ISDIGIT 3
diff --git a/lib/libc/locale/isgraph.3 b/lib/libc/locale/isgraph.3
index 4ba78e3c4d9ec..e9be94bff6ebc 100644
--- a/lib/libc/locale/isgraph.3
+++ b/lib/libc/locale/isgraph.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.22 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISGRAPH 3
diff --git a/lib/libc/locale/isideogram.3 b/lib/libc/locale/isideogram.3
index cbaa625e91dff..e4fe16ba0cd68 100644
--- a/lib/libc/locale/isideogram.3
+++ b/lib/libc/locale/isideogram.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isideogram.3,v 1.2 2004/07/04 20:55:48 ru Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISIDEOGRAM 3
diff --git a/lib/libc/locale/islower.3 b/lib/libc/locale/islower.3
index d72e7cf5b121e..9f68255493bdf 100644
--- a/lib/libc/locale/islower.3
+++ b/lib/libc/locale/islower.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)islower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/islower.3,v 1.20 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISLOWER 3
diff --git a/lib/libc/locale/isphonogram.3 b/lib/libc/locale/isphonogram.3
index b0d82c428cba3..66bd0062c3994 100644
--- a/lib/libc/locale/isphonogram.3
+++ b/lib/libc/locale/isphonogram.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isphonogram.3,v 1.1 2004/03/30 07:23:54 tjr Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISPHONOGRAM 3
diff --git a/lib/libc/locale/isprint.3 b/lib/libc/locale/isprint.3
index f3408501c29f6..7dd47d0c02667 100644
--- a/lib/libc/locale/isprint.3
+++ b/lib/libc/locale/isprint.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isprint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.23 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISPRINT 3
diff --git a/lib/libc/locale/ispunct.3 b/lib/libc/locale/ispunct.3
index aa0246107e4e3..fc333d682c3f3 100644
--- a/lib/libc/locale/ispunct.3
+++ b/lib/libc/locale/ispunct.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ispunct.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/ispunct.3,v 1.21 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISPUNCT 3
diff --git a/lib/libc/locale/isrune.3 b/lib/libc/locale/isrune.3
index 424c367d20144..2b1f64f6cb352 100644
--- a/lib/libc/locale/isrune.3
+++ b/lib/libc/locale/isrune.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isrune.3,v 1.1 2004/03/30 07:23:54 tjr Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISRUNE 3
diff --git a/lib/libc/locale/isspace.3 b/lib/libc/locale/isspace.3
index f1e08d6cdfee5..221fd05862ff6 100644
--- a/lib/libc/locale/isspace.3
+++ b/lib/libc/locale/isspace.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isspace.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isspace.3,v 1.20 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISSPACE 3
diff --git a/lib/libc/locale/isspecial.3 b/lib/libc/locale/isspecial.3
index de361d28f96ba..57eefc8221c35 100644
--- a/lib/libc/locale/isspecial.3
+++ b/lib/libc/locale/isspecial.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isspecial.3,v 1.1 2004/03/30 07:23:54 tjr Exp $
 .\"
 .Dd March 30, 2004
 .Dt ISSPECIAL 3
diff --git a/lib/libc/locale/isupper.3 b/lib/libc/locale/isupper.3
index 6aeb5ac9aa3dd..e4df8ed8d2218 100644
--- a/lib/libc/locale/isupper.3
+++ b/lib/libc/locale/isupper.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isupper.3,v 1.21 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISUPPER 3
diff --git a/lib/libc/locale/iswalnum.3 b/lib/libc/locale/iswalnum.3
index 89960974f19d1..f50a1b5f09364 100644
--- a/lib/libc/locale/iswalnum.3
+++ b/lib/libc/locale/iswalnum.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/iswalnum.3,v 1.6 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd October 3, 2002
 .Dt ISWALNUM 3
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index eaa1bf3d27806..4b4483cffb131 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.7 2007/01/09 00:28:00 imp Exp $");
 
 #include <wctype.h>
 
diff --git a/lib/libc/locale/isxdigit.3 b/lib/libc/locale/isxdigit.3
index 1fb54bf94f5dd..adac1218abd29 100644
--- a/lib/libc/locale/isxdigit.3
+++ b/lib/libc/locale/isxdigit.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isxdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/isxdigit.3,v 1.23 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISXDIGIT 3
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index ea7b3886ada83..932165ff67e42 100644
--- a/lib/libc/locale/ldpart.c
+++ b/lib/libc/locale/ldpart.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.15 2004/04/25 19:56:50 ache Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/locale/ldpart.h b/lib/libc/locale/ldpart.h
index 45f7339fe8fb8..02e0c9502b09a 100644
--- a/lib/libc/locale/ldpart.h
+++ b/lib/libc/locale/ldpart.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/ldpart.h,v 1.6 2003/06/13 00:14:07 jkh Exp $
  */
 
 #ifndef _LDPART_H_
diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c
index 3498be2a6e8e9..488b5728c332f 100644
--- a/lib/libc/locale/lmessages.c
+++ b/lib/libc/locale/lmessages.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.14 2003/06/26 10:46:16 phantom Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/locale/lmessages.h b/lib/libc/locale/lmessages.h
index 41dcfa98ca6b3..ee690ae7c1cc8 100644
--- a/lib/libc/locale/lmessages.h
+++ b/lib/libc/locale/lmessages.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/lmessages.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
  */
 
 #ifndef _LMESSAGES_H_
diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c
index 8d55ab2c6e5de..e3e709585c323 100644
--- a/lib/libc/locale/lmonetary.c
+++ b/lib/libc/locale/lmonetary.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.19 2003/06/26 10:46:16 phantom Exp $");
 
 #include <limits.h>
 #include <stddef.h>
diff --git a/lib/libc/locale/lmonetary.h b/lib/libc/locale/lmonetary.h
index 45ec3235b5780..e278ea5135118 100644
--- a/lib/libc/locale/lmonetary.h
+++ b/lib/libc/locale/lmonetary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/lmonetary.h,v 1.4 2002/10/09 09:19:28 tjr Exp $
  */
 
 #ifndef _LMONETARY_H_
diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c
index d4ed04f659453..ff9c94871e6a5 100644
--- a/lib/libc/locale/lnumeric.c
+++ b/lib/libc/locale/lnumeric.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.16 2003/06/26 10:46:16 phantom Exp $");
 
 #include <limits.h>
 
diff --git a/lib/libc/locale/lnumeric.h b/lib/libc/locale/lnumeric.h
index cc6965b62cc74..9678c1f02c1a0 100644
--- a/lib/libc/locale/lnumeric.h
+++ b/lib/libc/locale/lnumeric.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/lnumeric.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
  */
 
 #ifndef _LNUMERIC_H_
diff --git a/lib/libc/locale/localeconv.3 b/lib/libc/locale/localeconv.3
index e03515eea538e..092f670238c48 100644
--- a/lib/libc/locale/localeconv.3
+++ b/lib/libc/locale/localeconv.3
@@ -30,7 +30,7 @@
 .\"
 .\" From @(#)setlocale.3	8.1 (Berkeley) 6/9/93
 .\" From FreeBSD: src/lib/libc/locale/setlocale.3,v 1.28 2003/11/15 02:26:04 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/localeconv.3,v 1.3 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd November 21, 2003
 .Dt LOCALECONV 3
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index 97c22dd1d1340..1420aa88f578c 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)localeconv.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $");
 
 #include <locale.h>
 
diff --git a/lib/libc/locale/mblen.3 b/lib/libc/locale/mblen.3
index f142f390a8fbd..adfd58ad873b1 100644
--- a/lib/libc/locale/mblen.3
+++ b/lib/libc/locale/mblen.3
@@ -31,7 +31,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mblen.3,v 1.6 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd April 11, 2004
 .Dt MBLEN 3
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
index 4a2cc5cbcde8b..2891e90e99bd9 100644
--- a/lib/libc/locale/mblen.c
+++ b/lib/libc/locale/mblen.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.9 2004/07/29 06:18:40 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
index e424ebe94fe5b..63c5b16aa11b1 100644
--- a/lib/libc/locale/mblocal.h
+++ b/lib/libc/locale/mblocal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/mblocal.h,v 1.5 2005/02/27 15:11:09 phantom Exp $
  */
 
 #ifndef _MBLOCAL_H_
diff --git a/lib/libc/locale/mbrlen.3 b/lib/libc/locale/mbrlen.3
index 524d2c7b4016f..ce33175353b5a 100644
--- a/lib/libc/locale/mbrlen.3
+++ b/lib/libc/locale/mbrlen.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.8 2004/06/30 19:32:41 ru Exp $
 .\"
 .Dd April 7, 2004
 .Dt MBRLEN 3
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index b4c3a04694d41..33f7ea02c0b37 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/mbrtowc.3 b/lib/libc/locale/mbrtowc.3
index 10160d1916fd5..ab7138eb54173 100644
--- a/lib/libc/locale/mbrtowc.3
+++ b/lib/libc/locale/mbrtowc.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.5 2004/06/30 19:32:41 ru Exp $
 .\"
 .Dd April 8, 2004
 .Dt MBRTOWC 3
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
index 42d5f7a178d61..9b19d1046b51c 100644
--- a/lib/libc/locale/mbrtowc.c
+++ b/lib/libc/locale/mbrtowc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.7 2004/05/12 14:09:04 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/mbsinit.3 b/lib/libc/locale/mbsinit.3
index afc2500c3a771..e2a9e46143b0e 100644
--- a/lib/libc/locale/mbsinit.3
+++ b/lib/libc/locale/mbsinit.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbsinit.3,v 1.3 2004/04/08 09:59:02 tjr Exp $
 .\"
 .Dd April 8, 2004
 .Dt MBSINIT 3
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
index 24408c7f573e7..cddb56726acdd 100644
--- a/lib/libc/locale/mbsinit.c
+++ b/lib/libc/locale/mbsinit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsinit.c,v 1.3 2004/05/12 14:09:04 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/mbsnrtowcs.c b/lib/libc/locale/mbsnrtowcs.c
index 5284087fb4c1c..3e65b154b58b5 100644
--- a/lib/libc/locale/mbsnrtowcs.c
+++ b/lib/libc/locale/mbsnrtowcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsnrtowcs.c,v 1.1 2004/07/21 10:54:57 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/mbsrtowcs.3 b/lib/libc/locale/mbsrtowcs.3
index eaf9f9093056f..dce9c781c87a0 100644
--- a/lib/libc/locale/mbsrtowcs.3
+++ b/lib/libc/locale/mbsrtowcs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.6 2005/01/11 20:50:49 ru Exp $
 .Dd July 21, 2004
 .Dt MBSRTOWCS 3
 .Os
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index 1239c82c337ff..12feaab5ead0d 100644
--- a/lib/libc/locale/mbsrtowcs.c
+++ b/lib/libc/locale/mbsrtowcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
index fb9168303ad1e..f710b8b4bbf13 100644
--- a/lib/libc/locale/mbstowcs.3
+++ b/lib/libc/locale/mbstowcs.3
@@ -31,7 +31,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbstowcs.3,v 1.5 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd April 8, 2004
 .Dt MBSTOWCS 3
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
index ad259d84dab37..ab2e849eeb7d1 100644
--- a/lib/libc/locale/mbstowcs.c
+++ b/lib/libc/locale/mbstowcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.11 2004/07/21 10:54:57 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/mbtowc.3 b/lib/libc/locale/mbtowc.3
index b59dbf4b31441..9481c63fe6cf6 100644
--- a/lib/libc/locale/mbtowc.3
+++ b/lib/libc/locale/mbtowc.3
@@ -31,7 +31,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mbtowc.3,v 1.5 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd April 11, 2004
 .Dt MBTOWC 3
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index ad5b735256351..5e3a3683e62bb 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.11 2004/07/29 06:18:40 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/mskanji.5 b/lib/libc/locale/mskanji.5
index 8ebaccdd7af2b..29802d5a70151 100644
--- a/lib/libc/locale/mskanji.5
+++ b/lib/libc/locale/mskanji.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/mskanji.5,v 1.4 2004/07/05 06:36:36 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt MSKANJI 5
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index 9ee91de28c155..eaeb8068c0bc9 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)mskanji.c	1.0 (Phase One) 5/5/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.17.10.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index 465bf66e76d6b..de7099c05d3ac 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.28 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd April 8, 2004
 .Dt MULTIBYTE 3
diff --git a/lib/libc/locale/nextwctype.3 b/lib/libc/locale/nextwctype.3
index 0f6f88079f642..aa6ba6894db8e 100644
--- a/lib/libc/locale/nextwctype.3
+++ b/lib/libc/locale/nextwctype.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/nextwctype.3,v 1.3 2005/07/21 10:27:45 tjr Exp $
 .\"
 .Dd July 21, 2005
 .Dt NEXTWCTYPE 3
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
index 9363b0a700ccc..89c63df81889f 100644
--- a/lib/libc/locale/nextwctype.c
+++ b/lib/libc/locale/nextwctype.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nextwctype.c,v 1.1 2004/07/08 06:43:37 tjr Exp $");
 
 #include <runetype.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/nl_langinfo.3 b/lib/libc/locale/nl_langinfo.3
index 8de168206c202..36652f1218b1e 100644
--- a/lib/libc/locale/nl_langinfo.3
+++ b/lib/libc/locale/nl_langinfo.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.6 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd May 3, 2001
 .Dt NL_LANGINFO 3
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index 9bd508214e4b7..22d27a3e450f8 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
 
 #include <langinfo.h>
 #include <limits.h>
diff --git a/lib/libc/locale/nomacros.c b/lib/libc/locale/nomacros.c
index ba49a1fe0b378..eea37d01674a0 100644
--- a/lib/libc/locale/nomacros.c
+++ b/lib/libc/locale/nomacros.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nomacros.c,v 1.5 2002/03/22 21:52:18 obrien Exp $");
 
 /*
  * Tell <ctype.h> to generate extern versions of all its inline
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
index 22fcd203937be..a10bd5bf234c2 100644
--- a/lib/libc/locale/none.c
+++ b/lib/libc/locale/none.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)none.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.14.2.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/rpmatch.3 b/lib/libc/locale/rpmatch.3
index b34c5bfa199a9..7b278624e5ee9 100644
--- a/lib/libc/locale/rpmatch.3
+++ b/lib/libc/locale/rpmatch.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/rpmatch.3,v 1.3 2005/07/21 10:53:27 tjr Exp $
 .\"
 .Dd July 21, 2005
 .Dt RPMATCH 3
diff --git a/lib/libc/locale/rpmatch.c b/lib/libc/locale/rpmatch.c
index 4d90eb8dcf8b0..370f23da6bde2 100644
--- a/lib/libc/locale/rpmatch.c
+++ b/lib/libc/locale/rpmatch.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/rpmatch.c,v 1.1 2005/01/09 03:55:13 tjr Exp $");
 
 #include <langinfo.h>
 #include <regex.h>
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index f72ba748a96a9..54dc40c28b9f0 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rune.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/rune.c,v 1.15 2007/01/09 00:28:00 imp Exp $");
 
 #include "namespace.h"
 #include <arpa/inet.h>
diff --git a/lib/libc/locale/runefile.h b/lib/libc/locale/runefile.h
index ce1e47e5f92d6..cacc66fd216eb 100644
--- a/lib/libc/locale/runefile.h
+++ b/lib/libc/locale/runefile.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/runefile.h,v 1.1 2005/05/16 09:32:41 ru Exp $
  */
 
 #ifndef _RUNEFILE_H_
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index 5765b855073a8..bb1bbc4180091 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/runetype.c,v 1.14 2007/01/09 00:28:00 imp Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index 8be6730633264..1048ce915d500 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)setlocale.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.35 2007/01/09 00:28:00 imp Exp $
 .\"
 .Dd November 21, 2003
 .Dt SETLOCALE 3
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index d6db1813d2a04..98748493dcce7 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)setlocale.c	8.1 (Berkeley) 7/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.51 2007/01/09 00:28:00 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/locale/setlocale.h b/lib/libc/locale/setlocale.h
index 33b4b6e9aeeab..82462ee8de6fc 100644
--- a/lib/libc/locale/setlocale.h
+++ b/lib/libc/locale/setlocale.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.6 2003/07/06 02:03:37 ache Exp $
  */
 
 #ifndef _SETLOCALE_H_
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index e723ea627affd..157716ae2dc36 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.46.2.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <runetype.h>
 #include <errno.h>
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index e1f49d189a622..874f41562900d 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.28 2007/01/09 00:28:00 imp Exp $");
 
 #include <ctype.h>
 #include <runetype.h>
diff --git a/lib/libc/locale/toascii.3 b/lib/libc/locale/toascii.3
index 97243cb53acf9..30878796921c6 100644
--- a/lib/libc/locale/toascii.3
+++ b/lib/libc/locale/toascii.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toascii.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/toascii.3,v 1.8 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt TOASCII 3
diff --git a/lib/libc/locale/tolower.3 b/lib/libc/locale/tolower.3
index fce37fdc5755b..e2248541d2221 100644
--- a/lib/libc/locale/tolower.3
+++ b/lib/libc/locale/tolower.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/tolower.3,v 1.19 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt TOLOWER 3
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index 82a78cfdc9b9d..968cb5a04ed01 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.13 2007/01/09 00:28:01 imp Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/libc/locale/toupper.3 b/lib/libc/locale/toupper.3
index 3a3c7f8336888..9b21a648e01af 100644
--- a/lib/libc/locale/toupper.3
+++ b/lib/libc/locale/toupper.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/toupper.3,v 1.19 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd July 17, 2005
 .Dt TOUPPER 3
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index 4870e8e12cbba..e160b39573c5d 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/toupper.c,v 1.13 2007/01/09 00:28:01 imp Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/libc/locale/towlower.3 b/lib/libc/locale/towlower.3
index 96e2951cfc33f..b6968b7ffb46a 100644
--- a/lib/libc/locale/towlower.3
+++ b/lib/libc/locale/towlower.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/towlower.3,v 1.6 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd October 3, 2002
 .Dt TOWLOWER 3
diff --git a/lib/libc/locale/towupper.3 b/lib/libc/locale/towupper.3
index 05216709facb0..1d3763b632d91 100644
--- a/lib/libc/locale/towupper.3
+++ b/lib/libc/locale/towupper.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/towupper.3,v 1.3 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd October 3, 2002
 .Dt TOWUPPER 3
diff --git a/lib/libc/locale/utf8.5 b/lib/libc/locale/utf8.5
index c11aa01af676c..e5c3b61f95d56 100644
--- a/lib/libc/locale/utf8.5
+++ b/lib/libc/locale/utf8.5
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)utf2.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/utf8.5,v 1.7 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd April 7, 2004
 .Dt UTF8 5
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 0ccadd3e8d3bf..a0ad88ff78f22 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.14.2.1 2007/10/24 14:29:31 rafan Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcrtomb.3 b/lib/libc/locale/wcrtomb.3
index c89614e2d34b0..432eddf34f81a 100644
--- a/lib/libc/locale/wcrtomb.3
+++ b/lib/libc/locale/wcrtomb.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.4 2004/04/08 09:59:02 tjr Exp $
 .\"
 .Dd April 8, 2004
 .Dt WCRTOMB 3
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
index ef75b78f37603..4d7b115067222 100644
--- a/lib/libc/locale/wcrtomb.c
+++ b/lib/libc/locale/wcrtomb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.8 2004/05/12 14:09:04 tjr Exp $");
 
 #include <wchar.h>
 #include "mblocal.h"
diff --git a/lib/libc/locale/wcsftime.3 b/lib/libc/locale/wcsftime.3
index 92aee9313f592..5f29f39c7130e 100644
--- a/lib/libc/locale/wcsftime.3
+++ b/lib/libc/locale/wcsftime.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcsftime.3,v 1.2 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd September 8, 2002
 .Dt WCSFTIME 3
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
index 7a54fc053c5a7..2598043e64413 100644
--- a/lib/libc/locale/wcsftime.c
+++ b/lib/libc/locale/wcsftime.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcsnrtombs.c b/lib/libc/locale/wcsnrtombs.c
index e89969820957c..89cd9b72b2b48 100644
--- a/lib/libc/locale/wcsnrtombs.c
+++ b/lib/libc/locale/wcsnrtombs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsnrtombs.c,v 1.3 2005/02/12 08:45:12 stefanf Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3
index ff607c2dad11e..b38f3a4527b70 100644
--- a/lib/libc/locale/wcsrtombs.3
+++ b/lib/libc/locale/wcsrtombs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $
 .\"
 .Dd July 21, 2004
 .Dt WCSRTOMBS 3
diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
index f3b38b71c4d82..61e5432de749b 100644
--- a/lib/libc/locale/wcsrtombs.c
+++ b/lib/libc/locale/wcsrtombs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcstod.3 b/lib/libc/locale/wcstod.3
index f8c5135ee86b5..e63a2c8e68804 100644
--- a/lib/libc/locale/wcstod.3
+++ b/lib/libc/locale/wcstod.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.4 2003/05/22 13:02:27 ru Exp $
 .\"
 .Dd February 22, 2003
 .Dt WCSTOD 3
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
index 68df1eddfeddb..da90f16c28f47 100644
--- a/lib/libc/locale/wcstod.c
+++ b/lib/libc/locale/wcstod.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstod.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
index ba238d459031e..a68b382d989c2 100644
--- a/lib/libc/locale/wcstof.c
+++ b/lib/libc/locale/wcstof.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
index 66e692ad71a85..53d52a9040ca3 100644
--- a/lib/libc/locale/wcstoimax.c
+++ b/lib/libc/locale/wcstoimax.c
@@ -34,7 +34,7 @@ static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoimax.c,v 1.3 2007/01/09 00:28:01 imp Exp $");
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/lib/libc/locale/wcstol.3 b/lib/libc/locale/wcstol.3
index e69a72672d545..306f223022262 100644
--- a/lib/libc/locale/wcstol.3
+++ b/lib/libc/locale/wcstol.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.4 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd September 7, 2002
 .Dt WCSTOL 3
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
index 294b6e0a4989a..7c2afbda732dc 100644
--- a/lib/libc/locale/wcstol.c
+++ b/lib/libc/locale/wcstol.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstol.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
index cf9d87464c5df..c50ffbdf6bca3 100644
--- a/lib/libc/locale/wcstold.c
+++ b/lib/libc/locale/wcstold.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
index 19b285fb83178..9a019ff85c3e6 100644
--- a/lib/libc/locale/wcstoll.c
+++ b/lib/libc/locale/wcstoll.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcstombs.3 b/lib/libc/locale/wcstombs.3
index 723ae801b99a1..2ef8f279d5ff5 100644
--- a/lib/libc/locale/wcstombs.3
+++ b/lib/libc/locale/wcstombs.3
@@ -31,7 +31,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcstombs.3,v 1.5 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd April 8, 2004
 .Dt WCSTOMBS 3
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
index acd0051463b3e..b798c9e1a5e53 100644
--- a/lib/libc/locale/wcstombs.c
+++ b/lib/libc/locale/wcstombs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.10 2004/07/21 10:54:57 tjr Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
index f50e7a74d8181..5a5d6430fbf56 100644
--- a/lib/libc/locale/wcstoul.c
+++ b/lib/libc/locale/wcstoul.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoul.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
index d84042458b12f..9700cde47d8b9 100644
--- a/lib/libc/locale/wcstoull.c
+++ b/lib/libc/locale/wcstoull.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.18 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoull.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c
index d643b0b248847..765bbfb274d9d 100644
--- a/lib/libc/locale/wcstoumax.c
+++ b/lib/libc/locale/wcstoumax.c
@@ -34,7 +34,7 @@ static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoumax.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
 
 #include <errno.h>
 #include <inttypes.h>
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index cb39adc451417..a8f00560b0d3d 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctob.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/locale/wctomb.3 b/lib/libc/locale/wctomb.3
index fe08d837b49d9..1ecc8764cc2e3 100644
--- a/lib/libc/locale/wctomb.3
+++ b/lib/libc/locale/wctomb.3
@@ -31,7 +31,7 @@
 .\"
 .\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
 .\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wctomb.3,v 1.4 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd April 8, 2004
 .Dt WCTOMB 3
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
index 77b9043d61e10..701b3ca4cc61f 100644
--- a/lib/libc/locale/wctomb.c
+++ b/lib/libc/locale/wctomb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.8 2004/07/29 06:18:40 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/wctrans.3 b/lib/libc/locale/wctrans.3
index ce3e68c9eb340..0f2bc650b9c7f 100644
--- a/lib/libc/locale/wctrans.3
+++ b/lib/libc/locale/wctrans.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wctrans.3,v 1.3 2002/11/29 17:35:09 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt WCTRANS 3
diff --git a/lib/libc/locale/wctrans.c b/lib/libc/locale/wctrans.c
index 6813e3304629f..a86e5c782987e 100644
--- a/lib/libc/locale/wctrans.c
+++ b/lib/libc/locale/wctrans.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctrans.c,v 1.3 2003/11/01 08:20:58 tjr Exp $");
 
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc/locale/wctype.3 b/lib/libc/locale/wctype.3
index 099631d517904..16c3de938bf16 100644
--- a/lib/libc/locale/wctype.3
+++ b/lib/libc/locale/wctype.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.7 2006/10/13 16:11:12 ru Exp $
 .\"
 .Dd March 27, 2004
 .Dt WCTYPE 3
diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
index f9aa8dd2fe48c..a0e21bc87a781 100644
--- a/lib/libc/locale/wctype.c
+++ b/lib/libc/locale/wctype.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wctype.c,v 1.3 2004/03/27 08:59:21 tjr Exp $");
 
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/libc/locale/wcwidth.3 b/lib/libc/locale/wcwidth.3
index 0c7c74fed155c..026813f201385 100644
--- a/lib/libc/locale/wcwidth.3
+++ b/lib/libc/locale/wcwidth.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.6 2004/08/17 04:56:03 trhodes Exp $
 .\"
 .Dd August 17, 2004
 .Dt WCWIDTH 3
diff --git a/lib/libc/locale/wcwidth.c b/lib/libc/locale/wcwidth.c
index 7a5d2eda2bfde..587862eff8153 100644
--- a/lib/libc/locale/wcwidth.c
+++ b/lib/libc/locale/wcwidth.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.8 2007/01/09 00:28:01 imp Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/nameser/Makefile.inc b/lib/libc/nameser/Makefile.inc
index 05b4f55f4b5c1..6fbc9a5875d65 100644
--- a/lib/libc/nameser/Makefile.inc
+++ b/lib/libc/nameser/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/nameser/Makefile.inc,v 1.2 2006/03/23 16:55:13 des Exp $
 
 # nameser sources
 .PATH: ${.CURDIR}/nameser
diff --git a/lib/libc/nameser/Symbol.map b/lib/libc/nameser/Symbol.map
index 190a59f3575f8..da7fc5b803e0e 100644
--- a/lib/libc/nameser/Symbol.map
+++ b/lib/libc/nameser/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/nameser/Symbol.map,v 1.3 2007/04/29 14:05:17 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
index f7b0ee3901ad7..7e1f454323323 100644
--- a/lib/libc/nameser/ns_parse.c
+++ b/lib/libc/nameser/ns_parse.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_parse.c,v 1.1.1.2.2.1 2007/12/14 20:32:13 ume Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
index 2a463795e34e1..93658be89eec9 100644
--- a/lib/libc/nameser/ns_print.c
+++ b/lib/libc/nameser/ns_print.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: ns_print.c,v 1.6.18.4 2005/04/27 05:01:09 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_print.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
index 9c43c79e4c6d9..21d397caff027 100644
--- a/lib/libc/nameser/ns_samedomain.c
+++ b/lib/libc/nameser/ns_samedomain.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: ns_samedomain.c,v 1.5.18.1 2005/04/27 05:01:09 sra Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_samedomain.c,v 1.4 2007/06/03 17:20:26 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 4eadf98006000..6e4542a43e3bd 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.69.2.1 2007/11/16 07:18:12 ru Exp $
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/net
diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map
index de44cc5761492..38c9c66459c24 100644
--- a/lib/libc/net/Symbol.map
+++ b/lib/libc/net/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.17 2007/06/12 16:24:55 bms Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 43350303898ec..0facc934e34e6 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/base64.c,v 1.5 2002/03/22 21:52:28 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/byteorder.3 b/lib/libc/net/byteorder.3
index ebb56d8c23a99..c538fe271080d 100644
--- a/lib/libc/net/byteorder.3
+++ b/lib/libc/net/byteorder.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/byteorder.3,v 1.13 2007/01/09 00:28:01 imp Exp $
 .\"
 .Dd March 20, 2005
 .Dt BYTEORDER 3
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index d769f2781a441..b2dda1f876997 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.17 2007/05/13 13:57:44 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 54d2149fa9a35..f8b1b00312176 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.24 2007/05/13 13:57:45 rwatson Exp $
 .\"
 .Dd May 13, 2007
 .Dt ETHERS 3
diff --git a/lib/libc/net/eui64.3 b/lib/libc/net/eui64.3
index 3000c74e6d00d..f90d5b544057c 100644
--- a/lib/libc/net/eui64.3
+++ b/lib/libc/net/eui64.3
@@ -54,7 +54,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/eui64.3,v 1.4 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd March 4, 2004
 .Dt EUI64 3
diff --git a/lib/libc/net/eui64.c b/lib/libc/net/eui64.c
index 50851674de69a..e842903ee5429 100644
--- a/lib/libc/net/eui64.c
+++ b/lib/libc/net/eui64.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/eui64.c,v 1.2 2004/06/01 19:30:13 brooks Exp $");
 
 #include <stdio.h>
 #include <paths.h>
diff --git a/lib/libc/net/gai_strerror.3 b/lib/libc/net/gai_strerror.3
index 25cff0c01cf12..a358d45fba9bb 100644
--- a/lib/libc/net/gai_strerror.3
+++ b/lib/libc/net/gai_strerror.3
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/gai_strerror.3,v 1.5 2006/09/17 21:27:33 ru Exp $
 .\"
 .Dd May 21, 2006
 .Dt GAI_STRERROR 3
diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c
index 5611559cfe0c4..c097f04f07a71 100644
--- a/lib/libc/net/gai_strerror.c
+++ b/lib/libc/net/gai_strerror.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gai_strerror.c,v 1.2 2006/05/21 11:22:31 ume Exp $");
 
 #include <netdb.h>
 
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 07bef877de686..c359769815bd1 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.33 2007/06/06 19:24:02 remko Exp $
 .\"
 .Dd June 6, 2007
 .Dt GETADDRINFO 3
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 60be685568871..f20bdad533e05 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.86 2007/09/05 18:08:14 jinmei Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 2e3fe8d66b275..b27892d4787b9 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.58 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index 8c41d9a107a54..8186e61e86c5b 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -51,7 +51,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.27 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 9b8c0b915333b..76dbbda9a3dc8 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.38 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd May 12, 2006
 .Dt GETHOSTBYNAME 3
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 7921ced71946a..18da4678219de 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbynis.c,v 1.28 2006/05/12 15:37:23 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index ffad6f297d689..3c0c9eb2347a1 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.33 2006/05/21 11:27:28 ume Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index a12cd00bfb4c2..b217990505a2a 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getifaddrs.3,v 1.10 2005/02/09 18:03:13 ru Exp $
 .\"
 .Dd October 12, 1995
 .Dt GETIFADDRS 3
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c
index 41ef3f464ab6f..81f365e8a90af 100644
--- a/lib/libc/net/getifaddrs.c
+++ b/lib/libc/net/getifaddrs.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getifaddrs.c,v 1.6 2002/07/25 08:08:30 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/getifmaddrs.3 b/lib/libc/net/getifmaddrs.3
index 2d2a936812975..56601cf71bb47 100644
--- a/lib/libc/net/getifmaddrs.3
+++ b/lib/libc/net/getifmaddrs.3
@@ -18,7 +18,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getifmaddrs.3,v 1.3 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt GETIFMADDRS 3
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
index adbc4a5dde6ee..9e7bb1d73e431 100644
--- a/lib/libc/net/getifmaddrs.c
+++ b/lib/libc/net/getifmaddrs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getifmaddrs.c,v 1.2 2005/04/08 21:24:23 stefanf Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/getipnodebyname.3 b/lib/libc/net/getipnodebyname.3
index 615c5bb22d846..84f6c7b192515 100644
--- a/lib/libc/net/getipnodebyname.3
+++ b/lib/libc/net/getipnodebyname.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getipnodebyname.3,v 1.18 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd August 6, 2004
 .Dt GETIPNODEBYNAME 3
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index e9d17ff67f973..266812dba65ff 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.25 2007/02/28 21:28:33 bms Exp $
 .\"
 .Dd February 28, 2007
 .Dt GETNAMEINFO 3
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index 0b595866adda5..def8d080a1e98 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index 6fd7d2fc72cd7..f530767acb96f 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -58,7 +58,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.34 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index 2bbba0698093e..d600f1f64f18c 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.19 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index d00c7f28970c8..1e14a04cf2aaf 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbynis.c,v 1.21 2006/04/15 16:20:27 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3
index f408f7617caba..f573279b32ada 100644
--- a/lib/libc/net/getnetent.3
+++ b/lib/libc/net/getnetent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getnetent.3,v 1.23 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETNETENT 3
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index ec7e94bbda8f6..1fc674311eaf5 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.23 2006/04/28 12:03:35 ume Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index 85b40e146a41c..9e658482dd5cf 100644
--- a/lib/libc/net/getproto.c
+++ b/lib/libc/net/getproto.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.7 2007/01/09 00:28:02 imp Exp $");
 
 #include <netdb.h>
 #include <nsswitch.h>
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index b3ded5d9469e2..71d6659c51e1b 100644
--- a/lib/libc/net/getprotoent.3
+++ b/lib/libc/net/getprotoent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getprotoent.3,v 1.12 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPROTOENT 3
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index dda5d1895800b..f0bb22aa58e2d 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.9 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index bead63a307e7f..50c8c60e26081 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.7 2007/01/09 00:28:02 imp Exp $");
 
 #include <netdb.h>
 #include <nsswitch.h>
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 65d40bbb40390..20838be877e14 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/getservent.3,v 1.15 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd July 9, 1995
 .Dt GETSERVENT 3
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index ebb7a7d3dacf8..3cc169404e4f5 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.23 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/hesiod.3 b/lib/libc/net/hesiod.3
index bae4e4419f820..6401e79227c40 100644
--- a/lib/libc/net/hesiod.3
+++ b/lib/libc/net/hesiod.3
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/hesiod.3,v 1.5 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd November 30, 1996
 .Dt HESIOD 3
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index c22bdbad836b7..3afa0ab9c3a67 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -49,7 +49,7 @@
 static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/hesiod.c,v 1.9 2003/05/01 19:03:14 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index 715c33cfedcd2..25b805fc364f2 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/if_indextoname.3,v 1.11 2005/11/23 10:49:07 ru Exp $
 .\"
 .Dd November 23, 2005
 .Dt IF_NAMETOINDEX 3
diff --git a/lib/libc/net/if_indextoname.c b/lib/libc/net/if_indextoname.c
index 4dadce351ad96..33888cdb3c680 100644
--- a/lib/libc/net/if_indextoname.c
+++ b/lib/libc/net/if_indextoname.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/if_indextoname.c,v 1.1 2002/07/15 19:58:56 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c
index 7a12d34b58e7c..f190f23f8b828 100644
--- a/lib/libc/net/if_nameindex.c
+++ b/lib/libc/net/if_nameindex.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/if_nameindex.c,v 1.1 2002/07/15 19:58:56 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c
index d0ca5212755df..e94463468ee51 100644
--- a/lib/libc/net/if_nametoindex.c
+++ b/lib/libc/net/if_nametoindex.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/if_nametoindex.c,v 1.5 2003/05/01 19:03:14 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3
index af48143d9f684..1211e5332e736 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.36 2007/06/14 07:13:28 delphij Exp $
 .\"
 .Dd June 14, 2007
 .Dt INET 3
diff --git a/lib/libc/net/inet6_opt_init.3 b/lib/libc/net/inet6_opt_init.3
index 671346818470b..74b822dad172f 100644
--- a/lib/libc/net/inet6_opt_init.3
+++ b/lib/libc/net/inet6_opt_init.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_opt_init.3,v 1.10 2005/11/23 16:07:54 ru Exp $
 .\"
 .Dd December 23, 2004
 .Dt INET6_OPT_INIT 3
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index e17855a32ba7d..a22fd774c5f2d 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.18 2005/01/24 18:14:18 ru Exp $
 .\"
 .Dd January 24, 2005
 .Dt INET6_OPTION_SPACE 3
diff --git a/lib/libc/net/inet6_rth_space.3 b/lib/libc/net/inet6_rth_space.3
index 2750170d33cd5..d7b3cd7f8e206 100644
--- a/lib/libc/net/inet6_rth_space.3
+++ b/lib/libc/net/inet6_rth_space.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_rth_space.3,v 1.10 2005/07/31 03:30:44 keramida Exp $
 .\"
 .Dd December 24, 2004
 .Dt INET6_RTH_SPACE 3
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index bfb2f231a8740..d44102d851abd 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.16 2005/01/24 18:14:18 ru Exp $
 .\"
 .Dd January 24, 2005
 .Dt INET6_RTHDR_SPACE 3
diff --git a/lib/libc/net/inet_net.3 b/lib/libc/net/inet_net.3
index 1da5975eec33a..201100c31d04a 100644
--- a/lib/libc/net/inet_net.3
+++ b/lib/libc/net/inet_net.3
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.4 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd February 26, 2006
 .Dt INET_NET 3
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 7b65d0607ce0d..fff19be152398 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.8 2005/07/19 18:13:58 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 43876753ea335..17ddfaa429738 100644
--- a/lib/libc/net/linkaddr.3
+++ b/lib/libc/net/linkaddr.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/linkaddr.3,v 1.16 2007/02/28 21:18:38 bms Exp $
 .\"
 .Dd February 28, 2007
 .Dt LINK_ADDR 3
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index 86bb7a2955ee5..85f9f0fa77efa 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/linkaddr.c,v 1.4 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index dbc7e7031271d..c14c070bffcd4 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -53,7 +53,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/map_v4v6.c,v 1.10 2007/01/09 00:28:02 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 4864bf4a6f55b..94a313a87afbd 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.62 2007/07/31 16:09:41 bushman Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
index b48dd7be6d07b..51ec8c49501f7 100644
--- a/lib/libc/net/netdb_private.h
+++ b/lib/libc/net/netdb_private.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.13 2006/05/12 15:37:23 ume Exp $
  */
 
 #ifndef _NETDB_PRIVATE_H_
diff --git a/lib/libc/net/nscache.c b/lib/libc/net/nscache.c
index 68cec2129a158..2bdce5fc72c66 100644
--- a/lib/libc/net/nscache.c
+++ b/lib/libc/net/nscache.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.1.2.1 2007/10/18 23:59:12 bushman Exp $");
 
 #include "namespace.h"
 #include <nsswitch.h>
diff --git a/lib/libc/net/nscachedcli.c b/lib/libc/net/nscachedcli.c
index 1323805d68862..76b6682485892 100644
--- a/lib/libc/net/nscachedcli.c
+++ b/lib/libc/net/nscachedcli.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nscachedcli.c,v 1.3 2006/12/04 17:08:43 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index cf15002795b8c..28792ee47a417 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.14 2007/01/22 11:45:25 bms Exp $
 .\"
 .Dd January 22, 2007
 .Dt NSDISPATCH 3
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index ad3f208d6292c..665bf56795051 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -68,7 +68,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.14 2007/05/17 03:33:23 jon Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
index 34c79d9259646..f87d66b44bb57 100644
--- a/lib/libc/net/nslexer.l
+++ b/lib/libc/net/nslexer.l
@@ -40,7 +40,7 @@
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = 
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/net/nslexer.l,v 1.5 2003/04/17 14:14:22 nectar Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
index 730458a37f075..fe7ae3a624e10 100644
--- a/lib/libc/net/nsparser.y
+++ b/lib/libc/net/nsparser.y
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsparser.y,v 1.6 2007/05/17 03:33:23 jon Exp $");
 
 #include "namespace.h"
 #define _NS_PRIVATE
diff --git a/lib/libc/net/nss_backends.h b/lib/libc/net/nss_backends.h
index 9bea37b1c24b0..e39a25a19fd46 100644
--- a/lib/libc/net/nss_backends.h
+++ b/lib/libc/net/nss_backends.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/nss_backends.h,v 1.1 2003/04/17 14:14:22 nectar Exp $
  */
 /*
  * Eventually, the implementations of existing built-in NSS functions
diff --git a/lib/libc/net/nss_compat.c b/lib/libc/net/nss_compat.c
index 09a2d4f8f5cc6..135bad40a3e2d 100644
--- a/lib/libc/net/nss_compat.c
+++ b/lib/libc/net/nss_compat.c
@@ -32,7 +32,7 @@
  * Compatibility shims for the GNU C Library-style nsswitch interface.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/nss_compat.c,v 1.3 2004/03/30 15:56:15 nectar Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/ntoh.c b/lib/libc/net/ntoh.c
index 738d8c70c67de..6cfd80d898a5c 100644
--- a/lib/libc/net/ntoh.c
+++ b/lib/libc/net/ntoh.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/ntoh.c,v 1.1 2006/11/06 22:07:47 cognet Exp $");
 
 #include <sys/endian.h>
 
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index e0643db913524..9596cbef002fd 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.26 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd March 3, 2000
 .Dt RCMD 3
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 990289a7edccc..a444283e66bd7 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.42 2007/01/09 00:28:02 imp Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/net/rcmdsh.3 b/lib/libc/net/rcmdsh.3
index 54c3a0a25205f..8acaa8ecaebb5 100644
--- a/lib/libc/net/rcmdsh.3
+++ b/lib/libc/net/rcmdsh.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/rcmdsh.3,v 1.7 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd September 1, 1996
 .Dt RCMDSH 3
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
index bc4e87af9faff..8d93bcbeefd22 100644
--- a/lib/libc/net/rcmdsh.c
+++ b/lib/libc/net/rcmdsh.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/rcmdsh.c,v 1.5 2003/02/27 13:40:00 nectar Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
index c8230d683b947..8e3945c28b1b6 100644
--- a/lib/libc/net/recv.c
+++ b/lib/libc/net/recv.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/recv.c,v 1.4 2007/01/09 00:28:02 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/res_config.h b/lib/libc/net/res_config.h
index 05909bca57baf..1f38fb0a1b39a 100644
--- a/lib/libc/net/res_config.h
+++ b/lib/libc/net/res_config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/net/res_config.h,v 1.9 2006/03/21 16:11:11 ume Exp $ */
 
 #define	DEBUG	1	/* enable debugging code (needed for dig) */
 #define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index e35a5450ccb50..8361c4a152853 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.33 2007/01/09 00:28:02 imp Exp $
 .\"
 .Dd November 4, 2006
 .Dt RESOLVER 3
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index f92fdec20a694..bb2e54ec6a922 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.9 2007/04/19 15:48:16 mtm Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/net/sctp_bindx.3 b/lib/libc/net/sctp_bindx.3
index a2a260008bf34..d114f1452be02 100644
--- a/lib/libc/net/sctp_bindx.3
+++ b/lib/libc/net/sctp_bindx.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_bindx.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_BINDX 3
diff --git a/lib/libc/net/sctp_connectx.3 b/lib/libc/net/sctp_connectx.3
index 7b75f4ad300c6..1bc9fdced17af 100644
--- a/lib/libc/net/sctp_connectx.3
+++ b/lib/libc/net/sctp_connectx.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.6 2007/09/25 16:48:08 brueffer Exp $
 .\"
 .Dd June 19, 2007
 .Dt SCTP_CONNECTX 3
diff --git a/lib/libc/net/sctp_freepaddrs.3 b/lib/libc/net/sctp_freepaddrs.3
index a6815f4c461ae..f1e97fd0ccbf2 100644
--- a/lib/libc/net/sctp_freepaddrs.3
+++ b/lib/libc/net/sctp_freepaddrs.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_freepaddrs.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_FREEPADDRS 3
diff --git a/lib/libc/net/sctp_getaddrlen.3 b/lib/libc/net/sctp_getaddrlen.3
index 325e2b0365cd9..46cca911f1ac9 100644
--- a/lib/libc/net/sctp_getaddrlen.3
+++ b/lib/libc/net/sctp_getaddrlen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_getaddrlen.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GETADDRLEN 3
diff --git a/lib/libc/net/sctp_getassocid.3 b/lib/libc/net/sctp_getassocid.3
index ee0926a8cbaa4..cb695360f5879 100644
--- a/lib/libc/net/sctp_getassocid.3
+++ b/lib/libc/net/sctp_getassocid.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_getassocid.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GETASSOCID 3
diff --git a/lib/libc/net/sctp_getpaddrs.3 b/lib/libc/net/sctp_getpaddrs.3
index 9f6d632cd03db..6dc6280d51bbc 100644
--- a/lib/libc/net/sctp_getpaddrs.3
+++ b/lib/libc/net/sctp_getpaddrs.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_getpaddrs.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GETPADDR 3
diff --git a/lib/libc/net/sctp_opt_info.3 b/lib/libc/net/sctp_opt_info.3
index 560b3e47051ef..b242ff5c64ce0 100644
--- a/lib/libc/net/sctp_opt_info.3
+++ b/lib/libc/net/sctp_opt_info.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_OPT_INFO 3
diff --git a/lib/libc/net/sctp_recvmsg.3 b/lib/libc/net/sctp_recvmsg.3
index b9ccfb8c0d8ef..4fe22efd3f0ff 100644
--- a/lib/libc/net/sctp_recvmsg.3
+++ b/lib/libc/net/sctp_recvmsg.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.5 2007/09/25 16:48:08 brueffer Exp $
 .\"
 .Dd August 13, 2007
 .Dt SCTP_RECVMSG 3
diff --git a/lib/libc/net/sctp_send.3 b/lib/libc/net/sctp_send.3
index 230173024f03f..1c44b4455581a 100644
--- a/lib/libc/net/sctp_send.3
+++ b/lib/libc/net/sctp_send.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_send.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_SEND 3
diff --git a/lib/libc/net/sctp_sendmsg.3 b/lib/libc/net/sctp_sendmsg.3
index 61eec224cadd6..7f3dac47d1053 100644
--- a/lib/libc/net/sctp_sendmsg.3
+++ b/lib/libc/net/sctp_sendmsg.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_SENDMSG 3
diff --git a/lib/libc/net/sctp_sys_calls.c b/lib/libc/net/sctp_sys_calls.c
index 715fcbd797fc0..1eb05418b5d10 100644
--- a/lib/libc/net/sctp_sys_calls.c
+++ b/lib/libc/net/sctp_sys_calls.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.14 2007/07/24 20:06:01 rrs Exp $");
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
index 101b0ceb45ff0..f6ed904a5a80c 100644
--- a/lib/libc/net/send.c
+++ b/lib/libc/net/send.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/send.c,v 1.4 2007/01/09 00:28:02 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/net/sockatmark.3 b/lib/libc/net/sockatmark.3
index 61a1a9f529895..0bb8745679494 100644
--- a/lib/libc/net/sockatmark.3
+++ b/lib/libc/net/sockatmark.3
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sockatmark.3,v 1.4 2002/12/19 09:40:22 ru Exp $
 .\"
 .Dd October 13, 2002
 .Dt SOCKATMARK 3
diff --git a/lib/libc/net/sockatmark.c b/lib/libc/net/sockatmark.c
index e416de80a9ca8..497ce7f3ab834 100644
--- a/lib/libc/net/sockatmark.c
+++ b/lib/libc/net/sockatmark.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/net/sockatmark.c,v 1.1 2002/12/13 22:22:55 fenner Exp $
  */
 #include <sys/ioctl.h>
 
diff --git a/lib/libc/net/sourcefilter.3 b/lib/libc/net/sourcefilter.3
index c44101fda9381..0a68068327633 100644
--- a/lib/libc/net/sourcefilter.3
+++ b/lib/libc/net/sourcefilter.3
@@ -18,7 +18,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/net/sourcefilter.3,v 1.1 2007/06/12 18:03:37 bms Exp $
 .\"
 .Dd June 12, 2007
 .Dt SOURCEFILTER 3
diff --git a/lib/libc/net/sourcefilter.c b/lib/libc/net/sourcefilter.c
index 14812c51cd742..4fe3c700ba8ac 100644
--- a/lib/libc/net/sourcefilter.c
+++ b/lib/libc/net/sourcefilter.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/sourcefilter.c,v 1.3 2007/07/04 00:55:50 peter Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c
index 42ee2054d4e7d..8181b8193324c 100644
--- a/lib/libc/net/vars.c
+++ b/lib/libc/net/vars.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/net/vars.c,v 1.3 2002/04/19 04:46:20 suz Exp $");
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/lib/libc/nls/C.msg b/lib/libc/nls/C.msg
index aa2c4cc881aeb..4d8699e941314 100644
--- a/lib/libc/nls/C.msg
+++ b/lib/libc/nls/C.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.1 2005/02/27 17:59:39 phantom Exp $
 $
 $ Message catalog for C locale (template)
 $
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
index 90a67414d03f4..ca4e2730e6de5 100644
--- a/lib/libc/nls/Makefile.inc
+++ b/lib/libc/nls/Makefile.inc
@@ -1,5 +1,5 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.11 2006/03/13 01:14:57 deischen Exp $
 
 .PATH: ${.CURDIR}/nls
 
diff --git a/lib/libc/nls/Symbol.map b/lib/libc/nls/Symbol.map
index 818466e6ffb1a..7374cb8277962 100644
--- a/lib/libc/nls/Symbol.map
+++ b/lib/libc/nls/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/nls/Symbol.map,v 1.2 2007/04/29 14:05:17 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index ed0f639d23935..cf238b5b7a17d 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/nls/catclose.3,v 1.15 2005/02/27 16:30:16 phantom Exp $
 .Dd February 12, 2005
 .Dt CATCLOSE 3
 .Os
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
index 38e92ba23c303..ba230334efe5e 100644
--- a/lib/libc/nls/catgets.3
+++ b/lib/libc/nls/catgets.3
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/nls/catgets.3,v 1.13 2005/06/15 19:04:04 ru Exp $
 .Dd February 12, 2005
 .Dt CATGETS 3
 .Os
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index 7a16ee50408ad..dad21aeafaae7 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/nls/catopen.3,v 1.17 2005/02/27 16:30:16 phantom Exp $
 .Dd February 12, 2005
 .Dt CATOPEN 3
 .Os
diff --git a/lib/libc/nls/ko_KR.UTF-8.msg b/lib/libc/nls/ko_KR.UTF-8.msg
index 4fc4e78e624b5..08f88813c58f4 100644
--- a/lib/libc/nls/ko_KR.UTF-8.msg
+++ b/lib/libc/nls/ko_KR.UTF-8.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $
 $
 $ Message catalog for ko_KR.UTF-8 locale
 $
diff --git a/lib/libc/nls/ko_KR.eucKR.msg b/lib/libc/nls/ko_KR.eucKR.msg
index c2ca1a06b18cb..e75dccf049be8 100644
--- a/lib/libc/nls/ko_KR.eucKR.msg
+++ b/lib/libc/nls/ko_KR.eucKR.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $
 $
 $ Message catalog for ko_KR.eucKR locale
 $
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 8689b7eaa0e7a..afcbdda9be6df 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -31,7 +31,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.50 2005/02/27 16:26:49 phantom Exp $");
 
 #define _NLS_PRIVATE
 
diff --git a/lib/libc/nls/pl_PL.ISO8859-2.msg b/lib/libc/nls/pl_PL.ISO8859-2.msg
index 1c184b30997d0..d74463c1cd536 100644
--- a/lib/libc/nls/pl_PL.ISO8859-2.msg
+++ b/lib/libc/nls/pl_PL.ISO8859-2.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/pl_PL.ISO8859-2.msg,v 1.2 2005/07/23 21:30:35 pjd Exp $
 $
 $ Message catalog for pl_PL.ISO8859-2 locale
 $
diff --git a/lib/libc/nls/ru_RU.KOI8-R.msg b/lib/libc/nls/ru_RU.KOI8-R.msg
index 55233b946abfb..8400fca1b1718 100644
--- a/lib/libc/nls/ru_RU.KOI8-R.msg
+++ b/lib/libc/nls/ru_RU.KOI8-R.msg
@@ -1,4 +1,4 @@
-$ $FreeBSD$
+$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.1 2005/02/27 18:09:09 phantom Exp $
 $
 $ Message catalog for ru_RU.KOI8-R locale
 $
diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc
index 99f58e3c42e2b..768ecf8ca53c2 100644
--- a/lib/libc/posix1e/Makefile.inc
+++ b/lib/libc/posix1e/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.19 2006/07/07 14:02:17 rwatson Exp $
 
 .PATH: ${.CURDIR}/posix1e
 
diff --git a/lib/libc/posix1e/Symbol.map b/lib/libc/posix1e/Symbol.map
index dd3c08fe06894..b27ec131c6c36 100644
--- a/lib/libc/posix1e/Symbol.map
+++ b/lib/libc/posix1e/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/Symbol.map,v 1.3 2007/05/31 13:01:33 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index 1c824d047e705..eed1b9968d149 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.22 2003/02/06 11:04:46 charnier Exp $
 .\"
 .Dd December 18, 2002
 .Dt ACL 3
diff --git a/lib/libc/posix1e/acl_add_perm.3 b/lib/libc/posix1e/acl_add_perm.3
index 43d04f11fb0a8..13a7047067fc5 100644
--- a/lib/libc/posix1e/acl_add_perm.3
+++ b/lib/libc/posix1e/acl_add_perm.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.6 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_ADD_PERM 3
diff --git a/lib/libc/posix1e/acl_calc_mask.3 b/lib/libc/posix1e/acl_calc_mask.3
index 48d2678c2f5dc..6a540e5fc3f86 100644
--- a/lib/libc/posix1e/acl_calc_mask.3
+++ b/lib/libc/posix1e/acl_calc_mask.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_calc_mask.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_CALC_MASK 3
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index 7e2f955803180..86c198e12dcd1 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_calc_mask.c,v 1.8 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_clear_perms.3 b/lib/libc/posix1e/acl_clear_perms.3
index db026a3abcf4f..ba24470b5dfbd 100644
--- a/lib/libc/posix1e/acl_clear_perms.3
+++ b/lib/libc/posix1e/acl_clear_perms.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_clear_perms.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_CLEAR_PERMS 3
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 6d1e0a86736b9..137394484707d 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_copy.c,v 1.5 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_copy_entry.3 b/lib/libc/posix1e/acl_copy_entry.3
index fead89ffe431e..1656a4a4d9d10 100644
--- a/lib/libc/posix1e/acl_copy_entry.3
+++ b/lib/libc/posix1e/acl_copy_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_copy_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_COPY_ENTRY 3
diff --git a/lib/libc/posix1e/acl_create_entry.3 b/lib/libc/posix1e/acl_create_entry.3
index fb856ad77bcbc..8fdfeccb9515e 100644
--- a/lib/libc/posix1e/acl_create_entry.3
+++ b/lib/libc/posix1e/acl_create_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_create_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 16, 2001
 .Dt ACL_CREATE_ENTRY 3
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
index fb2958b73e498..347a885a4112f 100644
--- a/lib/libc/posix1e/acl_delete.3
+++ b/lib/libc/posix1e/acl_delete.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.18 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_DELETE 3
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index a93cd7b2ec9dc..106242e456876 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_delete.c,v 1.8 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_delete_entry.3 b/lib/libc/posix1e/acl_delete_entry.3
index a931db03f04ae..46ace13695ee9 100644
--- a/lib/libc/posix1e/acl_delete_entry.3
+++ b/lib/libc/posix1e/acl_delete_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_entry.3,v 1.6 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_DELETE_ENTRY 3
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 3195fac65a30e..2a0c5f92c6bb1 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_delete_entry.c,v 1.7 2004/01/06 20:29:40 nectar Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_delete_perm.3 b/lib/libc/posix1e/acl_delete_perm.3
index 0740d61333759..f7919ce6ce803 100644
--- a/lib/libc/posix1e/acl_delete_perm.3
+++ b/lib/libc/posix1e/acl_delete_perm.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_perm.3,v 1.6 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_DELETE_PERM 3
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
index ae4ff4f7b4745..be42e4e5c9daf 100644
--- a/lib/libc/posix1e/acl_dup.3
+++ b/lib/libc/posix1e/acl_dup.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_dup.3,v 1.13 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_DUP 3
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index f5bdbede9c5cf..437acfd17f51d 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_entry.c,v 1.7 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_free.3 b/lib/libc/posix1e/acl_free.3
index d64c72a7c7e27..654e57a016829 100644
--- a/lib/libc/posix1e/acl_free.3
+++ b/lib/libc/posix1e/acl_free.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_free.3,v 1.13 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_FREE 3
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index 6de41da8abfbb..316c77cabd895 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_free.c,v 1.5 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
index 8b10784e502b3..0be44862f9156 100644
--- a/lib/libc/posix1e/acl_from_text.3
+++ b/lib/libc/posix1e/acl_from_text.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_from_text.3,v 1.16 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_FROM_TEXT 3
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index c679b172ae0ab..cdfead295645b 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text.c,v 1.11 2007/02/26 02:07:02 kientzle Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index fa915df3ec48e..114d761d834d0 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.18 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_GET 3
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 1f97baaecabc9..a5d8da158c3ca 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_get.c,v 1.12 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
index 42e03c1076516..66bf41e06eb36 100644
--- a/lib/libc/posix1e/acl_get_entry.3
+++ b/lib/libc/posix1e/acl_get_entry.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_entry.3,v 1.9 2005/11/17 12:59:59 ru Exp $
 .\"
 .Dd April 13, 2001
 .Dt ACL_GET_ENTRY 3
diff --git a/lib/libc/posix1e/acl_get_perm_np.3 b/lib/libc/posix1e/acl_get_perm_np.3
index 7fe6c9c5b7bad..d576ef9c19cc1 100644
--- a/lib/libc/posix1e/acl_get_perm_np.3
+++ b/lib/libc/posix1e/acl_get_perm_np.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_perm_np.3,v 1.4 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd April 10, 2001
 .Dt ACL_GET_PERM_NP 3
diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3
index 403b10a059042..e75437cc08e66 100644
--- a/lib/libc/posix1e/acl_get_permset.3
+++ b/lib/libc/posix1e/acl_get_permset.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_permset.3,v 1.5 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_GET_PERMSET 3
diff --git a/lib/libc/posix1e/acl_get_qualifier.3 b/lib/libc/posix1e/acl_get_qualifier.3
index 867809e52da69..3b2a1835ac3b0 100644
--- a/lib/libc/posix1e/acl_get_qualifier.3
+++ b/lib/libc/posix1e/acl_get_qualifier.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_qualifier.3,v 1.7 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 13, 2001
 .Dt ACL_GET_QUALIFIER 3
diff --git a/lib/libc/posix1e/acl_get_tag_type.3 b/lib/libc/posix1e/acl_get_tag_type.3
index ff225114a3949..47b81cf73c86e 100644
--- a/lib/libc/posix1e/acl_get_tag_type.3
+++ b/lib/libc/posix1e/acl_get_tag_type.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_get_tag_type.3,v 1.7 2002/12/27 12:15:28 schweikh Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_GET_TAG_TYPE 3
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
index dba89231c44a2..44db86ec374ce 100644
--- a/lib/libc/posix1e/acl_init.3
+++ b/lib/libc/posix1e/acl_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_init.3,v 1.14 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_INIT 3
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index 6ce40de479694..c766ecda0ff6a 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_init.c,v 1.10 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index c3375e000c213..06f0697215754 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_perm.c,v 1.6 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_set.3 b/lib/libc/posix1e/acl_set.3
index a2d50b840dde7..e5280908a9cf9 100644
--- a/lib/libc/posix1e/acl_set.3
+++ b/lib/libc/posix1e/acl_set.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.17 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_SET 3
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index 34d5a336e093f..65a1d07b57255 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_set.c,v 1.12 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_set_permset.3 b/lib/libc/posix1e/acl_set_permset.3
index 152e226d5b977..222cb408a6aab 100644
--- a/lib/libc/posix1e/acl_set_permset.3
+++ b/lib/libc/posix1e/acl_set_permset.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_permset.3,v 1.6 2002/12/18 12:45:09 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_SET_PERMSET 3
diff --git a/lib/libc/posix1e/acl_set_qualifier.3 b/lib/libc/posix1e/acl_set_qualifier.3
index 3442a823f9ec2..ed4091e4f19ab 100644
--- a/lib/libc/posix1e/acl_set_qualifier.3
+++ b/lib/libc/posix1e/acl_set_qualifier.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_qualifier.3,v 1.6 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_SET_QUALIFIER 3
diff --git a/lib/libc/posix1e/acl_set_tag_type.3 b/lib/libc/posix1e/acl_set_tag_type.3
index 3830be7c1d7ff..04b4aa29636dc 100644
--- a/lib/libc/posix1e/acl_set_tag_type.3
+++ b/lib/libc/posix1e/acl_set_tag_type.3
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_set_tag_type.3,v 1.7 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_SET_TAG_TYPE 3
diff --git a/lib/libc/posix1e/acl_size.c b/lib/libc/posix1e/acl_size.c
index e8bd0a423fbfa..a7a4e3ccc304d 100644
--- a/lib/libc/posix1e/acl_size.c
+++ b/lib/libc/posix1e/acl_size.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_size.c,v 1.4 2002/03/22 21:52:38 obrien Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index b49808faa502f..bd8231d556660 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_support.c,v 1.14 2007/02/26 02:07:02 kientzle Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_support.h b/lib/libc/posix1e/acl_support.h
index a5c93c01a043e..bba024e6b4aa9 100644
--- a/lib/libc/posix1e/acl_support.h
+++ b/lib/libc/posix1e/acl_support.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/acl_support.h,v 1.5 2007/02/26 02:07:02 kientzle Exp $
  */
 /*
  * Support functionality for the POSIX.1e ACL interface
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
index 833a6d2a575d8..0da6278a3ea67 100644
--- a/lib/libc/posix1e/acl_to_text.3
+++ b/lib/libc/posix1e/acl_to_text.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_to_text.3,v 1.16 2004/07/02 23:52:11 ru Exp $
 .\"
 .Dd January 28, 2000
 .Dt ACL_TO_TEXT 3
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index f2905c3a05c52..0368280644003 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.11 2003/07/24 23:33:25 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
index 83f7746774a9e..a93d7a2dd17c8 100644
--- a/lib/libc/posix1e/acl_valid.3
+++ b/lib/libc/posix1e/acl_valid.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/acl_valid.3,v 1.16 2005/01/15 12:21:03 ru Exp $
 .\"
 .Dd December 29, 2002
 .Dt ACL_VALID 3
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 9b1f9b96c4d2c..2c35a0a730979 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_valid.c,v 1.10 2002/12/29 20:47:05 rwatson Exp $");
 
 #include <sys/types.h>
 #include "namespace.h"
diff --git a/lib/libc/posix1e/extattr.3 b/lib/libc/posix1e/extattr.3
index 5e606861c6227..f37f7dfb121af 100644
--- a/lib/libc/posix1e/extattr.3
+++ b/lib/libc/posix1e/extattr.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/extattr.3,v 1.5 2002/12/12 17:25:53 ru Exp $
 .\"
 .Dd June 24, 2001
 .Dt EXTATTR 3
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index 5a9ddce3a088e..07076383e7a38 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/extattr.c,v 1.7 2005/09/12 19:52:41 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/extattr.h>
diff --git a/lib/libc/posix1e/mac.3 b/lib/libc/posix1e/mac.3
index ac6affd52e526..33713e96060e6 100644
--- a/lib/libc/posix1e/mac.3
+++ b/lib/libc/posix1e/mac.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.15 2005/07/31 03:30:44 keramida Exp $
 .\"
 .Dd April 19, 2003
 .Dt MAC 3
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index ded9059cdc6cc..2d17148f83d29 100644
--- a/lib/libc/posix1e/mac.c
+++ b/lib/libc/posix1e/mac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac.c,v 1.12 2004/01/06 18:26:15 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac.conf.5 b/lib/libc/posix1e/mac.conf.5
index a8dfba214393e..4ae527af6597e 100644
--- a/lib/libc/posix1e/mac.conf.5
+++ b/lib/libc/posix1e/mac.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.7 2005/01/20 09:17:03 ru Exp $
 .\"
 .Dd April 19, 2003
 .Dt MAC.CONF 5
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
index fb3f994114db4..b7325aca8fd11 100644
--- a/lib/libc/posix1e/mac_exec.c
+++ b/lib/libc/posix1e/mac_exec.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac_exec.c,v 1.2 2003/02/16 17:29:10 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3
index 33ef9ec785a8a..c9673fde4f5a2 100644
--- a/lib/libc/posix1e/mac_free.3
+++ b/lib/libc/posix1e/mac_free.3
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_free.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_FREE 3
diff --git a/lib/libc/posix1e/mac_get.3 b/lib/libc/posix1e/mac_get.3
index cd498d0e4e7d5..832bea5b90e59 100644
--- a/lib/libc/posix1e/mac_get.3
+++ b/lib/libc/posix1e/mac_get.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.10 2004/06/30 20:09:09 ru Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_GET 3
diff --git a/lib/libc/posix1e/mac_get.c b/lib/libc/posix1e/mac_get.c
index 1913f5d21f44f..7ccdc1d455d5a 100644
--- a/lib/libc/posix1e/mac_get.c
+++ b/lib/libc/posix1e/mac_get.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac_get.c,v 1.5 2005/01/23 15:28:02 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac_is_present.3 b/lib/libc/posix1e/mac_is_present.3
index 96d8cbfd9b76d..5a0a2a26d4cde 100644
--- a/lib/libc/posix1e/mac_is_present.3
+++ b/lib/libc/posix1e/mac_is_present.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.9 2006/09/30 10:29:43 ru Exp $
 .\"
 .Dd July 7, 2006
 .Dt MAC_IS_PRESENT 3
diff --git a/lib/libc/posix1e/mac_prepare.3 b/lib/libc/posix1e/mac_prepare.3
index 1d8522908f9a4..e51cc723f3c7f 100644
--- a/lib/libc/posix1e/mac_prepare.3
+++ b/lib/libc/posix1e/mac_prepare.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_prepare.3,v 1.8 2006/07/07 14:02:17 rwatson Exp $
 .\"
 .Dd August 22, 2003
 .Os
diff --git a/lib/libc/posix1e/mac_set.3 b/lib/libc/posix1e/mac_set.3
index 84a1800412df1..c3bd0ffb6fcf1 100644
--- a/lib/libc/posix1e/mac_set.3
+++ b/lib/libc/posix1e/mac_set.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.11 2006/07/07 14:02:17 rwatson Exp $
 .\"
 .Dd January 14, 2003
 .Dt MAC_SET 3
diff --git a/lib/libc/posix1e/mac_set.c b/lib/libc/posix1e/mac_set.c
index 4353ee64f1d8b..4b1c7d9364ee7 100644
--- a/lib/libc/posix1e/mac_set.c
+++ b/lib/libc/posix1e/mac_set.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/posix1e/mac_set.c,v 1.3 2003/02/27 13:40:01 nectar Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3
index 66c1e2113948c..ffc1b3b2a2c46 100644
--- a/lib/libc/posix1e/mac_text.3
+++ b/lib/libc/posix1e/mac_text.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.12 2006/07/07 14:02:17 rwatson Exp $
 .\"
 .Dd December 21, 2001
 .Dt MAC_TEXT 3
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 6333b08b8ab7a..cfbdecfeec503 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.27 2005/11/23 16:24:39 ru Exp $
 .\"
 .Dd January 17, 2000
 .Dt POSIX1E 3
diff --git a/lib/libc/powerpc/Makefile.inc b/lib/libc/powerpc/Makefile.inc
index 453726a670be5..954b7f907a2dd 100644
--- a/lib/libc/powerpc/Makefile.inc
+++ b/lib/libc/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/Makefile.inc,v 1.2 2006/03/13 01:14:58 deischen Exp $
 
 # Long double is 64-bits
 MDSRCS+=machdep_ldisd.c
diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h
index 7ec3075fdf32f..75de39cbd5c0e 100644
--- a/lib/libc/powerpc/SYS.h
+++ b/lib/libc/powerpc/SYS.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	$NetBSD: SYS.h,v 1.8 2002/01/14 00:55:56 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/SYS.h,v 1.6 2003/01/18 23:26:04 obrien Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
index 6982c6e36f8c3..01cff4569b8bb 100644
--- a/lib/libc/powerpc/Symbol.map
+++ b/lib/libc/powerpc/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.5 2007/05/31 13:01:34 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/powerpc/_fpmath.h b/lib/libc/powerpc/_fpmath.h
index 6d80eb4bdf4e2..5285cb9b6f1ee 100644
--- a/lib/libc/powerpc/_fpmath.h
+++ b/lib/libc/powerpc/_fpmath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.7 2005/03/07 04:55:22 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/powerpc/arith.h b/lib/libc/powerpc/arith.h
index 8e2c9ec597b38..4c9b024fdec1c 100644
--- a/lib/libc/powerpc/arith.h
+++ b/lib/libc/powerpc/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
  */
 
 /*
diff --git a/lib/libc/powerpc/gd_qnan.h b/lib/libc/powerpc/gd_qnan.h
index d70d8c318c4c5..4980269f67ad5 100644
--- a/lib/libc/powerpc/gd_qnan.h
+++ b/lib/libc/powerpc/gd_qnan.h
@@ -4,7 +4,7 @@
  * This file can be generated by compiling and running contrib/gdtoa/qnan.c
  * on the target architecture after arith.h has been generated.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/gd_qnan.h,v 1.1 2007/01/03 05:00:03 das Exp $
  */
 
 #define f_QNAN 0x7fc00000
diff --git a/lib/libc/powerpc/gen/Makefile.inc b/lib/libc/powerpc/gen/Makefile.inc
index 4b381c3d93825..0e805ddd26db8 100644
--- a/lib/libc/powerpc/gen/Makefile.inc
+++ b/lib/libc/powerpc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.8 2005/03/15 15:53:38 das Exp $
 
 SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
 	fpgetsticky.c fpsetmask.c fpsetround.c \
diff --git a/lib/libc/powerpc/gen/_ctx_start.S b/lib/libc/powerpc/gen/_ctx_start.S
index a269e86eefc15..eb316b7a2e40b 100644
--- a/lib/libc/powerpc/gen/_ctx_start.S
+++ b/lib/libc/powerpc/gen/_ctx_start.S
@@ -26,7 +26,7 @@
 
  #include <machine/asm.h>
 
- __FBSDID("$FreeBSD$");
+ __FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/_ctx_start.S,v 1.1 2004/03/02 06:22:24 grehan Exp $");
 
 	.globl  CNAME(_ctx_done)
 	.globl  CNAME(abort)
diff --git a/lib/libc/powerpc/gen/_set_tp.c b/lib/libc/powerpc/gen/_set_tp.c
index 5a89698b82c56..6e8ca7d1d13e2 100644
--- a/lib/libc/powerpc/gen/_set_tp.c
+++ b/lib/libc/powerpc/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/powerpc/gen/_set_tp.c,v 1.3 2006/09/02 01:07:21 marcel Exp $
  */
 
 void
diff --git a/lib/libc/powerpc/gen/_setjmp.S b/lib/libc/powerpc/gen/_setjmp.S
index 6d6e5e062a6f7..60cc60c18050c 100644
--- a/lib/libc/powerpc/gen/_setjmp.S
+++ b/lib/libc/powerpc/gen/_setjmp.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $      */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/_setjmp.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/powerpc/gen/fabs.S b/lib/libc/powerpc/gen/fabs.S
index 79475ca9c0a83..f19d2fe589160 100644
--- a/lib/libc/powerpc/gen/fabs.S
+++ b/lib/libc/powerpc/gen/fabs.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fabs.S,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 /*
  * double fabs(double)
diff --git a/lib/libc/powerpc/gen/flt_rounds.c b/lib/libc/powerpc/gen/flt_rounds.c
index ec32a36ed28eb..1179861f817ad 100644
--- a/lib/libc/powerpc/gen/flt_rounds.c
+++ b/lib/libc/powerpc/gen/flt_rounds.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <machine/float.h>
diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c
index 4d9a3b08c2036..a217584705253 100644
--- a/lib/libc/powerpc/gen/fpgetmask.c
+++ b/lib/libc/powerpc/gen/fpgetmask.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c
index 2e4b92277af72..3b3e10661cc89 100644
--- a/lib/libc/powerpc/gen/fpgetround.c
+++ b/lib/libc/powerpc/gen/fpgetround.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c
index e8a21cab2202b..4ff2694ba7bb2 100644
--- a/lib/libc/powerpc/gen/fpgetsticky.c
+++ b/lib/libc/powerpc/gen/fpgetsticky.c
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.1 2004/02/12 09:11:06 grehan Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c
index 76a686730b289..8eb7ee41d9d5b 100644
--- a/lib/libc/powerpc/gen/fpsetmask.c
+++ b/lib/libc/powerpc/gen/fpsetmask.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c
index 13377562b6cf1..60a5d279a71a5 100644
--- a/lib/libc/powerpc/gen/fpsetround.c
+++ b/lib/libc/powerpc/gen/fpsetround.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $");
 
 #include <sys/types.h>
 #include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/infinity.c b/lib/libc/powerpc/gen/infinity.c
index cf1695e68028b..a4b10ac93b46c 100644
--- a/lib/libc/powerpc/gen/infinity.c
+++ b/lib/libc/powerpc/gen/infinity.c
@@ -4,7 +4,7 @@
 __RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/infinity.c,v 1.2 2003/02/08 20:37:53 mike Exp $");
 
 /* infinity.c */
 
diff --git a/lib/libc/powerpc/gen/makecontext.c b/lib/libc/powerpc/gen/makecontext.c
index d66e82457a4ed..b8695ea3d8c5c 100644
--- a/lib/libc/powerpc/gen/makecontext.c
+++ b/lib/libc/powerpc/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/makecontext.c,v 1.2 2004/07/19 12:05:07 grehan Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/powerpc/gen/modf.c b/lib/libc/powerpc/gen/modf.c
index 37786dc1e19b8..108b7f8e5c0b7 100644
--- a/lib/libc/powerpc/gen/modf.c
+++ b/lib/libc/powerpc/gen/modf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/modf.c,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/powerpc/gen/setjmp.S b/lib/libc/powerpc/gen/setjmp.S
index a7961206f6cb5..33ec9866710e7 100644
--- a/lib/libc/powerpc/gen/setjmp.S
+++ b/lib/libc/powerpc/gen/setjmp.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $        */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/setjmp.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include <sys/syscall.h>
 	
diff --git a/lib/libc/powerpc/gen/signalcontext.c b/lib/libc/powerpc/gen/signalcontext.c
index 30e2be848b2b0..fd828c7a6f79b 100644
--- a/lib/libc/powerpc/gen/signalcontext.c
+++ b/lib/libc/powerpc/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/signalcontext.c,v 1.1 2004/07/19 12:08:03 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/powerpc/gen/sigsetjmp.S b/lib/libc/powerpc/gen/sigsetjmp.S
index 3d5d1e510e54f..05fd2cceb7957 100644
--- a/lib/libc/powerpc/gen/sigsetjmp.S
+++ b/lib/libc/powerpc/gen/sigsetjmp.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $     */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/sigsetjmp.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 /*
  * C library -- sigsetjmp, siglongjmp
diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c
index 02ab938f508e7..dc8b98c285989 100644
--- a/lib/libc/powerpc/gen/syncicache.c
+++ b/lib/libc/powerpc/gen/syncicache.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.4 2007/06/10 16:32:08 marcel Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/powerpc/sys/Makefile.inc b/lib/libc/powerpc/sys/Makefile.inc
index 6ca7938c12517..c1e4ea6aa09c2 100644
--- a/lib/libc/powerpc/sys/Makefile.inc
+++ b/lib/libc/powerpc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/powerpc/sys/Makefile.inc,v 1.3 2007/07/04 23:23:00 peter Exp $
 
 MDASM+=	brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S
 
diff --git a/lib/libc/powerpc/sys/brk.S b/lib/libc/powerpc/sys/brk.S
index 9223db3d680b8..365997139a8aa 100644
--- a/lib/libc/powerpc/sys/brk.S
+++ b/lib/libc/powerpc/sys/brk.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: brk.S,v 1.9 2000/06/26 06:25:43 kleink Exp $   */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/brk.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/cerror.S b/lib/libc/powerpc/sys/cerror.S
index 91a30062b8933..9b8f5fed723b0 100644
--- a/lib/libc/powerpc/sys/cerror.S
+++ b/lib/libc/powerpc/sys/cerror.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: cerror.S,v 1.5 2000/01/27 14:58:48 kleink Exp $        */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/cerror.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 	
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/exect.S b/lib/libc/powerpc/sys/exect.S
index d5f9c201b676a..bb510c73b432d 100644
--- a/lib/libc/powerpc/sys/exect.S
+++ b/lib/libc/powerpc/sys/exect.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: exect.S,v 1.3 1998/05/25 15:28:03 ws Exp $     */
 	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/exect.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/pipe.S b/lib/libc/powerpc/sys/pipe.S
index 3ca2358321e2f..b0ad198913f49 100644
--- a/lib/libc/powerpc/sys/pipe.S
+++ b/lib/libc/powerpc/sys/pipe.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: pipe.S,v 1.6 2000/09/28 08:38:54 kleink Exp $  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/pipe.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/ptrace.S b/lib/libc/powerpc/sys/ptrace.S
index f47fc67c70e95..dd36833cf74d7 100644
--- a/lib/libc/powerpc/sys/ptrace.S
+++ b/lib/libc/powerpc/sys/ptrace.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: ptrace.S,v 1.3 2000/02/23 20:16:57 kleink Exp $        */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/ptrace.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/sbrk.S b/lib/libc/powerpc/sys/sbrk.S
index 47fc0fe620280..efd889e194f6b 100644
--- a/lib/libc/powerpc/sys/sbrk.S
+++ b/lib/libc/powerpc/sys/sbrk.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:44 kleink Exp $  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/sbrk.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/powerpc/sys/setlogin.S b/lib/libc/powerpc/sys/setlogin.S
index c65e639ba55f9..3ec868b33bd08 100644
--- a/lib/libc/powerpc/sys/setlogin.S
+++ b/lib/libc/powerpc/sys/setlogin.S
@@ -26,7 +26,7 @@
 /*      $NetBSD: setlogin.S,v 1.3 1998/11/24 11:14:57 tsubai Exp $      */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/powerpc/sys/setlogin.S,v 1.1 2002/12/04 07:25:14 grehan Exp $");
 	
 #include "SYS.h"
 
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 14a5b1f50d13c..011948bafc500 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.11 2007/07/06 13:42:24 deischen Exp $
 
 # Quad support, if needed
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad
diff --git a/lib/libc/quad/Symbol.map b/lib/libc/quad/Symbol.map
index 82ad9402a9ff3..963d40633d29e 100644
--- a/lib/libc/quad/Symbol.map
+++ b/lib/libc/quad/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/quad/Symbol.map,v 1.3 2007/05/31 13:07:37 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
index a9471a2ec632e..e5fcc62680298 100644
--- a/lib/libc/quad/TESTS/divrem.c
+++ b/lib/libc/quad/TESTS/divrem.c
@@ -41,7 +41,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)divrem.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/TESTS/divrem.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
index ba543be0ea91b..b357f50886f8a 100644
--- a/lib/libc/quad/TESTS/mul.c
+++ b/lib/libc/quad/TESTS/mul.c
@@ -41,7 +41,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/TESTS/mul.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c
index 40712216415f9..3a236ea18f373 100644
--- a/lib/libc/quad/adddi3.c
+++ b/lib/libc/quad/adddi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)adddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/adddi3.c,v 1.3 2007/01/09 00:28:02 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c
index 575a35ca91ebb..ca7aa57f1652f 100644
--- a/lib/libc/quad/anddi3.c
+++ b/lib/libc/quad/anddi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)anddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/anddi3.c,v 1.3 2007/01/09 00:28:02 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c
index c2fd87428f5b2..19687992c5f7f 100644
--- a/lib/libc/quad/ashldi3.c
+++ b/lib/libc/quad/ashldi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ashldi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/ashldi3.c,v 1.3 2007/01/09 00:28:02 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
index b5b1efd28f99e..384949b1234f8 100644
--- a/lib/libc/quad/ashrdi3.c
+++ b/lib/libc/quad/ashrdi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ashrdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/ashrdi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c
index 10cb48ca7fe5d..9909a29bcf933 100644
--- a/lib/libc/quad/cmpdi2.c
+++ b/lib/libc/quad/cmpdi2.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)cmpdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/cmpdi2.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c
index 4142056739e6f..baa118bf3ac5c 100644
--- a/lib/libc/quad/divdi3.c
+++ b/lib/libc/quad/divdi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)divdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/divdi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
index 2e3c18d541070..be43d770b3c17 100644
--- a/lib/libc/quad/fixdfdi.c
+++ b/lib/libc/quad/fixdfdi.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)fixdfdi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixdfdi.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
index 15ab68b1bd511..65c50c6463fe5 100644
--- a/lib/libc/quad/fixsfdi.c
+++ b/lib/libc/quad/fixsfdi.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)fixsfdi.c	5.1 (Berkeley) 7/7/92";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixsfdi.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
index 7b6c05e0508d1..a00b960de4a55 100644
--- a/lib/libc/quad/fixunsdfdi.c
+++ b/lib/libc/quad/fixunsdfdi.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)fixunsdfdi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixunsdfdi.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
index 9b13c792549c2..98a2710325e06 100644
--- a/lib/libc/quad/fixunssfdi.c
+++ b/lib/libc/quad/fixunssfdi.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)fixunssfdi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/fixunssfdi.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
index 7167715adc533..056e46cd08fee 100644
--- a/lib/libc/quad/floatdidf.c
+++ b/lib/libc/quad/floatdidf.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)floatdidf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/floatdidf.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
index 0cf7af8bc101a..793ee5d7d329e 100644
--- a/lib/libc/quad/floatdisf.c
+++ b/lib/libc/quad/floatdisf.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)floatdisf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/floatdisf.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
index 264cd6249637c..4872cc1e1d337 100644
--- a/lib/libc/quad/floatunsdidf.c
+++ b/lib/libc/quad/floatunsdidf.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)floatunsdidf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/floatunsdidf.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c
index 5f4c67c898b3c..2a79c1e4e315b 100644
--- a/lib/libc/quad/iordi3.c
+++ b/lib/libc/quad/iordi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)iordi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/iordi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c
index 56fb0597e3661..91c6885b537bb 100644
--- a/lib/libc/quad/lshldi3.c
+++ b/lib/libc/quad/lshldi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)lshldi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/lshldi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c
index 4fc9362b06e59..680e1b4c60111 100644
--- a/lib/libc/quad/lshrdi3.c
+++ b/lib/libc/quad/lshrdi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)lshrdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/lshrdi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c
index 9dbf1c3bce1bb..b0dbed0ba34d4 100644
--- a/lib/libc/quad/moddi3.c
+++ b/lib/libc/quad/moddi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)moddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/moddi3.c,v 1.4 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
index 05c84b9e0e9c0..70d59025b0cb9 100644
--- a/lib/libc/quad/muldi3.c
+++ b/lib/libc/quad/muldi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/muldi3.c,v 1.4 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c
index 6af1ea9021529..9f30011b263f9 100644
--- a/lib/libc/quad/negdi2.c
+++ b/lib/libc/quad/negdi2.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)negdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/negdi2.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c
index b5480bc17dc5e..ea963544f79e4 100644
--- a/lib/libc/quad/notdi2.c
+++ b/lib/libc/quad/notdi2.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)notdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/notdi2.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index e8e3c9857e600..d7a75617c7ba0 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/qdivrem.c,v 1.4 2007/01/09 00:28:03 imp Exp $");
 
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index d496fc6daba74..7d6d44c53c765 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/quad/quad.h,v 1.8 2007/01/09 00:28:03 imp Exp $
  */
 
 /*
diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c
index b31f0406e3891..48c45069b9f41 100644
--- a/lib/libc/quad/subdi3.c
+++ b/lib/libc/quad/subdi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)subdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/subdi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c
index 6605896e533df..c40dbe7da8b4b 100644
--- a/lib/libc/quad/ucmpdi2.c
+++ b/lib/libc/quad/ucmpdi2.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)ucmpdi2.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/ucmpdi2.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c
index 8b5a7888faf47..0a16767fb260d 100644
--- a/lib/libc/quad/udivdi3.c
+++ b/lib/libc/quad/udivdi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)udivdi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/udivdi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c
index 29ce2cba88196..e54cfb28522d2 100644
--- a/lib/libc/quad/umoddi3.c
+++ b/lib/libc/quad/umoddi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)umoddi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/umoddi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c
index ec7f6bd522060..248cc96218fa0 100644
--- a/lib/libc/quad/xordi3.c
+++ b/lib/libc/quad/xordi3.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)xordi3.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/quad/xordi3.c,v 1.3 2007/01/09 00:28:03 imp Exp $");
 
 #include "quad.h"
 
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index a2e23ebaf903a..1e930e893c57d 100644
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.8 2006/03/13 01:14:58 deischen Exp $
 
 # regex sources
 .PATH: ${.CURDIR}/regex
diff --git a/lib/libc/regex/Symbol.map b/lib/libc/regex/Symbol.map
index 5821f62b64309..af7584dede65e 100644
--- a/lib/libc/regex/Symbol.map
+++ b/lib/libc/regex/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/Symbol.map,v 1.2 2007/04/29 14:05:18 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
index 7087bcb565f36..19b4ddb4bbee3 100644
--- a/lib/libc/regex/cname.h
+++ b/lib/libc/regex/cname.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/cname.h,v 1.4 2007/01/09 00:28:04 imp Exp $
  */
 
 /* character-name table */
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index a44511b8d5610..20327558768d3 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.21 2007/05/25 12:44:58 delphij Exp $");
 
 /*
  * The matching engine and friends.  This file is #included by regexec.c
diff --git a/lib/libc/regex/grot/Makefile b/lib/libc/regex/grot/Makefile
index 3e4172432f1c9..be00e5d00ed14 100644
--- a/lib/libc/regex/grot/Makefile
+++ b/lib/libc/regex/grot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/grot/Makefile,v 1.4 2004/07/19 08:48:17 tjr Exp $
 # You probably want to take -DREDEBUG out of CFLAGS, and put something like
 # -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of
 # internal assertion checking).  Take -Dconst= out for an ANSI compiler.
diff --git a/lib/libc/regex/grot/debug.c b/lib/libc/regex/grot/debug.c
index caa2ca39612d3..74bca46573311 100644
--- a/lib/libc/regex/grot/debug.c
+++ b/lib/libc/regex/grot/debug.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/debug.c,v 1.4 2004/07/19 08:28:53 tjr Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c
index 6b2bf386eed4f..b43c0eb4f595d 100644
--- a/lib/libc/regex/grot/main.c
+++ b/lib/libc/regex/grot/main.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/main.c,v 1.3 2002/03/22 21:52:48 obrien Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/grot/mkh b/lib/libc/regex/grot/mkh
index 1deba7983d5ce..72bf2215d05c3 100755
--- a/lib/libc/regex/grot/mkh
+++ b/lib/libc/regex/grot/mkh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # mkh - pull headers out of C source
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/grot/mkh,v 1.3 2002/03/22 19:45:43 obrien Exp $
 PATH=/bin:/usr/bin ; export PATH
 
 # egrep pattern to pick out marked lines
diff --git a/lib/libc/regex/grot/split.c b/lib/libc/regex/grot/split.c
index 70e0ec5fca904..fbc8b012b9994 100644
--- a/lib/libc/regex/grot/split.c
+++ b/lib/libc/regex/grot/split.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/grot/split.c,v 1.3 2002/03/22 21:52:48 obrien Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/grot/tests b/lib/libc/regex/grot/tests
index 95a21bb0fdd4b..c6e4f57a145f0 100644
--- a/lib/libc/regex/grot/tests
+++ b/lib/libc/regex/grot/tests
@@ -1,5 +1,5 @@
 # regular expression test set
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.3 2007/03/05 09:44:41 delphij Exp $
 # Lines are at least three fields, separated by one or more tabs.  "" stands
 # for an empty field.  First field is an RE.  Second field is flags.  If
 # C flag given, regcomp() is expected to fail, and the third field is the
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index d4555a02d0a68..4527043f2a7d6 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/regex/re_format.7,v 1.11 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd March 20, 1994
 .Dt RE_FORMAT 7
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 39ae1d4679e12..6691eec273522 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.36 2007/06/11 03:05:54 delphij Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index b9b773cc602ee..9364bd4329616 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regerror.c,v 1.11 2007/06/11 03:05:54 delphij Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index ea1ba25a90b41..f848d66c3a3c5 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.21 2007/01/09 00:28:04 imp Exp $
 .\"
 .Dd August 17, 2005
 .Dt REGEX 3
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 7aa717edc1676..13bbf64a73c07 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.11 2007/01/09 00:28:04 imp Exp $
  */
 
 /*
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index 1cf87b810471c..4bc04ae6bdddd 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regexec.c,v 1.8 2007/06/11 03:05:54 delphij Exp $");
 
 /*
  * the outer shell of regexec()
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
index c979becdaf4d8..aa795fa783dcc 100644
--- a/lib/libc/regex/regfree.c
+++ b/lib/libc/regex/regfree.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/regex/regfree.c,v 1.8 2007/06/11 03:05:54 delphij Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/regex/utils.h b/lib/libc/regex/utils.h
index 3531aed232ed0..2a2ed9694de53 100644
--- a/lib/libc/regex/utils.h
+++ b/lib/libc/regex/utils.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/regex/utils.h,v 1.3 2007/01/09 00:28:04 imp Exp $
  */
 
 /* utility definitions */
diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc
index cd023cfc54a27..285281b31d16c 100644
--- a/lib/libc/resolv/Makefile.inc
+++ b/lib/libc/resolv/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/resolv/Makefile.inc,v 1.3 2006/05/21 11:19:36 ume Exp $
 
 # resolv sources
 .PATH: ${.CURDIR}/resolv
diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map
index 211f2c4c734b3..dd678ba3420e0 100644
--- a/lib/libc/resolv/Symbol.map
+++ b/lib/libc/resolv/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/resolv/Symbol.map,v 1.7 2007/04/29 14:05:18 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/resolv/h_errno.c b/lib/libc/resolv/h_errno.c
index 88d15aee7f9cb..ffa467bc1273b 100644
--- a/lib/libc/resolv/h_errno.c
+++ b/lib/libc/resolv/h_errno.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/resolv/h_errno.c,v 1.2 2006/05/21 11:29:26 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index cb9dd0e524c69..109aeb70fd1f9 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -49,7 +49,7 @@ static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: herror.c,v 1.3.18.1 2005/04/27 05:01:09 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/herror.c,v 1.4 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/resolv/mtctxres.c b/lib/libc/resolv/mtctxres.c
index f02a7f50281a2..46954bd76132b 100644
--- a/lib/libc/resolv/mtctxres.c
+++ b/lib/libc/resolv/mtctxres.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/mtctxres.c,v 1.3 2006/12/15 20:59:55 ume Exp $");
 
 #include <port_before.h>
 #ifdef DO_PTHREADS
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index 35d6231858445..c2032ebb62ada 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -69,7 +69,7 @@ static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.4 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index 5a1a50c8c84c7..d172a2e95a3d0 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -19,7 +19,7 @@
 static const char rcsid[] = "$Id: res_data.c,v 1.3.18.2 2007/09/14 05:35:47 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.4.2.1 2007/12/14 20:32:13 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index a367a61a8fb9e..97073ed3074c6 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -94,7 +94,7 @@ static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_debug.c,v 1.5 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/resolv/res_findzonecut.c b/lib/libc/resolv/res_findzonecut.c
index 23c1af4f359c1..eb835ea0c5078 100644
--- a/lib/libc/resolv/res_findzonecut.c
+++ b/lib/libc/resolv/res_findzonecut.c
@@ -20,7 +20,7 @@ static const char rcsid[] = "$Id: res_findzonecut.c,v 1.7.18.3 2005/10/11 00:25:
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_findzonecut.c,v 1.3 2007/06/03 17:20:27 ume Exp $");
 
 /* Import. */
 
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 661e880f37e40..463251600d5cf 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -69,7 +69,7 @@ static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static const char rcsid[] = "$Id: res_init.c,v 1.16.18.7 2007/07/09 01:52:58 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.6.2.1 2007/12/14 20:32:13 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index f823026dce8ee..83596841f05d7 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -69,7 +69,7 @@ static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.1 2005/04/27 05:01:11 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkquery.c,v 1.4 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 589c056035fed..0086e3da5452f 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -25,7 +25,7 @@
 static const char rcsid[] = "$Id: res_mkupdate.c,v 1.4.18.4 2005/10/14 05:44:12 marka Exp $";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkupdate.c,v 1.3 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 3813291c8ab9d..e817c290dca3f 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -69,7 +69,7 @@ static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: res_query.c,v 1.7.18.1 2005/04/27 05:01:11 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_query.c,v 1.5 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index 78410d1c44ef0..1f4c9c69903f9 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -69,7 +69,7 @@ static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "$Id: res_send.c,v 1.9.18.8 2006/10/16 23:00:58 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.8 2007/06/03 17:20:27 ume Exp $");
 
 /*! \file
  * \brief
diff --git a/lib/libc/resolv/res_state.c b/lib/libc/resolv/res_state.c
index 59c943060757c..ef0c28c48c913 100644
--- a/lib/libc/resolv/res_state.c
+++ b/lib/libc/resolv/res_state.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/resolv/res_state.c,v 1.3 2006/05/21 11:29:26 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/resolv/res_update.c b/lib/libc/resolv/res_update.c
index a05e26d1f57e9..cad12c4ff5bda 100644
--- a/lib/libc/resolv/res_update.c
+++ b/lib/libc/resolv/res_update.c
@@ -26,7 +26,7 @@ static const char rcsid[] = "$Id: res_update.c,v 1.12.18.1 2005/04/27 05:01:12 s
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_update.c,v 1.3 2007/06/03 17:20:27 ume Exp $");
 
 #include "port_before.h"
 
diff --git a/lib/libc/rpc/DISCLAIMER b/lib/libc/rpc/DISCLAIMER
index 9a3a99161ae8c..738db7df82982 100644
--- a/lib/libc/rpc/DISCLAIMER
+++ b/lib/libc/rpc/DISCLAIMER
@@ -1,5 +1,5 @@
 /*	$NetBSD: DISCLAIMER,v 1.2 1998/01/09 04:11:51 perry Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/lib/libc/rpc/DISCLAIMER,v 1.2 2001/03/19 12:49:49 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/lib/libc/rpc/LICENSE b/lib/libc/rpc/LICENSE
index 5f1205c7052d1..6914461a79048 100644
--- a/lib/libc/rpc/LICENSE
+++ b/lib/libc/rpc/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libc/rpc/LICENSE,v 1.1 2002/07/11 16:23:04 alfred Exp $
 
 Sun Industry Standards Source License 1.0
 
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index dceecc7a4c809..2e6ec00c88b57 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile    5.11 (Berkeley) 9/6/90
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.28 2006/03/13 01:14:59 deischen Exp $
 
 .PATH: ${.CURDIR}/rpc ${.CURDIR}/.
 SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
diff --git a/lib/libc/rpc/PSD.doc/nfs.rfc.ms b/lib/libc/rpc/PSD.doc/nfs.rfc.ms
index 13d761908a8ee..75c25a6723ad2 100644
--- a/lib/libc/rpc/PSD.doc/nfs.rfc.ms
+++ b/lib/libc/rpc/PSD.doc/nfs.rfc.ms
@@ -2,7 +2,7 @@
 .\" Must use  --  tbl  --  with this one
 .\"
 .\" @(#)nfs.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/nfs.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/rpc.prog.ms b/lib/libc/rpc/PSD.doc/rpc.prog.ms
index 8b791309747e3..1fbde7d3fd5b1 100644
--- a/lib/libc/rpc/PSD.doc/rpc.prog.ms
+++ b/lib/libc/rpc/PSD.doc/rpc.prog.ms
@@ -2,7 +2,7 @@
 .\" Must use -- tbl and pic -- with this one
 .\"
 .\" @(#)rpc.prog.ms	2.3 88/08/11 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpc.prog.ms,v 1.5 2003/01/01 18:48:43 schweikh Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/rpc.rfc.ms b/lib/libc/rpc/PSD.doc/rpc.rfc.ms
index 9a948bd445dc4..a7652c0b8d195 100644
--- a/lib/libc/rpc/PSD.doc/rpc.rfc.ms
+++ b/lib/libc/rpc/PSD.doc/rpc.rfc.ms
@@ -2,7 +2,7 @@
 .\" Must use  --  tbl  --  with this one
 .\"
 .\" @(#)rpc.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpc.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/rpcgen.ms b/lib/libc/rpc/PSD.doc/rpcgen.ms
index e663e7fd4f941..de4f1ac05ee97 100644
--- a/lib/libc/rpc/PSD.doc/rpcgen.ms
+++ b/lib/libc/rpc/PSD.doc/rpcgen.ms
@@ -2,7 +2,7 @@
 .\" Must use  --  tbl -- for this one
 .\"
 .\" @(#)rpcgen.ms	2.2 88/08/04 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpcgen.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/PSD.doc/stubs b/lib/libc/rpc/PSD.doc/stubs
index 78b0a2c815d34..d715d3a4afe14 100644
--- a/lib/libc/rpc/PSD.doc/stubs
+++ b/lib/libc/rpc/PSD.doc/stubs
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/stubs,v 1.3 2002/10/29 15:00:10 ru Exp $
 .\"
 .if t .ftr L CR
diff --git a/lib/libc/rpc/PSD.doc/xdr.nts.ms b/lib/libc/rpc/PSD.doc/xdr.nts.ms
index 260c7f37eb050..55f26c604c973 100644
--- a/lib/libc/rpc/PSD.doc/xdr.nts.ms
+++ b/lib/libc/rpc/PSD.doc/xdr.nts.ms
@@ -2,7 +2,7 @@
 .\" Must use --  eqn -- with this one
 .\"
 .\" @(#)xdr.nts.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/xdr.nts.ms,v 1.4 2003/01/01 18:48:43 schweikh Exp $
 .\"
 .EQ
 delim $$
diff --git a/lib/libc/rpc/PSD.doc/xdr.rfc.ms b/lib/libc/rpc/PSD.doc/xdr.rfc.ms
index 480a339bce570..aa09e2d433d01 100644
--- a/lib/libc/rpc/PSD.doc/xdr.rfc.ms
+++ b/lib/libc/rpc/PSD.doc/xdr.rfc.ms
@@ -2,7 +2,7 @@
 .\"  Must use -- tbl -- with this one
 .\"
 .\" @(#)xdr.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/xdr.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
 .\"
 .de BT
 .if \\n%=1 .tl ''- % -''
diff --git a/lib/libc/rpc/README b/lib/libc/rpc/README
index c915fad283c6e..45bbd529627c0 100644
--- a/lib/libc/rpc/README
+++ b/lib/libc/rpc/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libc/rpc/README,v 1.2 2001/03/19 12:49:50 alfred Exp $
 
 PLEASE READ THE DISCLAIMER FILE.  DO NOT CALL THE SUN MICROSYSTEMS SUPPORT
 LINE WITH QUESTIONS ON THIS RELEASE.  THEY CANNOT ANSWER QUESTIONS ABOUT THIS
diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map
index e3ac6a608f7af..1628971756916 100644
--- a/lib/libc/rpc/Symbol.map
+++ b/lib/libc/rpc/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/rpc/Symbol.map,v 1.3 2007/05/31 13:01:34 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index 8f363e91a64f8..1335c680e0c2f 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -58,7 +58,7 @@
 static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.10 2006/02/27 22:10:58 deischen Exp $");
 
 #define USEC_PER_SEC		1000000
 #define RTIME_TIMEOUT		5	/* seconds to wait for sync */
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 01ad70139c7c1..6d2e406518a38 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.14 2006/02/27 22:10:58 deischen Exp $");
 
 /*
  * auth_none.c
diff --git a/lib/libc/rpc/auth_time.c b/lib/libc/rpc/auth_time.c
index 7aea23268a571..0e0c59dba132a 100644
--- a/lib/libc/rpc/auth_time.c
+++ b/lib/libc/rpc/auth_time.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_time.c,v 1.12 2007/09/20 22:35:24 matteo Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 5801015c25d12..b4b20a3f4609c 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.18 2007/06/14 20:07:35 harti Exp $");
 
 /*
  * auth_unix.c, Implements UNIX style authentication parameters.
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
index 19969b01819af..b9069c5a30673 100644
--- a/lib/libc/rpc/authdes_prot.c
+++ b/lib/libc/rpc/authdes_prot.c
@@ -2,7 +2,7 @@
 static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/authdes_prot.c,v 1.4 2002/03/22 23:18:36 obrien Exp $");
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index 441ba40affa89..9b5b4cb536da3 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * authunix_prot.c
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index 28e86e5f2a6fa..92ebf56b551cf 100644
--- a/lib/libc/rpc/bindresvport.3
+++ b/lib/libc/rpc/bindresvport.3
@@ -1,6 +1,6 @@
 .\" @(#)bindresvport.3n	2.2 88/08/02 4.0 RPCSRC; from 1.7 88/03/14 SMI
 .\" $NetBSD: bindresvport.3,v 1.8 2000/07/05 15:45:33 msaitoh Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/bindresvport.3,v 1.15 2002/12/18 12:45:10 ru Exp $
 .\"
 .Dd November 22, 1987
 .Dt BINDRESVPORT 3
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 75a1c8fd1c3dc..9ab2221d8a9f9 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -35,7 +35,7 @@ static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";
 #endif
 /* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1987 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index eef0ca59a02f6..823fd3f2c1aa5 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.9 2006/09/09 22:14:42 mbr Exp $");
 
 
 /*
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index 27296abf7a9f6..432625be9a7b7 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.19 2007/03/04 12:25:03 simon Exp $");
 
 /*
  * Implements a connectionless client side RPC.
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 302a30e96c605..9b74c6a53032b 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -53,7 +53,7 @@ static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
 static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index 4b6d6b1e6e0fe..e3e982bf30635 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -35,7 +35,7 @@ static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * clnt_perror.c
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 9d34a3d445cf1..88c011f6f0646 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.20 2006/02/27 22:10:58 deischen Exp $");
 
 /*
  * clnt_raw.c
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index 12b6679f240f6..1e233c42692cd 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -37,7 +37,7 @@ static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Mic
 static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.20 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * clnt_simple.c
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index 414eb0bcaa68d..805b8b7c53835 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -35,7 +35,7 @@ static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.20 2006/09/09 22:18:57 mbr Exp $");
  
 /*
  * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index 255b266f0567b..cdb5a0dc991ae 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/crypt_client.c,v 1.9 2003/02/16 17:29:10 nectar Exp $");
 
 #include "namespace.h"
 #include <err.h>
diff --git a/lib/libc/rpc/des_crypt.3 b/lib/libc/rpc/des_crypt.3
index b40a62c4ae298..51ebe40d83b64 100644
--- a/lib/libc/rpc/des_crypt.3
+++ b/lib/libc/rpc/des_crypt.3
@@ -1,5 +1,5 @@
 .\" @(#)des_crypt.3	2.1 88/08/11 4.0 RPCSRC; from 1.16 88/03/02 SMI;
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/des_crypt.3,v 1.9 2002/12/19 09:40:23 ru Exp $
 .\"
 .Dd October 6, 1987
 .Dt DES_CRYPT 3
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 238d55af7b120..f1e4b9efb0d3f 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
 
 static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
 int (*__des_crypt_LOCAL)() = 0;
diff --git a/lib/libc/rpc/des_soft.c b/lib/libc/rpc/des_soft.c
index daed2654e4456..f5bef95103fb6 100644
--- a/lib/libc/rpc/des_soft.c
+++ b/lib/libc/rpc/des_soft.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.3 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Table giving odd parity in the low bit for ASCII characters
diff --git a/lib/libc/rpc/getnetconfig.3 b/lib/libc/rpc/getnetconfig.3
index e67b9bbb75c9b..d6c2e5c38608c 100644
--- a/lib/libc/rpc/getnetconfig.3
+++ b/lib/libc/rpc/getnetconfig.3
@@ -1,6 +1,6 @@
 .\" @(#)getnetconfig.3n 1.28 93/06/02 SMI; from SVr4
 .\" $NetBSD: getnetconfig.3,v 1.1 2000/06/02 23:11:11 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getnetconfig.3,v 1.4 2002/12/19 09:40:23 ru Exp $
 .\" Copyright 1989 AT&T
 .Dd April 22, 2000
 .Dt GETNETCONFIG 3
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index 1bb3368ab3573..7b7b8c238f0cb 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.14 2007/09/20 22:35:24 matteo Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getnetpath.3 b/lib/libc/rpc/getnetpath.3
index 5dfe68ad6ec90..c5717063402f9 100644
--- a/lib/libc/rpc/getnetpath.3
+++ b/lib/libc/rpc/getnetpath.3
@@ -1,6 +1,6 @@
 .\" @(#)getnetpath.3n 1.26 93/05/07 SMI; from SVr4
 .\" $NetBSD: getnetpath.3,v 1.1 2000/06/02 23:11:11 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getnetpath.3,v 1.5 2002/12/18 12:45:10 ru Exp $
 .\" Copyright 1989 AT&T
 .Dd April 22, 2000
 .Dt GETNETPATH 3
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index 0563544df2af3..31d9badd61b34 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.8 2007/09/20 22:35:24 matteo Exp $");
 
 /*
  * Copyright (c) 1989 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index 3c9533888580c..2f705ff489735 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.9 2006/02/28 16:02:26 deischen Exp $");
 
 /*
  * publickey.c
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index 1a999eb3f9cbe..b33f874a4f54f 100644
--- a/lib/libc/rpc/getrpcent.3
+++ b/lib/libc/rpc/getrpcent.3
@@ -1,6 +1,6 @@
 .\" @(#)getrpcent.3n	2.2 88/08/02 4.0 RPCSRC; from 1.11 88/03/14 SMI
 .\" $NetBSD: getrpcent.3,v 1.6 1998/02/05 18:49:06 perry Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getrpcent.3,v 1.18 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd December 14, 1987
 .Dt GETRPCENT 3
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index abee480b35f54..73082ed2e2dc4 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -34,7 +34,7 @@
 static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcent.c,v 1.16 2007/05/17 03:34:33 jon Exp $");
 
 /*
  * Copyright (c) 1984 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getrpcport.3 b/lib/libc/rpc/getrpcport.3
index 6e1f199e7b3c0..e28ed3f5fb9fa 100644
--- a/lib/libc/rpc/getrpcport.3
+++ b/lib/libc/rpc/getrpcport.3
@@ -1,5 +1,5 @@
 .\" @(#)getrpcport.3r	2.2 88/08/02 4.0 RPCSRC; from 1.12 88/02/26 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/getrpcport.3,v 1.9 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd October 6, 1987
 .Dt GETRPCPORT 3
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 676a1f5ae1455..155320f6a087d 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 static char *sccsid = "@(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
 
 /*
  * Copyright (c) 1985 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index 615f24d9e867d..ae0ae308289f1 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -32,7 +32,7 @@
 
 #ident	"@(#)key_call.c	1.25	94/04/24 SMI"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.16 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * key_call.c, Interface to keyserver
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
index 18b132894eaec..fe3c1074d98fe 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -38,7 +38,7 @@
 
 /* #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
 
 /* 
  * Compiled from key_prot.x using rpcgen.
diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
index 62416117382d7..d33dac6781f28 100644
--- a/lib/libc/rpc/mt_misc.c
+++ b/lib/libc/rpc/mt_misc.c
@@ -2,7 +2,7 @@
 
 /* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.7 2006/02/27 22:10:59 deischen Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc/rpc/mt_misc.h b/lib/libc/rpc/mt_misc.h
index e785c30636875..d511fe34ba1d6 100644
--- a/lib/libc/rpc/mt_misc.h
+++ b/lib/libc/rpc/mt_misc.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/rpc/mt_misc.h,v 1.2 2006/02/28 07:36:25 delphij Exp $
  */
 #ifndef _MT_MISC_H
 #define	_MT_MISC_H
diff --git a/lib/libc/rpc/netconfig.5 b/lib/libc/rpc/netconfig.5
index edd2f63a0f536..7144ea29116b6 100644
--- a/lib/libc/rpc/netconfig.5
+++ b/lib/libc/rpc/netconfig.5
@@ -1,6 +1,6 @@
 .\"	$NetBSD: netconfig.5,v 1.2 2000/11/08 13:18:28 lukem Exp $
 .\" $NetBSD: netconfig.5,v 1.2 2000/11/08 13:18:28 lukem Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/netconfig.5,v 1.3 2006/01/11 13:57:15 ceri Exp $
 .Dd November 17, 2000
 .Dt NETCONFIG 5
 .Os
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c
index 2f305307b7bce..e8e72c3dd5525 100644
--- a/lib/libc/rpc/netname.c
+++ b/lib/libc/rpc/netname.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.8 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * netname utility routines
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 7e567dffaf3df..d88793d177605 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.12 2005/03/10 00:58:21 stefanf Exp $");
 
 /*
  * netname utility routines convert from unix names to network names and
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index a0db013d3a816..81caea768453f 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_clnt.c
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 42d3720b09db2..dcb895c8f428c 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.16 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_getmap.c
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index ca0aafde9b294..1fdda9a17e227 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Mic
 static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_getport.c
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index 2c01311815f0c..d9b66e88a60c2 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.9 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_prot.c
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index ae7c7c6fe4a8d..e3c6c2fe2089c 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.10 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_prot2.c
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index ddcde2e0587e9..a74f75b6d466b 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.20 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * pmap_rmt.c
diff --git a/lib/libc/rpc/publickey.3 b/lib/libc/rpc/publickey.3
index d0ad6ccda8fb2..daecf280dd156 100644
--- a/lib/libc/rpc/publickey.3
+++ b/lib/libc/rpc/publickey.3
@@ -1,5 +1,5 @@
 .\" @(#)publickey.3r	2.1 88/08/07 4.0 RPCSRC
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/publickey.3,v 1.8 2005/11/23 16:44:23 ru Exp $
 .\"
 .Dd October 6, 1987
 .Dt PUBLICKEY 3
diff --git a/lib/libc/rpc/publickey.5 b/lib/libc/rpc/publickey.5
index 71f4ef6aca404..674ad29b46252 100644
--- a/lib/libc/rpc/publickey.5
+++ b/lib/libc/rpc/publickey.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/publickey.5,v 1.7 2003/08/26 15:52:47 eivind Exp $
 .\" @(#)publickey.5	2.1 88/08/07 4.0 RPCSRC; from 1.6 88/02/29 SMI;
 .Dd October 19, 1987
 .Dt PUBLICKEY 5
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 81a24ca631636..17a3a5c1cebf7 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,7 +1,7 @@
 .\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .\" $NetBSD: rpc.3,v 1.10 2000/06/02 23:11:12 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc.3,v 1.23 2004/07/03 22:30:09 ru Exp $
 .Dd May 7, 1993
 .Dt RPC 3
 .Os
diff --git a/lib/libc/rpc/rpc.5 b/lib/libc/rpc/rpc.5
index 398d9aa4b4200..f8c0440366efb 100644
--- a/lib/libc/rpc/rpc.5
+++ b/lib/libc/rpc/rpc.5
@@ -1,5 +1,5 @@
 .\" $NetBSD: rpc.5,v 1.3 2000/06/15 20:05:54 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc.5,v 1.11 2005/01/20 09:17:04 ru Exp $
 .\" @(#)rpc.4 1.17 93/08/30 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .Dd December 10, 1991
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index b9b64f5991edf..05595cc83452a 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpc_callmsg.c
diff --git a/lib/libc/rpc/rpc_clnt_auth.3 b/lib/libc/rpc/rpc_clnt_auth.3
index 863707e3da5e9..9671d108b8764 100644
--- a/lib/libc/rpc/rpc_clnt_auth.3
+++ b/lib/libc/rpc/rpc_clnt_auth.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_clnt_auth 1.4 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_clnt_auth.3,v 1.1 2000/06/03 09:29:50 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_auth.3,v 1.6 2005/02/09 18:03:14 ru Exp $
 .Dd May 7, 1993
 .Dt RPC_CLNT_AUTH 3
 .Os
diff --git a/lib/libc/rpc/rpc_clnt_calls.3 b/lib/libc/rpc/rpc_clnt_calls.3
index 213a7d1848117..b7ca9eab996ef 100644
--- a/lib/libc/rpc/rpc_clnt_calls.3
+++ b/lib/libc/rpc/rpc_clnt_calls.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_clnt_calls 1.4 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_calls.3,v 1.8 2005/02/09 18:03:14 ru Exp $
 .Dd May 7, 1993
 .Dt RPC_CLNT_CALLS 3
 .Os
diff --git a/lib/libc/rpc/rpc_clnt_create.3 b/lib/libc/rpc/rpc_clnt_create.3
index 34c90ed77d1d1..267233958fce6 100644
--- a/lib/libc/rpc/rpc_clnt_create.3
+++ b/lib/libc/rpc/rpc_clnt_create.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_clnt_create 1.5 89/07/24 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\" $NetBSD: rpc_clnt_create.3,v 1.2 2000/06/20 00:53:08 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_clnt_create.3,v 1.15 2006/09/17 21:27:34 ru Exp $
 .Dd May 7, 1993
 .Dt RPC_CLNT_CREATE 3
 .Os
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
index f2bf11f5bf2c9..0d2e01bd5d1b9 100644
--- a/lib/libc/rpc/rpc_com.h
+++ b/lib/libc/rpc/rpc_com.h
@@ -28,7 +28,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/rpc/rpc_com.h,v 1.8 2006/02/27 22:10:59 deischen Exp $
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 679233a9521ef..8f7e897a9c186 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -33,7 +33,7 @@
 static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_commondata.c,v 1.9 2002/03/22 23:18:37 obrien Exp $");
 
 #include "namespace.h"
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 5e50ba8d84755..235809950aa1e 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 static char *sccsid = "@(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
 
 #include "namespace.h"
 #include <unistd.h>
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index 81bd92b1e1392..b69d8aaa4bf91 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -34,7 +34,7 @@
 
 /* #pragma ident	"@(#)rpc_generic.c	1.17	94/04/24 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_generic.c,v 1.14 2007/09/20 22:35:24 matteo Exp $");
 
 /*
  * rpc_generic.c, Miscl routines for RPC.
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index 87278e7c54410..203e3fa3cfefd 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpc_prot.c
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 07c6314c9402f..ca131cb71c72a 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -1,5 +1,5 @@
 .\" @(#)rpc_secure.3n	2.1 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_secure.3,v 1.15 2004/07/02 23:52:12 ru Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3
index ebc666b7bcec5..59058c06c6b5f 100644
--- a/lib/libc/rpc/rpc_soc.3
+++ b/lib/libc/rpc/rpc_soc.3
@@ -1,6 +1,6 @@
 .\" @(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
 .\" $NetBSD: rpc_soc.3,v 1.2 2000/06/07 13:39:43 simonb Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_soc.3,v 1.12 2003/02/06 11:04:47 charnier Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC_SOC 3
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 59220634db13a..603881f05d528 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.15 2006/02/27 22:10:59 deischen Exp $");
 
 #ifdef PORTMAP
 /*
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index 873296210cb41..4f0619fab8542 100644
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ b/lib/libc/rpc/rpc_svc_calls.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_svc_calls 1.5 89/07/25 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_svc_calls.3,v 1.1 2000/06/02 23:11:13 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_calls.3,v 1.10 2005/11/23 16:44:23 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_CALLS 3
 .Os
diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3
index 4016a6c36b03e..d47be2b2927bc 100644
--- a/lib/libc/rpc/rpc_svc_create.3
+++ b/lib/libc/rpc/rpc_svc_create.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_svc_create 1.3 89/06/28 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_create.3,v 1.7 2003/09/08 19:57:15 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_CREATE 3
 .Os
diff --git a/lib/libc/rpc/rpc_svc_err.3 b/lib/libc/rpc/rpc_svc_err.3
index 7a6b1f132f4ca..8af147520d97a 100644
--- a/lib/libc/rpc/rpc_svc_err.3
+++ b/lib/libc/rpc/rpc_svc_err.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_svc_err 1.4 89/06/28 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_svc_err.3,v 1.1 2000/06/02 23:11:14 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_err.3,v 1.5 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_ERR 3
 .Os
diff --git a/lib/libc/rpc/rpc_svc_reg.3 b/lib/libc/rpc/rpc_svc_reg.3
index aed2ba127a16a..847487db481c5 100644
--- a/lib/libc/rpc/rpc_svc_reg.3
+++ b/lib/libc/rpc/rpc_svc_reg.3
@@ -3,7 +3,7 @@
 .\" @(#)rpc_svc_call 1.6 89/07/20 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"	$NetBSD: rpc_svc_reg.3,v 1.1 2000/06/02 23:11:14 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_svc_reg.3,v 1.6 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_SVC_REG 3
 .Os
diff --git a/lib/libc/rpc/rpc_xdr.3 b/lib/libc/rpc/rpc_xdr.3
index 62754fe7e285a..fb1229e17d9ef 100644
--- a/lib/libc/rpc/rpc_xdr.3
+++ b/lib/libc/rpc/rpc_xdr.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" @(#)rpc_xdr.new 1.1 89/04/06 SMI;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpc_xdr.3,v 1.4 2005/02/09 18:03:14 ru Exp $
 .Dd May 3, 1993
 .Dt RPC_XDR 3
 .Os
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index afef8061c6732..e9f3693d6a797 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -56,7 +56,7 @@
 static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.17 2007/09/20 22:35:24 matteo Exp $");
 
 /*
  * rpcb_clnt.c
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
index 5c199d896f4fd..6f66f4ca5c2fe 100644
--- a/lib/libc/rpc/rpcb_prot.c
+++ b/lib/libc/rpc/rpcb_prot.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.6 2006/09/09 22:29:16 mbr Exp $");
 
 /*
  * rpcb_prot.c
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
index 7ca2ba94ff749..92f391217df5b 100644
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ b/lib/libc/rpc/rpcb_st_xdr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_st_xdr.c,v 1.3 2002/07/14 23:38:37 alfred Exp $");
 
 #include "namespace.h"
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/rpcbind.3 b/lib/libc/rpc/rpcbind.3
index 0b716ca7a2b63..b52399e32afe5 100644
--- a/lib/libc/rpc/rpcbind.3
+++ b/lib/libc/rpc/rpcbind.3
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 1988 Sun Microsystem's, Inc. - All Right's Reserved.
 .\"	$NetBSD: rpcbind.3,v 1.2 2000/06/03 18:47:28 fvdl Exp	$
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rpcbind.3,v 1.6 2005/02/09 18:03:14 ru Exp $
 .Dd May 7, 1993
 .Dt RPCBIND 3
 .Os
diff --git a/lib/libc/rpc/rpcdname.c b/lib/libc/rpc/rpcdname.c
index d4455f4088cd6..fd97528763b35 100644
--- a/lib/libc/rpc/rpcdname.c
+++ b/lib/libc/rpc/rpcdname.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * rpcdname.c
diff --git a/lib/libc/rpc/rtime.3 b/lib/libc/rpc/rtime.3
index 028d2beade14f..6e61350c32bc8 100644
--- a/lib/libc/rpc/rtime.3
+++ b/lib/libc/rpc/rtime.3
@@ -1,5 +1,5 @@
 .\" @(#)rtime.3n	2.1 88/08/08 4.0 RPCSRC; from 1.5 88/02/08 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/rpc/rtime.3,v 1.8 2002/12/19 09:40:23 ru Exp $
 .\"
 .Dd November 22, 1987
 .Dt RTIME 3
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 39ac19ba4a1f7..f8883ee08e6bf 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -58,7 +58,7 @@
 static char sccsid[] = 	"@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/rtime.c,v 1.9 2005/03/10 00:57:01 stefanf Exp $");
 
 extern int _rpc_dtablesize( void );
 
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index b924bdec78475..6ab2d40d59b32 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.24 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * svc.c, Server-side remote procedure call interface.
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index eb1a5f2f4a93b..b3fbb1169974f 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.13 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * svc_auth.c, Server-side rpc authenticator interface.
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 84f1e19a17596..7529c2962ae99 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -68,7 +68,7 @@
 static char sccsid[] = 	"@(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.9 2002/03/22 23:18:37 obrien Exp $");
 
 extern int key_decryptsession_pk(const char *, netobj *, des_block *);
 
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 4d6f1021c8142..d84afbbdb4b07 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -32,7 +32,7 @@ static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.11 2004/10/16 06:11:35 obrien Exp $");
 
 /*
  * svc_auth_unix.c
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index 1c602bc57ed22..13b18e3de5d3e 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -37,7 +37,7 @@
 #ident	"@(#)svc_dg.c	1.17	94/04/24 SMI"
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.8 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * svc_dg.c, Server side for connectionless RPC.
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 7f6cfb84eaeb4..f97019203247b 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.7 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * svc_generic.c, Server side for RPC.
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 32d1ff765b235..42430125864bc 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_raw.c,v 1.15 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * svc_raw.c,   This a toy for simple testing and timing.
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index b4627d65875be..a74d2a8d05380 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
 static char *sccsid = "from: @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_run.c,v 1.20 2006/02/27 22:10:59 deischen Exp $");
 
 /*
  * This is the rpc server side idle loop
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index cf00727c639c0..c18a125a0e924 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -34,7 +34,7 @@
 
 /* #pragma ident	"@(#)svc_simple.c	1.18	94/04/24 SMI" */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_simple.c,v 1.16 2006/09/09 22:32:07 mbr Exp $");
 
 /*
  * svc_simple.c
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index 6fcbb21a56e88..48f74b17d2bf3 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.26 2006/09/09 22:33:21 mbr Exp $");
 
 /*
  * svc_vc.c, Server side for Connection Oriented based RPC. 
diff --git a/lib/libc/softfloat/Makefile.inc b/lib/libc/softfloat/Makefile.inc
index c786761826578..738885f533e12 100644
--- a/lib/libc/softfloat/Makefile.inc
+++ b/lib/libc/softfloat/Makefile.inc
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.inc,v 1.3 2003/05/06 08:58:20 rearnsha Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/softfloat/Makefile.inc,v 1.3 2006/03/13 01:14:59 deischen Exp $
 
 SOFTFLOAT_BITS?=64
 .PATH:		${MACHINE_ARCH}/softfloat \
diff --git a/lib/libc/softfloat/README.NetBSD b/lib/libc/softfloat/README.NetBSD
index c6ca7a8753ccd..29cfe8fd64437 100644
--- a/lib/libc/softfloat/README.NetBSD
+++ b/lib/libc/softfloat/README.NetBSD
@@ -1,5 +1,5 @@
 $NetBSD: README.NetBSD,v 1.2 2002/05/21 23:51:05 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/README.NetBSD,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 This is a modified version of part of John Hauser's SoftFloat 2a package.
 This version has been heavily modified to support its use with GCC to
diff --git a/lib/libc/softfloat/README.txt b/lib/libc/softfloat/README.txt
index fe28ccc294fb8..99e662e48c823 100644
--- a/lib/libc/softfloat/README.txt
+++ b/lib/libc/softfloat/README.txt
@@ -1,5 +1,5 @@
 $NetBSD: README.txt,v 1.1 2000/06/06 08:15:02 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/README.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 Package Overview for SoftFloat Release 2a
 
diff --git a/lib/libc/softfloat/Symbol.map b/lib/libc/softfloat/Symbol.map
index 12fb33549bc8a..2f3ecc971d5ec 100644
--- a/lib/libc/softfloat/Symbol.map
+++ b/lib/libc/softfloat/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/softfloat/Symbol.map,v 1.2 2007/04/29 14:05:18 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/softfloat/bits32/softfloat-macros b/lib/libc/softfloat/bits32/softfloat-macros
index 4fd4f2f9fc66b..7c12aded2404c 100644
--- a/lib/libc/softfloat/bits32/softfloat-macros
+++ b/lib/libc/softfloat/bits32/softfloat-macros
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/bits32/softfloat-macros,v 1.1 2004/05/14 12:13:05 cognet Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/softfloat/bits32/softfloat.c b/lib/libc/softfloat/bits32/softfloat.c
index 7785c4ea11e88..75f1a99a9c990 100644
--- a/lib/libc/softfloat/bits32/softfloat.c
+++ b/lib/libc/softfloat/bits32/softfloat.c
@@ -52,7 +52,7 @@ this code that are retained.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $");
 
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
diff --git a/lib/libc/softfloat/bits64/softfloat-macros b/lib/libc/softfloat/bits64/softfloat-macros
index 9b478e884ebaa..f7c90c0631c0b 100644
--- a/lib/libc/softfloat/bits64/softfloat-macros
+++ b/lib/libc/softfloat/bits64/softfloat-macros
@@ -1,5 +1,5 @@
 /* $NetBSD: softfloat-macros,v 1.1 2002/05/21 23:51:08 bjh21 Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/bits64/softfloat-macros,v 1.1 2004/05/14 12:13:05 cognet Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/softfloat/bits64/softfloat.c b/lib/libc/softfloat/bits64/softfloat.c
index ffd5661d67195..66fd25aa182ef 100644
--- a/lib/libc/softfloat/bits64/softfloat.c
+++ b/lib/libc/softfloat/bits64/softfloat.c
@@ -45,7 +45,7 @@ this code that are retained.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits64/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $");
 
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
diff --git a/lib/libc/softfloat/eqdf2.c b/lib/libc/softfloat/eqdf2.c
index 68bb55c30e2cf..98fc61a0fcdff 100644
--- a/lib/libc/softfloat/eqdf2.c
+++ b/lib/libc/softfloat/eqdf2.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/eqdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "softfloat-for-gcc.h"
 #include "milieu.h"
diff --git a/lib/libc/softfloat/eqsf2.c b/lib/libc/softfloat/eqsf2.c
index d45b806cc9f34..f07e124f319ba 100644
--- a/lib/libc/softfloat/eqsf2.c
+++ b/lib/libc/softfloat/eqsf2.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/eqsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "softfloat-for-gcc.h"
 #include "milieu.h"
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
index 27f7460ff37a6..41d31ca10c39d 100644
--- a/lib/libc/softfloat/fpgetmask.c
+++ b/lib/libc/softfloat/fpgetmask.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpgetmask.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
index 4ffb71f36464f..cbf110731d60d 100644
--- a/lib/libc/softfloat/fpgetround.c
+++ b/lib/libc/softfloat/fpgetround.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpgetround.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
index c76f98521d175..2fb61b7217250 100644
--- a/lib/libc/softfloat/fpgetsticky.c
+++ b/lib/libc/softfloat/fpgetsticky.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpgetsticky.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
index fb8b44ddc0181..00d44f6ba70c8 100644
--- a/lib/libc/softfloat/fpsetmask.c
+++ b/lib/libc/softfloat/fpsetmask.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpsetmask.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
index ce3ef9e96ac06..a5e6215044125 100644
--- a/lib/libc/softfloat/fpsetround.c
+++ b/lib/libc/softfloat/fpsetround.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpsetround.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
index 99379b3eb81fc..9f33a00c65228 100644
--- a/lib/libc/softfloat/fpsetsticky.c
+++ b/lib/libc/softfloat/fpsetsticky.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/fpsetsticky.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include "namespace.h"
 
diff --git a/lib/libc/softfloat/gedf2.c b/lib/libc/softfloat/gedf2.c
index 76e25de58a64e..721617eeeb3f3 100644
--- a/lib/libc/softfloat/gedf2.c
+++ b/lib/libc/softfloat/gedf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gedf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gedf2(float64, float64);
 
diff --git a/lib/libc/softfloat/gesf2.c b/lib/libc/softfloat/gesf2.c
index b22e13afb63d4..6d47f7e299e41 100644
--- a/lib/libc/softfloat/gesf2.c
+++ b/lib/libc/softfloat/gesf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gesf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gesf2(float32, float32);
 
diff --git a/lib/libc/softfloat/gtdf2.c b/lib/libc/softfloat/gtdf2.c
index ff5764a519c6b..57e4847c7abac 100644
--- a/lib/libc/softfloat/gtdf2.c
+++ b/lib/libc/softfloat/gtdf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gtdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gtdf2(float64, float64);
 
diff --git a/lib/libc/softfloat/gtsf2.c b/lib/libc/softfloat/gtsf2.c
index 8e7e7a9371c1c..70a06ff8345c3 100644
--- a/lib/libc/softfloat/gtsf2.c
+++ b/lib/libc/softfloat/gtsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/gtsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __gtsf2(float32, float32);
 
diff --git a/lib/libc/softfloat/ledf2.c b/lib/libc/softfloat/ledf2.c
index 7d3e8fb548556..f4509e4d9228c 100644
--- a/lib/libc/softfloat/ledf2.c
+++ b/lib/libc/softfloat/ledf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/ledf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __ledf2(float64, float64);
 
diff --git a/lib/libc/softfloat/lesf2.c b/lib/libc/softfloat/lesf2.c
index 6fa13e5e24677..6e2b492fb1d15 100644
--- a/lib/libc/softfloat/lesf2.c
+++ b/lib/libc/softfloat/lesf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/lesf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __lesf2(float32, float32);
 
diff --git a/lib/libc/softfloat/ltdf2.c b/lib/libc/softfloat/ltdf2.c
index b8c668ccc01d9..f0702a70bd9d1 100644
--- a/lib/libc/softfloat/ltdf2.c
+++ b/lib/libc/softfloat/ltdf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/ltdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __ltdf2(float64, float64);
 
diff --git a/lib/libc/softfloat/ltsf2.c b/lib/libc/softfloat/ltsf2.c
index 8a1e8fa9e50b8..829e942b43b89 100644
--- a/lib/libc/softfloat/ltsf2.c
+++ b/lib/libc/softfloat/ltsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/ltsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __ltsf2(float32, float32);
 
diff --git a/lib/libc/softfloat/nedf2.c b/lib/libc/softfloat/nedf2.c
index 61f50443c9c5a..f9d2aa884dfd1 100644
--- a/lib/libc/softfloat/nedf2.c
+++ b/lib/libc/softfloat/nedf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/nedf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __nedf2(float64, float64);
 
diff --git a/lib/libc/softfloat/negdf2.c b/lib/libc/softfloat/negdf2.c
index 2485d586c4755..c07c7fafb3bca 100644
--- a/lib/libc/softfloat/negdf2.c
+++ b/lib/libc/softfloat/negdf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/negdf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 float64 __negdf2(float64);
 
diff --git a/lib/libc/softfloat/negsf2.c b/lib/libc/softfloat/negsf2.c
index 78f6c6bd5f1f6..3038f69b1b764 100644
--- a/lib/libc/softfloat/negsf2.c
+++ b/lib/libc/softfloat/negsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/negsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 float32 __negsf2(float32);
 
diff --git a/lib/libc/softfloat/nesf2.c b/lib/libc/softfloat/nesf2.c
index b8317cbf8dd8f..880f314e2bfe5 100644
--- a/lib/libc/softfloat/nesf2.c
+++ b/lib/libc/softfloat/nesf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/nesf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __nesf2(float32, float32);
 
diff --git a/lib/libc/softfloat/softfloat-for-gcc.h b/lib/libc/softfloat/softfloat-for-gcc.h
index fa5b3e8c90502..acc49780b0dce 100644
--- a/lib/libc/softfloat/softfloat-for-gcc.h
+++ b/lib/libc/softfloat/softfloat-for-gcc.h
@@ -1,5 +1,5 @@
 /* $NetBSD: softfloat-for-gcc.h,v 1.6 2003/07/26 19:24:51 salo Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/softfloat-for-gcc.h,v 1.1 2004/05/14 12:13:04 cognet Exp $ */
 
 /*
  * Move private identifiers with external linkage into implementation
diff --git a/lib/libc/softfloat/softfloat-history.txt b/lib/libc/softfloat/softfloat-history.txt
index d8c98db56ed40..9b22cc8624502 100644
--- a/lib/libc/softfloat/softfloat-history.txt
+++ b/lib/libc/softfloat/softfloat-history.txt
@@ -1,5 +1,5 @@
 $NetBSD: softfloat-history.txt,v 1.1 2000/06/06 08:15:08 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/softfloat-history.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 History of Major Changes to SoftFloat, up to Release 2a
 
diff --git a/lib/libc/softfloat/softfloat-source.txt b/lib/libc/softfloat/softfloat-source.txt
index 06759664ebe69..79abe9a026aab 100644
--- a/lib/libc/softfloat/softfloat-source.txt
+++ b/lib/libc/softfloat/softfloat-source.txt
@@ -1,5 +1,5 @@
 $NetBSD: softfloat-source.txt,v 1.1 2000/06/06 08:15:10 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/softfloat-source.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 SoftFloat Release 2a Source Documentation
 
diff --git a/lib/libc/softfloat/softfloat-specialize b/lib/libc/softfloat/softfloat-specialize
index c8c8028d652f3..88e6460c7742b 100644
--- a/lib/libc/softfloat/softfloat-specialize
+++ b/lib/libc/softfloat/softfloat-specialize
@@ -1,5 +1,5 @@
 /*	$NetBSD: softfloat-specialize,v 1.3 2002/05/12 13:12:45 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/softfloat/softfloat-specialize,v 1.1 2004/05/14 12:13:04 cognet Exp $ */
 
 /* This is a derivative work. */
 
diff --git a/lib/libc/softfloat/softfloat.txt b/lib/libc/softfloat/softfloat.txt
index bd63324faa962..47f59415bb3af 100644
--- a/lib/libc/softfloat/softfloat.txt
+++ b/lib/libc/softfloat/softfloat.txt
@@ -1,5 +1,5 @@
 $NetBSD: softfloat.txt,v 1.1 2000/06/06 08:15:10 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/softfloat.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 SoftFloat Release 2a General Documentation
 
diff --git a/lib/libc/softfloat/templates/milieu.h b/lib/libc/softfloat/templates/milieu.h
index b7bd8e5f5f411..d580b5f52ea52 100644
--- a/lib/libc/softfloat/templates/milieu.h
+++ b/lib/libc/softfloat/templates/milieu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */

+/* $FreeBSD: src/lib/libc/softfloat/templates/milieu.h,v 1.1 2004/05/14 12:13:06 cognet Exp $ */

 

 /*

 ===============================================================================

diff --git a/lib/libc/softfloat/templates/softfloat-specialize b/lib/libc/softfloat/templates/softfloat-specialize
index a1dc4de86a53a..dbd1dbe92dccd 100644
--- a/lib/libc/softfloat/templates/softfloat-specialize
+++ b/lib/libc/softfloat/templates/softfloat-specialize
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */

+/* $FreeBSD: src/lib/libc/softfloat/templates/softfloat-specialize,v 1.1 2004/05/14 12:13:06 cognet Exp $ */

 

 /*

 ===============================================================================

diff --git a/lib/libc/softfloat/templates/softfloat.h b/lib/libc/softfloat/templates/softfloat.h
index 070aab231c60d..c946bae1c3579 100644
--- a/lib/libc/softfloat/templates/softfloat.h
+++ b/lib/libc/softfloat/templates/softfloat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */

+/* $FreeBSD: src/lib/libc/softfloat/templates/softfloat.h,v 1.1 2004/05/14 12:13:06 cognet Exp $ */

 

 /*

 ===============================================================================

diff --git a/lib/libc/softfloat/timesoftfloat.c b/lib/libc/softfloat/timesoftfloat.c
index 98b6ba2eb3b72..e7e3df8901316 100644
--- a/lib/libc/softfloat/timesoftfloat.c
+++ b/lib/libc/softfloat/timesoftfloat.c
@@ -31,7 +31,7 @@ this code that are retained.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/timesoftfloat.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/lib/libc/softfloat/timesoftfloat.txt b/lib/libc/softfloat/timesoftfloat.txt
index addc64740c6d1..1de3ae8baa781 100644
--- a/lib/libc/softfloat/timesoftfloat.txt
+++ b/lib/libc/softfloat/timesoftfloat.txt
@@ -1,5 +1,5 @@
 $NetBSD: timesoftfloat.txt,v 1.1 2000/06/06 08:15:11 bjh21 Exp $
-$FreeBSD$
+$FreeBSD: src/lib/libc/softfloat/timesoftfloat.txt,v 1.1 2004/05/14 12:13:04 cognet Exp $
 
 Documentation for the `timesoftfloat' Program of SoftFloat Release 2a
 
diff --git a/lib/libc/softfloat/unorddf2.c b/lib/libc/softfloat/unorddf2.c
index 2986c82814755..b2ce6a79e2000 100644
--- a/lib/libc/softfloat/unorddf2.c
+++ b/lib/libc/softfloat/unorddf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/unorddf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __unorddf2(float64, float64);
 
diff --git a/lib/libc/softfloat/unordsf2.c b/lib/libc/softfloat/unordsf2.c
index e2f4c8f0947ca..be7cbe8b9d2a8 100644
--- a/lib/libc/softfloat/unordsf2.c
+++ b/lib/libc/softfloat/unordsf2.c
@@ -9,7 +9,7 @@
 #include "softfloat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/softfloat/unordsf2.c,v 1.1 2004/05/14 12:13:04 cognet Exp $");
 
 flag __unordsf2(float32, float32);
 
diff --git a/lib/libc/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc
index 2b9d3ab5a14e0..085d868b48893 100644
--- a/lib/libc/sparc64/Makefile.inc
+++ b/lib/libc/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.6 2006/03/16 14:22:19 ru Exp $
 #
 # Machine dependent definitions for the ultra sparc architecture.
 #
diff --git a/lib/libc/sparc64/SYS.h b/lib/libc/sparc64/SYS.h
index 0bc7840d94524..ecf5449fa4e58 100644
--- a/lib/libc/sparc64/SYS.h
+++ b/lib/libc/sparc64/SYS.h
@@ -31,7 +31,7 @@
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  *	from: FreeBSD: src/lib/libc/i386/SYS.h,v 1.20 2001/01/29
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/SYS.h,v 1.6 2007/07/04 23:18:38 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/sparc64/Symbol.map b/lib/libc/sparc64/Symbol.map
index 73d0ed51c4ec3..2fc45a2d51f9b 100644
--- a/lib/libc/sparc64/Symbol.map
+++ b/lib/libc/sparc64/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.5 2007/05/31 13:01:34 deischen Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/_fpmath.h b/lib/libc/sparc64/_fpmath.h
index e5f2238ac8d19..4afaab998dbec 100644
--- a/lib/libc/sparc64/_fpmath.h
+++ b/lib/libc/sparc64/_fpmath.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $
  */
 
 union IEEEl2bits {
diff --git a/lib/libc/sparc64/arith.h b/lib/libc/sparc64/arith.h
index 3c35b80f35c33..a32a3420fcacb 100644
--- a/lib/libc/sparc64/arith.h
+++ b/lib/libc/sparc64/arith.h
@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/fpu/Makefile.inc b/lib/libc/sparc64/fpu/Makefile.inc
index 1974d8a0b3193..eb9d3a5369618 100644
--- a/lib/libc/sparc64/fpu/Makefile.inc
+++ b/lib/libc/sparc64/fpu/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $
 
 .PATH: ${.CURDIR}/sparc64/fpu
 
diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c
index 74f07ec280d7c..41078bf765a02 100644
--- a/lib/libc/sparc64/fpu/fpu.c
+++ b/lib/libc/sparc64/fpu/fpu.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.9 2007/01/09 00:28:05 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libc/sparc64/fpu/fpu_add.c b/lib/libc/sparc64/fpu/fpu_add.c
index af493cd5a3e6d..10f36fbfd3ff4 100644
--- a/lib/libc/sparc64/fpu/fpu_add.c
+++ b/lib/libc/sparc64/fpu/fpu_add.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_add.c,v 1.5 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * Perform an FPU add (return x + y).
diff --git a/lib/libc/sparc64/fpu/fpu_arith.h b/lib/libc/sparc64/fpu/fpu_arith.h
index 292cd708a55f5..a77bb92e4792f 100644
--- a/lib/libc/sparc64/fpu/fpu_arith.h
+++ b/lib/libc/sparc64/fpu/fpu_arith.h
@@ -32,7 +32,7 @@
  *
  *	@(#)fpu_arith.h	8.1 (Berkeley) 6/11/93
  *	$NetBSD: fpu_arith.h,v 1.3 2000/07/24 04:11:03 mycroft Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_arith.h,v 1.3 2007/01/09 00:28:05 imp Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/fpu/fpu_compare.c b/lib/libc/sparc64/fpu/fpu_compare.c
index 84b00bf964eea..e3cf20b221554 100644
--- a/lib/libc/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/sparc64/fpu/fpu_compare.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_compare.c,v 1.5 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * CMP and CMPE instructions.
diff --git a/lib/libc/sparc64/fpu/fpu_div.c b/lib/libc/sparc64/fpu/fpu_div.c
index c4b8ef6121ff5..68f740be86009 100644
--- a/lib/libc/sparc64/fpu/fpu_div.c
+++ b/lib/libc/sparc64/fpu/fpu_div.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_div.c,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * Perform an FPU divide (return x / y).
diff --git a/lib/libc/sparc64/fpu/fpu_emu.h b/lib/libc/sparc64/fpu/fpu_emu.h
index de156e2dee9d1..d5c4202fd4749 100644
--- a/lib/libc/sparc64/fpu/fpu_emu.h
+++ b/lib/libc/sparc64/fpu/fpu_emu.h
@@ -32,7 +32,7 @@
  *
  *	@(#)fpu_emu.h	8.1 (Berkeley) 6/11/93
  *	$NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.6 2007/01/09 00:28:05 imp Exp $
  */
 
 /*
diff --git a/lib/libc/sparc64/fpu/fpu_explode.c b/lib/libc/sparc64/fpu/fpu_explode.c
index 0195a46e7e507..829e77e3a7fde 100644
--- a/lib/libc/sparc64/fpu/fpu_explode.c
+++ b/lib/libc/sparc64/fpu/fpu_explode.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.7 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * FPU subroutines: `explode' the machine's `packed binary' format numbers
diff --git a/lib/libc/sparc64/fpu/fpu_extern.h b/lib/libc/sparc64/fpu/fpu_extern.h
index f22c46300a55e..abc0fe3287cdf 100644
--- a/lib/libc/sparc64/fpu/fpu_extern.h
+++ b/lib/libc/sparc64/fpu/fpu_extern.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: fpu_extern.h,v 1.4 2000/08/03 18:32:08 eeh Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_extern.h,v 1.6 2002/04/27 21:56:28 jake Exp $
  */
 
 #ifndef _SPARC64_FPU_FPU_EXTERN_H_
diff --git a/lib/libc/sparc64/fpu/fpu_implode.c b/lib/libc/sparc64/fpu/fpu_implode.c
index 5287d2ba23c83..e10dee07311e5 100644
--- a/lib/libc/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/sparc64/fpu/fpu_implode.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_implode.c,v 1.8 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * FPU subroutines: `implode' internal format numbers into the machine's
diff --git a/lib/libc/sparc64/fpu/fpu_mul.c b/lib/libc/sparc64/fpu/fpu_mul.c
index 173810ecf76f3..1fa90278a89b0 100644
--- a/lib/libc/sparc64/fpu/fpu_mul.c
+++ b/lib/libc/sparc64/fpu/fpu_mul.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_mul.c,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * Perform an FPU multiply (return x * y).
diff --git a/lib/libc/sparc64/fpu/fpu_qp.c b/lib/libc/sparc64/fpu/fpu_qp.c
index 284ff5e02846b..785b0ed84cbd8 100644
--- a/lib/libc/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/sparc64/fpu/fpu_qp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $");
 
 #include <sys/types.h>
 #include <machine/fsr.h>
diff --git a/lib/libc/sparc64/fpu/fpu_reg.S b/lib/libc/sparc64/fpu/fpu_reg.S
index 781b4fec8f9cb..0c3093b2679e3 100644
--- a/lib/libc/sparc64/fpu/fpu_reg.S
+++ b/lib/libc/sparc64/fpu/fpu_reg.S
@@ -24,7 +24,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_reg.S,v 1.2 2002/05/06 23:24:39 obrien Exp $");
 
 /*
  * Define arrays of leaf functions to load/store fp registers to memory. See
diff --git a/lib/libc/sparc64/fpu/fpu_reg.h b/lib/libc/sparc64/fpu/fpu_reg.h
index b8b72291b71fd..5a91dc2751ddf 100644
--- a/lib/libc/sparc64/fpu/fpu_reg.h
+++ b/lib/libc/sparc64/fpu/fpu_reg.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_reg.h,v 1.1 2002/02/23 21:37:10 tmm Exp $
  */
 
 #ifndef _LIBC_SPARC64_FPU_FPU_REG_H_
diff --git a/lib/libc/sparc64/fpu/fpu_sqrt.c b/lib/libc/sparc64/fpu/fpu_sqrt.c
index b49b63b4195e3..dad62729008a8 100644
--- a/lib/libc/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/sparc64/fpu/fpu_sqrt.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * Perform an FPU square root (return sqrt(x)).
diff --git a/lib/libc/sparc64/fpu/fpu_subr.c b/lib/libc/sparc64/fpu/fpu_subr.c
index 074e959984ffc..531edbad8e517 100644
--- a/lib/libc/sparc64/fpu/fpu_subr.c
+++ b/lib/libc/sparc64/fpu/fpu_subr.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_subr.c,v 1.5 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * FPU subroutines.
diff --git a/lib/libc/sparc64/gd_qnan.h b/lib/libc/sparc64/gd_qnan.h
index 5e2de53d8e5b5..cbc4806f85163 100644
--- a/lib/libc/sparc64/gd_qnan.h
+++ b/lib/libc/sparc64/gd_qnan.h
@@ -4,7 +4,7 @@
  * This file can be generated by compiling and running contrib/gdtoa/qnan.c
  * on the target architecture after arith.h has been generated.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/gd_qnan.h,v 1.1 2007/01/03 05:00:03 das Exp $
  */
 
 #define f_QNAN 0x7fffffff
diff --git a/lib/libc/sparc64/gen/Makefile.inc b/lib/libc/sparc64/gen/Makefile.inc
index 979c1822ad6cb..714285bb05375 100644
--- a/lib/libc/sparc64/gen/Makefile.inc
+++ b/lib/libc/sparc64/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.12 2005/03/15 15:53:39 das Exp $
 
 SRCS+=	_ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \
 	fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c \
diff --git a/lib/libc/sparc64/gen/_ctx_start.S b/lib/libc/sparc64/gen/_ctx_start.S
index 4ba3fd80624b3..c35c0e55853a0 100644
--- a/lib/libc/sparc64/gen/_ctx_start.S
+++ b/lib/libc/sparc64/gen/_ctx_start.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_ctx_start.S,v 1.1 2003/04/01 23:28:50 jake Exp $");
 
 ENTRY(_ctx_start)
 	call	%g1
diff --git a/lib/libc/sparc64/gen/_set_tp.c b/lib/libc/sparc64/gen/_set_tp.c
index cf9db2676937e..4ccd194429fd1 100644
--- a/lib/libc/sparc64/gen/_set_tp.c
+++ b/lib/libc/sparc64/gen/_set_tp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc/sparc64/gen/_set_tp.c,v 1.2 2006/10/08 02:50:33 kmacy Exp $
  */
 
 void
diff --git a/lib/libc/sparc64/gen/_setjmp.S b/lib/libc/sparc64/gen/_setjmp.S
index 724c2c0148c07..e5ed0e9936851 100644
--- a/lib/libc/sparc64/gen/_setjmp.S
+++ b/lib/libc/sparc64/gen/_setjmp.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.6 2007/01/09 00:28:05 imp Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/gen/assym.s b/lib/libc/sparc64/gen/assym.s
index 7b205db2b6903..f3477bb3d6540 100644
--- a/lib/libc/sparc64/gen/assym.s
+++ b/lib/libc/sparc64/gen/assym.s
@@ -2,7 +2,7 @@
  * Offsets into into structures used from asm.  Must be kept in sync with
  * appropriate headers.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/gen/assym.s,v 1.3 2002/03/11 03:13:02 tmm Exp $
  */
 
 #define	_JB_FP		0x0
diff --git a/lib/libc/sparc64/gen/fabs.S b/lib/libc/sparc64/gen/fabs.S
index bbc744af8a8b6..c711689a97379 100644
--- a/lib/libc/sparc64/gen/fabs.S
+++ b/lib/libc/sparc64/gen/fabs.S
@@ -24,7 +24,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fabs.S,v 1.2 2004/02/10 20:45:28 cperciva Exp $");
 
 /*
  * double fabs(double);
diff --git a/lib/libc/sparc64/gen/fixunsdfsi.S b/lib/libc/sparc64/gen/fixunsdfsi.S
index 77c3059b01031..9f5aeae0957e2 100644
--- a/lib/libc/sparc64/gen/fixunsdfsi.S
+++ b/lib/libc/sparc64/gen/fixunsdfsi.S
@@ -41,7 +41,7 @@
 	RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 /*
  * Convert double to unsigned integer (for gcc).
diff --git a/lib/libc/sparc64/gen/flt_rounds.c b/lib/libc/sparc64/gen/flt_rounds.c
index 706ef5a0dc6a3..445c2da0db5d8 100644
--- a/lib/libc/sparc64/gen/flt_rounds.c
+++ b/lib/libc/sparc64/gen/flt_rounds.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/flt_rounds.c,v 1.2 2005/01/18 15:29:28 das Exp $");
 
 #include <sys/types.h>
 #include <machine/float.h>
diff --git a/lib/libc/sparc64/gen/fpgetmask.c b/lib/libc/sparc64/gen/fpgetmask.c
index 05b151af0d104..1dbdfd012666c 100644
--- a/lib/libc/sparc64/gen/fpgetmask.c
+++ b/lib/libc/sparc64/gen/fpgetmask.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpgetmask.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 
 #include <machine/fsr.h>
diff --git a/lib/libc/sparc64/gen/fpgetround.c b/lib/libc/sparc64/gen/fpgetround.c
index dbc90d728bd19..949e9ae487ee6 100644
--- a/lib/libc/sparc64/gen/fpgetround.c
+++ b/lib/libc/sparc64/gen/fpgetround.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpgetround.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/fpgetsticky.c b/lib/libc/sparc64/gen/fpgetsticky.c
index 274566acd48a3..842cf5ddc14b6 100644
--- a/lib/libc/sparc64/gen/fpgetsticky.c
+++ b/lib/libc/sparc64/gen/fpgetsticky.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpgetsticky.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/fpsetmask.c b/lib/libc/sparc64/gen/fpsetmask.c
index 9aefb137837a4..dd95579bf0e40 100644
--- a/lib/libc/sparc64/gen/fpsetmask.c
+++ b/lib/libc/sparc64/gen/fpsetmask.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetmask.c,v 1.2 2002/09/14 18:07:03 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/fpsetround.c b/lib/libc/sparc64/gen/fpsetround.c
index 1e27f596c16c0..1bca4d0066d44 100644
--- a/lib/libc/sparc64/gen/fpsetround.c
+++ b/lib/libc/sparc64/gen/fpsetround.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetround.c,v 1.1 2002/09/14 18:06:21 tmm Exp $");
 
 #include <machine/fsr.h>
 #include <ieeefp.h>
diff --git a/lib/libc/sparc64/gen/infinity.c b/lib/libc/sparc64/gen/infinity.c
index 6d0d9344b1904..fabc24517abc6 100644
--- a/lib/libc/sparc64/gen/infinity.c
+++ b/lib/libc/sparc64/gen/infinity.c
@@ -4,7 +4,7 @@
 __RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/infinity.c,v 1.7 2003/02/08 20:37:54 mike Exp $");
 
 /* infinity.c */
 
diff --git a/lib/libc/sparc64/gen/makecontext.c b/lib/libc/sparc64/gen/makecontext.c
index 95795de992cf9..2fc4580ace116 100644
--- a/lib/libc/sparc64/gen/makecontext.c
+++ b/lib/libc/sparc64/gen/makecontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/makecontext.c,v 1.1 2003/04/01 23:28:50 jake Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/lib/libc/sparc64/gen/modf.S b/lib/libc/sparc64/gen/modf.S
index cec2f94b303f1..eeb421999441d 100644
--- a/lib/libc/sparc64/gen/modf.S
+++ b/lib/libc/sparc64/gen/modf.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/gen/setjmp.S b/lib/libc/sparc64/gen/setjmp.S
index 8161b7ae48f9c..7a5a88a8d99d4 100644
--- a/lib/libc/sparc64/gen/setjmp.S
+++ b/lib/libc/sparc64/gen/setjmp.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.5 2007/01/09 00:28:05 imp Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/gen/signalcontext.c b/lib/libc/sparc64/gen/signalcontext.c
index 622f36f5bd75b..44933a7607253 100644
--- a/lib/libc/sparc64/gen/signalcontext.c
+++ b/lib/libc/sparc64/gen/signalcontext.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/signalcontext.c,v 1.2 2004/01/06 18:53:26 nectar Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
diff --git a/lib/libc/sparc64/gen/sigsetjmp.S b/lib/libc/sparc64/gen/sigsetjmp.S
index 4e4456648c665..c141c3ebe59ae 100644
--- a/lib/libc/sparc64/gen/sigsetjmp.S
+++ b/lib/libc/sparc64/gen/sigsetjmp.S
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.5 2003/01/05 22:10:06 tmm Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/sparc64/stdlib/Makefile.inc b/lib/libc/sparc64/stdlib/Makefile.inc
index e8c0da7a1d7eb..52a362a6255f8 100644
--- a/lib/libc/sparc64/stdlib/Makefile.inc
+++ b/lib/libc/sparc64/stdlib/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/stdlib/Makefile.inc,v 1.1 2001/10/26 05:40:07 jake Exp $
diff --git a/lib/libc/sparc64/string/Makefile.inc b/lib/libc/sparc64/string/Makefile.inc
index e8c0da7a1d7eb..c032c7f7f398f 100644
--- a/lib/libc/sparc64/string/Makefile.inc
+++ b/lib/libc/sparc64/string/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/string/Makefile.inc,v 1.1 2001/10/26 05:40:07 jake Exp $
diff --git a/lib/libc/sparc64/sys/Makefile.inc b/lib/libc/sparc64/sys/Makefile.inc
index b738a5736bfaa..187844ff4ebb2 100644
--- a/lib/libc/sparc64/sys/Makefile.inc
+++ b/lib/libc/sparc64/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.11 2007/07/04 23:23:01 peter Exp $
 
 SRCS+=	__sparc_sigtramp_setup.c \
 	__sparc_utrap.c \
diff --git a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
index 4475c6d4632ad..6b6b2ac6f75f8 100644
--- a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c,v 1.5 2004/01/10 15:57:06 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/sparc64/sys/__sparc_utrap.c b/lib/libc/sparc64/sys/__sparc_utrap.c
index e556f830570fc..fa7ea575623f7 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap.c,v 1.6 2004/01/19 16:14:58 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_align.c b/lib/libc/sparc64/sys/__sparc_utrap_align.c
index 9b59826263cd9..6d494dd3ce778 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_align.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_align.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_align.c,v 1.2 2002/05/13 22:48:01 jake Exp $");
 
 #include <sys/types.h>
 #include <machine/cpufunc.h>
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_emul.c b/lib/libc/sparc64/sys/__sparc_utrap_emul.c
index 6c6dd1b9b97ad..2381a019c272f 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_emul.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_emul.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.2 2002/05/11 21:20:05 jake Exp $");
 
 #include <sys/types.h>
 #include <machine/cpufunc.h>
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S b/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
index 502f81a22510f..159d62925eef3 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
+++ b/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S,v 1.2 2002/06/30 05:36:49 obrien Exp $");
 
 #include <machine/utrap.h>
 
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_gen.S b/lib/libc/sparc64/sys/__sparc_utrap_gen.S
index 4fb128dd3f6ae..c85962d392ac7 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_gen.S
+++ b/lib/libc/sparc64/sys/__sparc_utrap_gen.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.5 2006/11/03 23:43:18 kmacy Exp $");
 
 	.register	%g2, #ignore
 	.register	%g3, #ignore
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_install.c b/lib/libc/sparc64/sys/__sparc_utrap_install.c
index 7b1a5e7a0226b..604fb3bf7cacc 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_install.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_install.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_install.c,v 1.3 2004/01/09 16:52:09 nectar Exp $");
 
 #include <machine/utrap.h>
 #include <machine/sysarch.h>
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_private.h b/lib/libc/sparc64/sys/__sparc_utrap_private.h
index 8b9ae9eefc961..c909e8945c4fc 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_private.h
+++ b/lib/libc/sparc64/sys/__sparc_utrap_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_private.h,v 1.4 2002/05/13 04:35:08 jake Exp $
  */
 
 #ifndef	___SPARC_UTRAP_PRIVATE_H_
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_setup.c b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
index f4a624bfe4c76..14993bb542a42 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_setup.c,v 1.7 2004/01/09 16:52:09 nectar Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/sparc64/sys/assym.s b/lib/libc/sparc64/sys/assym.s
index 2e799f6566b80..e58fff03dabab 100644
--- a/lib/libc/sparc64/sys/assym.s
+++ b/lib/libc/sparc64/sys/assym.s
@@ -2,7 +2,7 @@
  * Offsets into structures used from asm.  Must be kept in sync with
  * appropriate headers.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sparc64/sys/assym.s,v 1.3 2002/04/29 18:14:44 jake Exp $
  */
 
 #define	FPRS_FEF	0x4
diff --git a/lib/libc/sparc64/sys/brk.S b/lib/libc/sparc64/sys/brk.S
index 0167c4ee1e543..5ad07332b48c6 100644
--- a/lib/libc/sparc64/sys/brk.S
+++ b/lib/libc/sparc64/sys/brk.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/brk.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/cerror.S b/lib/libc/sparc64/sys/cerror.S
index 9f903ea9a4282..7138b5140925a 100644
--- a/lib/libc/sparc64/sys/cerror.S
+++ b/lib/libc/sparc64/sys/cerror.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/cerror.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/exect.S b/lib/libc/sparc64/sys/exect.S
index f6af2230c0be6..0a8eb5eefd3c3 100644
--- a/lib/libc/sparc64/sys/exect.S
+++ b/lib/libc/sparc64/sys/exect.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/exect.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/pipe.S b/lib/libc/sparc64/sys/pipe.S
index 894054493bc5b..82fcc0d54cfb9 100644
--- a/lib/libc/sparc64/sys/pipe.S
+++ b/lib/libc/sparc64/sys/pipe.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/pipe.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/ptrace.S b/lib/libc/sparc64/sys/ptrace.S
index eb415cdbe0207..907b797278cd0 100644
--- a/lib/libc/sparc64/sys/ptrace.S
+++ b/lib/libc/sparc64/sys/ptrace.S
@@ -41,7 +41,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/ptrace.S,v 1.5 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sbrk.S b/lib/libc/sparc64/sys/sbrk.S
index c8c6e97eeb13b..e2812b689e9fe 100644
--- a/lib/libc/sparc64/sys/sbrk.S
+++ b/lib/libc/sparc64/sys/sbrk.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sbrk.S,v 1.5 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/setlogin.S b/lib/libc/sparc64/sys/setlogin.S
index d7595cf9a07ad..436bd6f5b2f0c 100644
--- a/lib/libc/sparc64/sys/setlogin.S
+++ b/lib/libc/sparc64/sys/setlogin.S
@@ -40,7 +40,7 @@
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/setlogin.S,v 1.4 2007/01/09 00:28:05 imp Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sigaction.S b/lib/libc/sparc64/sys/sigaction.S
index 7d32f975af20f..3105ec15e963d 100644
--- a/lib/libc/sparc64/sys/sigaction.S
+++ b/lib/libc/sparc64/sys/sigaction.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sigaction.S,v 1.1 2002/09/03 14:55:29 jake Exp $");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sigcode.S b/lib/libc/sparc64/sys/sigcode.S
index be3cb451a8b3e..21bcb66c3c74a 100644
--- a/lib/libc/sparc64/sys/sigcode.S
+++ b/lib/libc/sparc64/sys/sigcode.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sigcode.S,v 1.2 2002/10/22 15:15:39 jake Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index d815c971146e2..6d9205f907ffc 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.37 2006/04/22 15:09:15 deischen Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/stdio
diff --git a/lib/libc/stdio/Symbol.map b/lib/libc/stdio/Symbol.map
index 05389dc77f6c5..42491e65ae49e 100644
--- a/lib/libc/stdio/Symbol.map
+++ b/lib/libc/stdio/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.5 2007/04/29 14:05:19 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
index 716ba609aa0d1..38b2ebfb1337f 100644
--- a/lib/libc/stdio/_flock_stub.c
+++ b/lib/libc/stdio/_flock_stub.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.15 2007/01/12 07:31:30 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index f14265179589d..02362b0c23f0c 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index 8d924b3c90ae0..d6d374e3e2210 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.10 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
index 883aa108e7db3..c3720bfcc81a8 100644
--- a/lib/libc/stdio/fclose.3
+++ b/lib/libc/stdio/fclose.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fclose.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fclose.3,v 1.15 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd April 22, 2006
 .Dt FCLOSE 3
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index f0629e830d0e0..e80edcfcf0cf0 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fclose.c,v 1.12 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fcloseall.c b/lib/libc/stdio/fcloseall.c
index 8ee9a6227b790..530e98216a8c3 100644
--- a/lib/libc/stdio/fcloseall.c
+++ b/lib/libc/stdio/fcloseall.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fcloseall.c,v 1.2 2006/04/22 16:47:59 deischen Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
index c1998713c6cbd..a88828e5eeb5b 100644
--- a/lib/libc/stdio/fdopen.c
+++ b/lib/libc/stdio/fdopen.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fdopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.8 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index 996004ff11a0d..88460e05432fb 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.10 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3
index d7daef39e086c..4082f29727adf 100644
--- a/lib/libc/stdio/ferror.3
+++ b/lib/libc/stdio/ferror.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ferror.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/ferror.3,v 1.10 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd January 10, 2003
 .Dt FERROR 3
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index 9afabcae6597e..a28cd369ebd69 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.10 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
index 1c04103a71617..e05b2ff2fc4e9 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fflush.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fflush.3,v 1.11 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt FFLUSH 3
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index c0237cf5a2647..2507c795b1e3f 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fflush.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index 8024df1523958..96cd999ec3497 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetc.c,v 1.13 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index b95c61ed9ec24..f301b014f964a 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.9 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt FGETLN 3
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index 7cb2854d9f040..bbad594a037b2 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fgetln.c	8.2 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.11 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index 9053be84a5de1..40e134d6ed3f2 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetpos.c,v 1.13 2007/01/09 00:28:06 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
index cd74fccabb6bb..b0e8a41f0141c 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgets.3,v 1.21 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt FGETS 3
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index a0cc724525165..c9efd57e709cb 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgets.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
index 719556ad9e1f1..f4a273a6542a9 100644
--- a/lib/libc/stdio/fgetwc.c
+++ b/lib/libc/stdio/fgetwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.12 2004/07/20 08:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fgetwln.3 b/lib/libc/stdio/fgetwln.3
index b1594e26c8b57..5a8119c325167 100644
--- a/lib/libc/stdio/fgetwln.3
+++ b/lib/libc/stdio/fgetwln.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgetwln.3,v 1.3 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd July 16, 2004
 .Dt FGETWLN 3
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
index 1a1ad2ddeaa04..49b52af314421 100644
--- a/lib/libc/stdio/fgetwln.c
+++ b/lib/libc/stdio/fgetwln.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwln.c,v 1.2 2004/08/06 17:00:09 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetws.3 b/lib/libc/stdio/fgetws.3
index 5397a100aec11..eba1bb9eb743f 100644
--- a/lib/libc/stdio/fgetws.3
+++ b/lib/libc/stdio/fgetws.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.4 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd August 6, 2002
 .Dt FGETWS 3
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index b6ef01e5c0aff..be180c9f4771a 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index e858dd815f262..274cbd91dd207 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.11 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 73a0d4b2c5e0d..a00ffb5bdced5 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.31 2007/01/09 00:28:06 imp Exp $");
 
 #include <sys/param.h>
 #include <machine/atomic.h>
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index 729b4d5638e6d..17d175db19130 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/flags.c,v 1.10 2007/01/09 00:28:06 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
index 09d24b85aac8c..9c57d8e24c31b 100644
--- a/lib/libc/stdio/floatio.h
+++ b/lib/libc/stdio/floatio.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/floatio.h,v 1.6 2007/01/09 00:28:06 imp Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/flockfile.3 b/lib/libc/stdio/flockfile.3
index a895a0aae0451..a8c9c26ecb686 100644
--- a/lib/libc/stdio/flockfile.3
+++ b/lib/libc/stdio/flockfile.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/flockfile.3,v 1.3 2003/01/13 01:29:14 tjr Exp $
 .\"
 .Dd January 10, 2003
 .Dt FLOCKFILE 3
diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3
index 3d572cad169cf..b0bf2257257f6 100644
--- a/lib/libc/stdio/fopen.3
+++ b/lib/libc/stdio/fopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fopen.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fopen.3,v 1.20 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd January 26, 2003
 .Dt FOPEN 3
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index 9cedcda6a4df1..cd2b5f0ec61d5 100644
--- a/lib/libc/stdio/fopen.c
+++ b/lib/libc/stdio/fopen.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.11 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index bebc182d97ad2..f061bc92dc2d4 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.11 2007/01/09 00:28:06 imp Exp $");
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index 6a2c70c3c5dac..4a673ecbf7e0e 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fpurge.c,v 1.11 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index 66d9a2f773cf4..e429d1c663902 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputc.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
index 8e8bbd185d040..c0feb0cfdb0f0 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.14 2007/04/19 14:01:04 phk Exp $
 .\"
 .Dd June 4, 1993
 .Dt FPUTS 3
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index eb20f9eb4a1e2..a52168580c0c7 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputs.c,v 1.12 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
index 0848b74998d1d..dfe876f85fc81 100644
--- a/lib/libc/stdio/fputwc.c
+++ b/lib/libc/stdio/fputwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.10 2004/07/20 08:27:27 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fputws.3 b/lib/libc/stdio/fputws.3
index ff6205752d332..096e3491db861 100644
--- a/lib/libc/stdio/fputws.3
+++ b/lib/libc/stdio/fputws.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fputws.3,v 1.6 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd August 6, 2002
 .Dt FPUTWS 3
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index 025e1c00d198f..fea591490dbb7 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fread.3 b/lib/libc/stdio/fread.3
index 14541bb89f668..4da3569d0ae7d 100644
--- a/lib/libc/stdio/fread.3
+++ b/lib/libc/stdio/fread.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fread.3	8.2 (Berkeley) 3/8/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fread.3,v 1.10 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd March 8, 1994
 .Dt FREAD 3
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index 6ddfca6a2d55f..bf3a3fc96d625 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index b5bc8840d5121..7125ae26d12f7 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)freopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.18 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index ce3001a103dfd..27b6849af9bb1 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.13 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index 3f45e31457094..5a25dab0e5db6 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.27 2007/06/18 02:13:04 ache Exp $
 .\"
 .Dd March 19, 2004
 .Dt FSEEK 3
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 8482d0d57d36a..a8e39f5c4d78a 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fseek.c	8.3 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.43 2007/06/18 02:09:08 ache Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index f9a742e53a045..6d9bddfb905a6 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fsetpos.c,v 1.9 2007/01/09 00:28:06 imp Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index a9ff6ed5c37ce..a0849d270979c 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ftell.c,v 1.27 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index ef7c8f9934759..f4a3f1cf9f459 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)funopen.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/funopen.3,v 1.16 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd March 19, 2004
 .Dt FUNOPEN 3
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
index 9535340cb262d..378f84d7bcb55 100644
--- a/lib/libc/stdio/funopen.c
+++ b/lib/libc/stdio/funopen.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)funopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/funopen.c,v 1.6 2007/01/09 00:28:06 imp Exp $");
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index fd69eb9542083..06a98809ff629 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.18 2007/01/09 00:28:06 imp Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h
index a4da7434f0bf8..45a03826fd629 100644
--- a/lib/libc/stdio/fvwrite.h
+++ b/lib/libc/stdio/fvwrite.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/fvwrite.h,v 1.4 2007/01/09 00:28:06 imp Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index e5ce49f4ff35e..10d93d9414a63 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwalk.c,v 1.10 2007/01/09 00:28:06 imp Exp $");
 
 #include <sys/types.h>
 #include <machine/atomic.h>
diff --git a/lib/libc/stdio/fwide.3 b/lib/libc/stdio/fwide.3
index 6ff8d92649954..1c1961fbcc739 100644
--- a/lib/libc/stdio/fwide.3
+++ b/lib/libc/stdio/fwide.3
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Citrus: xpg4dl/FreeBSD/lib/libc/stdio/fwide.3,v 1.2 2001/12/07 04:47:08 yamt Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/fwide.3,v 1.3 2002/12/18 12:45:10 ru Exp $
 .\"
 .Dd October 24, 2001
 .Dt FWIDE 3
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
index 70309f56daa1f..1386c48d4b4b2 100644
--- a/lib/libc/stdio/fwide.c
+++ b/lib/libc/stdio/fwide.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwide.c,v 1.1 2002/08/13 09:30:41 tjr Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
index a22edaeb55f05..dcd6c3841fd31 100644
--- a/lib/libc/stdio/fwprintf.c
+++ b/lib/libc/stdio/fwprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index 999d5958193d2..511a66454b2d9 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwrite.c,v 1.12 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
index f779c538518ad..47e8550215d99 100644
--- a/lib/libc/stdio/fwscanf.c
+++ b/lib/libc/stdio/fwscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index c8b938664f28a..26a70229d125d 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/getc.3,v 1.21 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd January 10, 2003
 .Dt GETC 3
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 96e6a4d5d7a63..355d781f564ba 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index d10daed73c087..c616ca7051b23 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.13 2007/01/09 00:28:06 imp Exp $");
 
 /*
  * A subroutine version of the macro getchar.
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index 6a617cec99740..5c3d64f8ddd0f 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/gets.c,v 1.17 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
 #include <unistd.h>
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index d2c69426db3fe..7b669aa072a67 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getw.c,v 1.8 2007/01/09 00:28:06 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/getwc.3 b/lib/libc/stdio/getwc.3
index bc4218a5bd7d2..0f2fe2e445ad2 100644
--- a/lib/libc/stdio/getwc.3
+++ b/lib/libc/stdio/getwc.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/getwc.3,v 1.8 2007/01/09 00:28:06 imp Exp $
 .\"
 .Dd March 3, 2004
 .Dt GETWC 3
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
index ba5ab6011bfd7..34a7de32584f0 100644
--- a/lib/libc/stdio/getwc.c
+++ b/lib/libc/stdio/getwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getwc.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
index 79dd7bc4b33bd..1297cbb86f7f6 100644
--- a/lib/libc/stdio/getwchar.c
+++ b/lib/libc/stdio/getwchar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/glue.h b/lib/libc/stdio/glue.h
index 1fef1404663a3..1543dc3a65c27 100644
--- a/lib/libc/stdio/glue.h
+++ b/lib/libc/stdio/glue.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)glue.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/glue.h,v 1.4 2007/01/09 00:28:06 imp Exp $
  */
 
 /*
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 9d2ff0f00083f..2c20741f70fd4 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.30 2007/01/09 00:28:06 imp Exp $
  */
 
 #include <sys/types.h>	/* for off_t */
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
index 92e6c4be56185..7d90164cdf9a9 100644
--- a/lib/libc/stdio/makebuf.c
+++ b/lib/libc/stdio/makebuf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)makebuf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/makebuf.c,v 1.6 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index 3e02d94fdfd8c..af2eba70f0f5f 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.22 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd February 11, 1998
 .Dt MKTEMP 3
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 37bfb02e5f322..82b83403c9270 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/mktemp.c,v 1.29 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index 9f1855196ffcf..25d147f49b9b6 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)perror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/perror.c,v 1.9 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 84e6089b6b7c8..6e56eebc4ee65 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.60 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd October 16, 2004
 .Dt PRINTF 3
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index df290fa134516..c1ee17802083f 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.11 2007/01/09 00:28:07 imp Exp $");
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
index a9fea5e631022..216c1cba2f5e7 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/putc.3,v 1.16 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd January 10, 2003
 .Dt PUTC 3
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index f15dbc1713e50..85af07f8a5600 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.14 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 175f5ffd86bdc..784f71a39a735 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.14 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 2dc945b86b5cb..4b27733aa11a8 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/puts.c,v 1.11 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 8fc1b4da1a6ec..b5a88a890e728 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putw.c,v 1.10 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putwc.3 b/lib/libc/stdio/putwc.3
index a661c77894a85..47b728c0a5348 100644
--- a/lib/libc/stdio/putwc.3
+++ b/lib/libc/stdio/putwc.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/putwc.3,v 1.8 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd March 3, 2004
 .Dt PUTWC 3
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
index 8fe065bdfe328..0feec5b621c57 100644
--- a/lib/libc/stdio/putwc.c
+++ b/lib/libc/stdio/putwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putwc.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
index 55030713c7522..b983995d3e82d 100644
--- a/lib/libc/stdio/putwchar.c
+++ b/lib/libc/stdio/putwchar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index a4f649bafbc8a..3c0bf8e6e73f4 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/refill.c,v 1.19 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/remove.3 b/lib/libc/stdio/remove.3
index e7a57fe1fe8b8..618111f889482 100644
--- a/lib/libc/stdio/remove.3
+++ b/lib/libc/stdio/remove.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)remove.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/remove.3,v 1.10 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt REMOVE 3
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index f08e47c4e8c89..c6e608b89d3cf 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/remove.c,v 1.9 2007/01/09 00:28:07 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index 73ef2c657bfc4..b5204ed3a038b 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/rewind.c,v 1.12 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index 71c75e0ac9e11..7e69c41546bbe 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rget.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/rget.c,v 1.6 2007/01/09 00:28:07 imp Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index 319455a5fca2b..5f424fff4f64d 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.25 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd January 4, 2003
 .Dt SCANF 3
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 4ae88da973fcc..794149989c7ed 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.13 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index be8803404b89d..8f4ef0a29e67d 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setbuf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.17 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETBUF 3
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index 0daef5422ec28..933afb7ff92c8 100644
--- a/lib/libc/stdio/setbuf.c
+++ b/lib/libc/stdio/setbuf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)setbuf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.5 2007/01/09 00:28:07 imp Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index dd1caa01f8067..64e5932bfa41c 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuffer.c,v 1.8 2007/01/09 00:28:07 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index d897925fa3631..bedaa37f9f0df 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.14 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index c430ab1893488..7c2bf6795e196 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.21 2007/01/09 00:28:07 imp Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index f49259f97ce72..1d4a8a8cf8d15 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.15 2007/01/09 00:28:07 imp Exp $");
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index a1ee11d35d62d..60ca639250c11 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.12 2007/01/09 00:28:07 imp Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index 1a13ee98ac777..484e35aeaaaea 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stdio.3	8.7 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/stdio.3,v 1.28 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd January 10, 2003
 .Dt STDIO 3
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 2447d180ef56a..e11115f47cb46 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.25 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
index d66531820d30a..190326a7b6e9c 100644
--- a/lib/libc/stdio/swprintf.c
+++ b/lib/libc/stdio/swprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/swprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
index 728a3d6957c52..81ac9f1256a2b 100644
--- a/lib/libc/stdio/swscanf.c
+++ b/lib/libc/stdio/swscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index ea4a2c8ca63a0..72a5e60ba57f1 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tempnam.c,v 1.11 2007/01/09 00:28:07 imp Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
index 7ff297fe15d64..3f1679ff9bdee 100644
--- a/lib/libc/stdio/tmpfile.c
+++ b/lib/libc/stdio/tmpfile.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)tmpfile.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpfile.c,v 1.10 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 66652b741716e..3392af25ff930 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tmpnam.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/tmpnam.3,v 1.20 2007/03/16 21:46:24 maxim Exp $
 .\"
 .Dd March 18, 2007
 .Dt TMPFILE 3
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index 05bcb5bad6c49..f3ab680805e4e 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)tmpnam.c	8.3 (Berkeley) 3/28/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.6 2007/01/09 00:28:07 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index 86566b3765a48..ee280eb9a745a 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/ungetc.3,v 1.14 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt UNGETC 3
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index ef2c68b935830..9f4bc766888fc 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.17 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/ungetwc.3 b/lib/libc/stdio/ungetwc.3
index 2cdfbe9f3978d..561825340a12e 100644
--- a/lib/libc/stdio/ungetwc.3
+++ b/lib/libc/stdio/ungetwc.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/ungetwc.3,v 1.6 2007/01/09 00:28:07 imp Exp $
 .\"
 .Dd March 3, 2004
 .Dt UNGETWC 3
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
index 510648b8ded4e..e63f5e1badda9 100644
--- a/lib/libc/stdio/ungetwc.c
+++ b/lib/libc/stdio/ungetwc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.10 2005/08/20 07:59:13 stefanf Exp $");
 
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libc/stdio/unlocked.c b/lib/libc/stdio/unlocked.c
index 083d26f24ffd9..6b1c0ef44fc59 100644
--- a/lib/libc/stdio/unlocked.c
+++ b/lib/libc/stdio/unlocked.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/unlocked.c,v 1.1 2003/01/10 04:35:08 tjr Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 01ac06889c3ef..197c42714bab6 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.18 2002/09/26 13:11:24 tjr Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 45e7c7fbc14c0..bef07c78eddfe 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.77 2007/05/08 03:08:28 das Exp $");
 
 /*
  * Actual printf innards.
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 452eb65ece26e..97e309ac20fd2 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.41 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index eabdc9ec8dc7b..8f4ae97972606 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
 
 /*
  * Actual wprintf innards.
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index b6d97e3194f03..e53ae4466beb8 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.15 2007/01/09 00:28:08 imp Exp $");
 
 #include "namespace.h"
 #include <ctype.h>
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index a610b7dc2b13a..b11af0d743383 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vprintf.c,v 1.11 2007/01/09 00:28:08 imp Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 25bce72c1cec3..7792970ac6356 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vscanf.c,v 1.13 2007/01/09 00:28:08 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index ba15c34ffa3bb..44624d66c09a5 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.23 2007/01/09 00:28:08 imp Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 923afd814369f..406654a25f635 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.15 2007/01/09 00:28:08 imp Exp $");
 
 #include <stdio.h>
 #include <limits.h>
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 1f4b80bdad908..663d08cff5a67 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.13 2007/01/09 00:28:08 imp Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
index 1d8a64ed4c11a..a4b6306a00e89 100644
--- a/lib/libc/stdio/vswprintf.c
+++ b/lib/libc/stdio/vswprintf.c
@@ -31,7 +31,7 @@
 #if 0
 __FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.6 2005/02/21 19:41:44 fjoe Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
index 5d9a22a5b0d3c..e68fe1c1641f3 100644
--- a/lib/libc/stdio/vswscanf.c
+++ b/lib/libc/stdio/vswscanf.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.11 2002/08/21 16:19:57 mike Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vswscanf.c,v 1.4 2007/01/09 00:28:08 imp Exp $");
 
 #include <limits.h>
 #include <stdarg.h>
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
index 91212a8bf3d0d..4390c0696fda3 100644
--- a/lib/libc/stdio/vwprintf.c
+++ b/lib/libc/stdio/vwprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
index 4a21af2d8356f..6e103d5485d2e 100644
--- a/lib/libc/stdio/vwscanf.c
+++ b/lib/libc/stdio/vwscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 58e2da569df55..4f1c4aaea36fa 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.12 2007/01/09 00:28:08 imp Exp $");
 
 #include <stdio.h>
 #include "local.h"
diff --git a/lib/libc/stdio/wprintf.3 b/lib/libc/stdio/wprintf.3
index d9e724f81cd99..39713e217e69e 100644
--- a/lib/libc/stdio/wprintf.3
+++ b/lib/libc/stdio/wprintf.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/stdio/printf.3,v 1.47 2002/09/06 11:23:55 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/wprintf.3,v 1.6 2007/01/09 00:28:08 imp Exp $
 .\"
 .Dd July 5, 2003
 .Dt WPRINTF 3
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
index 92426f6c207be..4b5596e1da2ce 100644
--- a/lib/libc/stdio/wprintf.c
+++ b/lib/libc/stdio/wprintf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/wscanf.3 b/lib/libc/stdio/wscanf.3
index f696d3d644484..21d32ab70c077 100644
--- a/lib/libc/stdio/wscanf.3
+++ b/lib/libc/stdio/wscanf.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
 .\" FreeBSD: src/lib/libc/stdio/scanf.3,v 1.24 2003/06/28 09:03:25 das Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdio/wscanf.3,v 1.7 2007/01/09 00:28:08 imp Exp $
 .\"
 .Dd July 5, 2003
 .Dt WSCANF 3
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
index 5e27b401fa84d..86290272cd5ce 100644
--- a/lib/libc/stdio/wscanf.c
+++ b/lib/libc/stdio/wscanf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index a5da23f003ec3..8710457b2c2b8 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.10 2007/01/09 00:28:08 imp Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/xprintf.c b/lib/libc/stdio/xprintf.c
index 41ee4abca39de..905dd6e5a3b2b 100644
--- a/lib/libc/stdio/xprintf.c
+++ b/lib/libc/stdio/xprintf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.5 2006/10/23 07:25:25 kib Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c
index 0c2be46a6d70f..5016bf3f84087 100644
--- a/lib/libc/stdio/xprintf_errno.c
+++ b/lib/libc/stdio/xprintf_errno.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_errno.c,v 1.1 2006/01/25 12:45:24 phk Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_float.c b/lib/libc/stdio/xprintf_float.c
index b719aacc2fbdb..e08cf6acf90e1 100644
--- a/lib/libc/stdio/xprintf_float.c
+++ b/lib/libc/stdio/xprintf_float.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_float.c,v 1.1 2005/12/16 18:56:38 phk Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_hexdump.c b/lib/libc/stdio/xprintf_hexdump.c
index a2956ba27b65f..b055191628c21 100644
--- a/lib/libc/stdio/xprintf_hexdump.c
+++ b/lib/libc/stdio/xprintf_hexdump.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_hexdump.c,v 1.1 2005/12/16 18:56:38 phk Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_int.c b/lib/libc/stdio/xprintf_int.c
index f006b54d51cbd..eb44a9d245e65 100644
--- a/lib/libc/stdio/xprintf_int.c
+++ b/lib/libc/stdio/xprintf_int.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_int.c,v 1.2 2005/12/22 14:23:54 cognet Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_quote.c b/lib/libc/stdio/xprintf_quote.c
index 0edcd30e9c556..ad6b5e991774a 100644
--- a/lib/libc/stdio/xprintf_quote.c
+++ b/lib/libc/stdio/xprintf_quote.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_quote.c,v 1.2 2006/03/02 08:53:45 phk Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_str.c b/lib/libc/stdio/xprintf_str.c
index d46fa85841aab..e4a6e5743ac1f 100644
--- a/lib/libc/stdio/xprintf_str.c
+++ b/lib/libc/stdio/xprintf_str.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_str.c,v 1.1 2005/12/16 18:56:38 phk Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdio/xprintf_time.c b/lib/libc/stdio/xprintf_time.c
index 81697f165a430..a96174f9f8f4f 100644
--- a/lib/libc/stdio/xprintf_time.c
+++ b/lib/libc/stdio/xprintf_time.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_time.c,v 1.3 2006/02/04 14:35:01 phk Exp $
  */
 #include <namespace.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/xprintf_vis.c b/lib/libc/stdio/xprintf_vis.c
index 819f09ff1d8fa..8a9010013f514 100644
--- a/lib/libc/stdio/xprintf_vis.c
+++ b/lib/libc/stdio/xprintf_vis.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdio/xprintf_vis.c,v 1.2 2006/01/25 12:45:24 phk Exp $
  */
 
 #include <namespace.h>
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index f9b8fec7ab9d1..4c4141f4c162d 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.54 2007/07/04 00:00:39 scf Exp $
 
 # machine-independent stdlib sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib
diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map
index cbb9fb11c5acb..13052072177cc 100644
--- a/lib/libc/stdlib/Symbol.map
+++ b/lib/libc/stdlib/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/Symbol.map,v 1.6 2007/05/22 05:28:40 jon Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdlib/_Exit.c b/lib/libc/stdlib/_Exit.c
index e7f0f5104f93a..3a2e94e78c9fd 100644
--- a/lib/libc/stdlib/_Exit.c
+++ b/lib/libc/stdlib/_Exit.c
@@ -2,7 +2,7 @@
  * This file is in the public domain.  Written by Garrett A. Wollman,
  * 2002-09-07.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/_Exit.c,v 1.1 2002/09/10 02:04:49 wollman Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/a64l.3 b/lib/libc/stdlib/a64l.3
index 61fbffdbab331..49c03e715e2a7 100644
--- a/lib/libc/stdlib/a64l.3
+++ b/lib/libc/stdlib/a64l.3
@@ -32,7 +32,7 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.3 2006/09/30 10:29:43 ru Exp $
 .\"
 .Dd November 20, 2005
 .Dt A64L 3
diff --git a/lib/libc/stdlib/a64l.c b/lib/libc/stdlib/a64l.c
index a130dcb24bf52..5812c9e79a6fc 100644
--- a/lib/libc/stdlib/a64l.c
+++ b/lib/libc/stdlib/a64l.c
@@ -10,7 +10,7 @@ __RCSID("$NetBSD: a64l.c,v 1.8 2000/01/22 22:19:19 mycroft Exp $");
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/a64l.c,v 1.2 2006/05/19 19:06:38 jkim Exp $");
 
 #include <stdlib.h>
 #include <inttypes.h>
diff --git a/lib/libc/stdlib/abort.3 b/lib/libc/stdlib/abort.3
index b939e9c23ebff..c283b31b5a017 100644
--- a/lib/libc/stdlib/abort.3
+++ b/lib/libc/stdlib/abort.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abort.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/abort.3,v 1.10 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt ABORT 3
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index eba53e5afa13a..50e34b00916c5 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)abort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/abort.c,v 1.11 2007/01/09 00:28:09 imp Exp $");
 
 #include "namespace.h"
 #include <signal.h>
diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3
index 4f02122535447..d53f7c13f51b0 100644
--- a/lib/libc/stdlib/abs.3
+++ b/lib/libc/stdlib/abs.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/abs.3,v 1.13 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd November 14, 2001
 .Dt ABS 3
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
index 5ca9596cb226d..85cc8f049f890 100644
--- a/lib/libc/stdlib/abs.c
+++ b/lib/libc/stdlib/abs.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)abs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/abs.c,v 1.3 2007/01/09 00:28:09 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/alloca.3 b/lib/libc/stdlib/alloca.3
index 95594443b0a0f..9866edfb2f0f2 100644
--- a/lib/libc/stdlib/alloca.3
+++ b/lib/libc/stdlib/alloca.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)alloca.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/alloca.3,v 1.13 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd September 5, 2006
 .Dt ALLOCA 3
diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3
index 3c44b8d8431d3..bf40c80829b62 100644
--- a/lib/libc/stdlib/atexit.3
+++ b/lib/libc/stdlib/atexit.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atexit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atexit.3,v 1.11 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd September 6, 2002
 .Dt ATEXIT 3
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index efd12649e009e..05dad84025954 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)atexit.c	8.2 (Berkeley) 7/3/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.8 2007/01/09 00:28:09 imp Exp $");
 
 #include "namespace.h"
 #include <stddef.h>
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
index f34194f7b991a..94929b5660833 100644
--- a/lib/libc/stdlib/atexit.h
+++ b/lib/libc/stdlib/atexit.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)atexit.h	8.2 (Berkeley) 7/3/94
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/atexit.h,v 1.4 2007/01/09 00:28:09 imp Exp $
  */
 
 /* must be at least 32 to guarantee ANSI conformance */
diff --git a/lib/libc/stdlib/atof.3 b/lib/libc/stdlib/atof.3
index abf5b7c97b6b1..e417e27993210 100644
--- a/lib/libc/stdlib/atof.3
+++ b/lib/libc/stdlib/atof.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atof.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atof.3,v 1.17 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt ATOF 3
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
index 51e482e7dac36..8ece0972c6349 100644
--- a/lib/libc/stdlib/atof.c
+++ b/lib/libc/stdlib/atof.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)atof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atof.c,v 1.6 2007/01/09 00:28:09 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/atoi.3 b/lib/libc/stdlib/atoi.3
index 5d2d754233436..6a2663a9fee1c 100644
--- a/lib/libc/stdlib/atoi.3
+++ b/lib/libc/stdlib/atoi.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atoi.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atoi.3,v 1.13 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt ATOI 3
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
index 0ffcd037394ef..38ab6325c6cdf 100644
--- a/lib/libc/stdlib/atoi.c
+++ b/lib/libc/stdlib/atoi.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)atoi.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoi.c,v 1.6 2007/01/09 00:28:09 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/atol.3 b/lib/libc/stdlib/atol.3
index b9cf9e9aa658e..bcaf3b3e5f87f 100644
--- a/lib/libc/stdlib/atol.3
+++ b/lib/libc/stdlib/atol.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/atol.3,v 1.14 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd November 28, 2001
 .Dt ATOL 3
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
index c9cf2e85b00bf..2209340ec45df 100644
--- a/lib/libc/stdlib/atol.c
+++ b/lib/libc/stdlib/atol.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)atol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atol.c,v 1.5 2007/01/09 00:28:09 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
index 203c17425ae4c..c5bc881e650dd 100644
--- a/lib/libc/stdlib/atoll.c
+++ b/lib/libc/stdlib/atoll.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoll.c,v 1.5 2007/01/09 00:28:09 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/bsearch.3 b/lib/libc/stdlib/bsearch.3
index b3591f8e998be..5ae58674d87d9 100644
--- a/lib/libc/stdlib/bsearch.3
+++ b/lib/libc/stdlib/bsearch.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bsearch.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/bsearch.3,v 1.9 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt BSEARCH 3
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index ff021688f3061..b6988690e3010 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/bsearch.c,v 1.4 2007/01/09 00:28:09 imp Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
index 46a145f39cf48..b29ca13c5a8ce 100644
--- a/lib/libc/stdlib/div.3
+++ b/lib/libc/stdlib/div.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)div.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/div.3,v 1.9 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd November 14, 2001
 .Dt DIV 3
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
index ef93d736f6cc3..2aa34922f1580 100644
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)div.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/div.c,v 1.3 2007/01/09 00:28:09 imp Exp $");
 
 #include <stdlib.h>		/* div_t */
 
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index a864ccba59b47..250f529139905 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.16 2007/01/09 00:28:09 imp Exp $
 .\"
 .Dd September 9, 2002
 .Dt EXIT 3
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index 26c346ac072fc..84496009ad957 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.9 2007/01/09 00:28:09 imp Exp $");
 
 #include "namespace.h"
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index 33d9c36f3a79b..ac5edefcd0fe1 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getenv.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.27 2007/07/04 00:00:39 scf Exp $
 .\"
 .Dd June 20, 2007
 .Dt GETENV 3
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 2b7757ed3374b..a8205d628bdf8 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -33,7 +33,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.12 2007/09/22 02:30:44 scf Exp $");
 
 
 static const char CorruptEnvFindMsg[] =
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index a96662458fb16..ec9bf198096f0 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getopt.3,v 1.26 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd April 27, 1995
 .Dt GETOPT 3
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index 4d319a45ffc3e..375907ac6cfc8 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt.c,v 1.8 2007/01/09 00:28:10 imp Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
diff --git a/lib/libc/stdlib/getopt_long.3 b/lib/libc/stdlib/getopt_long.3
index 352af083f9248..fd33cfca7617e 100644
--- a/lib/libc/stdlib/getopt_long.3
+++ b/lib/libc/stdlib/getopt_long.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.13 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd April 1, 2000
 .Dt GETOPT_LONG 3
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index bf7a04a2ee8c2..c42edb3618681 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -62,7 +62,7 @@ static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.15 2006/09/23 14:48:31 ache Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index b624eff65eea5..544e3438f28bf 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/getsubopt.3,v 1.11 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETSUBOPT 3
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index 6d0ab75668d04..194734e4ce20f 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)getsubopt.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getsubopt.c,v 1.7 2007/01/09 00:28:10 imp Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/stdlib/grantpt.3 b/lib/libc/stdlib/grantpt.3
index b4ad8c4edf410..795f4af7ae11f 100644
--- a/lib/libc/stdlib/grantpt.3
+++ b/lib/libc/stdlib/grantpt.3
@@ -29,7 +29,7 @@
 .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/grantpt.3,v 1.3 2003/09/14 13:41:57 ru Exp $
 .\"
 .Dd December 23, 2002
 .Os
diff --git a/lib/libc/stdlib/grantpt.c b/lib/libc/stdlib/grantpt.c
index 1d67607ec3d1c..60691c4e87798 100644
--- a/lib/libc/stdlib/grantpt.c
+++ b/lib/libc/stdlib/grantpt.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.7.2.2.2.2 2008/01/14 22:55:54 cperciva Exp $");
 #endif /* not lint */
 
 #include "namespace.h"
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
index 38743afb47469..b638f5a2ea4b8 100644
--- a/lib/libc/stdlib/hcreate.3
+++ b/lib/libc/stdlib/hcreate.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.5 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd May 8, 2001
 .Os
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index 58780850be6d1..6ab33e5be8011 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -52,7 +52,7 @@
 __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.3 2002/06/27 13:18:27 deischen Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index 135c48b5e1e82..6efe9552404a6 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)heapsort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/heapsort.c,v 1.5 2007/01/09 00:28:10 imp Exp $");
 
 #include <errno.h>
 #include <stddef.h>
diff --git a/lib/libc/stdlib/imaxabs.3 b/lib/libc/stdlib/imaxabs.3
index 430f873280f56..ac520b299d14d 100644
--- a/lib/libc/stdlib/imaxabs.3
+++ b/lib/libc/stdlib/imaxabs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/imaxabs.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt IMAXABS 3
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
index 35e3dee79d363..531de24fb81ae 100644
--- a/lib/libc/stdlib/imaxabs.c
+++ b/lib/libc/stdlib/imaxabs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/imaxabs.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <inttypes.h>
 
diff --git a/lib/libc/stdlib/imaxdiv.3 b/lib/libc/stdlib/imaxdiv.3
index 0ee0971a81bef..2a6bad57fecf7 100644
--- a/lib/libc/stdlib/imaxdiv.3
+++ b/lib/libc/stdlib/imaxdiv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/imaxdiv.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt IMAXDIV 3
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
index 7dae4675e2b1e..ff3087b6315e8 100644
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/imaxdiv.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <inttypes.h>
 
diff --git a/lib/libc/stdlib/insque.3 b/lib/libc/stdlib/insque.3
index a54434c6d3161..06f93bf20fc34 100644
--- a/lib/libc/stdlib/insque.3
+++ b/lib/libc/stdlib/insque.3
@@ -6,7 +6,7 @@
 .\" As long as the above copyright statement and this notice remain
 .\" unchanged, you can do what ever you want with this file.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/insque.3,v 1.3 2003/02/25 21:59:36 robert Exp $
 .\"
 .Dd October 10, 2002
 .Dt INSQUE 3
diff --git a/lib/libc/stdlib/insque.c b/lib/libc/stdlib/insque.c
index 388e4d592617e..92984b07d7846 100644
--- a/lib/libc/stdlib/insque.c
+++ b/lib/libc/stdlib/insque.c
@@ -7,7 +7,7 @@
  * unchanged, you can do what ever you want with this file. 
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/insque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
 
 #define	_SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/l64a.c b/lib/libc/stdlib/l64a.c
index bc105535ed127..d67970abee196 100644
--- a/lib/libc/stdlib/l64a.c
+++ b/lib/libc/stdlib/l64a.c
@@ -10,7 +10,7 @@ __RCSID("$NetBSD: l64a.c,v 1.13 2003/07/26 19:24:54 salo Exp $");
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/l64a.c,v 1.1 2005/12/24 22:37:59 trhodes Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/labs.3 b/lib/libc/stdlib/labs.3
index b714fe382a23f..b38d8adb658cc 100644
--- a/lib/libc/stdlib/labs.3
+++ b/lib/libc/stdlib/labs.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)labs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/labs.3,v 1.10 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd November 14, 2001
 .Dt LABS 3
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
index d22975e24d421..f2ead54d0b3a7 100644
--- a/lib/libc/stdlib/labs.c
+++ b/lib/libc/stdlib/labs.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)labs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/labs.c,v 1.3 2007/01/09 00:28:10 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3
index 221e68d27d5ad..492d5084f28ee 100644
--- a/lib/libc/stdlib/ldiv.3
+++ b/lib/libc/stdlib/ldiv.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ldiv.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/ldiv.3,v 1.10 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd November 14, 2001
 .Dt LDIV 3
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
index 0311d06e086db..a0707e3157e99 100644
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)ldiv.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/ldiv.c,v 1.3 2007/01/09 00:28:10 imp Exp $");
 
 #include <stdlib.h>		/* ldiv_t */
 
diff --git a/lib/libc/stdlib/llabs.3 b/lib/libc/stdlib/llabs.3
index 8c031a940d6f1..a8238dacea5a4 100644
--- a/lib/libc/stdlib/llabs.3
+++ b/lib/libc/stdlib/llabs.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/llabs.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt LLABS 3
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
index 2bfbada80d93c..4721fcee54e83 100644
--- a/lib/libc/stdlib/llabs.c
+++ b/lib/libc/stdlib/llabs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/llabs.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/lldiv.3 b/lib/libc/stdlib/lldiv.3
index 976a997b9cc80..96ecf1aeec70f 100644
--- a/lib/libc/stdlib/lldiv.3
+++ b/lib/libc/stdlib/lldiv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/lldiv.3,v 1.2 2001/11/21 16:19:50 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt LLDIV 3
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
index b34b65e8632d1..c9a4853329ce2 100644
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/lldiv.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/lsearch.3 b/lib/libc/stdlib/lsearch.3
index 5e76724dc115f..3ad6f6c790dd2 100644
--- a/lib/libc/stdlib/lsearch.3
+++ b/lib/libc/stdlib/lsearch.3
@@ -6,7 +6,7 @@
 .\" As long as the above copyright statement and this notice remain
 .\" unchanged, you can do what ever you want with this file.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/lsearch.3,v 1.5 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd October 11, 2002
 .Dt LSEARCH 3
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
index e4d1dd59c54d7..791bc4934d51e 100644
--- a/lib/libc/stdlib/lsearch.c
+++ b/lib/libc/stdlib/lsearch.c
@@ -8,7 +8,7 @@
  */
 #include <sys/types.h>
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/lsearch.c,v 1.1 2002/10/16 14:29:22 robert Exp $");
 
 #define	_SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 4667588a369c0..18fba2798dd42 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.73 2007/06/15 22:32:33 jasone Exp $
 .\"
 .Dd June 15, 2007
 .Dt MALLOC 3
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index c8a22773b985f..75bc845d2e011 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -105,7 +105,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147.2.1 2007/10/11 06:35:46 kensmith Exp $");
 
 #include "libc_private.h"
 #ifdef MALLOC_DEBUG
diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3
index 9f42fa6abdaba..3802a3212e961 100644
--- a/lib/libc/stdlib/memory.3
+++ b/lib/libc/stdlib/memory.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/memory.3,v 1.12 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMORY 3
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index e1078e7ccacdb..82acb0a51ce87 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.8 2007/01/09 00:28:10 imp Exp $");
 
 /*
  * Hybrid exponential search/linear search merge sort with hybrid
diff --git a/lib/libc/stdlib/posix_memalign.3 b/lib/libc/stdlib/posix_memalign.3
index b092cedd05982..36d1aee796441 100644
--- a/lib/libc/stdlib/posix_memalign.3
+++ b/lib/libc/stdlib/posix_memalign.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/posix_memalign.3,v 1.3 2007/03/28 04:32:51 jasone Exp $
 .\"
 .Dd January 11, 2006
 .Dt POSIX_MEMALIGN 3
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
index 0f7ef7334470a..23a116c3d2479 100644
--- a/lib/libc/stdlib/qsort.3
+++ b/lib/libc/stdlib/qsort.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)qsort.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/qsort.3,v 1.17 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd September 30, 2003
 .Dt QSORT 3
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 65e038c05d753..aae7c9bc86d23 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/qsort.c,v 1.13 2007/01/09 00:28:10 imp Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/qsort_r.c b/lib/libc/stdlib/qsort_r.c
index d86873604f591..f7c0e54f74330 100644
--- a/lib/libc/stdlib/qsort_r.c
+++ b/lib/libc/stdlib/qsort_r.c
@@ -2,7 +2,7 @@
  * This file is in the public domain.  Originally written by Garrett
  * A. Wollman.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/qsort_r.c,v 1.1 2002/09/10 02:04:49 wollman Exp $
  */
 #define I_AM_QSORT_R
 #include "qsort.c"
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
index dfa65f1359b33..9dc22860fa1d7 100644
--- a/lib/libc/stdlib/radixsort.3
+++ b/lib/libc/stdlib/radixsort.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)radixsort.3	8.2 (Berkeley) 1/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/radixsort.3,v 1.12 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd January 27, 1994
 .Dt RADIXSORT 3
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 82ff1bc673a7b..5e7c6dc39d5e8 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/radixsort.c,v 1.8 2007/01/09 00:28:10 imp Exp $");
 
 /*
  * Radixsort routines.
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index 9b247959f5333..f4705234bb615 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rand.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/rand.3,v 1.16 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd May 25, 1999
 .Dt RAND 3
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index d651a7002caf2..29130cf1f1384 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)rand.c	8.1 (Berkeley) 6/14/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.16 2007/01/09 00:28:10 imp Exp $");
 
 #include "namespace.h"
 #include <sys/time.h>          /* for sranddev() */
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
index aacf6e32bd5c3..4c3f06110dfcb 100644
--- a/lib/libc/stdlib/random.3
+++ b/lib/libc/stdlib/random.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/random.3,v 1.22 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt RANDOM 3
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index f7be4a7186b25..693550b238046 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/random.c,v 1.25 2007/01/09 00:28:10 imp Exp $");
 
 #include "namespace.h"
 #include <sys/time.h>          /* for srandomdev() */
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 5320926ce4bc6..d502006229da1 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/reallocf.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
 
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3
index 4205a3d6bbc6b..dc6ba9abe92c5 100644
--- a/lib/libc/stdlib/realpath.3
+++ b/lib/libc/stdlib/realpath.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)realpath.3	8.2 (Berkeley) 2/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/realpath.3,v 1.14 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd February 16, 1994
 .Dt REALPATH 3
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 3082f5f4b95a9..31e097787b8fb 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -30,7 +30,7 @@
 static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/realpath.c,v 1.20 2003/05/28 08:23:01 fjoe Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
diff --git a/lib/libc/stdlib/remque.c b/lib/libc/stdlib/remque.c
index 0a2f28f77c7c3..068a75fc0e163 100644
--- a/lib/libc/stdlib/remque.c
+++ b/lib/libc/stdlib/remque.c
@@ -7,7 +7,7 @@
  * unchanged, you can do what ever you want with this file. 
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/remque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
 
 #define	_SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
index 11b8e211bf66e..739a79877299a 100644
--- a/lib/libc/stdlib/strfmon.3
+++ b/lib/libc/stdlib/strfmon.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strfmon.3,v 1.7 2003/01/06 06:21:25 tjr Exp $
 .\"
 .Dd October 12, 2002
 .Dt STRFMON 3
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index db78232a07da5..42310d720a981 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index 33dd45250b72b..f4e6799c6785b 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtod.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtod.3,v 1.21 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd March 2, 2003
 .Dt STRTOD 3
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index 4f0063ca318aa..09e073f473e6a 100644
--- a/lib/libc/stdlib/strtoimax.c
+++ b/lib/libc/stdlib/strtoimax.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.12 2007/01/09 00:28:10 imp Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index 02316f58e4f56..42f7db381708f 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtol.3,v 1.23 2007/04/10 11:17:00 ru Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOL 3
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index 0d6f73684c0de..6bb1551e094b6 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtol.c,v 1.20 2007/01/09 00:28:10 imp Exp $");
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index 2e5547dc87e75..80dac676dc3c7 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.22 2007/01/09 00:28:10 imp Exp $");
 
 #include <limits.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtonum.3 b/lib/libc/stdlib/strtonum.3
index 90f0b578ff33c..f631d4e342c26 100644
--- a/lib/libc/stdlib/strtonum.3
+++ b/lib/libc/stdlib/strtonum.3
@@ -13,7 +13,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" $OpenBSD: strtonum.3,v 1.12 2005/10/26 11:37:58 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtonum.3,v 1.5 2006/09/30 10:29:43 ru Exp $
 .\"
 .Dd April 29, 2004
 .Dt STRTONUM 3
diff --git a/lib/libc/stdlib/strtonum.c b/lib/libc/stdlib/strtonum.c
index 6dccd973606b2..dd8804ea68833 100644
--- a/lib/libc/stdlib/strtonum.c
+++ b/lib/libc/stdlib/strtonum.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtonum.c,v 1.2 2006/03/14 19:53:03 ache Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index afad51fb80c0f..0d101d5fed4e1 100644
--- a/lib/libc/stdlib/strtoq.c
+++ b/lib/libc/stdlib/strtoq.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoq.c,v 1.12 2007/01/09 00:28:10 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 2c0f348961dfd..adc66437bf11b 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtoul.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/strtoul.3,v 1.23 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd November 28, 2001
 .Dt STRTOUL 3
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index e8d1e114a0a4e..76cd7b0816a64 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoul.c,v 1.19 2007/01/09 00:28:10 imp Exp $");
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index f11910c3a9ff8..38d6194bf80d0 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.21 2007/01/09 00:28:10 imp Exp $");
 
 #include <limits.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
index 23050c2c61aaa..f592063250bbb 100644
--- a/lib/libc/stdlib/strtoumax.c
+++ b/lib/libc/stdlib/strtoumax.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.11 2007/01/09 00:28:10 imp Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 9638c1198ae24..614c5b87058a0 100644
--- a/lib/libc/stdlib/strtouq.c
+++ b/lib/libc/stdlib/strtouq.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtouq.c,v 1.12 2007/01/09 00:28:10 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3
index 27f5137fce55f..9bbb5aef88c7f 100644
--- a/lib/libc/stdlib/system.3
+++ b/lib/libc/stdlib/system.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)system.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12 2007/01/09 00:28:10 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYSTEM 3
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index 08de630091986..8cdc1ddc18b5c 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/system.c,v 1.11 2007/01/09 00:28:10 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
index c83afb8cf3f1a..7fb6893466a06 100644
--- a/lib/libc/stdlib/tdelete.c
+++ b/lib/libc/stdlib/tdelete.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/tdelete.c,v 1.6 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index c5d66cf41612c..b58ed88735798 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/tfind.c,v 1.5 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index 7a204d06e1108..d7121d4bdd64a 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -25,7 +25,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	OpenBSD: tsearch.3,v 1.2 1998/06/21 22:13:49 millert Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdlib/tsearch.3,v 1.15 2006/06/23 13:36:33 keramida Exp $
 .\"
 .Dd June 15, 1997
 .Dt TSEARCH 3
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 149c2bb00f164..edeccde809d5e 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/tsearch.c,v 1.4 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
index 55f220f387500..516ef44e006c3 100644
--- a/lib/libc/stdlib/twalk.c
+++ b/lib/libc/stdlib/twalk.c
@@ -17,7 +17,7 @@
 __RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/twalk.c,v 1.5 2003/01/05 02:43:18 tjr Exp $");
 
 #define _SEARCH_PRIVATE
 #include <search.h>
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index a58a8a2ae8150..88e8b4c79aa8e 100644
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@@ -1,5 +1,5 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.15 2006/03/13 01:15:00 deischen Exp $
 
 .PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale
 
diff --git a/lib/libc/stdtime/Symbol.map b/lib/libc/stdtime/Symbol.map
index 3bee3735f7e64..be6fc753cf8f3 100644
--- a/lib/libc/stdtime/Symbol.map
+++ b/lib/libc/stdtime/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdtime/Symbol.map,v 1.3 2007/05/31 13:01:34 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdtime/asctime.c b/lib/libc/stdtime/asctime.c
index 0f4212f81c149..c28abae9826f2 100644
--- a/lib/libc/stdtime/asctime.c
+++ b/lib/libc/stdtime/asctime.c
@@ -9,7 +9,7 @@
 static char	elsieid[] __unused = "@(#)asctime.c	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.12 2004/06/14 10:31:52 stefanf Exp $");
 
 /*LINTLIBRARY*/
 
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index 143bc2c9fd029..5e7f3b7899a47 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ctime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/ctime.3,v 1.24 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd January 2, 1999
 .Dt CTIME 3
diff --git a/lib/libc/stdtime/difftime.c b/lib/libc/stdtime/difftime.c
index 596ea82f67ca6..df557534ff5c4 100644
--- a/lib/libc/stdtime/difftime.c
+++ b/lib/libc/stdtime/difftime.c
@@ -9,7 +9,7 @@
 static char	elsieid[] __unused = "@(#)difftime.c	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/difftime.c,v 1.8 2004/06/14 10:31:52 stefanf Exp $");
 
 /*LINTLIBRARY*/
 
diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index 827b140752a20..326c2846508a0 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -9,7 +9,7 @@
 static char	elsieid[] __unused = "@(#)localtime.c	7.78";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.41 2007/01/19 01:16:35 imp Exp $");
 
 /*
 ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
diff --git a/lib/libc/stdtime/private.h b/lib/libc/stdtime/private.h
index a3c777834e3d5..9878a1a4428f2 100644
--- a/lib/libc/stdtime/private.h
+++ b/lib/libc/stdtime/private.h
@@ -6,7 +6,7 @@
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
-** $FreeBSD$
+** $FreeBSD: src/lib/libc/stdtime/private.h,v 1.10 2004/06/14 10:31:52 stefanf Exp $
 */
 
 /* Stuff moved from Makefile.inc to reduce clutter */
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index e3a64db3bf59b..3155fcd018173 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strftime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.39 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd November 4, 2004
 .Dt STRFTIME 3
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 3f66ea25eb9a4..7e8a3dcdf8d33 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -32,7 +32,7 @@ static const char	elsieid[] = "@(#)strftime.c	7.64";
 static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.41 2004/11/04 08:34:57 delphij Exp $");
 
 #include "tzfile.h"
 #include <fcntl.h>
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index d763fbcab5d6f..00e6b57932c92 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/strptime.3,v 1.24 2005/01/20 09:17:04 ru Exp $
 .\" "
 .Dd January 4, 2003
 .Dt STRPTIME 3
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index ddf6b57e38fcc..901a742570455 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -59,7 +59,7 @@ static char copyright[] __unused =
 static char sccsid[] __unused = "@(#)strptime.c	0.1 (Powerdog) 94/03/27";
 #endif /* !defined NOID */
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.35 2003/11/17 04:19:15 nectar Exp $");
 
 #include "namespace.h"
 #include <time.h>
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index ce9c68d771559..ea5485edcbe92 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/time2posix.3,v 1.15 2005/09/11 17:09:50 stefanf Exp $
 .\"
 .Dd September 11, 2005
 .Dt TIME2POSIX 3
diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c
index e852a4f279e4b..5085dd7d9bf17 100644
--- a/lib/libc/stdtime/time32.c
+++ b/lib/libc/stdtime/time32.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/time32.c,v 1.5 2002/06/17 01:42:29 wollman Exp $");
 
 #include <sys/types.h>
 #include <timeconv.h>
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index 6917e6b6ccee6..2aba03c58ae92 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/timelocal.c,v 1.25 2003/06/13 00:14:07 jkh Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
index 5d26bf938d97f..0b0a59a483d4c 100644
--- a/lib/libc/stdtime/timelocal.h
+++ b/lib/libc/stdtime/timelocal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdtime/timelocal.h,v 1.11 2002/01/24 15:07:44 phantom Exp $
  */
 
 #ifndef _TIMELOCAL_H_
diff --git a/lib/libc/stdtime/tzfile.5 b/lib/libc/stdtime/tzfile.5
index cc7e659660606..04ecce86136d8 100644
--- a/lib/libc/stdtime/tzfile.5
+++ b/lib/libc/stdtime/tzfile.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/stdtime/tzfile.5,v 1.10 2001/07/10 13:41:23 ru Exp $
 .Dd September 13, 1994
 .Dt TZFILE 5
 .Os
diff --git a/lib/libc/stdtime/tzfile.h b/lib/libc/stdtime/tzfile.h
index 89c569453c21f..378d7ae606c6c 100644
--- a/lib/libc/stdtime/tzfile.h
+++ b/lib/libc/stdtime/tzfile.h
@@ -6,7 +6,7 @@
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 **
-** $FreeBSD$
+** $FreeBSD: src/lib/libc/stdtime/tzfile.h,v 1.8 2002/03/22 23:42:05 obrien Exp $
 */
 
 /*
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 6d64ea5a08c9a..cf06e4311f4a1 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $
 
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
 
diff --git a/lib/libc/string/Symbol.map b/lib/libc/string/Symbol.map
index ad9f74327f13d..ef754f24e54a1 100644
--- a/lib/libc/string/Symbol.map
+++ b/lib/libc/string/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index d043c2cc1b628..cf68665ad26ae 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bcmp.3,v 1.11 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt BCMP 3
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 117a9a1d0cfc8..4c518ee8ce92d 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)bcmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/bcmp.c,v 1.6 2007/01/09 00:28:11 imp Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
index 23f7ac22a1319..b7f511bcebbf6 100644
--- a/lib/libc/string/bcopy.3
+++ b/lib/libc/string/bcopy.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcopy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bcopy.3,v 1.10 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt BCOPY 3
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index bb1209cdc5750..09f81dace27d6 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)bcopy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/bcopy.c,v 1.7 2007/01/09 00:28:11 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index b1aef1b5f9efc..aa3f36199e583 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bstring.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bstring.3,v 1.8 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt BSTRING 3
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
index bc61d82b62afd..52d26843054c8 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bzero.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/bzero.3,v 1.10 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt BZERO 3
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 201bd64f808d7..85bc5e834e98c 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/bzero.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	BZERO
 #include "memset.c"
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index 55daae44f4b56..c2f5b68de1485 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ffs.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.11 2007/01/09 00:28:11 imp Exp $
 .\"
 .Dd October 12, 2006
 .Dt FFS 3
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 9c3e0b3182e79..47b6ec88e7cb1 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.8 2007/01/09 00:28:11 imp Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c
index e39fd039dbc73..920c74111318a 100644
--- a/lib/libc/string/ffsl.c
+++ b/lib/libc/string/ffsl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/ffsl.c,v 1.3 2007/01/09 00:28:11 imp Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
index 2a3a3f755a7fb..0d7dc1baa9e51 100644
--- a/lib/libc/string/fls.c
+++ b/lib/libc/string/fls.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/fls.c,v 1.3 2007/01/09 00:28:12 imp Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
index 8f60e33edaaad..71ae8c55e3a21 100644
--- a/lib/libc/string/flsl.c
+++ b/lib/libc/string/flsl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/flsl.c,v 1.3 2007/01/09 00:28:12 imp Exp $");
 
 #include <strings.h>
 
diff --git a/lib/libc/string/index.3 b/lib/libc/string/index.3
index 34bd9d6999642..387b1eb21f21d 100644
--- a/lib/libc/string/index.3
+++ b/lib/libc/string/index.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)index.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/index.3,v 1.12 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt INDEX 3
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index a3a317d5184e8..eab30b766e783 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)index.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index 350f0007c85c0..416d0f8e2d9a3 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memccpy.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memccpy.3,v 1.7 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt MEMCCPY 3
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index 5b4223eba27fe..b5de50ec58331 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)memccpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memccpy.c,v 1.6 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memchr.3 b/lib/libc/string/memchr.3
index d82d859dd0f11..62cd3a3826495 100644
--- a/lib/libc/string/memchr.3
+++ b/lib/libc/string/memchr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memchr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCHR 3
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 2b1231dadf09e..53112fb422c90 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)memchr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memchr.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index a7be20b32e605..d560279095ff3 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memcmp.3,v 1.9 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCMP 3
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index d048068c4732b..539d51122fbeb 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)memcmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memcmp.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memcpy.3 b/lib/libc/string/memcpy.3
index 80a8629afe3a6..4f690b2cdaf17 100644
--- a/lib/libc/string/memcpy.3
+++ b/lib/libc/string/memcpy.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memcpy.3,v 1.8 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMCPY 3
diff --git a/lib/libc/string/memcpy.c b/lib/libc/string/memcpy.c
index ed03856e54b4e..dfc03aed80e32 100644
--- a/lib/libc/string/memcpy.c
+++ b/lib/libc/string/memcpy.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memcpy.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	MEMCOPY
 #include "bcopy.c"
diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3
index 73c267c14c108..c55c525118050 100644
--- a/lib/libc/string/memmem.3
+++ b/lib/libc/string/memmem.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memmem.3,v 1.3 2005/11/24 06:56:21 ru Exp $
 .\"
 .Dd August 24, 2005
 .Dt MEMMEM 3
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c
index 0ac0a6dfc80e1..008458ddec193 100644
--- a/lib/libc/string/memmem.c
+++ b/lib/libc/string/memmem.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memmem.c,v 1.1 2005/08/25 18:26:58 andre Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/memmove.3 b/lib/libc/string/memmove.3
index 19c2987e763a4..b2ebc675c6f21 100644
--- a/lib/libc/string/memmove.3
+++ b/lib/libc/string/memmove.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memmove.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memmove.3,v 1.7 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMMOVE 3
diff --git a/lib/libc/string/memmove.c b/lib/libc/string/memmove.c
index 05cf75a2ce6a5..8f44e82cc3668 100644
--- a/lib/libc/string/memmove.c
+++ b/lib/libc/string/memmove.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memmove.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	MEMMOVE
 #include "bcopy.c"
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
index 58877f0dcb454..37f35a20aefc3 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memset.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/memset.3,v 1.8 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MEMSET 3
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 89f7e45a9be89..2b3a2268ec858 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)memset.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/memset.c,v 1.9 2007/01/09 00:28:12 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index 9fd0bdcf111d7..b687b18bf7b4b 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
index 0bee746290570..2742bf7a93ada 100644
--- a/lib/libc/string/stpcpy.c
+++ b/lib/libc/string/stpcpy.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/stpcpy.c,v 1.1 2002/10/03 19:39:20 obrien Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index f94abeca7c52d..7ebcf393ea2d5 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcasecmp.3,v 1.12 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRCASECMP 3
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index 2efcf55c68a45..9669c806715df 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
 
 #include <strings.h>
 #include <ctype.h>
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index b358b7d99a9fc..ccbcec0c5e3de 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcasestr.c,v 1.4 2007/01/09 00:28:12 imp Exp $");
 
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index e24ed9d7e532e..33f024d5705d0 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcat.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcat.3,v 1.15 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCAT 3
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 1578276c17246..8ebcf1b2ade57 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strcat.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcat.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
index 7c867a3b517d7..5125351717b2f 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strchr.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strchr.3,v 1.13 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt STRCHR 3
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
index 1d82abe86fd56..2fb91140984cc 100644
--- a/lib/libc/string/strchr.c
+++ b/lib/libc/string/strchr.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	STRCHR
 #include "index.c"
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
index 7c5877b397982..1edfaa7f1641f 100644
--- a/lib/libc/string/strcmp.3
+++ b/lib/libc/string/strcmp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcmp.3,v 1.11 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd October 11, 2001
 .Dt STRCMP 3
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index ab953338e43ac..975d76f550a79 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcmp.c,v 1.6 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3
index bb8b13fe5c08a..8c18f77eba571 100644
--- a/lib/libc/string/strcoll.3
+++ b/lib/libc/string/strcoll.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcoll.3,v 1.14 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCOLL 3
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index a0daf8dc182fd..b93ce48614231 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcoll.c,v 1.13 2001/11/07 19:55:16 obrien Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3
index 828475387d04e..4416725e677c7 100644
--- a/lib/libc/string/strcpy.3
+++ b/lib/libc/string/strcpy.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.26 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd August 9, 2001
 .Dt STRCPY 3
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index fec284e225253..7489997b16a7b 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcpy.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3
index d1df19813e4a4..dc57aa1c28b7b 100644
--- a/lib/libc/string/strcspn.3
+++ b/lib/libc/string/strcspn.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcspn.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strcspn.3,v 1.9 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRCSPN 3
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 3879a3b085c73..55acb8bd99cfc 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strcspn.c,v 1.5 2005/04/02 18:52:44 das Exp $");
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index 818be57e61889..55addb5fa84d5 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strdup.3,v 1.11 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRDUP 3
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
index c0b581d401793..f4126f53669f3 100644
--- a/lib/libc/string/strdup.c
+++ b/lib/libc/string/strdup.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strdup.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 2d6d206c10952..b8223d20dc3c7 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strerror.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.24 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd October 12, 2004
 .Dt STRERROR 3
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index 890ed2139af82..7da979614eaaf 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strerror.c,v 1.16 2007/01/09 00:28:12 imp Exp $");
 
 #if defined(NLS)
 #include <nl_types.h>
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index b0e25a9bc2dd0..05f92f229b855 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/string.3,v 1.14 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt STRING 3
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index 7f19f6bda144c..b8f0ff3e557e4 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strlcat.c,v 1.10 2004/10/16 06:32:43 obrien Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index f674fe2ac49bf..c33c0dd90896e 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -25,7 +25,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strlcpy.3,v 1.13 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd June 22, 1998
 .Dt STRLCPY 3
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 0fc56a4c138d4..6126ed174e20c 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.9 2006/06/15 15:56:55 maxim Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index 29c35158284f4..2535a9c38c663 100644
--- a/lib/libc/string/strlen.3
+++ b/lib/libc/string/strlen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strlen.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strlen.3,v 1.7 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRLEN 3
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index db4fe26eef2f3..aacc1aeb37140 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strlen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strlen.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 89d0160b3a168..b8fbc9151c2b9 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strmode.3	8.3 (Berkeley) 7/28/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strmode.3,v 1.10 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd July 28, 1994
 .Dt STRMODE 3
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index be09d7acc0dda..6d77a1be95d5f 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strmode.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index fb2802c6110b1..a9b5d7c4cace1 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)strncat.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncat.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index 659a7cbaff4f9..879c8fd0fb766 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncmp.c,v 1.6 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 07b9166d2b26d..6ace0642d2756 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncpy.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c
index bbb1ca64e4566..774cae849d6c5 100644
--- a/lib/libc/string/strnstr.c
+++ b/lib/libc/string/strnstr.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strnstr.c,v 1.4 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
index 0a16757cacf00..9e9f1573fb5a4 100644
--- a/lib/libc/string/strpbrk.3
+++ b/lib/libc/string/strpbrk.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strpbrk.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strpbrk.3,v 1.8 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRPBRK 3
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index efbdc8a723832..ade63b139f53c 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strpbrk.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strpbrk.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c
index 11cbd31e38472..b8c05007c938b 100644
--- a/lib/libc/string/strrchr.c
+++ b/lib/libc/string/strrchr.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strrchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
 
 #define	STRRCHR
 #include "rindex.c"
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 919ea3c3f71b1..8fda6119591d0 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)strsep.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strsep.3,v 1.15 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt STRSEP 3
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index 0850b0b96e3cc..c29e3d6258c34 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strsep.c,v 1.6 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index e4267a32f0119..0cd3438303a1f 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strsignal.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #if defined(NLS)
 #include <nl_types.h>
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index 6fc3280f3f410..12e213ed594ed 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strspn.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strspn.3,v 1.10 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRSPN 3
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 5dbac0a678576..3b96365dd6602 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strspn.c,v 1.5 2005/04/02 18:52:44 das Exp $");
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
index 7468ccca6067e..913a347dda65e 100644
--- a/lib/libc/string/strstr.3
+++ b/lib/libc/string/strstr.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strstr.3,v 1.14 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd October 11, 2001
 .Dt STRSTR 3
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index e2edd809c29f9..bbf96d0eeb83c 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.5 2007/01/09 00:28:12 imp Exp $");
 
 #include <string.h>
 
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index e5c8e3381c784..94a0e40890006 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -48,7 +48,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtok.3	8.2 (Berkeley) 2/3/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strtok.3,v 1.25 2005/01/20 09:17:04 ru Exp $
 .\"
 .Dd November 27, 1998
 .Dt STRTOK 3
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 1a29cc53a66b9..6aec194f87bca 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.9 2002/09/07 02:53:19 tjr Exp $");
 
 #include <stddef.h>
 #ifdef DEBUG_STRTOK
diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3
index 5f33763a22e2f..c32ea5cebec6f 100644
--- a/lib/libc/string/strxfrm.3
+++ b/lib/libc/string/strxfrm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/strxfrm.3,v 1.18 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STRXFRM 3
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index 81e05af6ab7bb..3ab7b720a4dee 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/string/swab.3 b/lib/libc/string/swab.3
index f8ef34ee3f3bf..d42143d283398 100644
--- a/lib/libc/string/swab.3
+++ b/lib/libc/string/swab.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swab.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.10 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd December 10, 2004
 .Dt SWAB 3
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index 1db7d1fab00b1..fae6e563230e7 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)swab.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
 
 #include <unistd.h>
 
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 1c965335e4d2a..cf7812ffd1397 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscat.c,v 1.8 2002/09/26 09:28:55 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 1df1fe6cd5201..0fae132247706 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.7 2002/10/23 10:47:47 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index 59c3eefb2e474..08b1755aa4d54 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
 __RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcscoll.3 b/lib/libc/string/wcscoll.3
index 6a3eedbfec587..819ae8767aae2 100644
--- a/lib/libc/string/wcscoll.3
+++ b/lib/libc/string/wcscoll.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/string/strcoll.3,v 1.11 2001/10/01 16:09:00 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcscoll.3,v 1.3 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd October 4, 2002
 .Dt WCSCOLL 3
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c
index dbfbcfa919a75..5095158efaf49 100644
--- a/lib/libc/string/wcscoll.c
+++ b/lib/libc/string/wcscoll.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscoll.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index 180bbd1b192d0..b4c236a780f33 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscpy.c,v 1.8 2002/09/26 09:23:07 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index 57a804c0c639f..c16f27083afce 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcscspn.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsdup.c b/lib/libc/string/wcsdup.c
index 1e5db9258a057..4379da1ed30cb 100644
--- a/lib/libc/string/wcsdup.c
+++ b/lib/libc/string/wcsdup.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsdup.c,v 1.1 2005/08/13 05:54:33 tjr Exp $");
 
 #include <stdlib.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index 6466f0690fd7b..f3b9a63608a2c 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -33,7 +33,7 @@
 __RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcslcat.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <sys/types.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index 1b9459a0c19e8..273c8fd937c82 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -33,7 +33,7 @@
 __RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcslcpy.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <sys/types.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index 1636d98cd2762..5e462a183daf0 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcslen.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index ba49a9eab98aa..5abb442f80671 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsncat.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 5b7b3ee188a1c..0eac412564b49 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
 __RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.8 2007/01/09 00:28:12 imp Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index 00d986b654b2d..8c64d599bad5c 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsncpy.c,v 1.10 2007/01/09 00:28:12 imp Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 7315c4445dda2..550244081b882 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcspbrk.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index 37c81ec8cdb70..093dd082aacab 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsrchr.c,v 1.7 2002/10/23 10:52:04 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 584a9d352850c..d4101c7f25100 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsspn.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index b8a7598c8efbd..e1df86260c3ee 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsstr.c,v 1.9 2007/01/09 00:28:12 imp Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcstok.3 b/lib/libc/string/wcstok.3
index 0de24d8366c87..4ddfb040e09de 100644
--- a/lib/libc/string/wcstok.3
+++ b/lib/libc/string/wcstok.3
@@ -47,7 +47,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp $
 .\"
 .Dd October 3, 2002
 .Dt WCSTOK 3
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
index 0dbdfe0e28365..5781adbda28b6 100644
--- a/lib/libc/string/wcstok.c
+++ b/lib/libc/string/wcstok.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcstok.c,v 1.2 2003/03/12 06:41:49 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcswidth.3 b/lib/libc/string/wcswidth.3
index 76d32ad8e4b94..973bfe067bedc 100644
--- a/lib/libc/string/wcswidth.3
+++ b/lib/libc/string/wcswidth.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcswidth.3,v 1.2 2002/12/09 14:04:05 ru Exp $
 .\"
 .Dd August 20, 2002
 .Dt WCSWIDTH 3
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index b142074f17089..5a3801276f2fe 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.7 2007/01/09 00:28:12 imp Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wcsxfrm.3 b/lib/libc/string/wcsxfrm.3
index b5add9cebb45f..16087fda6e7cc 100644
--- a/lib/libc/string/wcsxfrm.3
+++ b/lib/libc/string/wcsxfrm.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
 .\" FreeBSD: src/lib/libc/string/strxfrm.3,v 1.16 2002/09/06 11:24:06 tjr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wcsxfrm.3,v 1.3 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd October 4, 2002
 .Dt WCSXFRM 3
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c
index 5e47ad946ee6b..7aea3d13bf1f0 100644
--- a/lib/libc/string/wcsxfrm.c
+++ b/lib/libc/string/wcsxfrm.c
@@ -29,7 +29,7 @@
 #if 0
 __FBSDID("FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp ");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wcsxfrm.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
index 26ff1dfb4fbeb..c5ccd78a7516f 100644
--- a/lib/libc/string/wmemchr.3
+++ b/lib/libc/string/wmemchr.3
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)strcpy.3	8.1 (Berkeley) 6/4/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/string/wmemchr.3,v 1.8 2007/01/09 00:28:12 imp Exp $
 .\"
 .Dd August 13, 2005
 .Dt WMEMCHR 3
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index 2d96708fd6c4d..0b09f9421079b 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemchr.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index c9a9095b8eb23..30140416b716f 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemcmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 38d563d8053cb..4391309ea5dff 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemcpy.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
 
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index 6b3ee94e3a903..dd2036c953e4b 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemmove.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index b923f14637f10..df9153765e83d 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -32,7 +32,7 @@
 __RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/string/wmemset.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
 
 #include <wchar.h>
 
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 75ffcfcc3da6d..407cfbcfe671e 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.127 2007/09/15 14:33:55 imp Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
index 59d5190087f02..f5e2dec95151e 100644
--- a/lib/libc/sys/Symbol.map
+++ b/lib/libc/sys/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.9 2007/08/22 01:56:35 davidxu Exp $
  */
 
 /*
diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c
index d7b5529f999b1..d440aded751f6 100644
--- a/lib/libc/sys/__error.c
+++ b/lib/libc/sys/__error.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/__error.c,v 1.5 2007/01/12 07:31:30 imp Exp $");
 
 extern int errno;
 
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
index b35e7c48a8615..abdcbace9220c 100644
--- a/lib/libc/sys/_exit.2
+++ b/lib/libc/sys/_exit.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)_exit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/_exit.2,v 1.19 2007/01/09 00:28:13 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt EXIT 2
diff --git a/lib/libc/sys/abort2.2 b/lib/libc/sys/abort2.2
index 4698c72838461..d77f7fd8ee791 100644
--- a/lib/libc/sys/abort2.2
+++ b/lib/libc/sys/abort2.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/abort2.2,v 1.2 2006/09/30 10:24:00 ru Exp $
 .\"
 .Dd September 30, 2006
 .Dt ABORT2 2
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 7103cc18b5830..544401eace7f6 100644
--- a/lib/libc/sys/accept.2
+++ b/lib/libc/sys/accept.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.32 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt ACCEPT 2
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 3d4dbddd4fd85..a4eb3e1945318 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/access.2,v 1.19.4.1 2008/02/14 21:45:41 remko Exp $
 .\"
 .Dd February 11, 2008
 .Dt ACCESS 2
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index caf1aeab3b465..23469b5b4cd1d 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/acct.2,v 1.22 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd April 17, 2004
 .Dt ACCT 2
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index 95cfca0a464a0..c7a263c58b75a 100644
--- a/lib/libc/sys/adjtime.2
+++ b/lib/libc/sys/adjtime.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)adjtime.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/adjtime.2,v 1.16 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt ADJTIME 2
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 08102cf9d861d..a5f1392c64f5a 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_cancel.2,v 1.22 2003/01/13 10:37:11 tjr Exp $
 .\"
 .Dd January 19, 2000
 .Dt AIO_CANCEL 2
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index f63a2dd06c21b..92ef1099ed75a 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_error.2,v 1.20 2006/09/26 09:47:46 vd Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_ERROR 2
diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2
index 2c780404f9049..07a3d0876d82c 100644
--- a/lib/libc/sys/aio_read.2
+++ b/lib/libc/sys/aio_read.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.23 2005/12/13 13:43:35 davidxu Exp $
 .\"
 .Dd November 17, 1998
 .Dt AIO_READ 2
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 2034f9d048225..bf0f63acb68de 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.19 2006/10/07 10:49:20 trhodes Exp $
 .\"
 .Dd October 7, 2006
 .Dt AIO_RETURN 2
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index db704f137d1c1..6f9fbf169cf2e 100644
--- a/lib/libc/sys/aio_suspend.2
+++ b/lib/libc/sys/aio_suspend.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_suspend.2,v 1.22 2004/12/23 23:45:25 keramida Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_SUSPEND 2
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 5145f78118ab9..d0547fb74d689 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_waitcomplete.2,v 1.13 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd January 19, 2000
 .Dt AIO_WAITCOMPLETE 2
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index dd1e0f589cf8d..4dcd189cbf006 100644
--- a/lib/libc/sys/aio_write.2
+++ b/lib/libc/sys/aio_write.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/aio_write.2,v 1.20 2005/12/13 13:43:35 davidxu Exp $
 .\"
 .Dd June 2, 1999
 .Dt AIO_WRITE 2
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index bd5104049ebd1..9b8210e7b8714 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/bind.2,v 1.28 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt BIND 2
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index 31dea32a0923f..1c3c51db3e29f 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)brk.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/brk.2,v 1.26 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd July 12, 1999
 .Dt BRK 2
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index 33940c39c51d3..55a47dea6b758 100644
--- a/lib/libc/sys/chdir.2
+++ b/lib/libc/sys/chdir.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chdir.2,v 1.16 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt CHDIR 2
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 7780427fde7d8..a7aa5d72157a4 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chflags.2,v 1.29 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd May 16, 2006
 .Dt CHFLAGS 2
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index 185463df83499..aa29a53235133 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chmod.2,v 1.37 2007/01/16 15:17:27 pjd Exp $
 .\"
 .Dd January 16, 2006
 .Dt CHMOD 2
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index b95612eb0b440..93059e8ed1a9f 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chown.2,v 1.25 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt CHOWN 2
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index ecf2eb54fbc8a..7145eda14e2cf 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/chroot.2,v 1.21 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt CHROOT 2
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 39231b61333de..4e4e12ff9c19a 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd November 4, 2006
 .Dt CLOCK_GETTIME 2
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
index aef03796222e8..e7a3a4fee652b 100644
--- a/lib/libc/sys/close.2
+++ b/lib/libc/sys/close.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/close.2,v 1.27 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd December 4, 2006
 .Dt CLOSE 2
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index c673a836d2343..f39ee9c13b336 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.29 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd August 16, 2006
 .Dt CONNECT 2
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
index c87b386124829..dead826805b43 100644
--- a/lib/libc/sys/dup.2
+++ b/lib/libc/sys/dup.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dup.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/dup.2,v 1.22 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt DUP 2
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index feac99beee25b..e77990cdedde9 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/execve.2,v 1.40 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 1, 1994
 .Dt EXECVE 2
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libc/sys/extattr_get_file.2
index 6fd2a1859d40f..31a05b1c29b53 100644
--- a/lib/libc/sys/extattr_get_file.2
+++ b/lib/libc/sys/extattr_get_file.2
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.18 2006/11/06 15:12:43 rwatson Exp $
 .\"
 .Dd February 23, 2005
 .Dt EXTATTR 2
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index a476cff5d1d82..fb758702677f3 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.45 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd January 12, 1994
 .Dt FCNTL 2
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
index 2a609c1c2cd2b..b5bca44d0676d 100644
--- a/lib/libc/sys/fhopen.2
+++ b/lib/libc/sys/fhopen.2
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.16 2005/06/30 13:18:15 hmp Exp $
 .\"
 .Dd June 29, 1999
 .Dt FHOPEN 2
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index 5ee93ba0600d8..4b7dfb99f800d 100644
--- a/lib/libc/sys/flock.2
+++ b/lib/libc/sys/flock.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/flock.2,v 1.25 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt FLOCK 2
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index 4a8a646edb4a2..489326ee33456 100644
--- a/lib/libc/sys/fork.2
+++ b/lib/libc/sys/fork.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fork.2,v 1.20 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt FORK 2
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
index 7bdc4872be33e..bab42bba51bfe 100644
--- a/lib/libc/sys/fsync.2
+++ b/lib/libc/sys/fsync.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fsync.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/fsync.2,v 1.19 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt FSYNC 2
diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
index 78b5a36adba65..61c12b6170a22 100644
--- a/lib/libc/sys/ftruncate.c
+++ b/lib/libc/sys/ftruncate.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)ftruncate.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/ftruncate.c,v 1.7 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index e16e7f2a77f80..1fb73d8f1d009 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getdirentries.2	8.2 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getdirentries.2,v 1.24 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd May 3, 1995
 .Dt GETDIRENTRIES 2
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libc/sys/getdtablesize.2
index 916b91ef356d1..92f17f5bda505 100644
--- a/lib/libc/sys/getdtablesize.2
+++ b/lib/libc/sys/getdtablesize.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdtablesize.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getdtablesize.2,v 1.10 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETDTABLESIZE 2
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index 14881966a700d..8d581153d9b15 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getfh.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getfh.2,v 1.16 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd April 6, 2004
 .Dt GETFH 2
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index c27c6c295a9ba..84ad37c0f44f4 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getfsstat.2	8.3 (Berkeley) 5/25/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.19 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd November 20, 2003
 .Dt GETFSSTAT 2
diff --git a/lib/libc/sys/getgid.2 b/lib/libc/sys/getgid.2
index b03040bdf0076..96726a4506bb3 100644
--- a/lib/libc/sys/getgid.2
+++ b/lib/libc/sys/getgid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getgid.2,v 1.14 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETGID 2
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
index 5eadfe18b0ec1..80b18a82e8bbc 100644
--- a/lib/libc/sys/getgroups.2
+++ b/lib/libc/sys/getgroups.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getgroups.2,v 1.13 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd March 5, 1999
 .Dt GETGROUPS 2
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index 260f8f0dcfb3e..8e3af65789d1b 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getitimer.2,v 1.23 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd May 16, 1995
 .Dt GETITIMER 2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index b7c27df3329aa..17abae838f09f 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getlogin.2,v 1.29 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index 903711926e99f..abe2723370f23 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpeername.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpeername.2,v 1.23 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPEERNAME 2
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index f5e81a8a81e52..b389947ab1e1a 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpgrp.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpgrp.2,v 1.21 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPGRP 2
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
index aefa7708e7ca7..ca0879c29f72d 100644
--- a/lib/libc/sys/getpid.2
+++ b/lib/libc/sys/getpid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpid.2,v 1.16 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd November 2, 2006
 .Dt GETPID 2
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
index 28d1f1490d39e..4c69ae205efcc 100644
--- a/lib/libc/sys/getpriority.2
+++ b/lib/libc/sys/getpriority.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpriority.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getpriority.2,v 1.13 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPRIORITY 2
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 93d91f60648d9..9384f795cc07e 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrlimit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getrlimit.2,v 1.24 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 13, 2004
 .Dt GETRLIMIT 2
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index bdf5d4591cbfa..a9d5f3591eb0a 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getrusage.2,v 1.22 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETRUSAGE 2
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
index 8d31074396010..a0119824fc49f 100644
--- a/lib/libc/sys/getsid.2
+++ b/lib/libc/sys/getsid.2
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsid.2,v 1.10 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd August 19, 1997
 .Dt GETSID 2
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index f1537c7d08989..8d497752cdde7 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsockname.2,v 1.26 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETSOCKNAME 2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 3ea34c9b87d6b..237efb7dd0a85 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.38 2007/03/09 19:43:42 bms Exp $
 .\"
 .Dd March 8, 2007
 .Dt GETSOCKOPT 2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 9ffd0b3bcd3a9..00a65ab8a0d25 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.28 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd May 26, 1995
 .Dt GETTIMEOFDAY 2
diff --git a/lib/libc/sys/getuid.2 b/lib/libc/sys/getuid.2
index eae0b230c9f2d..43b71ed0ead1f 100644
--- a/lib/libc/sys/getuid.2
+++ b/lib/libc/sys/getuid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/getuid.2,v 1.13 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETUID 2
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 7338f8b0f52ad..8f20788ff309a 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.48 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd February 27, 1995
 .Dt INTRO 2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index 57d50c20fcff5..c533f8ce87f34 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -27,7 +27,7 @@
 .\"
 .\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.28 2007/07/14 19:23:29 brueffer Exp $
 .\"
 .Dd July 14, 2007
 .Dt IOCTL 2
diff --git a/lib/libc/sys/issetugid.2 b/lib/libc/sys/issetugid.2
index aed5062a10ad0..642ea15157101 100644
--- a/lib/libc/sys/issetugid.2
+++ b/lib/libc/sys/issetugid.2
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/issetugid.2,v 1.14 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd August 25, 1996
 .Dt ISSETUGID 2
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index 5cba4bf93d4d8..41a5ca8491606 100644
--- a/lib/libc/sys/jail.2
+++ b/lib/libc/sys/jail.2
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/jail.2,v 1.28 2005/02/09 18:03:14 ru Exp $
 .\"
 .Dd April 8, 2003
 .Dt JAIL 2
diff --git a/lib/libc/sys/kenv.2 b/lib/libc/sys/kenv.2
index 866c0d38a6f11..68f004928f441 100644
--- a/lib/libc/sys/kenv.2
+++ b/lib/libc/sys/kenv.2
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kenv.2,v 1.5 2005/06/30 13:18:15 hmp Exp $
 .\"
 .Dd April 17, 2002
 .Dt KENV 2
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index d46dc1f427754..2960fd57e0add 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kill.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kill.2,v 1.23 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt KILL 2
diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2
index a8892ed00650f..27268dc03b03f 100644
--- a/lib/libc/sys/kldfind.2
+++ b/lib/libc/sys/kldfind.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldfind.2,v 1.16 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDFIND 2
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2
index d9967ccd779c8..1830a3190fcde 100644
--- a/lib/libc/sys/kldfirstmod.2
+++ b/lib/libc/sys/kldfirstmod.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldfirstmod.2,v 1.15 2002/12/18 09:22:30 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDFIRSTMOD 2
diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2
index d31cc086e2f9e..04518a7f17779 100644
--- a/lib/libc/sys/kldload.2
+++ b/lib/libc/sys/kldload.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldload.2,v 1.18 2003/06/03 12:29:34 hmp Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDLOAD 2
diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2
index c856a2e671f8c..5a14886857c5b 100644
--- a/lib/libc/sys/kldnext.2
+++ b/lib/libc/sys/kldnext.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldnext.2,v 1.18 2006/09/17 21:27:34 ru Exp $
 .\"
 .Dd February 22, 2006
 .Dt KLDNEXT 2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index 946417a1b46d3..0c65a0169d5e6 100644
--- a/lib/libc/sys/kldstat.2
+++ b/lib/libc/sys/kldstat.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDSTAT 2
diff --git a/lib/libc/sys/kldsym.2 b/lib/libc/sys/kldsym.2
index acd6fcd77b147..37fc63454108b 100644
--- a/lib/libc/sys/kldsym.2
+++ b/lib/libc/sys/kldsym.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldsym.2,v 1.6 2002/12/19 09:40:25 ru Exp $
 .\"
 .Dd July 26, 2001
 .Dt KLDSYM 2
diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2
index ef6282b238cc8..c8e49e21f9239 100644
--- a/lib/libc/sys/kldunload.2
+++ b/lib/libc/sys/kldunload.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.18 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd March 3, 1999
 .Dt KLDUNLOAD 2
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 119ff79bc9fa1..5a0ed790480ac 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $
 .\"
 .Dd September 6, 2007
 .Dt KQUEUE 2
diff --git a/lib/libc/sys/kse.2 b/lib/libc/sys/kse.2
index 92c1de2b49985..8f2324789d5b2 100644
--- a/lib/libc/sys/kse.2
+++ b/lib/libc/sys/kse.2
@@ -33,7 +33,7 @@
 .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.22 2007/02/14 07:38:39 brueffer Exp $
 .\"
 .Dd February 13, 2007
 .Dt KSE 2
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index 598cc91f0151f..14d1ce40ee287 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ktrace.2,v 1.25 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt KTRACE 2
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index edf2e035e3efe..f23eb159b33f7 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/link.2,v 1.27 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt LINK 2
diff --git a/lib/libc/sys/lio_listio.2 b/lib/libc/sys/lio_listio.2
index 0ffbcddc9199e..2020a96dc820d 100644
--- a/lib/libc/sys/lio_listio.2
+++ b/lib/libc/sys/lio_listio.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.6 2006/10/07 05:13:32 trhodes Exp $
 .\"
 .Dd January 12, 2003
 .Dt LIO_LISTIO 2
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index bd6abded2a3e4..6ab2531069ea8 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/listen.2,v 1.30 2007/01/09 00:28:14 imp Exp $
 .\"
 .Dd August 29, 2005
 .Dt LISTEN 2
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index 874c523196ddf..655b2e6d7bfd1 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/lseek.2,v 1.25 2007/04/05 21:17:51 pjd Exp $
 .\"
 .Dd April 5, 2007
 .Dt LSEEK 2
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
index a086be18e537d..cb0616121c3ec 100644
--- a/lib/libc/sys/lseek.c
+++ b/lib/libc/sys/lseek.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)lseek.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/lseek.c,v 1.7 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index 48f0e5af8e7c6..0a38b8c452253 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.32 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd July 19, 1996
 .Dt MADVISE 2
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 6a7bd549bd62e..b96afb809140a 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.26 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd January 17, 2003
 .Dt MINCORE 2
diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2
index 5b3b18436e652..a6b7fe8e430b0 100644
--- a/lib/libc/sys/minherit.2
+++ b/lib/libc/sys/minherit.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.22 2007/09/21 14:05:26 obrien Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
index 94317d6c3496c..7390386ae1d64 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt MKDIR 2
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index 20119243da53e..c561efc73be36 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mkfifo.2,v 1.22 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd December 10, 2006
 .Dt MKFIFO 2
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index 51f587601c335..ffacc14f814f2 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mknod.2,v 1.17 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt MKNOD 2
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index 0c05b7b3056b5..cf9d731a6dba9 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.22 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLOCK 2
diff --git a/lib/libc/sys/mlockall.2 b/lib/libc/sys/mlockall.2
index db4c4a933e4ca..9f4fb35fc5b01 100644
--- a/lib/libc/sys/mlockall.2
+++ b/lib/libc/sys/mlockall.2
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mlockall.2,v 1.2 2004/07/03 23:14:34 ru Exp $
 .\"
 .Dd June 12, 1999
 .Dt MLOCKALL 2
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index da31179dc645a..5a94b77e47001 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd April 21, 2006
 .Dt MMAP 2
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index cfdb9448ea383..03783b0e40b89 100644
--- a/lib/libc/sys/mmap.c
+++ b/lib/libc/sys/mmap.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/mmap.c,v 1.7 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/lib/libc/sys/modfind.2 b/lib/libc/sys/modfind.2
index 3f485798a6c9a..8444d65e7164e 100644
--- a/lib/libc/sys/modfind.2
+++ b/lib/libc/sys/modfind.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/modfind.2,v 1.9 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd September 28, 2000
 .Dt MODFIND 2
diff --git a/lib/libc/sys/modnext.2 b/lib/libc/sys/modnext.2
index c0c0a0d3a223a..07cf9028cfa9a 100644
--- a/lib/libc/sys/modnext.2
+++ b/lib/libc/sys/modnext.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/modnext.2,v 1.9 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd September 28, 2000
 .Dt MODNEXT 2
diff --git a/lib/libc/sys/modstat.2 b/lib/libc/sys/modstat.2
index 66d23dbd34536..78fa4f91ee2d8 100644
--- a/lib/libc/sys/modstat.2
+++ b/lib/libc/sys/modstat.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/modstat.2,v 1.11 2007/06/13 19:22:29 brueffer Exp $
 .\"
 .Dd June 13, 2007
 .Dt MODSTAT 2
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 6ce2d4d2fa743..74c2d84b4c892 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.2	8.3 (Berkeley) 5/24/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.45 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd February 23, 2005
 .Dt MOUNT 2
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 8fc3621655117..c545285713f6f 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mprotect.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mprotect.2,v 1.18 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt MPROTECT 2
diff --git a/lib/libc/sys/mq_close.2 b/lib/libc/sys/mq_close.2
index ed634340f3854..a2438a79adf2b 100644
--- a/lib/libc/sys/mq_close.2
+++ b/lib/libc/sys/mq_close.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.4 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_CLOSE 2
diff --git a/lib/libc/sys/mq_getattr.2 b/lib/libc/sys/mq_getattr.2
index 2a52662b92e1c..c84123607c05e 100644
--- a/lib/libc/sys/mq_getattr.2
+++ b/lib/libc/sys/mq_getattr.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.4 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_GETATTR 2
diff --git a/lib/libc/sys/mq_notify.2 b/lib/libc/sys/mq_notify.2
index a22d826a13b81..a546e6986000c 100644
--- a/lib/libc/sys/mq_notify.2
+++ b/lib/libc/sys/mq_notify.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.8 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_NOTIFY 2
diff --git a/lib/libc/sys/mq_open.2 b/lib/libc/sys/mq_open.2
index 95230effabbb1..1f0dfffb6de7d 100644
--- a/lib/libc/sys/mq_open.2
+++ b/lib/libc/sys/mq_open.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.8 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_OPEN 2
diff --git a/lib/libc/sys/mq_receive.2 b/lib/libc/sys/mq_receive.2
index 4c5dc0883c395..cab4fc0cc24e4 100644
--- a/lib/libc/sys/mq_receive.2
+++ b/lib/libc/sys/mq_receive.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.5 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_RECEIVE 2
diff --git a/lib/libc/sys/mq_send.2 b/lib/libc/sys/mq_send.2
index b57a86578daeb..3e92e772f9f16 100644
--- a/lib/libc/sys/mq_send.2
+++ b/lib/libc/sys/mq_send.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.4 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_SEND 2
diff --git a/lib/libc/sys/mq_setattr.2 b/lib/libc/sys/mq_setattr.2
index 0cafdf3b6d3f4..ecc070b9c427b 100644
--- a/lib/libc/sys/mq_setattr.2
+++ b/lib/libc/sys/mq_setattr.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.5 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd November 29, 2005
 .Dt MQ_SETATTR 2
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index cb1592575b5d1..41babe4983cdb 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msync.2	8.2 (Berkeley) 6/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.29 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 21, 1994
 .Dt MSYNC 2
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 643107286203c..69a801e67562d 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)munmap.2	8.3 (Berkeley) 5/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/munmap.2,v 1.20 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd May 27, 1994
 .Dt MUNMAP 2
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
index 18e4c88af4977..f63918ff348ca 100644
--- a/lib/libc/sys/nanosleep.2
+++ b/lib/libc/sys/nanosleep.2
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/nanosleep.2,v 1.18 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd April 17, 1997
 .Dt NANOSLEEP 2
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index cf52187cdbd0d..5b9d1fcd5f792 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfssvc.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/nfssvc.2,v 1.19 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 9, 1993
 .Dt NFSSVC 2
diff --git a/lib/libc/sys/ntp_adjtime.2 b/lib/libc/sys/ntp_adjtime.2
index 5f5185f4976c9..cefbd0bb2d649 100644
--- a/lib/libc/sys/ntp_adjtime.2
+++ b/lib/libc/sys/ntp_adjtime.2
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.4 2007/09/15 14:33:55 imp Exp $
 .\"
 .Dd July 13, 2005
 .Dt NTP_ADJTIME 2
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index 423cf8bb15833..09f22a42a37c7 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.38 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd January 7, 2007
 .Dt OPEN 2
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 7a16a4de0b171..d06b0ef4f370d 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.21 2007/04/05 21:17:51 pjd Exp $
 .\"
 .Dd April 5, 2007
 .Dt PATHCONF 2
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index faf1a91a4c636..af7889294c908 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/pipe.2,v 1.23 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd January 30, 2006
 .Dt PIPE 2
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 932186d7fb84a..4eee295ee7a83 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -1,5 +1,5 @@
 .\"	$NetBSD: poll.2,v 1.3 1996/09/07 21:53:08 mycroft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/poll.2,v 1.16 2005/01/20 09:17:05 ru Exp $
 .\"
 .\" Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
 .\"
diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c
index 7566566d3e1d6..3c72134d51684 100644
--- a/lib/libc/sys/pread.c
+++ b/lib/libc/sys/pread.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/pread.c,v 1.4 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/profil.2 b/lib/libc/sys/profil.2
index 444d3c3373c3b..e139833019606 100644
--- a/lib/libc/sys/profil.2
+++ b/lib/libc/sys/profil.2
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)profil.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/profil.2,v 1.15 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt PROFIL 2
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 44fc1eafe13ee..12f79cfc2b7f4 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.41 2007/04/11 20:31:06 emaste Exp $
 .\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
 .\"
 .\" This file is in the public domain.
diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c
index d17ed2938f770..7b76387e7e6fa 100644
--- a/lib/libc/sys/pwrite.c
+++ b/lib/libc/sys/pwrite.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/pwrite.c,v 1.4 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index 4b4dca5fbcbd7..4ee4538c17782 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.26 2007/02/01 02:31:02 mpp Exp $
 .\"
 .Dd March 5, 1999
 .Dt QUOTACTL 2
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index 19e4ffe7087b3..d6badd47c6bb7 100644
--- a/lib/libc/sys/read.2
+++ b/lib/libc/sys/read.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)read.2	8.4 (Berkeley) 2/26/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.35 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd October 11, 2006
 .Dt READ 2
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 0f630f885c9d5..0e3be90534d7a 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.14 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt READLINK 2
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index f5571ae76b2b0..f2809b19c1b23 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/reboot.2,v 1.20 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt REBOOT 2
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 79d8f094f387c..87eaaa7fdd673 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.34 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd December 28, 2006
 .Dt RECV 2
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 3c3001cd95dbf..befb981ace0bb 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.27 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt RENAME 2
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index c88222e613207..c9835eaaefff8 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/revoke.2,v 1.13 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt REVOKE 2
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index c0f264af9e6ad..6f8f9b415d4f1 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -3,7 +3,7 @@
 .\" describe the actual BSD implementation. Permission for
 .\" use of this page comes from Rob Pike <rob@plan9.att.com>.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.35 2007/05/14 13:58:54 pav Exp $
 .\"
 .Dd May 14, 2007
 .Dt RFORK 2
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index 597c94647fae6..921c7e8f6d9f7 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmdir.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rmdir.2,v 1.17 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt RMDIR 2
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index afed81e2d98cd..838dab5311ce3 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/rtprio.2,v 1.26 2005/01/20 09:17:05 ru Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 2
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libc/sys/sched_get_priority_max.2
index 88d1d6d1460de..512ce35622c37 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_get_priority_max.2,v 1.19 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd March 12, 1998
 .Dt SCHED_GET_PRIORITY_MAX 2
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index 315fd826cc7d4..f9b944d652265 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_setparam.2,v 1.17 2004/07/04 20:55:48 ru Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index 21b34e0381900..2d6fce6d84b83 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_setscheduler.2,v 1.17 2004/07/02 23:52:13 ru Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libc/sys/sched_yield.2
index 9db8942249e23..0e6c98dcd3894 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sched_yield.2,v 1.13 2004/07/02 23:52:13 ru Exp $
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sctp_generic_recvmsg.2 b/lib/libc/sys/sctp_generic_recvmsg.2
index 3c6088dd594fb..85c0218ceea2e 100644
--- a/lib/libc/sys/sctp_generic_recvmsg.2
+++ b/lib/libc/sys/sctp_generic_recvmsg.2
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sctp_generic_recvmsg.2,v 1.2 2007/02/26 12:23:31 rrs Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GENERIC_RECVMSG 2
diff --git a/lib/libc/sys/sctp_generic_sendmsg.2 b/lib/libc/sys/sctp_generic_sendmsg.2
index f936c437873ad..31188e502358d 100644
--- a/lib/libc/sys/sctp_generic_sendmsg.2
+++ b/lib/libc/sys/sctp_generic_sendmsg.2
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sctp_generic_sendmsg.2,v 1.2 2007/02/26 12:23:31 rrs Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GENERIC_SENDMSG 2
diff --git a/lib/libc/sys/sctp_peeloff.2 b/lib/libc/sys/sctp_peeloff.2
index e5bf7b2a32009..ef3446f133f29 100644
--- a/lib/libc/sys/sctp_peeloff.2
+++ b/lib/libc/sys/sctp_peeloff.2
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sctp_peeloff.2,v 1.2 2007/02/26 12:23:31 rrs Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_PEELOFF 2
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 17fdbc4be31b0..b3c23a2d4dc27 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)select.2	8.2 (Berkeley) 3/25/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.33 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd November 17, 2002
 .Dt SELECT 2
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 01a984ac4c844..b7f4d26fe108a 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/semctl.2,v 1.20 2005/01/15 12:28:00 ru Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMCTL 2
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index 945044da65bb6..72ac42228228a 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/semget.2,v 1.16 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd September 12, 1995
 .Dt SEMGET 2
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 86200ee967ada..cc8b3b874d56f 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/semop.2,v 1.19 2005/01/15 12:28:00 ru Exp $
 .\"
 .Dd September 22, 1995
 .Dt SEMOP 2
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 6a61426bd7a02..5c117ec19a40f 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.36 2007/04/27 10:30:31 roam Exp $
 .\"
 .Dd September 13, 2006
 .Dt SEND 2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index 93420f69e27f7..c904daf3360a3 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.31 2006/11/24 11:44:19 yar Exp $
 .\"
 .Dd November 24, 2006
 .Dt SENDFILE 2
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index e4812294cc1ad..5ef707b29f69c 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.14 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd April 16, 1994
 .Dt SETGROUPS 2
diff --git a/lib/libc/sys/setpgid.2 b/lib/libc/sys/setpgid.2
index a56d83123d392..951fc815dbfea 100644
--- a/lib/libc/sys/setpgid.2
+++ b/lib/libc/sys/setpgid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setpgid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setpgid.2,v 1.16 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd February 8, 2004
 .Dt SETPGID 2
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
index 2eedae2ceda14..3806fd9a61822 100644
--- a/lib/libc/sys/setregid.2
+++ b/lib/libc/sys/setregid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setregid.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setregid.2,v 1.15 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd April 16, 1994
 .Dt SETREGID 2
diff --git a/lib/libc/sys/setresuid.2 b/lib/libc/sys/setresuid.2
index 08d07f3b67768..8f4eeef93e315 100644
--- a/lib/libc/sys/setresuid.2
+++ b/lib/libc/sys/setresuid.2
@@ -17,7 +17,7 @@
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setresuid.2,v 1.14 2002/12/18 09:22:31 ru Exp $
 .\"
 .Dd April 13, 2001
 .Dt SETRESUID 2
diff --git a/lib/libc/sys/setreuid.2 b/lib/libc/sys/setreuid.2
index 2983820334c96..2914cfc3f904a 100644
--- a/lib/libc/sys/setreuid.2
+++ b/lib/libc/sys/setreuid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setreuid.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setreuid.2,v 1.17 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd February 8, 2001
 .Dt SETREUID 2
diff --git a/lib/libc/sys/setsid.2 b/lib/libc/sys/setsid.2
index a09a31ae715a3..eb8bf4e93d0c0 100644
--- a/lib/libc/sys/setsid.2
+++ b/lib/libc/sys/setsid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)setsid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setsid.2,v 1.14 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETSID 2
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
index 78e4ab8f810bb..a224fe56afba0 100644
--- a/lib/libc/sys/setuid.2
+++ b/lib/libc/sys/setuid.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/setuid.2,v 1.24 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SETUID 2
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 8fe340c9ae4ab..de798c8262587 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shmat.2,v 1.18 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd August 2, 1995
 .Dt SHMAT 2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index 90c61c9a19469..95a919341b384 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shmctl.2,v 1.18 2005/02/13 23:45:46 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt SHMCTL 2
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index e7fd6d1672171..c198085a52884 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shmget.2,v 1.18 2004/07/02 23:52:13 ru Exp $
 .\"
 .Dd July 3, 1995
 .Dt SHMGET 2
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 70211ffb2ebd7..ea23b489ba6d5 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/shutdown.2,v 1.22 2007/03/07 13:34:49 bms Exp $
 .\"
 .Dd March 5, 2007
 .Dt SHUTDOWN 2
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 4c4f18f2a68ce..2f6a701703bfc 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.58 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 7, 2004
 .Dt SIGACTION 2
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index da6877e648677..da9c5be83439e 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigaltstack.2,v 1.22 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd May 1, 1995
 .Dt SIGALTSTACK 2
diff --git a/lib/libc/sys/sigpending.2 b/lib/libc/sys/sigpending.2
index 37f92d89d155d..2068f3e750a3a 100644
--- a/lib/libc/sys/sigpending.2
+++ b/lib/libc/sys/sigpending.2
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigpending.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigpending.2,v 1.13 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd January 12, 1994
 .Dt SIGPENDING 2
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index ef555a44651bf..4b54c9c70f4a4 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigprocmask.2,v 1.22 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGPROCMASK 2
diff --git a/lib/libc/sys/sigqueue.2 b/lib/libc/sys/sigqueue.2
index 780b6a03c5b24..9acb596a10fde 100644
--- a/lib/libc/sys/sigqueue.2
+++ b/lib/libc/sys/sigqueue.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigqueue.2,v 1.8 2006/09/17 21:27:34 ru Exp $
 .\"
 .Dd November 11, 2005
 .Dt SIGQUEUE 2
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index a0224709b1453..bac27625ec523 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigreturn.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigreturn.2,v 1.18 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGRETURN 2
diff --git a/lib/libc/sys/sigstack.2 b/lib/libc/sys/sigstack.2
index efd7ed76e6737..bd92a75c5935a 100644
--- a/lib/libc/sys/sigstack.2
+++ b/lib/libc/sys/sigstack.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigstack.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigstack.2,v 1.9 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGSTACK 2
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index 3a67b53374d49..0439b0ce63a34 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigsuspend.2	8.2 (Berkeley) 5/16/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigsuspend.2,v 1.17 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd May 16, 1995
 .Dt SIGSUSPEND 2
diff --git a/lib/libc/sys/sigwait.2 b/lib/libc/sys/sigwait.2
index 8c00cf4277c0c..ecc689e0f96a4 100644
--- a/lib/libc/sys/sigwait.2
+++ b/lib/libc/sys/sigwait.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigwait.2,v 1.13 2005/11/17 13:00:00 ru Exp $
 .\"
 .Dd November 11, 2005
 .Dt SIGWAIT 2
diff --git a/lib/libc/sys/sigwaitinfo.2 b/lib/libc/sys/sigwaitinfo.2
index 41be9e2bd5607..d1e6821d43f52 100644
--- a/lib/libc/sys/sigwaitinfo.2
+++ b/lib/libc/sys/sigwaitinfo.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sigwaitinfo.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $
 .\"
 .Dd November 11, 2005
 .Dt SIGTIMEDWAIT 2
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 1cf3af80b707d..618eaaa577a92 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.31 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd November 24, 1997
 .Dt SOCKET 2
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index c86db43f7ae67..3ae80b7ac2578 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)socketpair.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/socketpair.2,v 1.17 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SOCKETPAIR 2
diff --git a/lib/libc/sys/stack_protector.c b/lib/libc/sys/stack_protector.c
index f753fcddd4b7d..43291028a77bc 100644
--- a/lib/libc/sys/stack_protector.c
+++ b/lib/libc/sys/stack_protector.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.2 2007/06/05 08:24:34 des Exp $ */
 /* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $	*/
 /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $	*/
 /*
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.2 2007/06/05 08:24:34 des Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index e76745182fdb1..60bce354670bf 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.47 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd October 12, 2006
 .Dt STAT 2
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 888f97641434a..e385aa8013aed 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)statfs.2	8.5 (Berkeley) 5/24/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.29 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd November 1, 2006
 .Dt STATFS 2
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index b3e44741499a3..81ea54bedb7a5 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/swapon.2,v 1.17 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SWAPON 2
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index 28d77f55cb185..4dc4d24cbbcf7 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/symlink.2,v 1.22 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt SYMLINK 2
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index ff588ffc5a669..c8a9b32cdc127 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sync.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sync.2,v 1.16 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt SYNC 2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index bd060d17790c1..0cf15fd9f5640 100644
--- a/lib/libc/sys/sysarch.2
+++ b/lib/libc/sys/sysarch.2
@@ -1,5 +1,5 @@
 .\"	$NetBSD: sysarch.2,v 1.6 1998/02/25 21:24:57 perry Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/sysarch.2,v 1.10 2007/01/09 00:28:15 imp Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
index a9402d62bcf76..8a7cdef98fa05 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syscall.2	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/syscall.2,v 1.13 2007/01/09 00:28:15 imp Exp $
 .\"
 .Dd June 16, 1993
 .Dt SYSCALL 2
diff --git a/lib/libc/sys/timer_create.2 b/lib/libc/sys/timer_create.2
index 36eae434df511..12685868e53a5 100644
--- a/lib/libc/sys/timer_create.2
+++ b/lib/libc/sys/timer_create.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/timer_create.2,v 1.9 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd September 11, 2000
 .Dt TIMER_CREATE 2
diff --git a/lib/libc/sys/timer_delete.2 b/lib/libc/sys/timer_delete.2
index a1b245a527520..94da9697221ea 100644
--- a/lib/libc/sys/timer_delete.2
+++ b/lib/libc/sys/timer_delete.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/timer_delete.2,v 1.6 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd September 11, 2000
 .Dt TIMER_DELETE 2
diff --git a/lib/libc/sys/timer_settime.2 b/lib/libc/sys/timer_settime.2
index 4b9d93823b092..0bc76f636d916 100644
--- a/lib/libc/sys/timer_settime.2
+++ b/lib/libc/sys/timer_settime.2
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/timer_settime.2,v 1.8 2007/06/18 01:50:03 davidxu Exp $
 .\"
 .Dd September 11, 2000
 .Dt TIMER_SETTIME 2
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index f06c1ebaae327..d8ba67cc86ad9 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)truncate.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.21 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd December 13, 2006
 .Dt TRUNCATE 2
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
index 375c9d933c605..8ca02cd59e8bc 100644
--- a/lib/libc/sys/truncate.c
+++ b/lib/libc/sys/truncate.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)truncate.c	8.1 (Berkeley) 6/17/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/sys/truncate.c,v 1.5 2007/07/04 23:27:38 peter Exp $");
 
 #include <sys/types.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/sys/umask.2 b/lib/libc/sys/umask.2
index 025a72640e14d..16a5a2f0682b9 100644
--- a/lib/libc/sys/umask.2
+++ b/lib/libc/sys/umask.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/umask.2,v 1.14 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt UMASK 2
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index f686f5ec1e115..49aa6247ef182 100644
--- a/lib/libc/sys/undelete.2
+++ b/lib/libc/sys/undelete.2
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)undelete.2	8.4 (Berkeley) 10/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/undelete.2,v 1.18 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd January 22, 2006
 .Dt UNDELETE 2
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 11a3b36ac9098..df5ba7e1d559b 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/unlink.2,v 1.22 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd December 10, 2006
 .Dt UNLINK 2
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index c67af8e7e9a0c..7b8474e5949a9 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.21 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd December 9, 2006
 .Dt UTIMES 2
diff --git a/lib/libc/sys/utrace.2 b/lib/libc/sys/utrace.2
index a83c18551ad01..aa7a96df8567e 100644
--- a/lib/libc/sys/utrace.2
+++ b/lib/libc/sys/utrace.2
@@ -33,7 +33,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/utrace.2,v 1.3 2004/07/03 23:14:34 ru Exp $
 .\"
 .Dd December 28, 2000
 .Dt UTRACE 2
diff --git a/lib/libc/sys/uuidgen.2 b/lib/libc/sys/uuidgen.2
index 9c90102b3e2f7..0fabce6acabf7 100644
--- a/lib/libc/sys/uuidgen.2
+++ b/lib/libc/sys/uuidgen.2
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.8 2005/07/31 03:30:44 keramida Exp $
 .\"
 .Dd May 26, 2002
 .Dt UUIDGEN 2
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 928130b5d78a2..937fcac56e0a2 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.27 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt VFORK 2
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index f4dfe9d235ce8..401cb4db77095 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.28 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd November 12, 2005
 .Dt WAIT 2
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 6d608353226d6..d633070c9d5ab 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.2	8.5 (Berkeley) 4/2/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.34 2007/01/09 00:28:16 imp Exp $
 .\"
 .Dd July 7, 2005
 .Dt WRITE 2
diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc
index d2ef5213060e7..3445b1fa3b8bb 100644
--- a/lib/libc/uuid/Makefile.inc
+++ b/lib/libc/uuid/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.4 2006/03/13 01:15:01 deischen Exp $
 
 # DCE 1.1 UUID implementation sources
 
diff --git a/lib/libc/uuid/Symbol.map b/lib/libc/uuid/Symbol.map
index 974a964f61cee..f54875b2b98f1 100644
--- a/lib/libc/uuid/Symbol.map
+++ b/lib/libc/uuid/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.2 2007/04/29 14:05:20 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3
index 08cf7370144f4..42bd485c3629f 100644
--- a/lib/libc/uuid/uuid.3
+++ b/lib/libc/uuid/uuid.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.6 2005/11/24 07:04:20 ru Exp $
 .\"
 .Dd January 3, 2005
 .Dt UUID 3
diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c
index 13d7c2743bf53..dec35db176b0e 100644
--- a/lib/libc/uuid/uuid_compare.c
+++ b/lib/libc/uuid/uuid_compare.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.6 2007/04/05 02:07:33 delphij Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
index da3f1d39f78d8..407e37156b982 100644
--- a/lib/libc/uuid/uuid_create.c
+++ b/lib/libc/uuid/uuid_create.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_create.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
index 6e85ae7fb768c..0dc6d5d3ba18c 100644
--- a/lib/libc/uuid/uuid_create_nil.c
+++ b/lib/libc/uuid/uuid_create_nil.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_create_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <strings.h>
diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c
index e4c48e5253a12..7c0936bf3cb03 100644
--- a/lib/libc/uuid/uuid_equal.c
+++ b/lib/libc/uuid/uuid_equal.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_equal.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <string.h>
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
index b09a04df875d8..a2c7193279b34 100644
--- a/lib/libc/uuid/uuid_from_string.c
+++ b/lib/libc/uuid/uuid_from_string.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_from_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c
index e5695ee4f60e2..81133f82c9495 100644
--- a/lib/libc/uuid/uuid_hash.c
+++ b/lib/libc/uuid/uuid_hash.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_hash.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
index ee1865349dee3..4d35d87c3ae92 100644
--- a/lib/libc/uuid/uuid_is_nil.c
+++ b/lib/libc/uuid/uuid_is_nil.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_is_nil.c,v 1.4 2005/05/11 13:18:10 delphij Exp $
  */
 
 #include <uuid.h>
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
index f816391f2a4fc..f524b484add53 100644
--- a/lib/libc/uuid/uuid_to_string.c
+++ b/lib/libc/uuid/uuid_to_string.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/uuid/uuid_to_string.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 2d360ac6f5332..51a1d9c6db7f7 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.15 2006/03/13 01:15:01 deischen Exp $
 
 .PATH: ${.CURDIR}/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
diff --git a/lib/libc/xdr/Symbol.map b/lib/libc/xdr/Symbol.map
index 4cceeb7a5c937..0ae4c4653c4db 100644
--- a/lib/libc/xdr/Symbol.map
+++ b/lib/libc/xdr/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/xdr/Symbol.map,v 1.2 2007/04/29 14:05:20 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
index 19c7e57954147..852ccae5d448f 100644
--- a/lib/libc/xdr/xdr.3
+++ b/lib/libc/xdr/xdr.3
@@ -1,5 +1,5 @@
 .\" @(#)xdr.3n	2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libc/xdr/xdr.3,v 1.17 2005/11/24 07:12:01 ru Exp $
 .\"
 .Dd February 16, 1988
 .Dt XDR 3
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index c1e5eec25916d..80f4eaf25c24e 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr.c 1.35 87/08/12";
 static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr.c,v 1.14 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 6c35452612f6f..330b64105b5e4 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.15 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_array.c, Generic XDR routines impelmentation.
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 0a4f09f05f0d6..a010d5d222357 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.14 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_float.c, Generic XDR routines implementation.
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 138269c9d50b8..cb48bb66ac656 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_mem.c,v 1.13 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_mem.h, XDR implementation using memory buffers.
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index a50d1414ad4a2..eeb29b91e6b2c 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.21 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index 5a497b6dc06a1..bccb333e4d811 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 static char *sccsid = "@(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.12 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_reference.c, Generic XDR routines impelmentation.
diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c
index 20f1c3a20eb37..71322c810ef3b 100644
--- a/lib/libc/xdr/xdr_sizeof.c
+++ b/lib/libc/xdr/xdr_sizeof.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_sizeof.c,v 1.5 2003/03/07 13:19:40 nectar Exp $");
 
 #include "namespace.h"
 #include <rpc/types.h>
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 8c1724dd50e24..89c749640b254 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -34,7 +34,7 @@ static char *sccsid2 = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_stdio.c,v 1.13 2004/10/16 06:32:43 obrien Exp $");
 
 /*
  * xdr_stdio.c, XDR implementation on standard i/o file.
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index 842e63eb08da7..004c7af5e8827 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-# $FreeBSD$
+# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.10 2006/03/13 01:15:01 deischen Exp $
 
 # yp sources
 .PATH: ${.CURDIR}/yp
diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map
index cf2470a2dcb9f..053228e71e492 100644
--- a/lib/libc/yp/Symbol.map
+++ b/lib/libc/yp/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/yp/Symbol.map,v 1.2 2007/04/29 14:05:20 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index 7aed6ad3af840..4a1c80fd71f14 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/yp/xdryp.c,v 1.14 2002/04/28 15:18:47 des Exp $");
 
 #include <rpc/rpc.h>
 #include <rpcsvc/yp.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index eb5c34c1670b9..c420744672ae1 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/yp/yplib.c,v 1.51 2007/07/24 13:06:08 simon Exp $");
 
 #include "namespace.h"
 #include "reentrant.h"
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index c79b4d6ae08b7..a93d1544fda29 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.49 2007/05/21 02:49:03 deischen Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libc_r/arch/amd64/_atomic_lock.S b/lib/libc_r/arch/amd64/_atomic_lock.S
index aaab0814d8c3b..f9ffba7945c76 100644
--- a/lib/libc_r/arch/amd64/_atomic_lock.S
+++ b/lib/libc_r/arch/amd64/_atomic_lock.S
@@ -22,7 +22,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.6 2003/06/02 22:30:59 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>
diff --git a/lib/libc_r/arch/i386/_atomic_lock.S b/lib/libc_r/arch/i386/_atomic_lock.S
index af49aff68f038..7e32633e070f2 100644
--- a/lib/libc_r/arch/i386/_atomic_lock.S
+++ b/lib/libc_r/arch/i386/_atomic_lock.S
@@ -22,7 +22,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.5 2001/10/25 01:30:54 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>
diff --git a/lib/libc_r/arch/ia64/_atomic_lock.S b/lib/libc_r/arch/ia64/_atomic_lock.S
index b4b84da9f652b..4f6e0f1cb9031 100644
--- a/lib/libc_r/arch/ia64/_atomic_lock.S
+++ b/lib/libc_r/arch/ia64/_atomic_lock.S
@@ -26,7 +26,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/ia64/_atomic_lock.S,v 1.3 2004/02/10 20:45:28 cperciva Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>
diff --git a/lib/libc_r/arch/sparc64/_atomic_lock.S b/lib/libc_r/arch/sparc64/_atomic_lock.S
index ce931df630fdc..882486ed171d0 100644
--- a/lib/libc_r/arch/sparc64/_atomic_lock.S
+++ b/lib/libc_r/arch/sparc64/_atomic_lock.S
@@ -28,7 +28,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc_r/arch/sparc64/_atomic_lock.S,v 1.1 2003/01/05 22:23:11 tmm Exp $");
 
 /*
  * long _atomic_lock(long *)
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc
index e608afa69909c..96d320e296444 100644
--- a/lib/libc_r/sys/Makefile.inc
+++ b/lib/libc_r/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/sys/Makefile.inc,v 1.10 1999/08/28 00:03:13 peter Exp $
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libc_r/sys/uthread_error.c b/lib/libc_r/sys/uthread_error.c
index 8c52967427b17..45d5310970075 100644
--- a/lib/libc_r/sys/uthread_error.c
+++ b/lib/libc_r/sys/uthread_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/sys/uthread_error.c,v 1.4 2003/01/24 01:46:30 fjoe Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/test/Makefile b/lib/libc_r/test/Makefile
index 0eb530c3ef148..b97f39803cd98 100644
--- a/lib/libc_r/test/Makefile
+++ b/lib/libc_r/test/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/Makefile,v 1.11 2003/06/02 00:21:41 rwatson Exp $
 #
 # Automated test suite for libc_r (pthreads).
 #
diff --git a/lib/libc_r/test/README b/lib/libc_r/test/README
index 507ea4e19f74f..0a70ff4ee9ad2 100644
--- a/lib/libc_r/test/README
+++ b/lib/libc_r/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libc_r/test/README,v 1.1 2000/04/24 21:07:36 jasone Exp $
 
 This test suite is meant to test general functionality of pthreads, as well as
 provide a simple framework for regression tests.  In general, this test suite
diff --git a/lib/libc_r/test/guard_b.c b/lib/libc_r/test/guard_b.c
index 35aa4067cc48f..9e1740d30d752 100644
--- a/lib/libc_r/test/guard_b.c
+++ b/lib/libc_r/test/guard_b.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/guard_b.c,v 1.4 2003/06/04 20:36:08 marcel Exp $
  *
  * Test thread stack guard functionality.
  */
diff --git a/lib/libc_r/test/guard_s.pl b/lib/libc_r/test/guard_s.pl
index 7802ff3c38d6f..45ea5a48d3c7b 100755
--- a/lib/libc_r/test/guard_s.pl
+++ b/lib/libc_r/test/guard_s.pl
@@ -27,7 +27,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/guard_s.pl,v 1.1 2001/07/20 04:23:10 jasone Exp $
 #
 # Test thread stack guard functionality.  The C test program needs to be driven
 # by this script because it segfaults when the stack guard is hit.
diff --git a/lib/libc_r/test/hello_b.c b/lib/libc_r/test/hello_b.c
index 2eefa7f48bfe5..a078faaa73493 100644
--- a/lib/libc_r/test/hello_b.c
+++ b/lib/libc_r/test/hello_b.c
@@ -2,7 +2,7 @@
  *
  * Back end C programs can be anything compilable.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/hello_b.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/hello_d.c b/lib/libc_r/test/hello_d.c
index 6d77526f16c77..3dbc0a9331b92 100644
--- a/lib/libc_r/test/hello_d.c
+++ b/lib/libc_r/test/hello_d.c
@@ -2,7 +2,7 @@
  *
  * Simple diff mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/hello_d.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/hello_s.c b/lib/libc_r/test/hello_s.c
index 942bf2dae0aea..0bfccd6705260 100644
--- a/lib/libc_r/test/hello_s.c
+++ b/lib/libc_r/test/hello_s.c
@@ -2,7 +2,7 @@
  *
  * Simple sequence mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/hello_s.c,v 1.1 2000/04/24 21:07:37 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/join_leak_d.c b/lib/libc_r/test/join_leak_d.c
index 9a351400e3169..db1a45290bd7c 100644
--- a/lib/libc_r/test/join_leak_d.c
+++ b/lib/libc_r/test/join_leak_d.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/join_leak_d.c,v 1.2 2003/06/04 08:16:32 mtm Exp $
  *
  * Test for leaked joined threads.
  */
diff --git a/lib/libc_r/test/mutex_d.c b/lib/libc_r/test/mutex_d.c
index 2f0c868aad859..7d0fe6dfc20dc 100644
--- a/lib/libc_r/test/mutex_d.c
+++ b/lib/libc_r/test/mutex_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.4 2003/06/04 20:38:54 marcel Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/propagate_s.pl b/lib/libc_r/test/propagate_s.pl
index 9cd5fb054ae14..11c2317ea3485 100755
--- a/lib/libc_r/test/propagate_s.pl
+++ b/lib/libc_r/test/propagate_s.pl
@@ -31,7 +31,7 @@
 #
 # Verify that no cancellation points are propagated inside of libc_r.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/propagate_s.pl,v 1.1 2000/04/26 23:25:58 jasone Exp $
 #
 
 @CPOINTS = ("aio_suspend", "close", "creat", "fcntl", "fsync", "mq_receive",
diff --git a/lib/libc_r/test/sem_d.c b/lib/libc_r/test/sem_d.c
index b834591852d96..2238b44888eee 100644
--- a/lib/libc_r/test/sem_d.c
+++ b/lib/libc_r/test/sem_d.c
@@ -31,7 +31,7 @@
  *
  * sem test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/sem_d.c,v 1.2 2001/05/20 23:11:09 jasone Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libc_r/test/sigsuspend_d.c b/lib/libc_r/test/sigsuspend_d.c
index d2420ed844563..349fb149aa3ee 100644
--- a/lib/libc_r/test/sigsuspend_d.c
+++ b/lib/libc_r/test/sigsuspend_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/sigsuspend_d.c,v 1.1 2000/04/24 21:07:39 jasone Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/sigwait_d.c b/lib/libc_r/test/sigwait_d.c
index f3ccd6b98491d..749cc2c341abf 100644
--- a/lib/libc_r/test/sigwait_d.c
+++ b/lib/libc_r/test/sigwait_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/test/sigwait_d.c,v 1.2 2001/05/20 23:10:30 jasone Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/verify b/lib/libc_r/test/verify
index 2863e5c3fa0c1..4502148262540 100755
--- a/lib/libc_r/test/verify
+++ b/lib/libc_r/test/verify
@@ -33,7 +33,7 @@
 #
 # Test harness.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/test/verify,v 1.2 2001/05/20 23:11:54 jasone Exp $
 #
 #############################################################################
 
diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc
index 6d457c172d842..60794d56c2123 100644
--- a/lib/libc_r/uthread/Makefile.inc
+++ b/lib/libc_r/uthread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $
 
 # uthread sources
 .PATH: ${.CURDIR}/uthread
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index 56f74159c5d67..66046a9539512 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -28,7 +28,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.88 2007/01/12 07:25:24 imp Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libc_r/uthread/uthread_accept.c b/lib/libc_r/uthread/uthread_accept.c
index 2e284a952d69c..3fe00aecf736c 100644
--- a/lib/libc_r/uthread/uthread_accept.c
+++ b/lib/libc_r/uthread/uthread_accept.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_accept.c,v 1.18 2007/01/12 07:25:24 imp Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c b/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
index 19e9aaa6096d9..35cbb33a9c52d 100644
--- a/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c,v 1.3 2001/05/20 23:08:32 jasone Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_acl_delete_fd.c b/lib/libc_r/uthread/uthread_acl_delete_fd.c
index 2368c5f38bde1..850bd76c1846f 100644
--- a/lib/libc_r/uthread/uthread_acl_delete_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_delete_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_delete_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_acl_get_fd.c b/lib/libc_r/uthread/uthread_acl_get_fd.c
index f0fa8b18804b2..525a549e6aa4c 100644
--- a/lib/libc_r/uthread/uthread_acl_get_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_get_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_get_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_acl_set_fd.c b/lib/libc_r/uthread/uthread_acl_set_fd.c
index c68751a0d8a00..c38fe9e663453 100644
--- a/lib/libc_r/uthread/uthread_acl_set_fd.c
+++ b/lib/libc_r/uthread/uthread_acl_set_fd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_acl_set_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_aio_suspend.c b/lib/libc_r/uthread/uthread_aio_suspend.c
index 23d34f9aa52b5..a922e1f64091d 100644
--- a/lib/libc_r/uthread/uthread_aio_suspend.c
+++ b/lib/libc_r/uthread/uthread_aio_suspend.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_aio_suspend.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
  */
 
 #include <aio.h>
diff --git a/lib/libc_r/uthread/uthread_atfork.c b/lib/libc_r/uthread/uthread_atfork.c
index 8a094686186eb..b306bb0f164c6 100644
--- a/lib/libc_r/uthread/uthread_atfork.c
+++ b/lib/libc_r/uthread/uthread_atfork.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_atfork.c,v 1.1 2004/12/10 03:36:45 grog Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_attr_destroy.c b/lib/libc_r/uthread/uthread_attr_destroy.c
index fd0ff44b0fbc1..8c7e821b00fd4 100644
--- a/lib/libc_r/uthread/uthread_attr_destroy.c
+++ b/lib/libc_r/uthread/uthread_attr_destroy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_destroy.c,v 1.7 2007/01/12 07:25:24 imp Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_attr_get_np.c b/lib/libc_r/uthread/uthread_attr_get_np.c
index ba6fd19655fc9..9d2adac5db3a0 100644
--- a/lib/libc_r/uthread/uthread_attr_get_np.c
+++ b/lib/libc_r/uthread/uthread_attr_get_np.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_get_np.c,v 1.3 2003/02/03 10:08:45 phantom Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getdetachstate.c b/lib/libc_r/uthread/uthread_attr_getdetachstate.c
index 94e2bd166b079..2fa0a954b09d2 100644
--- a/lib/libc_r/uthread/uthread_attr_getdetachstate.c
+++ b/lib/libc_r/uthread/uthread_attr_getdetachstate.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getdetachstate.c,v 1.7 2007/01/12 07:25:24 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getguardsize.c b/lib/libc_r/uthread/uthread_attr_getguardsize.c
index 849bf27a50250..66f94ef5ddcf0 100644
--- a/lib/libc_r/uthread/uthread_attr_getguardsize.c
+++ b/lib/libc_r/uthread/uthread_attr_getguardsize.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getguardsize.c,v 1.1 2001/07/20 04:23:10 jasone Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getinheritsched.c b/lib/libc_r/uthread/uthread_attr_getinheritsched.c
index 6d6d3244e651e..b2106c49ecf20 100644
--- a/lib/libc_r/uthread/uthread_attr_getinheritsched.c
+++ b/lib/libc_r/uthread/uthread_attr_getinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getinheritsched.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getschedparam.c b/lib/libc_r/uthread/uthread_attr_getschedparam.c
index cac86fa92882a..e2c69b3a14d57 100644
--- a/lib/libc_r/uthread/uthread_attr_getschedparam.c
+++ b/lib/libc_r/uthread/uthread_attr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getschedparam.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
index f2b74fccc8fdd..6386984065ea0 100644
--- a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
+++ b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getschedpolicy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getscope.c b/lib/libc_r/uthread/uthread_attr_getscope.c
index 8abf418cfdca7..3747c1484fa5e 100644
--- a/lib/libc_r/uthread/uthread_attr_getscope.c
+++ b/lib/libc_r/uthread/uthread_attr_getscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getscope.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getstack.c b/lib/libc_r/uthread/uthread_attr_getstack.c
index e63cd8f6ccd11..8222d0f8e7caa 100644
--- a/lib/libc_r/uthread/uthread_attr_getstack.c
+++ b/lib/libc_r/uthread/uthread_attr_getstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getstackaddr.c b/lib/libc_r/uthread/uthread_attr_getstackaddr.c
index a9a05de511551..6271a721d450d 100644
--- a/lib/libc_r/uthread/uthread_attr_getstackaddr.c
+++ b/lib/libc_r/uthread/uthread_attr_getstackaddr.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstackaddr.c,v 1.7 2007/01/12 07:25:24 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getstacksize.c b/lib/libc_r/uthread/uthread_attr_getstacksize.c
index 436d25aa042c4..cca1b5086254d 100644
--- a/lib/libc_r/uthread/uthread_attr_getstacksize.c
+++ b/lib/libc_r/uthread/uthread_attr_getstacksize.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstacksize.c,v 1.7 2007/01/12 07:25:24 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_init.c b/lib/libc_r/uthread/uthread_attr_init.c
index d973bfa21d426..e4062397a19e5 100644
--- a/lib/libc_r/uthread/uthread_attr_init.c
+++ b/lib/libc_r/uthread/uthread_attr_init.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_init.c,v 1.8 2007/01/12 07:25:24 imp Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
index bb29e85cdb44c..d267dde10a30b 100644
--- a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
+++ b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c,v 1.6 2007/01/12 07:25:24 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setdetachstate.c b/lib/libc_r/uthread/uthread_attr_setdetachstate.c
index 932bf13f83a65..f730e722f822f 100644
--- a/lib/libc_r/uthread/uthread_attr_setdetachstate.c
+++ b/lib/libc_r/uthread/uthread_attr_setdetachstate.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setdetachstate.c,v 1.7 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setguardsize.c b/lib/libc_r/uthread/uthread_attr_setguardsize.c
index ad3e8bb9292f9..404d1677d3e3d 100644
--- a/lib/libc_r/uthread/uthread_attr_setguardsize.c
+++ b/lib/libc_r/uthread/uthread_attr_setguardsize.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setguardsize.c,v 1.3 2002/05/15 05:37:48 alfred Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setinheritsched.c b/lib/libc_r/uthread/uthread_attr_setinheritsched.c
index 3538131ca07a6..03729d38fbe69 100644
--- a/lib/libc_r/uthread/uthread_attr_setinheritsched.c
+++ b/lib/libc_r/uthread/uthread_attr_setinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setinheritsched.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setschedparam.c b/lib/libc_r/uthread/uthread_attr_setschedparam.c
index c42973e9c0bcf..2ab5964fa6067 100644
--- a/lib/libc_r/uthread/uthread_attr_setschedparam.c
+++ b/lib/libc_r/uthread/uthread_attr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setschedparam.c,v 1.8 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
index d9c83e64b3f7b..642263f49c27d 100644
--- a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
+++ b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setschedpolicy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setscope.c b/lib/libc_r/uthread/uthread_attr_setscope.c
index 3614615a3c017..6d739c4d5977e 100644
--- a/lib/libc_r/uthread/uthread_attr_setscope.c
+++ b/lib/libc_r/uthread/uthread_attr_setscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setscope.c,v 1.7 2002/02/14 15:20:36 maxim Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setstack.c b/lib/libc_r/uthread/uthread_attr_setstack.c
index e03f6deefe165..c51f943072980 100644
--- a/lib/libc_r/uthread/uthread_attr_setstack.c
+++ b/lib/libc_r/uthread/uthread_attr_setstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setstackaddr.c b/lib/libc_r/uthread/uthread_attr_setstackaddr.c
index b595451f7b374..c791ee137d4ad 100644
--- a/lib/libc_r/uthread/uthread_attr_setstackaddr.c
+++ b/lib/libc_r/uthread/uthread_attr_setstackaddr.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstackaddr.c,v 1.7 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_attr_setstacksize.c b/lib/libc_r/uthread/uthread_attr_setstacksize.c
index 2e736262a8931..157435c3e790e 100644
--- a/lib/libc_r/uthread/uthread_attr_setstacksize.c
+++ b/lib/libc_r/uthread/uthread_attr_setstacksize.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstacksize.c,v 1.8 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_autoinit.c b/lib/libc_r/uthread/uthread_autoinit.c
index 03ee58d6f5a5b..a8ba932985385 100644
--- a/lib/libc_r/uthread/uthread_autoinit.c
+++ b/lib/libc_r/uthread/uthread_autoinit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_autoinit.c,v 1.2 2002/11/13 18:13:26 deischen Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_bind.c b/lib/libc_r/uthread/uthread_bind.c
index d15be6ee2d92d..7eba3869fc180 100644
--- a/lib/libc_r/uthread/uthread_bind.c
+++ b/lib/libc_r/uthread/uthread_bind.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_bind.c,v 1.12 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_cancel.c b/lib/libc_r/uthread/uthread_cancel.c
index d9324abf01aa3..68487da48f397 100644
--- a/lib/libc_r/uthread/uthread_cancel.c
+++ b/lib/libc_r/uthread/uthread_cancel.c
@@ -1,6 +1,6 @@
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_cancel.c,v 1.14 2002/05/24 04:32:28 deischen Exp $
  */
 #include <sys/errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_clean.c b/lib/libc_r/uthread/uthread_clean.c
index 826f6b8056818..49858e16da982 100644
--- a/lib/libc_r/uthread/uthread_clean.c
+++ b/lib/libc_r/uthread/uthread_clean.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_clean.c,v 1.7 2007/01/12 07:25:25 imp Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_close.c b/lib/libc_r/uthread/uthread_close.c
index 2808076c70db2..ea209f4d23244 100644
--- a/lib/libc_r/uthread/uthread_close.c
+++ b/lib/libc_r/uthread/uthread_close.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.17 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_concurrency.c b/lib/libc_r/uthread/uthread_concurrency.c
index ddb82c19ea33e..8662bb5fc8935 100644
--- a/lib/libc_r/uthread/uthread_concurrency.c
+++ b/lib/libc_r/uthread/uthread_concurrency.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_concurrency.c,v 1.1 2003/04/20 01:53:12 jdp Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_cond.c b/lib/libc_r/uthread/uthread_cond.c
index 6a4c038e33e92..9db2cff742ac5 100644
--- a/lib/libc_r/uthread/uthread_cond.c
+++ b/lib/libc_r/uthread/uthread_cond.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_cond.c,v 1.35 2007/01/12 07:25:25 imp Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_condattr_destroy.c b/lib/libc_r/uthread/uthread_condattr_destroy.c
index aef920d554e76..4c02043e81e65 100644
--- a/lib/libc_r/uthread/uthread_condattr_destroy.c
+++ b/lib/libc_r/uthread/uthread_condattr_destroy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_condattr_destroy.c,v 1.7 2007/01/12 07:25:25 imp Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_condattr_init.c b/lib/libc_r/uthread/uthread_condattr_init.c
index e35b2170eef17..d4eefc1a3148a 100644
--- a/lib/libc_r/uthread/uthread_condattr_init.c
+++ b/lib/libc_r/uthread/uthread_condattr_init.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_condattr_init.c,v 1.8 2007/01/12 07:25:25 imp Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_connect.c b/lib/libc_r/uthread/uthread_connect.c
index efe6efdf526a5..593791e863930 100644
--- a/lib/libc_r/uthread/uthread_connect.c
+++ b/lib/libc_r/uthread/uthread_connect.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_connect.c,v 1.15 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_creat.c b/lib/libc_r/uthread/uthread_creat.c
index 92da971799019..087d7a586aee6 100644
--- a/lib/libc_r/uthread/uthread_creat.c
+++ b/lib/libc_r/uthread/uthread_creat.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_creat.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_create.c b/lib/libc_r/uthread/uthread_create.c
index 3474bfa2f9949..0df215b00dd18 100644
--- a/lib/libc_r/uthread/uthread_create.c
+++ b/lib/libc_r/uthread/uthread_create.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.39 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_detach.c b/lib/libc_r/uthread/uthread_detach.c
index e8ac8b00cc5ff..b606be62cb34e 100644
--- a/lib/libc_r/uthread/uthread_detach.c
+++ b/lib/libc_r/uthread/uthread_detach.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_detach.c,v 1.18 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_dup.c b/lib/libc_r/uthread/uthread_dup.c
index 4b66e970e48c2..20754bfc32b9a 100644
--- a/lib/libc_r/uthread/uthread_dup.c
+++ b/lib/libc_r/uthread/uthread_dup.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_dup.c,v 1.12 2007/01/12 07:25:25 imp Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_dup2.c b/lib/libc_r/uthread/uthread_dup2.c
index 05083617fc5d5..00763ace33e25 100644
--- a/lib/libc_r/uthread/uthread_dup2.c
+++ b/lib/libc_r/uthread/uthread_dup2.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_dup2.c,v 1.15 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_equal.c b/lib/libc_r/uthread/uthread_equal.c
index 9c21c3a1ac483..22975bdf23f03 100644
--- a/lib/libc_r/uthread/uthread_equal.c
+++ b/lib/libc_r/uthread/uthread_equal.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_equal.c,v 1.6 2007/01/12 07:25:25 imp Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_execve.c b/lib/libc_r/uthread/uthread_execve.c
index 50db4feb1caec..3540d475bd29a 100644
--- a/lib/libc_r/uthread/uthread_execve.c
+++ b/lib/libc_r/uthread/uthread_execve.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_execve.c,v 1.17 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_exit.c b/lib/libc_r/uthread/uthread_exit.c
index 87a9dcd02dc28..43f3c6cef5cf9 100644
--- a/lib/libc_r/uthread/uthread_exit.c
+++ b/lib/libc_r/uthread/uthread_exit.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.30 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fchflags.c b/lib/libc_r/uthread/uthread_fchflags.c
index cd076e2d21a94..4fdd502f37600 100644
--- a/lib/libc_r/uthread/uthread_fchflags.c
+++ b/lib/libc_r/uthread/uthread_fchflags.c
@@ -2,7 +2,7 @@
  * David Leonard <d@openbsd.org>, 1999. Public Domain.
  *
  * $OpenBSD: uthread_fchflags.c,v 1.1 1999/01/08 05:42:18 d Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fchflags.c,v 1.6 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <sys/stat.h>
diff --git a/lib/libc_r/uthread/uthread_fchmod.c b/lib/libc_r/uthread/uthread_fchmod.c
index ba0a35f1e2303..1c9421e02bb46 100644
--- a/lib/libc_r/uthread/uthread_fchmod.c
+++ b/lib/libc_r/uthread/uthread_fchmod.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fchmod.c,v 1.11 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libc_r/uthread/uthread_fchown.c b/lib/libc_r/uthread/uthread_fchown.c
index 6990b751eb43f..8e6fd23f735a0 100644
--- a/lib/libc_r/uthread/uthread_fchown.c
+++ b/lib/libc_r/uthread/uthread_fchown.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fchown.c,v 1.11 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fcntl.c b/lib/libc_r/uthread/uthread_fcntl.c
index eaf02e9de10ba..846ecd06006e6 100644
--- a/lib/libc_r/uthread/uthread_fcntl.c
+++ b/lib/libc_r/uthread/uthread_fcntl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.16 2007/01/12 07:25:25 imp Exp $
  */
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c
index 42583239a4f6f..d34e8e0d14e9d 100644
--- a/lib/libc_r/uthread/uthread_fd.c
+++ b/lib/libc_r/uthread/uthread_fd.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fd.c,v 1.23 2007/01/12 07:25:25 imp Exp $
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_file.c b/lib/libc_r/uthread/uthread_file.c
index cbedbc7b2a811..61e99fde1129d 100644
--- a/lib/libc_r/uthread/uthread_file.c
+++ b/lib/libc_r/uthread/uthread_file.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_file.c,v 1.18 2001/02/11 22:07:32 deischen Exp $
  *
  * POSIX stdio FILE locking functions. These assume that the locking
  * is only required at FILE structure level, not at file descriptor
diff --git a/lib/libc_r/uthread/uthread_find_thread.c b/lib/libc_r/uthread/uthread_find_thread.c
index 299d53ce6b818..ca36488fb7787 100644
--- a/lib/libc_r/uthread/uthread_find_thread.c
+++ b/lib/libc_r/uthread/uthread_find_thread.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_find_thread.c,v 1.8 2007/01/12 07:25:25 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_flock.c b/lib/libc_r/uthread/uthread_flock.c
index 388c025067da5..0c8af24e45502 100644
--- a/lib/libc_r/uthread/uthread_flock.c
+++ b/lib/libc_r/uthread/uthread_flock.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_flock.c,v 1.11 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/file.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_fork.c b/lib/libc_r/uthread/uthread_fork.c
index a24ad98f652b1..123f3fd17af66 100644
--- a/lib/libc_r/uthread/uthread_fork.c
+++ b/lib/libc_r/uthread/uthread_fork.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.29 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_fpathconf.c b/lib/libc_r/uthread/uthread_fpathconf.c
index 97e1d65e3e98c..5e78e952e0340 100644
--- a/lib/libc_r/uthread/uthread_fpathconf.c
+++ b/lib/libc_r/uthread/uthread_fpathconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fpathconf.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_fstat.c b/lib/libc_r/uthread/uthread_fstat.c
index d52e4aac95db6..ea0d245f40871 100644
--- a/lib/libc_r/uthread/uthread_fstat.c
+++ b/lib/libc_r/uthread/uthread_fstat.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fstat.c,v 1.13 2007/01/12 07:25:25 imp Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_fstatfs.c b/lib/libc_r/uthread/uthread_fstatfs.c
index c53c4a5a18133..306cf0435e80a 100644
--- a/lib/libc_r/uthread/uthread_fstatfs.c
+++ b/lib/libc_r/uthread/uthread_fstatfs.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fstatfs.c,v 1.13 2007/01/12 07:25:25 imp Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_fsync.c b/lib/libc_r/uthread/uthread_fsync.c
index 46ccbfec930b0..7d300f72f0111 100644
--- a/lib/libc_r/uthread/uthread_fsync.c
+++ b/lib/libc_r/uthread/uthread_fsync.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fsync.c,v 1.11 2007/01/12 07:25:25 imp Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_gc.c b/lib/libc_r/uthread/uthread_gc.c
index c5bf59fbfde02..0f693836852ea 100644
--- a/lib/libc_r/uthread/uthread_gc.c
+++ b/lib/libc_r/uthread/uthread_gc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_gc.c,v 1.18 2007/01/12 07:25:25 imp Exp $
  *
  * Garbage collector thread. Frees memory allocated for dead threads.
  *
diff --git a/lib/libc_r/uthread/uthread_getdirentries.c b/lib/libc_r/uthread/uthread_getdirentries.c
index f2c8f79ac8ea3..c428f0ae49926 100644
--- a/lib/libc_r/uthread/uthread_getdirentries.c
+++ b/lib/libc_r/uthread/uthread_getdirentries.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getdirentries.c,v 1.11 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/lib/libc_r/uthread/uthread_getpeername.c b/lib/libc_r/uthread/uthread_getpeername.c
index 0a61054e58299..071c50b103975 100644
--- a/lib/libc_r/uthread/uthread_getpeername.c
+++ b/lib/libc_r/uthread/uthread_getpeername.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getpeername.c,v 1.12 2007/01/12 07:25:25 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_getprio.c b/lib/libc_r/uthread/uthread_getprio.c
index 363e3cfc90622..c09611448bfca 100644
--- a/lib/libc_r/uthread/uthread_getprio.c
+++ b/lib/libc_r/uthread/uthread_getprio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getprio.c,v 1.9 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_getschedparam.c b/lib/libc_r/uthread/uthread_getschedparam.c
index 0d1ffe924ccdf..595b5e1cca61b 100644
--- a/lib/libc_r/uthread/uthread_getschedparam.c
+++ b/lib/libc_r/uthread/uthread_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getschedparam.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_getsockname.c b/lib/libc_r/uthread/uthread_getsockname.c
index 18705550e0946..d57498b9f5f99 100644
--- a/lib/libc_r/uthread/uthread_getsockname.c
+++ b/lib/libc_r/uthread/uthread_getsockname.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getsockname.c,v 1.12 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_getsockopt.c b/lib/libc_r/uthread/uthread_getsockopt.c
index 23f9860fa1925..7acce3efacfc5 100644
--- a/lib/libc_r/uthread/uthread_getsockopt.c
+++ b/lib/libc_r/uthread/uthread_getsockopt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_getsockopt.c,v 1.12 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_info.c b/lib/libc_r/uthread/uthread_info.c
index 2128820a9299a..4da696c1d08ea 100644
--- a/lib/libc_r/uthread/uthread_info.c
+++ b/lib/libc_r/uthread/uthread_info.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_info.c,v 1.25 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index 45f969c527ab2..4462812b176c3 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.51 2007/01/12 07:25:26 imp Exp $
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libc_r/uthread/uthread_ioctl.c b/lib/libc_r/uthread/uthread_ioctl.c
index f56146a99121c..03f32b2fd85e9 100644
--- a/lib/libc_r/uthread/uthread_ioctl.c
+++ b/lib/libc_r/uthread/uthread_ioctl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_ioctl.c,v 1.13 2007/01/12 07:25:26 imp Exp $
  */
 #include <stdarg.h>
 #include <sys/ioctl.h>
diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c
index 5aa0001819bae..6697ea2fcc6a1 100644
--- a/lib/libc_r/uthread/uthread_jmp.c
+++ b/lib/libc_r/uthread/uthread_jmp.c
@@ -28,7 +28,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c
index c8f844128f721..cd09326e933f4 100644
--- a/lib/libc_r/uthread/uthread_join.c
+++ b/lib/libc_r/uthread/uthread_join.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_join.c,v 1.23 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include "namespace.h"
diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c
index 8bd25b4920894..18d425b277bed 100644
--- a/lib/libc_r/uthread/uthread_kern.c
+++ b/lib/libc_r/uthread/uthread_kern.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kern.c,v 1.46 2007/01/12 07:25:26 imp Exp $
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_kevent.c b/lib/libc_r/uthread/uthread_kevent.c
index 17aeaea4583e8..c383003c68654 100644
--- a/lib/libc_r/uthread/uthread_kevent.c
+++ b/lib/libc_r/uthread/uthread_kevent.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kevent.c,v 1.6 2001/12/08 00:53:37 sobomax Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_kill.c b/lib/libc_r/uthread/uthread_kill.c
index 985ba0c6a2847..79f69a5589ac6 100644
--- a/lib/libc_r/uthread/uthread_kill.c
+++ b/lib/libc_r/uthread/uthread_kill.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kill.c,v 1.13 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc_r/uthread/uthread_kqueue.c b/lib/libc_r/uthread/uthread_kqueue.c
index 15aceb0b13899..fee328bc77427 100644
--- a/lib/libc_r/uthread/uthread_kqueue.c
+++ b/lib/libc_r/uthread/uthread_kqueue.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_kqueue.c,v 1.1 2003/07/25 17:02:33 mp Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_listen.c b/lib/libc_r/uthread/uthread_listen.c
index 600a4cbbdd9ed..87be7f3b58ed5 100644
--- a/lib/libc_r/uthread/uthread_listen.c
+++ b/lib/libc_r/uthread/uthread_listen.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_listen.c,v 1.11 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_main_np.c b/lib/libc_r/uthread/uthread_main_np.c
index 1c9c30b8a7519..ab53524274daa 100644
--- a/lib/libc_r/uthread/uthread_main_np.c
+++ b/lib/libc_r/uthread/uthread_main_np.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libc_r/uthread/uthread_main_np.c,v 1.4 2002/10/15 16:40:57 fjoe Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_mattr_init.c b/lib/libc_r/uthread/uthread_mattr_init.c
index 5c1fb6fd42ef0..cdedd304df802 100644
--- a/lib/libc_r/uthread/uthread_mattr_init.c
+++ b/lib/libc_r/uthread/uthread_mattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mattr_init.c,v 1.10 2005/01/08 17:16:43 hsu Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_mattr_kind_np.c b/lib/libc_r/uthread/uthread_mattr_kind_np.c
index 08fb0dba0a4e4..3560baf069eda 100644
--- a/lib/libc_r/uthread/uthread_mattr_kind_np.c
+++ b/lib/libc_r/uthread/uthread_mattr_kind_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mattr_kind_np.c,v 1.10 2005/08/19 21:31:41 stefanf Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_msync.c b/lib/libc_r/uthread/uthread_msync.c
index 24cbaa6053bb5..1b3098c7d05f0 100644
--- a/lib/libc_r/uthread/uthread_msync.c
+++ b/lib/libc_r/uthread/uthread_msync.c
@@ -3,7 +3,7 @@
  *
  * $OpenBSD: uthread_msync.c,v 1.2 1999/06/09 07:16:17 d Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_msync.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_multi_np.c b/lib/libc_r/uthread/uthread_multi_np.c
index 99b6df3aae73e..59a66f01a71f0 100644
--- a/lib/libc_r/uthread/uthread_multi_np.c
+++ b/lib/libc_r/uthread/uthread_multi_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_multi_np.c,v 1.8 2007/01/12 07:25:26 imp Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libc_r/uthread/uthread_mutex.c b/lib/libc_r/uthread/uthread_mutex.c
index 47fd7f66dd864..de232cae1f6b9 100644
--- a/lib/libc_r/uthread/uthread_mutex.c
+++ b/lib/libc_r/uthread/uthread_mutex.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex.c,v 1.35 2007/01/12 07:25:26 imp Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_mutex_prioceiling.c b/lib/libc_r/uthread/uthread_mutex_prioceiling.c
index eccc9e46f3821..a62bc160223c3 100644
--- a/lib/libc_r/uthread/uthread_mutex_prioceiling.c
+++ b/lib/libc_r/uthread/uthread_mutex_prioceiling.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex_prioceiling.c,v 1.6 2002/11/13 18:13:26 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_mutex_protocol.c b/lib/libc_r/uthread/uthread_mutex_protocol.c
index 4d020d6c5360b..79d0e03c90134 100644
--- a/lib/libc_r/uthread/uthread_mutex_protocol.c
+++ b/lib/libc_r/uthread/uthread_mutex_protocol.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex_protocol.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_mutexattr_destroy.c b/lib/libc_r/uthread/uthread_mutexattr_destroy.c
index 25d229386f7fc..30456883cc89e 100644
--- a/lib/libc_r/uthread/uthread_mutexattr_destroy.c
+++ b/lib/libc_r/uthread/uthread_mutexattr_destroy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_mutexattr_destroy.c,v 1.8 2007/01/12 07:25:26 imp Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_nanosleep.c b/lib/libc_r/uthread/uthread_nanosleep.c
index a8bea22249f4e..8408df906a113 100644
--- a/lib/libc_r/uthread/uthread_nanosleep.c
+++ b/lib/libc_r/uthread/uthread_nanosleep.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_nanosleep.c,v 1.17 2007/01/12 07:25:26 imp Exp $
  */
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_once.c b/lib/libc_r/uthread/uthread_once.c
index 6aa0c495a020d..3d37c49fda089 100644
--- a/lib/libc_r/uthread/uthread_once.c
+++ b/lib/libc_r/uthread/uthread_once.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_once.c,v 1.8 2007/01/12 07:25:26 imp Exp $
  */
 #include "namespace.h"
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_open.c b/lib/libc_r/uthread/uthread_open.c
index 9d7b8b25770ad..cc6c3f3693fa5 100644
--- a/lib/libc_r/uthread/uthread_open.c
+++ b/lib/libc_r/uthread/uthread_open.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_open.c,v 1.13 2007/01/12 07:25:26 imp Exp $
  *
  */
 #include <stdarg.h>
diff --git a/lib/libc_r/uthread/uthread_pause.c b/lib/libc_r/uthread/uthread_pause.c
index 57b508f266f61..6807f9c6f11bd 100644
--- a/lib/libc_r/uthread/uthread_pause.c
+++ b/lib/libc_r/uthread/uthread_pause.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_pause.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_pipe.c b/lib/libc_r/uthread/uthread_pipe.c
index 3d0090b0cf476..6b3be7586196c 100644
--- a/lib/libc_r/uthread/uthread_pipe.c
+++ b/lib/libc_r/uthread/uthread_pipe.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_pipe.c,v 1.11 2007/01/12 07:25:26 imp Exp $
  */
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_poll.c b/lib/libc_r/uthread/uthread_poll.c
index 62b261394dbbd..b22f0397d38a9 100644
--- a/lib/libc_r/uthread/uthread_poll.c
+++ b/lib/libc_r/uthread/uthread_poll.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_poll.c,v 1.12 2002/05/02 19:58:43 archie Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_priority_queue.c b/lib/libc_r/uthread/uthread_priority_queue.c
index b700d97f79557..2481357b6ec19 100644
--- a/lib/libc_r/uthread/uthread_priority_queue.c
+++ b/lib/libc_r/uthread/uthread_priority_queue.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_priority_queue.c,v 1.8 2002/05/24 04:32:28 deischen Exp $
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libc_r/uthread/uthread_pselect.c b/lib/libc_r/uthread/uthread_pselect.c
index 9848863325b21..a48f2cce757bd 100644
--- a/lib/libc_r/uthread/uthread_pselect.c
+++ b/lib/libc_r/uthread/uthread_pselect.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc_r/uthread/uthread_pselect.c,v 1.2 2002/11/13 18:13:26 deischen Exp $");
 
 #include <sys/select.h>
 #include <sys/time.h>
diff --git a/lib/libc_r/uthread/uthread_read.c b/lib/libc_r/uthread/uthread_read.c
index 655abdf866084..02e7e185e2910 100644
--- a/lib/libc_r/uthread/uthread_read.c
+++ b/lib/libc_r/uthread/uthread_read.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.15 2007/01/12 07:25:26 imp Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_readv.c b/lib/libc_r/uthread/uthread_readv.c
index 11e3433c165e1..86158e08ee4ec 100644
--- a/lib/libc_r/uthread/uthread_readv.c
+++ b/lib/libc_r/uthread/uthread_readv.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.16 2007/01/12 07:25:26 imp Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_recvfrom.c b/lib/libc_r/uthread/uthread_recvfrom.c
index 50a0a4272a587..68c9e5752c6b0 100644
--- a/lib/libc_r/uthread/uthread_recvfrom.c
+++ b/lib/libc_r/uthread/uthread_recvfrom.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_recvfrom.c,v 1.14 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_recvmsg.c b/lib/libc_r/uthread/uthread_recvmsg.c
index ed83f1a29bf8d..adf513536fd3b 100644
--- a/lib/libc_r/uthread/uthread_recvmsg.c
+++ b/lib/libc_r/uthread/uthread_recvmsg.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_recvmsg.c,v 1.12 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_resume_np.c b/lib/libc_r/uthread/uthread_resume_np.c
index 2ca1bc4d574c8..e83db679d5e76 100644
--- a/lib/libc_r/uthread/uthread_resume_np.c
+++ b/lib/libc_r/uthread/uthread_resume_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_resume_np.c,v 1.14 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_rwlock.c b/lib/libc_r/uthread/uthread_rwlock.c
index fdda04cd46ed2..fc87c298ab8c2 100644
--- a/lib/libc_r/uthread/uthread_rwlock.c
+++ b/lib/libc_r/uthread/uthread_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlock.c,v 1.9 2004/01/08 15:39:12 deischen Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_rwlockattr.c b/lib/libc_r/uthread/uthread_rwlockattr.c
index bc1b9eec03071..c304e6e18ed68 100644
--- a/lib/libc_r/uthread/uthread_rwlockattr.c
+++ b/lib/libc_r/uthread/uthread_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_select.c b/lib/libc_r/uthread/uthread_select.c
index 69293e3a12f83..478d360e8474d 100644
--- a/lib/libc_r/uthread/uthread_select.c
+++ b/lib/libc_r/uthread/uthread_select.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.23 2007/01/12 07:25:26 imp Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_self.c b/lib/libc_r/uthread/uthread_self.c
index 8a30b7a0ccd03..9c6e2a23f4443 100644
--- a/lib/libc_r/uthread/uthread_self.c
+++ b/lib/libc_r/uthread/uthread_self.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_self.c,v 1.6 2007/01/12 07:25:26 imp Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_sem.c b/lib/libc_r/uthread/uthread_sem.c
index f85bb91ea0e53..6216855d5a304 100644
--- a/lib/libc_r/uthread/uthread_sem.c
+++ b/lib/libc_r/uthread/uthread_sem.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sem.c,v 1.11 2002/11/13 18:13:26 deischen Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_sendfile.c b/lib/libc_r/uthread/uthread_sendfile.c
index ddaddeb3ff1e8..64fdf8e13b820 100644
--- a/lib/libc_r/uthread/uthread_sendfile.c
+++ b/lib/libc_r/uthread/uthread_sendfile.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sendfile.c,v 1.10 2002/08/29 23:06:07 deischen Exp $
  */
 
 #include <sys/fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_sendmsg.c b/lib/libc_r/uthread/uthread_sendmsg.c
index 30262f4e2a2d6..8998379443364 100644
--- a/lib/libc_r/uthread/uthread_sendmsg.c
+++ b/lib/libc_r/uthread/uthread_sendmsg.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sendmsg.c,v 1.12 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sendto.c b/lib/libc_r/uthread/uthread_sendto.c
index 2e4367a918b7a..1ef5200138b23 100644
--- a/lib/libc_r/uthread/uthread_sendto.c
+++ b/lib/libc_r/uthread/uthread_sendto.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sendto.c,v 1.14 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_seterrno.c b/lib/libc_r/uthread/uthread_seterrno.c
index dfcc57625911b..38a8203121442 100644
--- a/lib/libc_r/uthread/uthread_seterrno.c
+++ b/lib/libc_r/uthread/uthread_seterrno.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_seterrno.c,v 1.6 2007/01/12 07:25:26 imp Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_setprio.c b/lib/libc_r/uthread/uthread_setprio.c
index efc96c1679f10..4e5ee00e1e923 100644
--- a/lib/libc_r/uthread/uthread_setprio.c
+++ b/lib/libc_r/uthread/uthread_setprio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setprio.c,v 1.10 2007/01/12 07:25:26 imp Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_setschedparam.c b/lib/libc_r/uthread/uthread_setschedparam.c
index 7696762cc5f80..1c6d8471f975c 100644
--- a/lib/libc_r/uthread/uthread_setschedparam.c
+++ b/lib/libc_r/uthread/uthread_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setschedparam.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_setsockopt.c b/lib/libc_r/uthread/uthread_setsockopt.c
index 1c9baf1755760..b6689ef700efa 100644
--- a/lib/libc_r/uthread/uthread_setsockopt.c
+++ b/lib/libc_r/uthread/uthread_setsockopt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_setsockopt.c,v 1.12 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_shutdown.c b/lib/libc_r/uthread/uthread_shutdown.c
index e97b9b737f6b9..2655178dc623f 100644
--- a/lib/libc_r/uthread/uthread_shutdown.c
+++ b/lib/libc_r/uthread/uthread_shutdown.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_shutdown.c,v 1.12 2007/01/12 07:25:26 imp Exp $
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c
index d6045a0e1df38..0e75946ca023e 100644
--- a/lib/libc_r/uthread/uthread_sig.c
+++ b/lib/libc_r/uthread/uthread_sig.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.49 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigaction.c b/lib/libc_r/uthread/uthread_sigaction.c
index 25df5fc77dde6..71f734c1007c0 100644
--- a/lib/libc_r/uthread/uthread_sigaction.c
+++ b/lib/libc_r/uthread/uthread_sigaction.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigaction.c,v 1.17 2007/01/12 07:25:26 imp Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigmask.c b/lib/libc_r/uthread/uthread_sigmask.c
index 9cd5b92d40bd1..ebb68a76bdf38 100644
--- a/lib/libc_r/uthread/uthread_sigmask.c
+++ b/lib/libc_r/uthread/uthread_sigmask.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigmask.c,v 1.10 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigpending.c b/lib/libc_r/uthread/uthread_sigpending.c
index eb9affd789af9..54b487339c7e7 100644
--- a/lib/libc_r/uthread/uthread_sigpending.c
+++ b/lib/libc_r/uthread/uthread_sigpending.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigpending.c,v 1.10 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigprocmask.c b/lib/libc_r/uthread/uthread_sigprocmask.c
index 064f2baaed565..cc04d7d5dcfd5 100644
--- a/lib/libc_r/uthread/uthread_sigprocmask.c
+++ b/lib/libc_r/uthread/uthread_sigprocmask.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigprocmask.c,v 1.13 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_sigsuspend.c b/lib/libc_r/uthread/uthread_sigsuspend.c
index cd63dfcca2432..bc57efb02a3ef 100644
--- a/lib/libc_r/uthread/uthread_sigsuspend.c
+++ b/lib/libc_r/uthread/uthread_sigsuspend.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigsuspend.c,v 1.13 2007/01/12 07:25:26 imp Exp $
  */
 #include <signal.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_sigwait.c b/lib/libc_r/uthread/uthread_sigwait.c
index afb9def7b1949..2d5cac867772b 100644
--- a/lib/libc_r/uthread/uthread_sigwait.c
+++ b/lib/libc_r/uthread/uthread_sigwait.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sigwait.c,v 1.21 2007/01/12 07:25:26 imp Exp $
  */
 #include <signal.h>
 #include <sys/param.h>
diff --git a/lib/libc_r/uthread/uthread_single_np.c b/lib/libc_r/uthread/uthread_single_np.c
index a7b6dc1f544e3..b91b2ec2b12d6 100644
--- a/lib/libc_r/uthread/uthread_single_np.c
+++ b/lib/libc_r/uthread/uthread_single_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_single_np.c,v 1.7 2007/01/12 07:25:26 imp Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libc_r/uthread/uthread_sleep.c b/lib/libc_r/uthread/uthread_sleep.c
index 9e09db775a0af..4583a9dac2de3 100644
--- a/lib/libc_r/uthread/uthread_sleep.c
+++ b/lib/libc_r/uthread/uthread_sleep.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_sleep.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_socket.c b/lib/libc_r/uthread/uthread_socket.c
index c14d813d09b75..f398d369c4cb7 100644
--- a/lib/libc_r/uthread/uthread_socket.c
+++ b/lib/libc_r/uthread/uthread_socket.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_socket.c,v 1.11 2007/01/12 07:25:26 imp Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_socketpair.c b/lib/libc_r/uthread/uthread_socketpair.c
index b76dd804ad4b6..4f689aa6ed7cf 100644
--- a/lib/libc_r/uthread/uthread_socketpair.c
+++ b/lib/libc_r/uthread/uthread_socketpair.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_socketpair.c,v 1.13 2007/01/12 07:25:26 imp Exp $
  *
  */
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_spec.c b/lib/libc_r/uthread/uthread_spec.c
index 09044287a1706..0013b033fe484 100644
--- a/lib/libc_r/uthread/uthread_spec.c
+++ b/lib/libc_r/uthread/uthread_spec.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_spec.c,v 1.18 2007/01/12 07:25:26 imp Exp $
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_spinlock.c b/lib/libc_r/uthread/uthread_spinlock.c
index 6721470e3b232..9feec24ae9922 100644
--- a/lib/libc_r/uthread/uthread_spinlock.c
+++ b/lib/libc_r/uthread/uthread_spinlock.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.13 2007/01/12 07:25:27 imp Exp $
  *
  */
 
diff --git a/lib/libc_r/uthread/uthread_stack.c b/lib/libc_r/uthread/uthread_stack.c
index 0b176cede64dd..7336cf1144745 100644
--- a/lib/libc_r/uthread/uthread_stack.c
+++ b/lib/libc_r/uthread/uthread_stack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.7 2005/02/28 17:15:31 marcus Exp $
  */
 #include "namespace.h"
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_suspend_np.c b/lib/libc_r/uthread/uthread_suspend_np.c
index 58920312279d0..401831ed35f85 100644
--- a/lib/libc_r/uthread/uthread_suspend_np.c
+++ b/lib/libc_r/uthread/uthread_suspend_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_suspend_np.c,v 1.15 2007/01/12 07:25:27 imp Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_switch_np.c b/lib/libc_r/uthread/uthread_switch_np.c
index f24d99f74a4a3..2e5dde2d09f15 100644
--- a/lib/libc_r/uthread/uthread_switch_np.c
+++ b/lib/libc_r/uthread/uthread_switch_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_switch_np.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_system.c b/lib/libc_r/uthread/uthread_system.c
index d63969b085054..733c366c15616 100644
--- a/lib/libc_r/uthread/uthread_system.c
+++ b/lib/libc_r/uthread/uthread_system.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_system.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_tcdrain.c b/lib/libc_r/uthread/uthread_tcdrain.c
index 272bdf6e2747a..4ccccc6539ad2 100644
--- a/lib/libc_r/uthread/uthread_tcdrain.c
+++ b/lib/libc_r/uthread/uthread_tcdrain.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_tcdrain.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <termios.h>
diff --git a/lib/libc_r/uthread/uthread_vfork.c b/lib/libc_r/uthread/uthread_vfork.c
index dbefc65218024..87f2aa13a2bbf 100644
--- a/lib/libc_r/uthread/uthread_vfork.c
+++ b/lib/libc_r/uthread/uthread_vfork.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_vfork.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
  */
 #include <unistd.h>
 
diff --git a/lib/libc_r/uthread/uthread_wait.c b/lib/libc_r/uthread/uthread_wait.c
index e61138b21451c..7464a0fbe5882 100644
--- a/lib/libc_r/uthread/uthread_wait.c
+++ b/lib/libc_r/uthread/uthread_wait.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_wait.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_wait4.c b/lib/libc_r/uthread/uthread_wait4.c
index 2c8fc56a59c1c..c602959fb8701 100644
--- a/lib/libc_r/uthread/uthread_wait4.c
+++ b/lib/libc_r/uthread/uthread_wait4.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_wait4.c,v 1.15 2007/01/12 07:25:27 imp Exp $
  */
 #include <sys/types.h>
 
diff --git a/lib/libc_r/uthread/uthread_waitpid.c b/lib/libc_r/uthread/uthread_waitpid.c
index fcbbc9fa44ff5..72ccdc31272f2 100644
--- a/lib/libc_r/uthread/uthread_waitpid.c
+++ b/lib/libc_r/uthread/uthread_waitpid.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_waitpid.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_write.c b/lib/libc_r/uthread/uthread_write.c
index d9e6c841007d6..12525aadeeeba 100644
--- a/lib/libc_r/uthread/uthread_write.c
+++ b/lib/libc_r/uthread/uthread_write.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.25 2007/01/12 07:25:27 imp Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_writev.c b/lib/libc_r/uthread/uthread_writev.c
index ca576072832ce..66fe587c6210b 100644
--- a/lib/libc_r/uthread/uthread_writev.c
+++ b/lib/libc_r/uthread/uthread_writev.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.23 2007/01/12 07:25:27 imp Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_yield.c b/lib/libc_r/uthread/uthread_yield.c
index 414ff05746922..2eeb264d34740 100644
--- a/lib/libc_r/uthread/uthread_yield.c
+++ b/lib/libc_r/uthread/uthread_yield.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_yield.c,v 1.8 2007/01/12 07:25:27 imp Exp $
  */
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index 8bba20b726ba5..ea85d18ea41d1 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcalendar/Makefile,v 1.6 2001/07/15 06:46:01 dd Exp $
 
 LIB=	calendar
 WARNS?=	2
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 469f1c9e70c5c..71c176e0324ef 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcalendar/calendar.3,v 1.13 2004/07/02 23:52:14 ru Exp $
 .\"
 .Dd November 29, 1997
 .Dt CALENDAR 3
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index fca63eebd9ec6..02e32f8817a40 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcalendar/calendar.c,v 1.4 2001/09/30 21:09:57 dillon Exp $");
 
 #include "calendar.h"
 
diff --git a/lib/libcalendar/calendar.h b/lib/libcalendar/calendar.h
index 2c42d6c2214ee..378382a040b9a 100644
--- a/lib/libcalendar/calendar.h
+++ b/lib/libcalendar/calendar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcalendar/calendar.h,v 1.4 1999/08/28 00:04:04 peter Exp $
  */
 struct date {
 	int y;	/* year */
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index 8bb3e1c46a97b..d11ee576a9ff6 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcalendar/easter.c,v 1.5 2001/09/30 21:09:57 dillon Exp $");
 
 #include "calendar.h"
 
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 92be69db120fe..9e41141c740f4 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcam/Makefile,v 1.12 2004/02/05 22:44:22 ru Exp $
 
 LIB=		cam
 SHLIBDIR?=	/lib
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index 539709f265ab8..63d350da835e4 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcam/cam.3,v 1.14 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd October 10, 1998
 .Os
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 891652dca927b..d3bcfea6b22cd 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcam/cam_cdbparse.3,v 1.21 2005/02/13 22:25:13 ru Exp $
 .\"
 .\" This man page borrows heavily from the old scsi(3) man page, which had
 .\" the following copyright:
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index e521ed366cf5b..1bfc255bfd6ec 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16 2006/11/02 00:54:32 mjacob Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index e505c77c43afb..a0d1817c30852 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcam/camlib.h,v 1.5 2002/04/23 23:58:20 obrien Exp $
  */
 /*
  * Buffer encoding/decoding routines taken from the original FreeBSD SCSI
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index 3d977e10ad833..24faab2d9975b 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcam/scsi_cmdparse.c,v 1.7 2002/09/16 07:18:27 mike Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 65a3ffd212ad0..cdd9477791a60 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcom_err/Makefile,v 1.12 2001/03/27 17:26:58 ru Exp $
 
 LIB=	com_err
 SRCS=	com_err.c error.c
diff --git a/lib/libcom_err/doc/Makefile b/lib/libcom_err/doc/Makefile
index 4c3c0bb0c7447..39b4f9513a226 100644
--- a/lib/libcom_err/doc/Makefile
+++ b/lib/libcom_err/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libcom_err/doc/Makefile,v 1.8 1999/08/28 00:04:09 peter Exp $
 
 INFO=	com_err
 INFOSECTION= "Programming & development tools."
diff --git a/lib/libcom_err/doc/com_err.texinfo b/lib/libcom_err/doc/com_err.texinfo
index 6c71da8122e8b..466a6583f088b 100644
--- a/lib/libcom_err/doc/com_err.texinfo
+++ b/lib/libcom_err/doc/com_err.texinfo
@@ -1,6 +1,6 @@
 \input texinfo @c -*-texinfo-*-
 
-@c $FreeBSD$
+@c $FreeBSD: src/lib/libcom_err/doc/com_err.texinfo,v 1.4 1999/09/06 07:41:34 peter Exp $
 
 @c Note that although this source file is in texinfo format (more
 @c or less), it is not yet suitable for turning into an ``info''
diff --git a/lib/libcompat/4.1/ascftime.c b/lib/libcompat/4.1/ascftime.c
index b3c15e43f3268..ac917b3a9451c 100644
--- a/lib/libcompat/4.1/ascftime.c
+++ b/lib/libcompat/4.1/ascftime.c
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/ascftime.c,v 1.5 2002/05/28 17:00:42 alfred Exp $
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3
index 116f5de5dfad5..61a04c84aa4f1 100644
--- a/lib/libcompat/4.1/cftime.3
+++ b/lib/libcompat/4.1/cftime.3
@@ -32,7 +32,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/cftime.3,v 1.16 2005/02/13 23:45:47 ru Exp $
 .\"
 .Dd June 15, 1993
 .Os
diff --git a/lib/libcompat/4.1/cftime.c b/lib/libcompat/4.1/cftime.c
index 8033e446eb92b..40dc98b652638 100644
--- a/lib/libcompat/4.1/cftime.c
+++ b/lib/libcompat/4.1/cftime.c
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/cftime.c,v 1.5 2002/05/28 17:00:42 alfred Exp $
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 624b2d5843d8b..9a631ccf2c520 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/ftime.3,v 1.13 2007/01/09 01:02:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt FTIME 3
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index cc4a7f9ca071a..204f0ec3aa44a 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.5 1999/08/28 00:04:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/getpw.3 b/lib/libcompat/4.1/getpw.3
index ff3bd3907d8d8..77e478be1ccad 100644
--- a/lib/libcompat/4.1/getpw.3
+++ b/lib/libcompat/4.1/getpw.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpw.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/getpw.3,v 1.12 2007/01/09 01:02:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETPW 3
diff --git a/lib/libcompat/4.1/getpw.c b/lib/libcompat/4.1/getpw.c
index d6f4f8b5c2139..12a778d028d62 100644
--- a/lib/libcompat/4.1/getpw.c
+++ b/lib/libcompat/4.1/getpw.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.1/getpw.c,v 1.6 2002/05/28 17:00:42 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c
index 524f1a64753d4..25fdd650d2258 100644
--- a/lib/libcompat/4.1/gtty.c
+++ b/lib/libcompat/4.1/gtty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/gtty.c,v 1.5 1999/08/28 00:04:13 peter Exp $";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.1/stty.3 b/lib/libcompat/4.1/stty.3
index 139695717f327..e5c4dd855ecea 100644
--- a/lib/libcompat/4.1/stty.3
+++ b/lib/libcompat/4.1/stty.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.1/stty.3,v 1.10 2007/01/09 01:02:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt STTY 3
diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c
index cf0137f7ac197..75a6ac864fba3 100644
--- a/lib/libcompat/4.1/stty.c
+++ b/lib/libcompat/4.1/stty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/stty.c,v 1.5 1999/08/28 00:04:13 peter Exp $";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.3/cfree.3 b/lib/libcompat/4.3/cfree.3
index 4d380e4a2898a..86c292e0b8c59 100644
--- a/lib/libcompat/4.3/cfree.3
+++ b/lib/libcompat/4.3/cfree.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.3/cfree.3,v 1.7 2000/11/21 12:03:27 ben Exp $
 .\" " <- this is for hilit19 :)
 .Dd November 23, 1995
 .Dt CFREE 3
diff --git a/lib/libcompat/4.3/cfree.c b/lib/libcompat/4.3/cfree.c
index b100c2a837f29..a5d99c8a284c4 100644
--- a/lib/libcompat/4.3/cfree.c
+++ b/lib/libcompat/4.3/cfree.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/4.3/cfree.c,v 1.3 2007/01/09 01:02:02 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)cfree.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3
index e3b595a4457ae..cb42431291edd 100644
--- a/lib/libcompat/4.3/re_comp.3
+++ b/lib/libcompat/4.3/re_comp.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)re_comp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.3/re_comp.3,v 1.11 2007/01/09 01:02:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt RE_COMP 3
diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c
index 9c4faf6580c45..63a5fbb5b853f 100644
--- a/lib/libcompat/4.3/regex.c
+++ b/lib/libcompat/4.3/regex.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/4.3/regex.c,v 1.5 2007/01/09 01:02:02 imp Exp $");
 
 /*
  * Compatibility routines that implement the old re_comp/re_exec interface in
diff --git a/lib/libcompat/4.3/rexec.3 b/lib/libcompat/4.3/rexec.3
index 680910510987b..63dccde1082ee 100644
--- a/lib/libcompat/4.3/rexec.3
+++ b/lib/libcompat/4.3/rexec.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexec.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.3/rexec.3,v 1.13 2007/01/09 01:02:02 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt REXEC 3
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 632ca3e57cf57..93a8a02d0865b 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcompat/4.3/rexec.c,v 1.7 2007/01/09 01:02:02 imp Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 72811d5196d6a..3382b9ba240ba 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/4.4/cuserid.3,v 1.19 2004/07/02 23:52:14 ru Exp $
 .\"
 .Dd April 10, 1995
 .Os
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index 40de6b2f0f09b..69468f7d563f8 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)cuserid.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/4.4/cuserid.c,v 1.3 2007/01/09 01:02:03 imp Exp $");
 
 #include <pwd.h>
 #include <stdio.h>
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index b9b174daa89a8..fa1f7f7005b3f 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libcompat/Makefile,v 1.24 2004/12/21 09:33:46 ru Exp $
 
 LIB=compat
 CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3
index 14b3125a572de..932be9f583efa 100644
--- a/lib/libcompat/regexp/regexp.3
+++ b/lib/libcompat/regexp/regexp.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)regexp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcompat/regexp/regexp.3,v 1.13 2007/01/09 01:02:03 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt REGEXP 3
diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c
index 8276ffcf68662..b02b5dbfa414b 100644
--- a/lib/libcompat/regexp/regexp.c
+++ b/lib/libcompat/regexp/regexp.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/regexp/regexp.c,v 1.7 2002/03/21 23:37:30 obrien Exp $");
 
 #include <limits.h>
 #include <regexp.h>
diff --git a/lib/libcompat/regexp/regsub.c b/lib/libcompat/regexp/regsub.c
index 4ab921cf6f20a..d580e7ece440e 100644
--- a/lib/libcompat/regexp/regsub.c
+++ b/lib/libcompat/regexp/regsub.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcompat/regexp/regsub.c,v 1.2 2002/03/21 23:37:30 obrien Exp $");
 
 #include <regexp.h>
 #include <stdio.h>
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 71f6fce2f93f4..a39a0b8b76aca 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.39 2007/05/21 02:49:03 deischen Exp $
 #
 
 SHLIBDIR?=	/lib
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index 33186cd4de951..14a085d4665c9 100644
--- a/lib/libcrypt/crypt-md5.c
+++ b/lib/libcrypt/crypt-md5.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.13 2003/06/02 21:43:14 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c
index 19b84ceb831d2..705a461c183e7 100644
--- a/lib/libcrypt/crypt-nthash.c
+++ b/lib/libcrypt/crypt-nthash.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/crypt-nthash.c,v 1.1 2003/06/02 19:29:27 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
index 6d24554863e46..760c4b00866e8 100644
--- a/lib/libcrypt/crypt.3
+++ b/lib/libcrypt/crypt.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.32 2007/04/04 14:04:55 ceri Exp $
 .\"
 .Dd January 19, 1997
 .Dt CRYPT 3
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index a6b91f58ced59..be503ac39237f 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/crypt.c,v 1.23 2003/06/02 19:29:27 markm Exp $");
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/lib/libcrypt/crypt.h b/lib/libcrypt/crypt.h
index c6771605dc2f3..62ad53f58fb6b 100644
--- a/lib/libcrypt/crypt.h
+++ b/lib/libcrypt/crypt.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libcrypt/crypt.h,v 1.8 2003/06/02 19:29:27 markm Exp $
  *
  */
 
diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c
index 594c5801c4254..8135b8d73b051 100644
--- a/lib/libcrypt/misc.c
+++ b/lib/libcrypt/misc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libcrypt/misc.c,v 1.3 2002/03/06 17:18:08 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile
index 0615195f9385e..fb5cce0e5ccff 100644
--- a/lib/libdevinfo/Makefile
+++ b/lib/libdevinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdevinfo/Makefile,v 1.4 2002/05/13 12:11:54 ru Exp $
 
 LIB=	devinfo
 SRCS=	devinfo.c
diff --git a/lib/libdevinfo/devinfo.3 b/lib/libdevinfo/devinfo.3
index 0788100b7e881..76c4a7a633297 100644
--- a/lib/libdevinfo/devinfo.3
+++ b/lib/libdevinfo/devinfo.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdevinfo/devinfo.3,v 1.11 2006/09/17 21:27:35 ru Exp $
 .\"
 .Dd April 19, 2001
 .Dt DEVINFO 3
diff --git a/lib/libdevinfo/devinfo.c b/lib/libdevinfo/devinfo.c
index dbd02d0fba415..72c8cfd9e116d 100644
--- a/lib/libdevinfo/devinfo.c
+++ b/lib/libdevinfo/devinfo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdevinfo/devinfo.c,v 1.9 2006/07/17 09:33:24 stefanf Exp $");
 
 /*
  * An interface to the FreeBSD kernel's bus/device information interface.
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index 91930a44008ce..9ed43f9c45528 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.5 2005/08/31 14:57:39 rodrigc Exp $
  */
 
 #ifndef _DEVINFO_H_INCLUDED
diff --git a/lib/libdevinfo/devinfo_var.h b/lib/libdevinfo/devinfo_var.h
index b409671e1d4df..3ff9bcdd7fc85 100644
--- a/lib/libdevinfo/devinfo_var.h
+++ b/lib/libdevinfo/devinfo_var.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libdevinfo/devinfo_var.h,v 1.3 2003/02/17 18:56:00 imp Exp $
  */
 
 #include <sys/rman.h>
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 035862870d8f4..0ab8593cdb3cf 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdevstat/Makefile,v 1.16 2007/05/21 02:49:03 deischen Exp $
 
 LIB=	devstat
 SHLIBDIR?= /lib
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 849a149edf430..c13146f2c4712 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.28 2005/08/10 00:51:36 ken Exp $
 .\"
 .Dd March 18, 2003
 .Dt DEVSTAT 3
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index d0ba704222c5e..c13aebf7d16e7 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29 2005/10/04 22:00:35 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index 61b8ccbe9777d..40cba72da4841 100644
--- a/lib/libdevstat/devstat.h
+++ b/lib/libdevstat/devstat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libdevstat/devstat.h,v 1.11 2005/07/22 17:19:00 kensmith Exp $
  */
 
 #ifndef _DEVSTAT_H
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 763170d4852cd..9ad56632387c4 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libdisk/Makefile,v 1.48 2006/10/09 05:12:54 kmacy Exp $
 
 .if ${MACHINE_ARCH} == "ia64"
 _open_disk=	open_ia64_disk.c
diff --git a/lib/libdisk/blocks.c b/lib/libdisk/blocks.c
index 313c5cca357e0..96d31e2937c0d 100644
--- a/lib/libdisk/blocks.c
+++ b/lib/libdisk/blocks.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/blocks.c,v 1.15 2002/10/31 07:56:40 phk Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c
index 7b63561567338..175cec30c8948 100644
--- a/lib/libdisk/change.c
+++ b/lib/libdisk/change.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.26 2005/03/30 13:03:33 nyan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index fb43ef5192a07..dd1defc2b8b99 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.52 2004/10/31 01:28:59 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/stdint.h>
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 7f1453e6fcd14..d5503ea1188d0 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.86 2005/01/05 14:07:31 delphij Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 68be4eee464a3..71585f96a12de 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.127 2006/04/25 20:42:15 maxim Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 43e7ba1df6843..e7607cab791d9 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.39 2006/01/30 08:26:59 harti Exp $
 .\" "
 .Dd January 30, 2006
 .Dt LIBDISK 3
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index 0a161cc7fd5d3..5fcb3d0d6ff6a 100644
--- a/lib/libdisk/libdisk.h
+++ b/lib/libdisk/libdisk.h
@@ -6,7 +6,7 @@
 * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 * ----------------------------------------------------------------------------
 *
-* $FreeBSD$
+* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.63 2006/01/25 11:24:37 cognet Exp $
 *
 */
 
diff --git a/lib/libdisk/open_disk.c b/lib/libdisk/open_disk.c
index 5ffae46fe0283..fc87b6fb6e4f8 100644
--- a/lib/libdisk/open_disk.c
+++ b/lib/libdisk/open_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.12 2007/09/21 16:19:50 marcel Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/open_ia64_disk.c b/lib/libdisk/open_ia64_disk.c
index bd28c7a0ab39f..b5813fd5f317d 100644
--- a/lib/libdisk/open_ia64_disk.c
+++ b/lib/libdisk/open_ia64_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/open_ia64_disk.c,v 1.4 2007/09/21 16:24:01 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index 1f12f4c8a384f..842cb26b9c0a2 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.34 2004/03/30 01:39:00 kuriyama Exp $");
 
 #include <sys/types.h>
 #include <sys/stdint.h>
diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c
index 7bb7579599711..41b34ddba2509 100644
--- a/lib/libdisk/tst01.c
+++ b/lib/libdisk/tst01.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/tst01.c,v 1.35 2003/11/02 08:01:18 marcel Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_amd64_disk.c b/lib/libdisk/write_amd64_disk.c
index 98992583fdff5..93b8d2bb5d69a 100644
--- a/lib/libdisk/write_amd64_disk.c
+++ b/lib/libdisk/write_amd64_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_amd64_disk.c,v 1.8 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_arm_disk.c b/lib/libdisk/write_arm_disk.c
index 5dbb0ad650f02..716e6c01bc2bd 100644
--- a/lib/libdisk/write_arm_disk.c
+++ b/lib/libdisk/write_arm_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_arm_disk.c,v 1.1 2006/01/25 11:24:37 cognet Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index 024981beff239..e0d5864b31588 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_disk.c,v 1.53 2003/11/02 08:07:25 marcel Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_i386_disk.c b/lib/libdisk/write_i386_disk.c
index 15317d384f53a..4f7469f62fe8f 100644
--- a/lib/libdisk/write_i386_disk.c
+++ b/lib/libdisk/write_i386_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.9 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_ia64_disk.c b/lib/libdisk/write_ia64_disk.c
index 6a57322adb1c7..d091821f6bf73 100644
--- a/lib/libdisk/write_ia64_disk.c
+++ b/lib/libdisk/write_ia64_disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.16 2006/08/09 20:19:15 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/lib/libdisk/write_pc98_disk.c b/lib/libdisk/write_pc98_disk.c
index 8f2a45da91f01..582d0ee09f33a 100644
--- a/lib/libdisk/write_pc98_disk.c
+++ b/lib/libdisk/write_pc98_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_pc98_disk.c,v 1.11 2004/06/04 11:49:11 brian Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_powerpc_disk.c b/lib/libdisk/write_powerpc_disk.c
index ec955e2d35e49..31c89bb736c64 100644
--- a/lib/libdisk/write_powerpc_disk.c
+++ b/lib/libdisk/write_powerpc_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_powerpc_disk.c,v 1.1 2004/04/21 23:21:13 grehan Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdisk/write_sparc64_disk.c b/lib/libdisk/write_sparc64_disk.c
index 9832b0d32a1bd..5e354eba9792d 100644
--- a/lib/libdisk/write_sparc64_disk.c
+++ b/lib/libdisk/write_sparc64_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_sparc64_disk.c,v 1.8 2003/04/22 05:34:35 phk Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index c472494c6d144..158110b3cf7d9 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.34 2005/05/28 12:02:53 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libedit/Makefile,v 1.31 2007/05/21 02:49:03 deischen Exp $
 
 LIB=	edit
 SHLIB_MAJOR=	6
diff --git a/lib/libedit/TEST/test.c b/lib/libedit/TEST/test.c
index facbdaa7e3df1..f42a7c91e56e5 100644
--- a/lib/libedit/TEST/test.c
+++ b/lib/libedit/TEST/test.c
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 __RCSID("$NetBSD: test.c,v 1.18 2005/06/01 11:37:52 lukem Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/TEST/test.c,v 1.5 2005/08/07 20:51:53 stefanf Exp $");
 
 /*
  * test.c: A little test program
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index ffaaaa77d0aef..0991d98f50933 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/chared.c,v 1.10 2005/08/09 13:31:59 stefanf Exp $");
 
 /*
  * chared.c: Character editor utilities
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index 6636fc7b8610a..95c841fe3b946 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -31,7 +31,7 @@
  *
  *	@(#)chared.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: chared.h,v 1.17 2006/03/06 21:11:56 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/chared.h,v 1.9 2007/03/11 18:30:22 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index d4a9fa302bbc1..dfd1597c4aa6c 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)common.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/common.c,v 1.12 2007/03/11 18:30:22 stefanf Exp $");
 
 /*
  * common.c: Common Editor functions
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 7ed5e383783bd..299d3272a29bc 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libedit/editline.3,v 1.31 2007/06/10 19:06:09 stefanf Exp $
 .\"
 .Dd January 12, 2007
 .Os
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 8428fea86d148..401c30c0c5dd6 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libedit/editrc.5,v 1.20 2007/03/11 08:41:01 stefanf Exp $
 .\"
 .Dd October 18, 2003
 .Os
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
index 3b4036f1b5bf2..9268461f5e4e7 100644
--- a/lib/libedit/el.c
+++ b/lib/libedit/el.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.14 2007/06/10 19:06:09 stefanf Exp $");
 
 /*
  * el.c: EditLine interface functions
diff --git a/lib/libedit/el.h b/lib/libedit/el.h
index 8d0d15289c636..07bd0609d905d 100644
--- a/lib/libedit/el.h
+++ b/lib/libedit/el.h
@@ -31,7 +31,7 @@
  *
  *	@(#)el.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: el.h,v 1.17 2006/12/15 22:13:33 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/el.h,v 1.7 2007/06/10 19:06:09 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index a285b1c305eea..37577d9505547 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)emacs.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/emacs.c,v 1.11 2007/03/11 18:30:22 stefanf Exp $");
 
 /*
  * emacs.c: Emacs functions
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index 601e10272dce0..33c8563067f9c 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/hist.c,v 1.6 2005/08/07 20:51:52 stefanf Exp $");
 
 /*
  * hist.c: History access functions
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h
index 4f2824aff2003..8b1c07240121a 100644
--- a/lib/libedit/hist.h
+++ b/lib/libedit/hist.h
@@ -31,7 +31,7 @@
  *
  *	@(#)hist.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: hist.h,v 1.10 2003/08/07 16:44:31 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/hist.h,v 1.4 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index 76b3b076d8118..a5b5122e51327 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/history.c,v 1.9 2007/03/11 21:47:39 stefanf Exp $");
 
 /*
  * hist.c: History access functions
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 0b9d05d337b32..f7d1a999a324e 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/key.c,v 1.12 2007/03/11 18:30:22 stefanf Exp $");
 
 /*
  * key.c: This module contains the procedures for maintaining
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
index 3a212923b9687..9a2d9aa236f49 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/key.h
@@ -31,7 +31,7 @@
  *
  *	@(#)key.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: key.h,v 1.10 2006/03/23 20:22:51 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/key.h,v 1.6 2007/03/11 18:30:22 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/makelist b/lib/libedit/makelist
index e44a0e701cbaf..f81ac80a7bcc5 100644
--- a/lib/libedit/makelist
+++ b/lib/libedit/makelist
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #	$NetBSD: makelist,v 1.10 2005/08/08 14:04:49 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libedit/makelist,v 1.10 2005/10/04 21:59:29 stefanf Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index 591118f2cf028..83593d4419d5b 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/map.c,v 1.14 2007/03/11 21:47:39 stefanf Exp $");
 
 /*
  * map.c: Editor function definitions
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
index a76d8727b92a4..f82a963826d8b 100644
--- a/lib/libedit/map.h
+++ b/lib/libedit/map.h
@@ -31,7 +31,7 @@
  *
  *	@(#)map.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: map.h,v 1.8 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/map.h,v 1.4 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index 0ffe51d8ec459..74f3786e3d59d 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/parse.c,v 1.10 2005/08/07 20:51:52 stefanf Exp $");
 
 /*
  * parse.c: parse an editline extended command
diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h
index cca4abf1999c7..73340d1afd777 100644
--- a/lib/libedit/parse.h
+++ b/lib/libedit/parse.h
@@ -31,7 +31,7 @@
  *
  *	@(#)parse.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: parse.h,v 1.6 2005/05/29 04:58:15 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/parse.h,v 1.4 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 3d72da73e9477..4e266c917c923 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/prompt.c,v 1.6 2005/08/07 20:51:52 stefanf Exp $");
 
 /*
  * prompt.c: Prompt printing functions
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
index 6523add855cd6..a48135fa6211a 100644
--- a/lib/libedit/prompt.h
+++ b/lib/libedit/prompt.h
@@ -31,7 +31,7 @@
  *
  *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: prompt.h,v 1.6 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/prompt.h,v 1.3 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index f774217279f56..217d427d65158 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/read.c,v 1.13 2007/03/11 21:47:40 stefanf Exp $");
 
 /*
  * read.c: Clean this junk up! This is horrible code.
diff --git a/lib/libedit/read.h b/lib/libedit/read.h
index 18de818ffbe52..9765d76e3304a 100644
--- a/lib/libedit/read.h
+++ b/lib/libedit/read.h
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: read.h,v 1.5 2006/08/21 12:45:30 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/read.h,v 1.2 2007/03/11 08:41:01 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 22e1de419adea..ee210e8456a97 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/refresh.c,v 1.11 2005/12/04 09:34:56 stefanf Exp $");
 
 /*
  * refresh.c: Lower level screen refreshing functions
diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h
index e44ef9c5f2745..7e05878f11ae7 100644
--- a/lib/libedit/refresh.h
+++ b/lib/libedit/refresh.h
@@ -31,7 +31,7 @@
  *
  *	@(#)refresh.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: refresh.h,v 1.5 2003/08/07 16:44:33 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/refresh.h,v 1.3 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 991bad2461412..0f31416b2ccf4 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/search.c,v 1.10 2005/08/07 20:51:52 stefanf Exp $");
 
 /*
  * search.c: History and character search functions
diff --git a/lib/libedit/search.h b/lib/libedit/search.h
index 725af7cadacd7..ea97f8ba32384 100644
--- a/lib/libedit/search.h
+++ b/lib/libedit/search.h
@@ -31,7 +31,7 @@
  *
  *	@(#)search.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: search.h,v 1.8 2003/10/18 23:27:36 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/search.h,v 1.4 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
index a895aeabb1583..d3f6ed960f84b 100644
--- a/lib/libedit/sig.c
+++ b/lib/libedit/sig.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/sig.c,v 1.7 2005/08/07 20:51:52 stefanf Exp $");
 
 /*
  * sig.c: Signal handling stuff.
diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h
index b1ce14b090966..43894ed52c6e6 100644
--- a/lib/libedit/sig.h
+++ b/lib/libedit/sig.h
@@ -31,7 +31,7 @@
  *
  *	@(#)sig.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: sig.h,v 1.5 2003/08/07 16:44:33 agc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/sig.h,v 1.3 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
index 9b1f040310729..7ea8a3d488816 100644
--- a/lib/libedit/sys.h
+++ b/lib/libedit/sys.h
@@ -31,7 +31,7 @@
  *
  *	@(#)sys.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: sys.h,v 1.9 2004/01/17 17:57:40 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/sys.h,v 1.6 2005/08/10 13:41:31 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index cffad075608ce..993ebb2927afc 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.2 (Berkeley) 4/30/95";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.21 2007/06/10 19:06:09 stefanf Exp $");
 
 /*
  * term.c: Editor/termcap-curses interface
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index 8ded5d77e95b7..e6bcf4574f92d 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -31,7 +31,7 @@
  *
  *	@(#)term.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: term.h,v 1.18 2006/11/24 00:01:17 christos Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/term.h,v 1.8 2007/06/10 19:06:09 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 8e3100de586ba..e442a500a2925 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/tokenizer.c,v 1.8 2005/08/07 20:51:52 stefanf Exp $");
 
 /*
  * tokenize.c: Bourne shell like tokenizer
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index fca3c2bbe1d0c..37dd43cedc448 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/tty.c,v 1.9 2007/03/11 21:47:40 stefanf Exp $");
 
 /*
  * tty.c: tty interface stuff
diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h
index 3a4e94accf339..1f39ba43e8cce 100644
--- a/lib/libedit/tty.h
+++ b/lib/libedit/tty.h
@@ -31,7 +31,7 @@
  *
  *	@(#)tty.h	8.1 (Berkeley) 6/4/93
  *	$NetBSD: tty.h,v 1.11 2005/06/01 11:37:52 lukem Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libedit/tty.h,v 1.5 2005/08/07 20:51:52 stefanf Exp $
  */
 
 /*
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index ae57e07a01da0..39a93a443820d 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libedit/vi.c,v 1.14 2007/03/11 18:30:22 stefanf Exp $");
 
 /*
  * vi.c: Vi mode commands.
diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index 0af640c95b8a3..dcec18b8bc1c4 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libelf/Makefile,v 1.5 2006/12/25 02:22:22 jkoshy Exp $
 
 LIB=	elf
 
diff --git a/lib/libelf/Version.map b/lib/libelf/Version.map
index 147d6c152a820..b5a848b67be70 100644
--- a/lib/libelf/Version.map
+++ b/lib/libelf/Version.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/Version.map,v 1.3 2007/04/29 14:05:22 deischen Exp $
  */
 FBSD_1.0 {
 global:
diff --git a/lib/libelf/_libelf.h b/lib/libelf/_libelf.h
index 08185cc76c7f4..ab1c6be70e102 100644
--- a/lib/libelf/_libelf.h
+++ b/lib/libelf/_libelf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/_libelf.h,v 1.2 2006/12/25 02:22:22 jkoshy Exp $
  */
 
 #ifndef	__LIBELF_H_
diff --git a/lib/libelf/elf.3 b/lib/libelf/elf.3
index c15063ba5b495..20a2ae45fdd35 100644
--- a/lib/libelf/elf.3
+++ b/lib/libelf/elf.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf.3,v 1.3 2006/12/11 09:03:27 jkoshy Exp $
 .\"
 .Dd December 11, 2006
 .Os
diff --git a/lib/libelf/elf_begin.3 b/lib/libelf/elf_begin.3
index c43766f7bcb29..f580f8dd64ff1 100644
--- a/lib/libelf/elf_begin.3
+++ b/lib/libelf/elf_begin.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_begin.3,v 1.3 2007/07/28 15:35:03 jkoshy Exp $
 .\"
 .Dd June 21, 2006
 .Os
diff --git a/lib/libelf/elf_begin.c b/lib/libelf/elf_begin.c
index d59042c2baf73..87c0a4b08d502 100644
--- a/lib/libelf/elf_begin.c
+++ b/lib/libelf/elf_begin.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_begin.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/lib/libelf/elf_cntl.3 b/lib/libelf/elf_cntl.3
index 73dca21394463..9a271fdc43643 100644
--- a/lib/libelf/elf_cntl.3
+++ b/lib/libelf/elf_cntl.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_cntl.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 9, 2006
 .Os
diff --git a/lib/libelf/elf_cntl.c b/lib/libelf/elf_cntl.c
index 9fbd5c7c9696a..4d9372cbb71db 100644
--- a/lib/libelf/elf_cntl.c
+++ b/lib/libelf/elf_cntl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_cntl.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_data.c b/lib/libelf/elf_data.c
index 4613358ba9697..a00d34d212a46 100644
--- a/lib/libelf/elf_data.c
+++ b/lib/libelf/elf_data.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_data.c,v 1.2 2007/03/19 03:52:20 jkoshy Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/lib/libelf/elf_end.3 b/lib/libelf/elf_end.3
index 0f74a89847292..b8c0ac43a730a 100644
--- a/lib/libelf/elf_end.3
+++ b/lib/libelf/elf_end.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_end.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 29, 2006
 .Os
diff --git a/lib/libelf/elf_end.c b/lib/libelf/elf_end.c
index affb135ae5218..e36fca2ac102c 100644
--- a/lib/libelf/elf_end.c
+++ b/lib/libelf/elf_end.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_end.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/mman.h>
 
diff --git a/lib/libelf/elf_errmsg.3 b/lib/libelf/elf_errmsg.3
index 1ed70bf9ee68a..845b38fb3a90c 100644
--- a/lib/libelf/elf_errmsg.3
+++ b/lib/libelf/elf_errmsg.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_errmsg.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 11, 2006
 .Os
diff --git a/lib/libelf/elf_errmsg.c b/lib/libelf/elf_errmsg.c
index 05947a7cf28a1..52693fb13f433 100644
--- a/lib/libelf/elf_errmsg.c
+++ b/lib/libelf/elf_errmsg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_errmsg.c,v 1.2 2006/12/09 16:27:15 jkoshy Exp $");
 
 #include <libelf.h>
 #include <string.h>
diff --git a/lib/libelf/elf_errno.c b/lib/libelf/elf_errno.c
index 44feae3053822..225e43faad837 100644
--- a/lib/libelf/elf_errno.c
+++ b/lib/libelf/elf_errno.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_errno.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_fill.3 b/lib/libelf/elf_fill.3
index 33446b99c485d..8e02b1453e854 100644
--- a/lib/libelf/elf_fill.3
+++ b/lib/libelf/elf_fill.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_fill.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 11, 2006
 .Os
diff --git a/lib/libelf/elf_fill.c b/lib/libelf/elf_fill.c
index 3dae25dc51b20..15957d0180172 100644
--- a/lib/libelf/elf_fill.c
+++ b/lib/libelf/elf_fill.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_fill.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_flag.c b/lib/libelf/elf_flag.c
index a8e948e31e729..92d6a161e4c55 100644
--- a/lib/libelf/elf_flag.c
+++ b/lib/libelf/elf_flag.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_flag.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_flagdata.3 b/lib/libelf/elf_flagdata.3
index 92bf3aa9bc48d..cb769df2b7605 100644
--- a/lib/libelf/elf_flagdata.3
+++ b/lib/libelf/elf_flagdata.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 10, 2006
 .Os
diff --git a/lib/libelf/elf_getarhdr.3 b/lib/libelf/elf_getarhdr.3
index f78fc80bc33c2..54ad405ebc20a 100644
--- a/lib/libelf/elf_getarhdr.3
+++ b/lib/libelf/elf_getarhdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getarhdr.3,v 1.3 2007/03/27 04:47:50 jkoshy Exp $
 .\"
 .Dd August 15, 2006
 .Os
diff --git a/lib/libelf/elf_getarhdr.c b/lib/libelf/elf_getarhdr.c
index 31b1f342399c5..30b6e513665e5 100644
--- a/lib/libelf/elf_getarhdr.c
+++ b/lib/libelf/elf_getarhdr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_getarhdr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_getarsym.3 b/lib/libelf/elf_getarsym.3
index 1030ea2b6f50a..b512af6491a52 100644
--- a/lib/libelf/elf_getarsym.3
+++ b/lib/libelf/elf_getarsym.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getarsym.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 15, 2006
 .Os
diff --git a/lib/libelf/elf_getarsym.c b/lib/libelf/elf_getarsym.c
index df85c057de204..3cdaa9c992381 100644
--- a/lib/libelf/elf_getarsym.c
+++ b/lib/libelf/elf_getarsym.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_getarsym.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_getbase.3 b/lib/libelf/elf_getbase.3
index 30be6c5c2591d..404c5a00b158d 100644
--- a/lib/libelf/elf_getbase.3
+++ b/lib/libelf/elf_getbase.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getbase.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 11, 2006
 .Os
diff --git a/lib/libelf/elf_getbase.c b/lib/libelf/elf_getbase.c
index d32fa6c52d053..6ac2a51b323c6 100644
--- a/lib/libelf/elf_getbase.c
+++ b/lib/libelf/elf_getbase.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_getbase.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_getdata.3 b/lib/libelf/elf_getdata.3
index 64da4ad9f8cec..f9261d7613346 100644
--- a/lib/libelf/elf_getdata.3
+++ b/lib/libelf/elf_getdata.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 26, 2006
 .Os
diff --git a/lib/libelf/elf_getident.3 b/lib/libelf/elf_getident.3
index f34ab70e3732f..e7bd73641dd60 100644
--- a/lib/libelf/elf_getident.3
+++ b/lib/libelf/elf_getident.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getident.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd July 3, 2006
 .Os
diff --git a/lib/libelf/elf_getident.c b/lib/libelf/elf_getident.c
index 1b5ae1329fd73..d8a7436048f6d 100644
--- a/lib/libelf/elf_getident.c
+++ b/lib/libelf/elf_getident.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_getident.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <ar.h>
 #include <assert.h>
diff --git a/lib/libelf/elf_getphnum.3 b/lib/libelf/elf_getphnum.3
index 606ceb0e755e4..d3ed488e36449 100644
--- a/lib/libelf/elf_getphnum.3
+++ b/lib/libelf/elf_getphnum.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getphnum.3,v 1.1 2006/12/25 02:22:22 jkoshy Exp $
 .\"
 .Dd December 16, 2006
 .Os
diff --git a/lib/libelf/elf_getscn.3 b/lib/libelf/elf_getscn.3
index e0df8db6a777e..f11e3edf74392 100644
--- a/lib/libelf/elf_getscn.3
+++ b/lib/libelf/elf_getscn.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getscn.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 26, 2006
 .Os
diff --git a/lib/libelf/elf_getshnum.3 b/lib/libelf/elf_getshnum.3
index 10a370ce6db85..341b14090cbe8 100644
--- a/lib/libelf/elf_getshnum.3
+++ b/lib/libelf/elf_getshnum.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getshnum.3,v 1.3 2006/12/16 10:45:43 jkoshy Exp $
 .\"
 .Dd October 31, 2006
 .Os
diff --git a/lib/libelf/elf_getshstrndx.3 b/lib/libelf/elf_getshstrndx.3
index 115b2dac1c6df..1de1515562236 100644
--- a/lib/libelf/elf_getshstrndx.3
+++ b/lib/libelf/elf_getshstrndx.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_getshstrndx.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd October 31, 2006
 .Os
diff --git a/lib/libelf/elf_hash.3 b/lib/libelf/elf_hash.3
index 02095988959a1..657f25ebdb538 100644
--- a/lib/libelf/elf_hash.3
+++ b/lib/libelf/elf_hash.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_hash.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 15, 2006
 .Os
diff --git a/lib/libelf/elf_hash.c b/lib/libelf/elf_hash.c
index 60914504d0c07..9918fdcf9653e 100644
--- a/lib/libelf/elf_hash.c
+++ b/lib/libelf/elf_hash.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_hash.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_kind.3 b/lib/libelf/elf_kind.3
index def1582b22998..255ed800180a5 100644
--- a/lib/libelf/elf_kind.3
+++ b/lib/libelf/elf_kind.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_kind.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 1, 2006
 .Os
diff --git a/lib/libelf/elf_kind.c b/lib/libelf/elf_kind.c
index 88888da89b3ac..f2be2c8962bcd 100644
--- a/lib/libelf/elf_kind.c
+++ b/lib/libelf/elf_kind.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_kind.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_memory.3 b/lib/libelf/elf_memory.3
index 9af6c5e30fa81..17cd4bf798985 100644
--- a/lib/libelf/elf_memory.3
+++ b/lib/libelf/elf_memory.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_memory.3,v 1.3 2007/07/28 15:35:03 jkoshy Exp $
 .\"
 .Dd June 28, 2006
 .Os
diff --git a/lib/libelf/elf_memory.c b/lib/libelf/elf_memory.c
index f42378ebfdfdc..ae2d5500d56ca 100644
--- a/lib/libelf/elf_memory.c
+++ b/lib/libelf/elf_memory.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_memory.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <ar.h>
 #include <libelf.h>
diff --git a/lib/libelf/elf_next.3 b/lib/libelf/elf_next.3
index da995fc253bee..28c88ca11ceaa 100644
--- a/lib/libelf/elf_next.3
+++ b/lib/libelf/elf_next.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_next.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 17, 2006
 .Os
diff --git a/lib/libelf/elf_next.c b/lib/libelf/elf_next.c
index 1e1627c83ed61..1670b5c521788 100644
--- a/lib/libelf/elf_next.c
+++ b/lib/libelf/elf_next.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_next.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <ar.h>
 #include <assert.h>
diff --git a/lib/libelf/elf_phnum.c b/lib/libelf/elf_phnum.c
index ff10c7e9c96e9..73b86fddfee2d 100644
--- a/lib/libelf/elf_phnum.c
+++ b/lib/libelf/elf_phnum.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_phnum.c,v 1.1 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <ar.h>
 #include <libelf.h>
diff --git a/lib/libelf/elf_rand.3 b/lib/libelf/elf_rand.3
index 46cec6d2895e2..255b108453243 100644
--- a/lib/libelf/elf_rand.3
+++ b/lib/libelf/elf_rand.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_rand.3,v 1.3 2007/03/26 16:31:42 jkoshy Exp $
 .\"
 .Dd June 17, 2006
 .Os
diff --git a/lib/libelf/elf_rand.c b/lib/libelf/elf_rand.c
index 0b79c5cc33f99..3df5adeecd2dc 100644
--- a/lib/libelf/elf_rand.c
+++ b/lib/libelf/elf_rand.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_rand.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <ar.h>
 #include <libelf.h>
diff --git a/lib/libelf/elf_rawfile.3 b/lib/libelf/elf_rawfile.3
index 76026e7971bcc..5f5387722c939 100644
--- a/lib/libelf/elf_rawfile.3
+++ b/lib/libelf/elf_rawfile.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_rawfile.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd July 3, 2006
 .Os
diff --git a/lib/libelf/elf_rawfile.c b/lib/libelf/elf_rawfile.c
index 5143ad78d993c..4141536f78253 100644
--- a/lib/libelf/elf_rawfile.c
+++ b/lib/libelf/elf_rawfile.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_rawfile.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/elf_scn.c b/lib/libelf/elf_scn.c
index 139f6d9f37e13..ee2d7eb24567d 100644
--- a/lib/libelf/elf_scn.c
+++ b/lib/libelf/elf_scn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_scn.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/lib/libelf/elf_shnum.c b/lib/libelf/elf_shnum.c
index d22a1fc4b6f4d..73a691aeea278 100644
--- a/lib/libelf/elf_shnum.c
+++ b/lib/libelf/elf_shnum.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_shnum.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <ar.h>
 #include <libelf.h>
diff --git a/lib/libelf/elf_shstrndx.c b/lib/libelf/elf_shstrndx.c
index f4f502db66943..2201d6812b04e 100644
--- a/lib/libelf/elf_shstrndx.c
+++ b/lib/libelf/elf_shstrndx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_shstrndx.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <ar.h>
 #include <libelf.h>
diff --git a/lib/libelf/elf_strptr.3 b/lib/libelf/elf_strptr.3
index bf24cc1f6553d..9352fc7d43367 100644
--- a/lib/libelf/elf_strptr.3
+++ b/lib/libelf/elf_strptr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_strptr.3,v 1.3 2006/12/25 02:24:38 jkoshy Exp $
 .\"
 .Dd December 16, 2006
 .Os
diff --git a/lib/libelf/elf_strptr.c b/lib/libelf/elf_strptr.c
index 04cc6240e21e7..30384aeaf469b 100644
--- a/lib/libelf/elf_strptr.c
+++ b/lib/libelf/elf_strptr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libelf/elf_types.m4 b/lib/libelf/elf_types.m4
index 9abbe71bfcd2d..0e2c1b64cf305 100644
--- a/lib/libelf/elf_types.m4
+++ b/lib/libelf/elf_types.m4
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/elf_types.m4,v 1.2 2006/12/18 05:40:01 jkoshy Exp $
  */
 
 /*
diff --git a/lib/libelf/elf_update.3 b/lib/libelf/elf_update.3
index ad5240c7465d7..e47652d5f3eae 100644
--- a/lib/libelf/elf_update.3
+++ b/lib/libelf/elf_update.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_update.3,v 1.4 2007/09/08 08:20:12 jkoshy Exp $
 .\"
 .Dd September 08, 2007
 .Os
diff --git a/lib/libelf/elf_update.c b/lib/libelf/elf_update.c
index 57b432e54c804..1bbd3d72e3632 100644
--- a/lib/libelf/elf_update.c
+++ b/lib/libelf/elf_update.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.3 2007/09/08 08:20:12 jkoshy Exp $");
 
 #include <sys/mman.h>
 #include <sys/param.h>
diff --git a/lib/libelf/elf_version.3 b/lib/libelf/elf_version.3
index 25ea62b231cfd..71c7b385c9929 100644
--- a/lib/libelf/elf_version.3
+++ b/lib/libelf/elf_version.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/elf_version.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd June 1, 2006
 .Os
diff --git a/lib/libelf/elf_version.c b/lib/libelf/elf_version.c
index 7f66d4241e00b..2166fc3601198 100644
--- a/lib/libelf/elf_version.c
+++ b/lib/libelf/elf_version.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_version.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <libelf.h>
 
diff --git a/lib/libelf/gelf.3 b/lib/libelf/gelf.3
index 4ab5ff2867c2f..ba8254bc07242 100644
--- a/lib/libelf/gelf.3
+++ b/lib/libelf/gelf.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf.3,v 1.1 2006/11/11 17:16:33 jkoshy Exp $
 .\"
 .Dd September 1, 2006
 .Os
diff --git a/lib/libelf/gelf.h b/lib/libelf/gelf.h
index ad852d5c07672..3dd844cdb29e3 100644
--- a/lib/libelf/gelf.h
+++ b/lib/libelf/gelf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/gelf.h,v 1.3 2007/03/08 04:01:30 jkoshy Exp $
  */
 
 #ifndef	_GELF_H_
diff --git a/lib/libelf/gelf_cap.c b/lib/libelf/gelf_cap.c
index 76338a8a11d69..2c6fd0fa27dfb 100644
--- a/lib/libelf/gelf_cap.c
+++ b/lib/libelf/gelf_cap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_cap.c,v 1.2 2006/12/18 05:40:01 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_checksum.3 b/lib/libelf/gelf_checksum.3
index a6f19784b3c73..307a6148fb1d5 100644
--- a/lib/libelf/gelf_checksum.3
+++ b/lib/libelf/gelf_checksum.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_checksum.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_checksum.c b/lib/libelf/gelf_checksum.c
index 64eb6c32d1f8b..8e4c868b3ad63 100644
--- a/lib/libelf/gelf_checksum.c
+++ b/lib/libelf/gelf_checksum.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_checksum.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <gelf.h>
 #include <libelf.h>
diff --git a/lib/libelf/gelf_dyn.c b/lib/libelf/gelf_dyn.c
index 329fe938a84d8..6170c78529af5 100644
--- a/lib/libelf/gelf_dyn.c
+++ b/lib/libelf/gelf_dyn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_dyn.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_ehdr.c b/lib/libelf/gelf_ehdr.c
index 4d7698af93519..f684e3c380162 100644
--- a/lib/libelf/gelf_ehdr.c
+++ b/lib/libelf/gelf_ehdr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_ehdr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_fsize.3 b/lib/libelf/gelf_fsize.3
index 45fe7e60b8e37..392f2fa276e9e 100644
--- a/lib/libelf/gelf_fsize.3
+++ b/lib/libelf/gelf_fsize.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_fsize.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd July 3, 2006
 .Os
diff --git a/lib/libelf/gelf_fsize.c b/lib/libelf/gelf_fsize.c
index 0137c11c3b797..e593ae4f2990f 100644
--- a/lib/libelf/gelf_fsize.c
+++ b/lib/libelf/gelf_fsize.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_fsize.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <gelf.h>
 #include <libelf.h>
diff --git a/lib/libelf/gelf_getcap.3 b/lib/libelf/gelf_getcap.3
index f6262d81a94ee..61ba69fc6dc60 100644
--- a/lib/libelf/gelf_getcap.3
+++ b/lib/libelf/gelf_getcap.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getcap.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getclass.3 b/lib/libelf/gelf_getclass.3
index cab3e24b8322b..1da52e6b36f40 100644
--- a/lib/libelf/gelf_getclass.3
+++ b/lib/libelf/gelf_getclass.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getclass.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd July 3, 2006
 .Os
diff --git a/lib/libelf/gelf_getclass.c b/lib/libelf/gelf_getclass.c
index badd8ffd7af11..290af7a6890db 100644
--- a/lib/libelf/gelf_getclass.c
+++ b/lib/libelf/gelf_getclass.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_getclass.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <gelf.h>
 
diff --git a/lib/libelf/gelf_getdyn.3 b/lib/libelf/gelf_getdyn.3
index 11244440ff8ce..6558988fafd2d 100644
--- a/lib/libelf/gelf_getdyn.3
+++ b/lib/libelf/gelf_getdyn.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getdyn.3,v 1.2 2006/11/13 09:46:15 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getehdr.3 b/lib/libelf/gelf_getehdr.3
index d4c8cb34e53ae..ad34d40181196 100644
--- a/lib/libelf/gelf_getehdr.3
+++ b/lib/libelf/gelf_getehdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getehdr.3,v 1.4 2007/03/03 06:13:38 jkoshy Exp $
 .\"
 .Dd December 16, 2006
 .Os
diff --git a/lib/libelf/gelf_getmove.3 b/lib/libelf/gelf_getmove.3
index 11fd9cad95516..02d7d6fe74bac 100644
--- a/lib/libelf/gelf_getmove.3
+++ b/lib/libelf/gelf_getmove.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getmove.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getphdr.3 b/lib/libelf/gelf_getphdr.3
index 51d20a009c99e..e6420c6aa70f7 100644
--- a/lib/libelf/gelf_getphdr.3
+++ b/lib/libelf/gelf_getphdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getphdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
 .\"
 .Dd December 16, 2006
 .Os
diff --git a/lib/libelf/gelf_getrel.3 b/lib/libelf/gelf_getrel.3
index 75fa79e98222d..e4207ea8614c8 100644
--- a/lib/libelf/gelf_getrel.3
+++ b/lib/libelf/gelf_getrel.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getrel.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getrela.3 b/lib/libelf/gelf_getrela.3
index d8968f56129a2..bc154a7e8b0c6 100644
--- a/lib/libelf/gelf_getrela.3
+++ b/lib/libelf/gelf_getrela.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getrela.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getshdr.3 b/lib/libelf/gelf_getshdr.3
index c1823b54d523e..b19b068e5cbf3 100644
--- a/lib/libelf/gelf_getshdr.3
+++ b/lib/libelf/gelf_getshdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getshdr.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 27, 2006
 .Os
diff --git a/lib/libelf/gelf_getsym.3 b/lib/libelf/gelf_getsym.3
index 4e35133648d9e..1ccd721c1fbf1 100644
--- a/lib/libelf/gelf_getsym.3
+++ b/lib/libelf/gelf_getsym.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getsym.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getsyminfo.3 b/lib/libelf/gelf_getsyminfo.3
index 904e6490a2e85..7760b368e88f7 100644
--- a/lib/libelf/gelf_getsyminfo.3
+++ b/lib/libelf/gelf_getsyminfo.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getsyminfo.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 29, 2006
 .Os
diff --git a/lib/libelf/gelf_getsymshndx.3 b/lib/libelf/gelf_getsymshndx.3
index c254a4382594f..6d3844843c647 100644
--- a/lib/libelf/gelf_getsymshndx.3
+++ b/lib/libelf/gelf_getsymshndx.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_getsymshndx.3,v 1.3 2006/12/13 15:14:46 jkoshy Exp $
 .\"
 .Dd November 5, 2006
 .Os
diff --git a/lib/libelf/gelf_move.c b/lib/libelf/gelf_move.c
index d303b1890152f..c07d8d831e432 100644
--- a/lib/libelf/gelf_move.c
+++ b/lib/libelf/gelf_move.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_move.c,v 1.2 2006/12/18 05:40:01 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_newehdr.3 b/lib/libelf/gelf_newehdr.3
index 82ae809a1a708..0210ed8887e60 100644
--- a/lib/libelf/gelf_newehdr.3
+++ b/lib/libelf/gelf_newehdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_newehdr.3,v 1.3 2006/12/25 02:24:39 jkoshy Exp $
 .\"
 .Dd December 16, 2006
 .Os
diff --git a/lib/libelf/gelf_newphdr.3 b/lib/libelf/gelf_newphdr.3
index c94b474779795..7ebf6056d251e 100644
--- a/lib/libelf/gelf_newphdr.3
+++ b/lib/libelf/gelf_newphdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_newphdr.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 25, 2006
 .Os
diff --git a/lib/libelf/gelf_phdr.c b/lib/libelf/gelf_phdr.c
index 6d82d7fdb4a66..62b70ba841f44 100644
--- a/lib/libelf/gelf_phdr.c
+++ b/lib/libelf/gelf_phdr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_phdr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_rel.c b/lib/libelf/gelf_rel.c
index e9cf9481275da..3b4c1a5e2048a 100644
--- a/lib/libelf/gelf_rel.c
+++ b/lib/libelf/gelf_rel.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_rel.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_rela.c b/lib/libelf/gelf_rela.c
index 1549a53332f95..11cb12f2efe3b 100644
--- a/lib/libelf/gelf_rela.c
+++ b/lib/libelf/gelf_rela.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_rela.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_shdr.c b/lib/libelf/gelf_shdr.c
index efe98b8b67572..b601ca674c00c 100644
--- a/lib/libelf/gelf_shdr.c
+++ b/lib/libelf/gelf_shdr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_shdr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_sym.c b/lib/libelf/gelf_sym.c
index ef969ef229bab..3f075177208ee 100644
--- a/lib/libelf/gelf_sym.c
+++ b/lib/libelf/gelf_sym.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_sym.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_syminfo.c b/lib/libelf/gelf_syminfo.c
index 90c1ed976ab1c..66807ceae1879 100644
--- a/lib/libelf/gelf_syminfo.c
+++ b/lib/libelf/gelf_syminfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_syminfo.c,v 1.2 2006/12/18 05:40:01 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_symshndx.c b/lib/libelf/gelf_symshndx.c
index b8f2103ea8c2a..3afba974c40f0 100644
--- a/lib/libelf/gelf_symshndx.c
+++ b/lib/libelf/gelf_symshndx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_symshndx.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/limits.h>
 
diff --git a/lib/libelf/gelf_update_ehdr.3 b/lib/libelf/gelf_update_ehdr.3
index 82098314e0333..16afd8b187f77 100644
--- a/lib/libelf/gelf_update_ehdr.3
+++ b/lib/libelf/gelf_update_ehdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_update_ehdr.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd August 27, 2006
 .Os
diff --git a/lib/libelf/gelf_xlate.c b/lib/libelf/gelf_xlate.c
index d161984c574e2..68e99a3934942 100644
--- a/lib/libelf/gelf_xlate.c
+++ b/lib/libelf/gelf_xlate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/gelf_xlate.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <gelf.h>
 #include <libelf.h>
diff --git a/lib/libelf/gelf_xlatetof.3 b/lib/libelf/gelf_xlatetof.3
index 436fef3dcf816..372c6ea7fac72 100644
--- a/lib/libelf/gelf_xlatetof.3
+++ b/lib/libelf/gelf_xlatetof.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libelf/gelf_xlatetof.3,v 1.2 2006/11/13 09:46:16 ru Exp $
 .\"
 .Dd July 24, 2006
 .Os
diff --git a/lib/libelf/libelf.c b/lib/libelf/libelf.c
index 837556e03ca2d..dc70731acd161 100644
--- a/lib/libelf/libelf.c
+++ b/lib/libelf/libelf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libelf/libelf.h b/lib/libelf/libelf.h
index ceb0350362e94..35d8546b1f30f 100644
--- a/lib/libelf/libelf.h
+++ b/lib/libelf/libelf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/libelf.h,v 1.1 2006/11/11 17:16:33 jkoshy Exp $
  */
 
 #ifndef	_LIBELF_H_
diff --git a/lib/libelf/libelf_align.c b/lib/libelf/libelf_align.c
index 525c258aa1310..54f6ca6919c77 100644
--- a/lib/libelf/libelf_align.c
+++ b/lib/libelf/libelf_align.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libelf/libelf_allocate.c b/lib/libelf/libelf_allocate.c
index 1fa1eee18a970..e7a069e12e970 100644
--- a/lib/libelf/libelf_allocate.c
+++ b/lib/libelf/libelf_allocate.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.2 2007/02/21 08:14:22 dumbbell Exp $");
 
 #include <sys/errno.h>
 
diff --git a/lib/libelf/libelf_ar.c b/lib/libelf/libelf_ar.c
index 31eea3d1cf00c..a764e7d731d97 100644
--- a/lib/libelf/libelf_ar.c
+++ b/lib/libelf/libelf_ar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_ar.c,v 1.3 2007/03/27 04:40:57 jkoshy Exp $");
 
 #include <ar.h>
 #include <assert.h>
diff --git a/lib/libelf/libelf_checksum.c b/lib/libelf/libelf_checksum.c
index c7eb8a0e4e895..57bbe04e21ba1 100644
--- a/lib/libelf/libelf_checksum.c
+++ b/lib/libelf/libelf_checksum.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_checksum.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <gelf.h>
 
diff --git a/lib/libelf/libelf_convert.m4 b/lib/libelf/libelf_convert.m4
index 5d0c21fce0172..fe7f60287f6cd 100644
--- a/lib/libelf/libelf_convert.m4
+++ b/lib/libelf/libelf_convert.m4
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.3 2007/09/09 02:10:53 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/elf32.h>
diff --git a/lib/libelf/libelf_data.c b/lib/libelf/libelf_data.c
index 873fac8119764..dbc058f470d18 100644
--- a/lib/libelf/libelf_data.c
+++ b/lib/libelf/libelf_data.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $");
 
 #include <libelf.h>
 #include <osreldate.h>
diff --git a/lib/libelf/libelf_ehdr.c b/lib/libelf/libelf_ehdr.c
index e0c488650d1a9..bb1f5c6951480 100644
--- a/lib/libelf/libelf_ehdr.c
+++ b/lib/libelf/libelf_ehdr.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/libelf_ehdr.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_ehdr.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <assert.h>
 #include <gelf.h>
diff --git a/lib/libelf/libelf_extended.c b/lib/libelf/libelf_extended.c
index 6e45d818fb237..2f7df10d3a515 100644
--- a/lib/libelf/libelf_extended.c
+++ b/lib/libelf/libelf_extended.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_extended.c,v 1.1 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <assert.h>
 #include <libelf.h>
diff --git a/lib/libelf/libelf_fsize.m4 b/lib/libelf/libelf_fsize.m4
index d9b11ec50cb8b..5cf36aaad42e9 100644
--- a/lib/libelf/libelf_fsize.m4
+++ b/lib/libelf/libelf_fsize.m4
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/libelf_fsize.m4,v 1.2 2006/12/18 05:40:01 jkoshy Exp $
  */
 
 #include <libelf.h>
diff --git a/lib/libelf/libelf_msize.m4 b/lib/libelf/libelf_msize.m4
index 3e735919251ca..78c0f3f31790f 100644
--- a/lib/libelf/libelf_msize.m4
+++ b/lib/libelf/libelf_msize.m4
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_msize.m4,v 1.2 2006/12/18 05:40:01 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/elf32.h>
diff --git a/lib/libelf/libelf_phdr.c b/lib/libelf/libelf_phdr.c
index fd43851725e14..d520534deeee8 100644
--- a/lib/libelf/libelf_phdr.c
+++ b/lib/libelf/libelf_phdr.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libelf/libelf_phdr.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_phdr.c,v 1.2 2006/12/25 02:22:22 jkoshy Exp $");
 
 #include <assert.h>
 #include <gelf.h>
diff --git a/lib/libelf/libelf_shdr.c b/lib/libelf/libelf_shdr.c
index 853cc90d5b5f5..441c4bf07967f 100644
--- a/lib/libelf/libelf_shdr.c
+++ b/lib/libelf/libelf_shdr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_shdr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
 
 #include <gelf.h>
 #include <libelf.h>
diff --git a/lib/libelf/libelf_xlate.c b/lib/libelf/libelf_xlate.c
index 06ef8d096a88b..83f2018f56858 100644
--- a/lib/libelf/libelf_xlate.c
+++ b/lib/libelf/libelf_xlate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_xlate.c,v 1.2 2006/12/24 09:45:10 jkoshy Exp $");
 
 #include <assert.h>
 #include <libelf.h>
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 41142ecddd7d7..4d490d952f192 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libexpat/Makefile,v 1.6 2007/05/21 02:49:04 deischen Exp $
 
 EXPAT=		${.CURDIR}/../../contrib/expat
 
diff --git a/lib/libexpat/expat_config.h b/lib/libexpat/expat_config.h
index 980812954a827..589ca2ee400d6 100644
--- a/lib/libexpat/expat_config.h
+++ b/lib/libexpat/expat_config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libexpat/expat_config.h,v 1.2 2007/04/24 06:29:27 phk Exp $ */
 
 #include <machine/endian.h>
 
diff --git a/lib/libexpat/libbsdxml.3 b/lib/libexpat/libbsdxml.3
index 2d5fc3e5e82ef..f18c7eac9bc12 100644
--- a/lib/libexpat/libbsdxml.3
+++ b/lib/libexpat/libbsdxml.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libexpat/libbsdxml.3,v 1.3 2002/12/27 12:15:30 schweikh Exp $
 .\"/
 .Dd October 4, 2002
 .Dt LIBBSDXML 3
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index f49c763e46266..1b464623fb805 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.49 2007/05/24 20:28:14 des Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index ba0d711974afd..ad6d4961d1ca2 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.50 2005/02/16 12:46:46 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index 62e0846b102dc..d75e763d8ae7a 100644
--- a/lib/libfetch/common.h
+++ b/lib/libfetch/common.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/common.h,v 1.28 2004/09/21 18:35:20 des Exp $
  */
 
 #ifndef _COMMON_H_INCLUDED
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 26ea5a788f0f1..7289e57375174 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.63 2007/05/24 20:28:14 des Exp $
 .\"
 .Dd April 22, 2007
 .Dt FETCH 3
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index 403a2dba1e17b..d79c239c57304 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.38 2004/09/21 18:35:20 des Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libfetch/fetch.h b/lib/libfetch/fetch.h
index 10d911a4fe3bc..e820f967e4881 100644
--- a/lib/libfetch/fetch.h
+++ b/lib/libfetch/fetch.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libfetch/fetch.h,v 1.26 2004/09/21 18:35:20 des Exp $
  */
 
 #ifndef _FETCH_H_INCLUDED
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 42ce68d63f9d1..237ddc48e2720 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.17 2004/09/21 18:35:20 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index 3613c4ca75adc..ed2043542bfb9 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.96 2007/04/22 22:33:29 njl Exp $");
 
 /*
  * Portions of this code were taken from or based on ftpio.c:
diff --git a/lib/libfetch/ftp.errors b/lib/libfetch/ftp.errors
index 9a4a11ec4b866..9ce0277fbeadb 100644
--- a/lib/libfetch/ftp.errors
+++ b/lib/libfetch/ftp.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/ftp.errors,v 1.6 2002/10/30 06:06:16 des Exp $
 #
 # This list is taken from RFC 959.
 # It probably needs a going over.
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 4b62b5a488c33..9de27a80dd202 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.78 2007/05/08 19:28:03 des Exp $");
 
 /*
  * The following copyright applies to the base64 code:
diff --git a/lib/libfetch/http.errors b/lib/libfetch/http.errors
index 1f38574d463a7..62e5581a2e237 100644
--- a/lib/libfetch/http.errors
+++ b/lib/libfetch/http.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libfetch/http.errors,v 1.5 2001/05/23 18:52:02 des Exp $
 #
 # This list is taken from RFC 2068.
 #
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index 7b30984cf6be3..903496401efdb 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libftpio/Makefile,v 1.16 2007/05/21 02:49:04 deischen Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libftpio/ftp.errors b/lib/libftpio/ftp.errors
index c03eeacae3294..632fcdca24f68 100644
--- a/lib/libftpio/ftp.errors
+++ b/lib/libftpio/ftp.errors
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libftpio/ftp.errors,v 1.5 2000/07/05 19:34:43 ume Exp $
 #
 # This list is taken from RFC 959.
 # It probably needs a going over.
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index 64378c259279b..30df72d9d118f 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.35 2005/02/13 23:45:47 ru Exp $
 .\"
 .Dd June 17, 1996
 .Dt FTPIO 3
diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c
index f990d4ddac965..902f867991a14 100644
--- a/lib/libftpio/ftpio.c
+++ b/lib/libftpio/ftpio.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libftpio/ftpio.c,v 1.44 2005/02/14 18:40:31 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libftpio/ftpio.h b/lib/libftpio/ftpio.h
index 879abea6607c7..5799d6a30e2e2 100644
--- a/lib/libftpio/ftpio.h
+++ b/lib/libftpio/ftpio.h
@@ -22,7 +22,7 @@
  * Turned inside out. Now returns xfers as new file ids, not as a special
  * `state' of FTP_t
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libftpio/ftpio.h,v 1.17 2002/03/25 13:49:48 phk Exp $
  */
 
 /* Internal housekeeping data structure for FTP sessions */
diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
index 7535e1ed37525..52edf120f3b46 100644
--- a/lib/libgeom/Makefile
+++ b/lib/libgeom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libgeom/Makefile,v 1.11 2007/05/06 01:17:46 pjd Exp $
 
 LIB=	geom
 SHLIBDIR?= /lib
diff --git a/lib/libgeom/geom_ctl.c b/lib/libgeom/geom_ctl.c
index d308849e80a14..7029119079a36 100644
--- a/lib/libgeom/geom_ctl.c
+++ b/lib/libgeom/geom_ctl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.4 2003/06/01 15:05:22 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c
index 68ff91bcf14f7..6b6ce8397e020 100644
--- a/lib/libgeom/geom_getxml.c
+++ b/lib/libgeom/geom_getxml.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_getxml.c,v 1.2 2007/05/01 10:47:09 wkoszek Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c
index 14f9b222123c8..fc61e3f418481 100644
--- a/lib/libgeom/geom_stats.c
+++ b/lib/libgeom/geom_stats.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_stats.c,v 1.3 2003/03/18 09:53:46 phk Exp $
  */
 
 #include <paths.h>
diff --git a/lib/libgeom/geom_util.c b/lib/libgeom/geom_util.c
index fa7d89a0a3da5..0f0bc96920eae 100644
--- a/lib/libgeom/geom_util.c
+++ b/lib/libgeom/geom_util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1 2007/05/06 01:17:46 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
index 7798f44544af2..fc4655f438cf0 100644
--- a/lib/libgeom/geom_xml2tree.c
+++ b/lib/libgeom/geom_xml2tree.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.5 2005/05/24 10:10:38 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libgeom/libgeom.3 b/lib/libgeom/libgeom.3
index bb67105b83fa5..3552bf5a3dcf8 100644
--- a/lib/libgeom/libgeom.3
+++ b/lib/libgeom/libgeom.3
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.8 2007/05/06 01:17:46 pjd Exp $
 .\"
 .Dd May 6, 2007
 .Dt LIBGEOM 3
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
index 56736a36e2ccf..15592a1b5ecf0 100644
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.12 2007/05/06 10:00:27 des Exp $
  */
 #ifndef _LIBGEOM_H_
 #define _LIBGEOM_H_
diff --git a/lib/libgpib/Makefile b/lib/libgpib/Makefile
index 7e53df9ce4cbe..352a2a6157562 100644
--- a/lib/libgpib/Makefile
+++ b/lib/libgpib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libgpib/Makefile,v 1.6 2007/05/21 02:49:04 deischen Exp $
 
 LIB=		gpib
 SHLIB_MAJOR=	2
diff --git a/lib/libgpib/gpib.h b/lib/libgpib/gpib.h
index d3144b527665d..7e8a119a89dde 100644
--- a/lib/libgpib/gpib.h
+++ b/lib/libgpib/gpib.h
@@ -25,7 +25,7 @@
  *
  * This file merely redirects to the file in <dev/ieee488/ugpib.h>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgpib/gpib.h,v 1.2 2005/02/12 21:07:09 phk Exp $
  */
 
 #include <dev/ieee488/ugpib.h>
diff --git a/lib/libgpib/ibfoo.c b/lib/libgpib/ibfoo.c
index e88563a6a3cfc..1ceb35cd6ad64 100644
--- a/lib/libgpib/ibfoo.c
+++ b/lib/libgpib/ibfoo.c
@@ -25,7 +25,7 @@
  *
  * This file merely redirects to the file in <dev/ieee488/ugpib.h>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libgpib/ibfoo.c,v 1.6 2005/02/13 06:21:36 scottl Exp $
  */
 
 #include <stdio.h>
diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index cedc4243576f2..53c0fc64b47fd 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libgssapi/Makefile,v 1.2.2.1 2007/11/20 20:48:01 kensmith Exp $
 
 LIB=		gssapi
 SHLIB_MAJOR=	9
diff --git a/lib/libgssapi/context.h b/lib/libgssapi/context.h
index 403b3909ca9f1..e1ce9ea76c960 100644
--- a/lib/libgssapi/context.h
+++ b/lib/libgssapi/context.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/context.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 struct _gss_context {
diff --git a/lib/libgssapi/cred.h b/lib/libgssapi/cred.h
index 6301b895b59c1..55deca1791f52 100644
--- a/lib/libgssapi/cred.h
+++ b/lib/libgssapi/cred.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/cred.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <sys/queue.h>
diff --git a/lib/libgssapi/gss_accept_sec_context.3 b/lib/libgssapi/gss_accept_sec_context.3
index 43c95764c1d8a..692f02bdf81ad 100644
--- a/lib/libgssapi/gss_accept_sec_context.3
+++ b/lib/libgssapi/gss_accept_sec_context.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_accept_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_accept_sec_context.c b/lib/libgssapi/gss_accept_sec_context.c
index 269a620219a5c..08bc977503b1e 100644
--- a/lib/libgssapi/gss_accept_sec_context.c
+++ b/lib/libgssapi/gss_accept_sec_context.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_accept_sec_context.c,v 1.3 2007/06/30 07:47:45 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_acquire_cred.3 b/lib/libgssapi/gss_acquire_cred.3
index 7462dc06191d0..345df5d5aced5 100644
--- a/lib/libgssapi/gss_acquire_cred.3
+++ b/lib/libgssapi/gss_acquire_cred.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_acquire_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_acquire_cred.c b/lib/libgssapi/gss_acquire_cred.c
index ba8b8b1e4c497..b713d2e79a057 100644
--- a/lib/libgssapi/gss_acquire_cred.c
+++ b/lib/libgssapi/gss_acquire_cred.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_acquire_cred.c,v 1.1.2.1 2007/12/02 10:06:59 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_add_cred.3 b/lib/libgssapi/gss_add_cred.3
index 612d0f924a29c..1c67f33267a2b 100644
--- a/lib/libgssapi/gss_add_cred.3
+++ b/lib/libgssapi/gss_add_cred.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_add_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_add_cred.c b/lib/libgssapi/gss_add_cred.c
index 61756078c0e70..0a0746915ba6b 100644
--- a/lib/libgssapi/gss_add_cred.c
+++ b/lib/libgssapi/gss_add_cred.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_add_cred.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_add_oid_set_member.3 b/lib/libgssapi/gss_add_oid_set_member.3
index 94661d298693a..6f78aa502ad58 100644
--- a/lib/libgssapi/gss_add_oid_set_member.3
+++ b/lib/libgssapi/gss_add_oid_set_member.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_add_oid_set_member.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_add_oid_set_member.c b/lib/libgssapi/gss_add_oid_set_member.c
index 57d3499cbd1f1..e9098d65ed51d 100644
--- a/lib/libgssapi/gss_add_oid_set_member.c
+++ b/lib/libgssapi/gss_add_oid_set_member.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_add_oid_set_member.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_canonicalize_name.3 b/lib/libgssapi/gss_canonicalize_name.3
index 78ddd4cadbf02..afcf49c6143a3 100644
--- a/lib/libgssapi/gss_canonicalize_name.3
+++ b/lib/libgssapi/gss_canonicalize_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_canonicalize_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_canonicalize_name.c b/lib/libgssapi/gss_canonicalize_name.c
index 098362219769c..1d798933fe7ad 100644
--- a/lib/libgssapi/gss_canonicalize_name.c
+++ b/lib/libgssapi/gss_canonicalize_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_canonicalize_name.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_compare_name.3 b/lib/libgssapi/gss_compare_name.3
index 34caaadd4b158..b39a7792fc2fa 100644
--- a/lib/libgssapi/gss_compare_name.3
+++ b/lib/libgssapi/gss_compare_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_compare_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_compare_name.c b/lib/libgssapi/gss_compare_name.c
index 644b4a6ff5abd..c687f5b4db2e4 100644
--- a/lib/libgssapi/gss_compare_name.c
+++ b/lib/libgssapi/gss_compare_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_compare_name.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_context_time.3 b/lib/libgssapi/gss_context_time.3
index edfc852f6357f..70bb37cd2ab1c 100644
--- a/lib/libgssapi/gss_context_time.3
+++ b/lib/libgssapi/gss_context_time.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_context_time.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_context_time.c b/lib/libgssapi/gss_context_time.c
index 585ebd6908753..2256c4c429b22 100644
--- a/lib/libgssapi/gss_context_time.c
+++ b/lib/libgssapi/gss_context_time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_context_time.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_create_empty_oid_set.3 b/lib/libgssapi/gss_create_empty_oid_set.3
index 3aa0158a6bb6a..87f2bbda375f8 100644
--- a/lib/libgssapi/gss_create_empty_oid_set.3
+++ b/lib/libgssapi/gss_create_empty_oid_set.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_create_empty_oid_set.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_create_empty_oid_set.c b/lib/libgssapi/gss_create_empty_oid_set.c
index 0412817a280f2..89825971e3c3a 100644
--- a/lib/libgssapi/gss_create_empty_oid_set.c
+++ b/lib/libgssapi/gss_create_empty_oid_set.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_create_empty_oid_set.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_delete_sec_context.3 b/lib/libgssapi/gss_delete_sec_context.3
index 16466be89e134..ba89b46ba8fa1 100644
--- a/lib/libgssapi/gss_delete_sec_context.3
+++ b/lib/libgssapi/gss_delete_sec_context.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_delete_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_delete_sec_context.c
index b1f39c24c0fda..9831ec122a6db 100644
--- a/lib/libgssapi/gss_delete_sec_context.c
+++ b/lib/libgssapi/gss_delete_sec_context.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_delete_sec_context.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_display_name.3 b/lib/libgssapi/gss_display_name.3
index 24e63705dec6e..e0e2ae2056062 100644
--- a/lib/libgssapi/gss_display_name.3
+++ b/lib/libgssapi/gss_display_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_display_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_display_name.c b/lib/libgssapi/gss_display_name.c
index 5fe4f1d4b3518..79d3893721e05 100644
--- a/lib/libgssapi/gss_display_name.c
+++ b/lib/libgssapi/gss_display_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_display_name.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_display_status.3 b/lib/libgssapi/gss_display_status.3
index dacf9634e4b34..ef10742e2f1b7 100644
--- a/lib/libgssapi/gss_display_status.3
+++ b/lib/libgssapi/gss_display_status.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_display_status.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_display_status.c b/lib/libgssapi/gss_display_status.c
index f87cc9eeade7e..fed26791b9502 100644
--- a/lib/libgssapi/gss_display_status.c
+++ b/lib/libgssapi/gss_display_status.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_display_status.c,v 1.3 2007/07/05 13:40:07 dfr Exp $
  */
 /*
  * Copyright (c) 1998 - 2005 Kungliga Tekniska Högskolan
diff --git a/lib/libgssapi/gss_duplicate_name.3 b/lib/libgssapi/gss_duplicate_name.3
index c5b6854d88da2..70deb8ff5b8e8 100644
--- a/lib/libgssapi/gss_duplicate_name.3
+++ b/lib/libgssapi/gss_duplicate_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_duplicate_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_duplicate_name.c b/lib/libgssapi/gss_duplicate_name.c
index f0ce4173d4f7c..c82adcc66026b 100644
--- a/lib/libgssapi/gss_duplicate_name.c
+++ b/lib/libgssapi/gss_duplicate_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_duplicate_name.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_export_name.3 b/lib/libgssapi/gss_export_name.3
index 629e44681694c..3087fc6910996 100644
--- a/lib/libgssapi/gss_export_name.3
+++ b/lib/libgssapi/gss_export_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_export_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_export_name.c b/lib/libgssapi/gss_export_name.c
index 6cba2f8c380b7..9862e72ddaebc 100644
--- a/lib/libgssapi/gss_export_name.c
+++ b/lib/libgssapi/gss_export_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_export_name.c,v 1.2 2007/06/30 07:47:45 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_export_sec_context.3 b/lib/libgssapi/gss_export_sec_context.3
index 7cc3464158155..1e164f721d5c9 100644
--- a/lib/libgssapi/gss_export_sec_context.3
+++ b/lib/libgssapi/gss_export_sec_context.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_export_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_export_sec_context.c b/lib/libgssapi/gss_export_sec_context.c
index 71c6874e963d5..af4c7cb623226 100644
--- a/lib/libgssapi/gss_export_sec_context.c
+++ b/lib/libgssapi/gss_export_sec_context.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_export_sec_context.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_get_mic.3 b/lib/libgssapi/gss_get_mic.3
index b259f362381a7..55c539eaeadb8 100644
--- a/lib/libgssapi/gss_get_mic.3
+++ b/lib/libgssapi/gss_get_mic.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_get_mic.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_get_mic.c b/lib/libgssapi/gss_get_mic.c
index a3495ecfe7944..36d87c5978b95 100644
--- a/lib/libgssapi/gss_get_mic.c
+++ b/lib/libgssapi/gss_get_mic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_get_mic.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_import_name.3 b/lib/libgssapi/gss_import_name.3
index 931bf44d64532..7de13f2d80e5b 100644
--- a/lib/libgssapi/gss_import_name.3
+++ b/lib/libgssapi/gss_import_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_import_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_import_name.c b/lib/libgssapi/gss_import_name.c
index 65820b12874d5..0a89db4404bb8 100644
--- a/lib/libgssapi/gss_import_name.c
+++ b/lib/libgssapi/gss_import_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_import_name.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_import_sec_context.3 b/lib/libgssapi/gss_import_sec_context.3
index 07b5e19172e7b..325ad8b6256a2 100644
--- a/lib/libgssapi/gss_import_sec_context.3
+++ b/lib/libgssapi/gss_import_sec_context.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_import_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_import_sec_context.c b/lib/libgssapi/gss_import_sec_context.c
index ce3ddd10c3f3f..5c331710733f3 100644
--- a/lib/libgssapi/gss_import_sec_context.c
+++ b/lib/libgssapi/gss_import_sec_context.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_import_sec_context.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_indicate_mechs.3 b/lib/libgssapi/gss_indicate_mechs.3
index 52458576d41d5..a9f5ec5f3b890 100644
--- a/lib/libgssapi/gss_indicate_mechs.3
+++ b/lib/libgssapi/gss_indicate_mechs.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_indicate_mechs.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_indicate_mechs.c b/lib/libgssapi/gss_indicate_mechs.c
index 87a34f4e6dbeb..1100392ddf31f 100644
--- a/lib/libgssapi/gss_indicate_mechs.c
+++ b/lib/libgssapi/gss_indicate_mechs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_indicate_mechs.c,v 1.2 2007/06/30 07:47:45 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_init_sec_context.3 b/lib/libgssapi/gss_init_sec_context.3
index 9e019cfaa8ed7..83814da8d2e95 100644
--- a/lib/libgssapi/gss_init_sec_context.3
+++ b/lib/libgssapi/gss_init_sec_context.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_init_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_init_sec_context.c b/lib/libgssapi/gss_init_sec_context.c
index 8b596f3ba8924..c9d72e4d246c4 100644
--- a/lib/libgssapi/gss_init_sec_context.c
+++ b/lib/libgssapi/gss_init_sec_context.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_init_sec_context.c,v 1.4 2007/06/30 07:47:45 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_inquire_context.3 b/lib/libgssapi/gss_inquire_context.3
index a527b560a3772..8e516ad946550 100644
--- a/lib/libgssapi/gss_inquire_context.3
+++ b/lib/libgssapi/gss_inquire_context.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_inquire_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_inquire_context.c b/lib/libgssapi/gss_inquire_context.c
index 3f4531d2c4282..9cc033c839963 100644
--- a/lib/libgssapi/gss_inquire_context.c
+++ b/lib/libgssapi/gss_inquire_context.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_inquire_context.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_inquire_cred.3 b/lib/libgssapi/gss_inquire_cred.3
index 021bc9c23427e..2bf9bb68f2642 100644
--- a/lib/libgssapi/gss_inquire_cred.3
+++ b/lib/libgssapi/gss_inquire_cred.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_inquire_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_inquire_cred.c b/lib/libgssapi/gss_inquire_cred.c
index 60b746f53f6fa..8651c19a3ccc8 100644
--- a/lib/libgssapi/gss_inquire_cred.c
+++ b/lib/libgssapi/gss_inquire_cred.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_inquire_cred.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_inquire_cred_by_mech.3 b/lib/libgssapi/gss_inquire_cred_by_mech.3
index 15acc0cd10ded..832e48ab8e619 100644
--- a/lib/libgssapi/gss_inquire_cred_by_mech.3
+++ b/lib/libgssapi/gss_inquire_cred_by_mech.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_inquire_cred_by_mech.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_inquire_cred_by_mech.c b/lib/libgssapi/gss_inquire_cred_by_mech.c
index 2896f77c1e745..264e785d950ef 100644
--- a/lib/libgssapi/gss_inquire_cred_by_mech.c
+++ b/lib/libgssapi/gss_inquire_cred_by_mech.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_inquire_cred_by_mech.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_inquire_mechs_for_name.3 b/lib/libgssapi/gss_inquire_mechs_for_name.3
index 1427a3163dc02..e5706ad416cac 100644
--- a/lib/libgssapi/gss_inquire_mechs_for_name.3
+++ b/lib/libgssapi/gss_inquire_mechs_for_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_inquire_mechs_for_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_inquire_mechs_for_name.c b/lib/libgssapi/gss_inquire_mechs_for_name.c
index 10bdd7fd63140..a103fdcd5fe18 100644
--- a/lib/libgssapi/gss_inquire_mechs_for_name.c
+++ b/lib/libgssapi/gss_inquire_mechs_for_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_inquire_mechs_for_name.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_inquire_names_for_mech.3 b/lib/libgssapi/gss_inquire_names_for_mech.3
index 247f93e4ec189..55435ecb7cbb6 100644
--- a/lib/libgssapi/gss_inquire_names_for_mech.3
+++ b/lib/libgssapi/gss_inquire_names_for_mech.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_inquire_names_for_mech.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_inquire_names_for_mech.c b/lib/libgssapi/gss_inquire_names_for_mech.c
index 3ebb6328ff69f..d83d0c5f87968 100644
--- a/lib/libgssapi/gss_inquire_names_for_mech.c
+++ b/lib/libgssapi/gss_inquire_names_for_mech.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_inquire_names_for_mech.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_krb5.c b/lib/libgssapi/gss_krb5.c
index 5150f8564a048..8ec93796be4c5 100644
--- a/lib/libgssapi/gss_krb5.c
+++ b/lib/libgssapi/gss_krb5.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_krb5.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_mech_switch.c b/lib/libgssapi/gss_mech_switch.c
index a7528a406e426..4b1aca2d46a67 100644
--- a/lib/libgssapi/gss_mech_switch.c
+++ b/lib/libgssapi/gss_mech_switch.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_mech_switch.c,v 1.2 2006/02/04 09:40:21 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_names.c b/lib/libgssapi/gss_names.c
index d10350a9541ae..8cdcfa2a96d8f 100644
--- a/lib/libgssapi/gss_names.c
+++ b/lib/libgssapi/gss_names.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_names.c,v 1.2 2007/04/04 02:40:59 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_process_context_token.3 b/lib/libgssapi/gss_process_context_token.3
index 3459f0f921dd1..aece6fe759cb2 100644
--- a/lib/libgssapi/gss_process_context_token.3
+++ b/lib/libgssapi/gss_process_context_token.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_process_context_token.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_process_context_token.c b/lib/libgssapi/gss_process_context_token.c
index 0b4d7ec9bfca0..dc0df4ec9f483 100644
--- a/lib/libgssapi/gss_process_context_token.c
+++ b/lib/libgssapi/gss_process_context_token.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_process_context_token.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_release_buffer.3 b/lib/libgssapi/gss_release_buffer.3
index 4b43837d4ffa0..c3ef8c4a151ad 100644
--- a/lib/libgssapi/gss_release_buffer.3
+++ b/lib/libgssapi/gss_release_buffer.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_release_buffer.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_release_buffer.c b/lib/libgssapi/gss_release_buffer.c
index 8e7fa60e54715..35421dc57b76c 100644
--- a/lib/libgssapi/gss_release_buffer.c
+++ b/lib/libgssapi/gss_release_buffer.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_release_buffer.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_release_cred.3 b/lib/libgssapi/gss_release_cred.3
index 1154b896f937c..464031da4ff28 100644
--- a/lib/libgssapi/gss_release_cred.3
+++ b/lib/libgssapi/gss_release_cred.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_release_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_release_cred.c b/lib/libgssapi/gss_release_cred.c
index cec814c66291d..aa75795077a58 100644
--- a/lib/libgssapi/gss_release_cred.c
+++ b/lib/libgssapi/gss_release_cred.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_release_cred.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_release_name.3 b/lib/libgssapi/gss_release_name.3
index 8c696f8ba58bc..47098846b62b9 100644
--- a/lib/libgssapi/gss_release_name.3
+++ b/lib/libgssapi/gss_release_name.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_release_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_release_name.c b/lib/libgssapi/gss_release_name.c
index 4294ad7c4b486..4b60ab62910cb 100644
--- a/lib/libgssapi/gss_release_name.c
+++ b/lib/libgssapi/gss_release_name.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_release_name.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_release_oid_set.3 b/lib/libgssapi/gss_release_oid_set.3
index 0f176287b2867..7b9c4a1b87659 100644
--- a/lib/libgssapi/gss_release_oid_set.3
+++ b/lib/libgssapi/gss_release_oid_set.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_release_oid_set.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_release_oid_set.c b/lib/libgssapi/gss_release_oid_set.c
index 49c17ab8326ad..06bff5cc1d8ed 100644
--- a/lib/libgssapi/gss_release_oid_set.c
+++ b/lib/libgssapi/gss_release_oid_set.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_release_oid_set.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_seal.c b/lib/libgssapi/gss_seal.c
index c3e3f7a83d66c..961bba0e5a350 100644
--- a/lib/libgssapi/gss_seal.c
+++ b/lib/libgssapi/gss_seal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_seal.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_sign.c b/lib/libgssapi/gss_sign.c
index c521a7e533e6c..cee7ddcf9fb88 100644
--- a/lib/libgssapi/gss_sign.c
+++ b/lib/libgssapi/gss_sign.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_sign.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_test_oid_set_member.3 b/lib/libgssapi/gss_test_oid_set_member.3
index 8269637edcac1..34814aebdb311 100644
--- a/lib/libgssapi/gss_test_oid_set_member.3
+++ b/lib/libgssapi/gss_test_oid_set_member.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_test_oid_set_member.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_test_oid_set_member.c b/lib/libgssapi/gss_test_oid_set_member.c
index 1a09540dbc53a..46562c10a886e 100644
--- a/lib/libgssapi/gss_test_oid_set_member.c
+++ b/lib/libgssapi/gss_test_oid_set_member.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_test_oid_set_member.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_unseal.c b/lib/libgssapi/gss_unseal.c
index bc7dc26111c0e..fe2787de975d1 100644
--- a/lib/libgssapi/gss_unseal.c
+++ b/lib/libgssapi/gss_unseal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_unseal.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_unwrap.3 b/lib/libgssapi/gss_unwrap.3
index d422ae5d9a694..c3679ba3885bb 100644
--- a/lib/libgssapi/gss_unwrap.3
+++ b/lib/libgssapi/gss_unwrap.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_unwrap.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_unwrap.c b/lib/libgssapi/gss_unwrap.c
index 9ccc848d3efe0..17f3bc8ea5b1c 100644
--- a/lib/libgssapi/gss_unwrap.c
+++ b/lib/libgssapi/gss_unwrap.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_unwrap.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_utils.c b/lib/libgssapi/gss_utils.c
index 6243df8acc566..5ee039e0fd280 100644
--- a/lib/libgssapi/gss_utils.c
+++ b/lib/libgssapi/gss_utils.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_utils.c,v 1.2 2007/04/04 02:28:48 kan Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_verify.c b/lib/libgssapi/gss_verify.c
index 31108750e3ddd..5fc35c5832291 100644
--- a/lib/libgssapi/gss_verify.c
+++ b/lib/libgssapi/gss_verify.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_verify.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_verify_mic.3 b/lib/libgssapi/gss_verify_mic.3
index ab63706b2e578..3755b62317582 100644
--- a/lib/libgssapi/gss_verify_mic.3
+++ b/lib/libgssapi/gss_verify_mic.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_verify_mic.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_verify_mic.c b/lib/libgssapi/gss_verify_mic.c
index 4e11ab1e08fc3..e583f527e0212 100644
--- a/lib/libgssapi/gss_verify_mic.c
+++ b/lib/libgssapi/gss_verify_mic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_verify_mic.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_wrap.3 b/lib/libgssapi/gss_wrap.3
index 3b81c687d0071..6626bc4a6a2f5 100644
--- a/lib/libgssapi/gss_wrap.3
+++ b/lib/libgssapi/gss_wrap.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_wrap.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_wrap.c b/lib/libgssapi/gss_wrap.c
index 0d7c74933c318..9bbf03d1a9dea 100644
--- a/lib/libgssapi/gss_wrap.c
+++ b/lib/libgssapi/gss_wrap.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_wrap.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_wrap_size_limit.3 b/lib/libgssapi/gss_wrap_size_limit.3
index fe93ca659f34e..6fde6e593406c 100644
--- a/lib/libgssapi/gss_wrap_size_limit.3
+++ b/lib/libgssapi/gss_wrap_size_limit.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gss_wrap_size_limit.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .\" The following commands are required for all man pages.
 .Dd November 12, 2005
diff --git a/lib/libgssapi/gss_wrap_size_limit.c b/lib/libgssapi/gss_wrap_size_limit.c
index 8abd52a120947..690e2dc408b8b 100644
--- a/lib/libgssapi/gss_wrap_size_limit.c
+++ b/lib/libgssapi/gss_wrap_size_limit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/gss_wrap_size_limit.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gssapi.3 b/lib/libgssapi/gssapi.3
index ce26e7eed4e60..71e27bba9a497 100644
--- a/lib/libgssapi/gssapi.3
+++ b/lib/libgssapi/gssapi.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/lib/libgssapi/gssapi.3,v 1.2 2006/01/25 10:06:28 dfr Exp $
 .\"
 .Dd November 30, 2005
 .Dt GSSAPI 3
diff --git a/lib/libgssapi/mech.5 b/lib/libgssapi/mech.5
index 1edcc1a846df6..f3b734828051a 100644
--- a/lib/libgssapi/mech.5
+++ b/lib/libgssapi/mech.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libgssapi/mech.5,v 1.1 2005/12/29 14:40:20 dfr Exp $
 .Dd November 14, 2005
 .Dt MECH 5
 .Os
diff --git a/lib/libgssapi/mech_switch.h b/lib/libgssapi/mech_switch.h
index 4add12d8af108..f1f0ca006c632 100644
--- a/lib/libgssapi/mech_switch.h
+++ b/lib/libgssapi/mech_switch.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/mech_switch.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <sys/queue.h>
diff --git a/lib/libgssapi/name.h b/lib/libgssapi/name.h
index a64d5d91e7289..d93e40253b2d2 100644
--- a/lib/libgssapi/name.h
+++ b/lib/libgssapi/name.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/name.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 #include <sys/queue.h>
diff --git a/lib/libgssapi/spnego.h b/lib/libgssapi/spnego.h
index 8b2e22d537f25..db0238ac6bc23 100644
--- a/lib/libgssapi/spnego.h
+++ b/lib/libgssapi/spnego.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/spnego.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 typedef xder_OID MechType;
diff --git a/lib/libgssapi/utils.h b/lib/libgssapi/utils.h
index 46edb9d4a25a8..eaa00dad334f9 100644
--- a/lib/libgssapi/utils.h
+++ b/lib/libgssapi/utils.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libgssapi/utils.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
  */
 
 extern int _gss_oid_equal(const gss_OID, const gss_OID);
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index a415e262d53ab..cdb86100a2ea6 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libipsec/Makefile,v 1.21 2007/07/01 12:08:05 gnn Exp $
 
 SHLIBDIR?= /lib
 
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c
index 638d788f03db8..9ac094abb58a3 100644
--- a/lib/libipsec/ipsec_dump_policy.c
+++ b/lib/libipsec/ipsec_dump_policy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/ipsec_dump_policy.c,v 1.9 2007/07/01 12:08:05 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/ipsec_get_policylen.c b/lib/libipsec/ipsec_get_policylen.c
index 232cb45097ff2..64d0aea8d51b3 100644
--- a/lib/libipsec/ipsec_get_policylen.c
+++ b/lib/libipsec/ipsec_get_policylen.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/ipsec_get_policylen.c,v 1.4 2007/07/01 12:08:05 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3
index 1e24b63e6c048..dd011bded36bd 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libipsec/ipsec_set_policy.3,v 1.23 2007/07/01 12:08:05 gnn Exp $
 .\"
 .Dd February 14, 2006
 .Dt IPSEC_SET_POLICY 3
diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3
index 73fe68dcce1f4..c99d26b83e644 100644
--- a/lib/libipsec/ipsec_strerror.3
+++ b/lib/libipsec/ipsec_strerror.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libipsec/ipsec_strerror.3,v 1.15 2007/07/01 12:08:05 gnn Exp $
 .\"
 .Dd February 14, 2006
 .Dt IPSEC_STRERROR 3
diff --git a/lib/libipsec/ipsec_strerror.c b/lib/libipsec/ipsec_strerror.c
index f9b2dc9cf8057..f22d294ad1de7 100644
--- a/lib/libipsec/ipsec_strerror.c
+++ b/lib/libipsec/ipsec_strerror.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/ipsec_strerror.c,v 1.5 2007/07/01 12:08:05 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/ipsec_strerror.h b/lib/libipsec/ipsec_strerror.h
index d9a1f0deffe2e..2492f7a14d6bb 100644
--- a/lib/libipsec/ipsec_strerror.h
+++ b/lib/libipsec/ipsec_strerror.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/lib/libipsec/ipsec_strerror.h,v 1.4 2002/03/21 23:52:35 obrien Exp $	*/
 /*	$KAME: ipsec_strerror.h,v 1.8 2000/07/30 00:45:12 itojun Exp $	*/
 
 /*
diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h
index 07ff582ec8275..022961c4c63ab 100644
--- a/lib/libipsec/libpfkey.h
+++ b/lib/libipsec/libpfkey.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/lib/libipsec/libpfkey.h,v 1.4 2002/03/22 09:18:36 obrien Exp $	*/
 /*	$KAME: libpfkey.h,v 1.6 2001/03/05 18:22:17 thorpej Exp $	*/
 
 /*
diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c
index 2dd9d7183c4d9..e759c59b4b4f3 100644
--- a/lib/libipsec/pfkey.c
+++ b/lib/libipsec/pfkey.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/pfkey.c,v 1.9 2007/07/01 12:08:05 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c
index 068ad0e060b0f..7635d2c1f4b00 100644
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.17 2007/07/01 12:08:06 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y
index 9e2f979c72d36..add9178841288 100644
--- a/lib/libipsec/policy_parse.y
+++ b/lib/libipsec/policy_parse.y
@@ -50,7 +50,7 @@
 
 %{
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/policy_parse.y,v 1.5 2007/07/01 12:08:06 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
index d648702c5cc7a..6f44930c04bb7 100644
--- a/lib/libipsec/policy_token.l
+++ b/lib/libipsec/policy_token.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/lib/libipsec/policy_token.l,v 1.9 2007/07/01 12:08:06 gnn Exp $	*/
 /*	$KAME: policy_token.l,v 1.13 2003/05/09 05:19:55 sakane Exp $	*/
 
 /*
diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c
index c1dfc7962d043..e24bbbf48c1fc 100644
--- a/lib/libipsec/test-policy.c
+++ b/lib/libipsec/test-policy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipsec/test-policy.c,v 1.8 2007/07/01 12:08:06 gnn Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/lib/libipx/Makefile b/lib/libipx/Makefile
index 66f566a4bd04b..2cd9c094afac6 100644
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libipx/Makefile,v 1.7 2003/08/18 15:25:38 obrien Exp $
 
 LIB=	ipx
 SHLIBDIR?= /lib
diff --git a/lib/libipx/ipx.3 b/lib/libipx/ipx.3
index b38683dff8c93..f4cbc774f363f 100644
--- a/lib/libipx/ipx.3
+++ b/lib/libipx/ipx.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libipx/ipx.3,v 1.16 2007/01/09 01:02:03 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt IPX 3
diff --git a/lib/libipx/ipx_addr.c b/lib/libipx/ipx_addr.c
index 6d48b59cd9f30..487a748c283e4 100644
--- a/lib/libipx/ipx_addr.c
+++ b/lib/libipx/ipx_addr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipx/ipx_addr.c,v 1.9 2007/01/09 01:02:03 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ipx_addr.c";
diff --git a/lib/libipx/ipx_ntoa.c b/lib/libipx/ipx_ntoa.c
index a33b80712207f..09d72840f41c3 100644
--- a/lib/libipx/ipx_ntoa.c
+++ b/lib/libipx/ipx_ntoa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libipx/ipx_ntoa.c,v 1.7 2007/01/09 01:02:03 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ipx_ntoa.c";
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index afb6392608a1f..1205735f5e2c2 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkiconv/Makefile,v 1.4 2007/05/21 02:49:04 deischen Exp $
 
 LIB=		kiconv
 SHLIBDIR?=	/lib
diff --git a/lib/libkiconv/kiconv.3 b/lib/libkiconv/kiconv.3
index affacf1687cb8..757d1381bd8e3 100644
--- a/lib/libkiconv/kiconv.3
+++ b/lib/libkiconv/kiconv.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkiconv/kiconv.3,v 1.6 2004/07/05 06:59:17 ru Exp $
 .\"
 .Dd July 17, 2003
 .Dt KICONV 3
diff --git a/lib/libkiconv/quirks.c b/lib/libkiconv/quirks.c
index d9a80ee5ec992..287c01eca21e5 100644
--- a/lib/libkiconv/quirks.c
+++ b/lib/libkiconv/quirks.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/quirks.c,v 1.1 2003/09/26 20:26:20 fjoe Exp $
  */
 
 /*
diff --git a/lib/libkiconv/quirks.h b/lib/libkiconv/quirks.h
index 682d2cd7fc0ce..5a1c20453c91b 100644
--- a/lib/libkiconv/quirks.h
+++ b/lib/libkiconv/quirks.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/quirks.h,v 1.1 2003/09/26 20:26:20 fjoe Exp $
  */
 
 #ifndef _KICONV_QUIRKS_H_
diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c
index db304c3a42187..1a4b56cbed8d1 100644
--- a/lib/libkiconv/xlat16_iconv.c
+++ b/lib/libkiconv/xlat16_iconv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/xlat16_iconv.c,v 1.4 2005/08/05 07:28:26 stefanf Exp $
  */
 
 /*
diff --git a/lib/libkiconv/xlat16_sysctl.c b/lib/libkiconv/xlat16_sysctl.c
index 28420d9d3d6bc..92a286d19bc9b 100644
--- a/lib/libkiconv/xlat16_sysctl.c
+++ b/lib/libkiconv/xlat16_sysctl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkiconv/xlat16_sysctl.c,v 1.2 2005/08/24 12:38:26 imura Exp $
  */
 
 /*
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index f2c71a2f35167..b9e8e0efa7c87 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/Makefile,v 1.66.2.1 2007/12/06 16:22:18 brooks Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libkse/arch/amd64/Makefile.inc b/lib/libkse/arch/amd64/Makefile.inc
index c8b0362bca851..b41d9ced1e757 100644
--- a/lib/libkse/arch/amd64/Makefile.inc
+++ b/lib/libkse/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/arch/amd64/Makefile.inc,v 1.3 2007/10/09 13:42:22 obrien Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libkse/arch/amd64/amd64/context.S b/lib/libkse/arch/amd64/amd64/context.S
index 6a6b558109502..4ff146680ff58 100644
--- a/lib/libkse/arch/amd64/amd64/context.S
+++ b/lib/libkse/arch/amd64/amd64/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/amd64/amd64/context.S,v 1.9 2007/10/09 13:42:22 obrien Exp $");
 
 /*
  * The following notes ("cheat sheet") was provided by Peter Wemm.
diff --git a/lib/libkse/arch/amd64/amd64/enter_uts.S b/lib/libkse/arch/amd64/amd64/enter_uts.S
index fb0df8725785c..7401313e9678d 100644
--- a/lib/libkse/arch/amd64/amd64/enter_uts.S
+++ b/lib/libkse/arch/amd64/amd64/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/amd64/amd64/enter_uts.S,v 1.6 2007/10/09 13:42:22 obrien Exp $");
 
 
 /*
diff --git a/lib/libkse/arch/amd64/amd64/pthread_md.c b/lib/libkse/arch/amd64/amd64/pthread_md.c
index 3aceec7c63f5d..a391da169fd0e 100644
--- a/lib/libkse/arch/amd64/amd64/pthread_md.c
+++ b/lib/libkse/arch/amd64/amd64/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/amd64/amd64/pthread_md.c,v 1.5 2007/10/09 13:42:22 obrien Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libkse/arch/amd64/include/atomic_ops.h b/lib/libkse/arch/amd64/include/atomic_ops.h
index 980eb8e664caa..f64acf6a5316b 100644
--- a/lib/libkse/arch/amd64/include/atomic_ops.h
+++ b/lib/libkse/arch/amd64/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/amd64/include/atomic_ops.h,v 1.3 2007/10/09 13:42:22 obrien Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libkse/arch/amd64/include/pthread_md.h b/lib/libkse/arch/amd64/include/pthread_md.h
index a7da5dfaf4cf0..ca5b75a7d9528 100644
--- a/lib/libkse/arch/amd64/include/pthread_md.h
+++ b/lib/libkse/arch/amd64/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/amd64/include/pthread_md.h,v 1.11 2007/10/09 13:42:22 obrien Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
diff --git a/lib/libkse/arch/arm/Makefile.inc b/lib/libkse/arch/arm/Makefile.inc
index ced7063106e1b..22a56238400de 100644
--- a/lib/libkse/arch/arm/Makefile.inc
+++ b/lib/libkse/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/arch/arm/Makefile.inc,v 1.3 2007/10/09 13:42:22 obrien Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libkse/arch/arm/arm/context.S b/lib/libkse/arch/arm/arm/context.S
index c63880458bd48..9ff0bcc1a30cb 100644
--- a/lib/libkse/arch/arm/arm/context.S
+++ b/lib/libkse/arch/arm/arm/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/arm/arm/context.S,v 1.4 2007/10/09 13:42:22 obrien Exp $");
 
 /*
  * int thr_setcontext(mcontext_t *mcp, intptr_t val, intptr_t *loc)
diff --git a/lib/libkse/arch/arm/arm/pthread_md.c b/lib/libkse/arch/arm/arm/pthread_md.c
index 72426d467985d..1d54e0ddc8c72 100644
--- a/lib/libkse/arch/arm/arm/pthread_md.c
+++ b/lib/libkse/arch/arm/arm/pthread_md.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/arm/arm/pthread_md.c,v 1.5 2007/10/09 13:42:22 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libkse/arch/arm/include/atomic_ops.h b/lib/libkse/arch/arm/include/atomic_ops.h
index 3a209b3faf17f..0964724243858 100644
--- a/lib/libkse/arch/arm/include/atomic_ops.h
+++ b/lib/libkse/arch/arm/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/arm/include/atomic_ops.h,v 1.4 2007/10/09 13:42:23 obrien Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libkse/arch/arm/include/pthread_md.h b/lib/libkse/arch/arm/include/pthread_md.h
index 857fa1b1c8b48..a587a9bd47ad1 100644
--- a/lib/libkse/arch/arm/include/pthread_md.h
+++ b/lib/libkse/arch/arm/include/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/arm/include/pthread_md.h,v 1.9 2007/10/09 13:42:23 obrien Exp $
  */
 
 /*
diff --git a/lib/libkse/arch/i386/Makefile.inc b/lib/libkse/arch/i386/Makefile.inc
index 73a9a8acde45f..4c1a925d9f7ee 100644
--- a/lib/libkse/arch/i386/Makefile.inc
+++ b/lib/libkse/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/arch/i386/Makefile.inc,v 1.4 2007/10/09 13:42:23 obrien Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libkse/arch/i386/i386/pthread_md.c b/lib/libkse/arch/i386/i386/pthread_md.c
index cbea6d4f6af13..b7fdb41cb6c2b 100644
--- a/lib/libkse/arch/i386/i386/pthread_md.c
+++ b/lib/libkse/arch/i386/i386/pthread_md.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/i386/i386/pthread_md.c,v 1.9 2007/10/09 13:42:23 obrien Exp $");
 
 #include <sys/types.h>
 #include <machine/cpufunc.h>
diff --git a/lib/libkse/arch/i386/i386/thr_enter_uts.S b/lib/libkse/arch/i386/i386/thr_enter_uts.S
index bf6df8f5c60bd..e35e32f5db690 100644
--- a/lib/libkse/arch/i386/i386/thr_enter_uts.S
+++ b/lib/libkse/arch/i386/i386/thr_enter_uts.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/i386/i386/thr_enter_uts.S,v 1.7 2007/10/09 13:42:23 obrien Exp $");
 
 
 /*
diff --git a/lib/libkse/arch/i386/i386/thr_getcontext.S b/lib/libkse/arch/i386/i386/thr_getcontext.S
index d9d300f7da837..5d454465dd865 100644
--- a/lib/libkse/arch/i386/i386/thr_getcontext.S
+++ b/lib/libkse/arch/i386/i386/thr_getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/i386/i386/thr_getcontext.S,v 1.7 2007/10/09 13:42:23 obrien Exp $");
 
 /*
  * Where do we define these?
diff --git a/lib/libkse/arch/i386/include/atomic_ops.h b/lib/libkse/arch/i386/include/atomic_ops.h
index 7bc3d1b71a054..8908fe3db3a88 100644
--- a/lib/libkse/arch/i386/include/atomic_ops.h
+++ b/lib/libkse/arch/i386/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/i386/include/atomic_ops.h,v 1.4 2007/10/09 13:42:23 obrien Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libkse/arch/i386/include/pthread_md.h b/lib/libkse/arch/i386/include/pthread_md.h
index 52afd6a5515dc..e4122ac9f5cfe 100644
--- a/lib/libkse/arch/i386/include/pthread_md.h
+++ b/lib/libkse/arch/i386/include/pthread_md.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/i386/include/pthread_md.h,v 1.17 2007/10/09 13:42:23 obrien Exp $
  */
 /*
  * Machine-dependent thread prototypes/definitions for the thread kernel.
diff --git a/lib/libkse/arch/ia64/Makefile.inc b/lib/libkse/arch/ia64/Makefile.inc
index c8b0362bca851..ab4bf144d6f92 100644
--- a/lib/libkse/arch/ia64/Makefile.inc
+++ b/lib/libkse/arch/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/arch/ia64/Makefile.inc,v 1.5 2007/10/09 13:42:24 obrien Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libkse/arch/ia64/ia64/context.S b/lib/libkse/arch/ia64/ia64/context.S
index 9411293ec7b81..730ab5eb7e9fa 100644
--- a/lib/libkse/arch/ia64/ia64/context.S
+++ b/lib/libkse/arch/ia64/ia64/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/ia64/ia64/context.S,v 1.6 2007/10/09 13:42:24 obrien Exp $");
 
 #include <sys/syscall.h>
 
diff --git a/lib/libkse/arch/ia64/ia64/enter_uts.S b/lib/libkse/arch/ia64/ia64/enter_uts.S
index 5df4d939272c0..b4163bd90c091 100644
--- a/lib/libkse/arch/ia64/ia64/enter_uts.S
+++ b/lib/libkse/arch/ia64/ia64/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/ia64/ia64/enter_uts.S,v 1.2 2007/10/09 13:42:24 obrien Exp $");
 
 /*
  * void _ia64_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack,
diff --git a/lib/libkse/arch/ia64/ia64/pthread_md.c b/lib/libkse/arch/ia64/ia64/pthread_md.c
index dc59b0e87f8f2..42fb628d548c8 100644
--- a/lib/libkse/arch/ia64/ia64/pthread_md.c
+++ b/lib/libkse/arch/ia64/ia64/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/ia64/ia64/pthread_md.c,v 1.6 2007/10/09 13:42:24 obrien Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libkse/arch/ia64/include/atomic_ops.h b/lib/libkse/arch/ia64/include/atomic_ops.h
index 483c9050634d1..69fa2f7195ce6 100644
--- a/lib/libkse/arch/ia64/include/atomic_ops.h
+++ b/lib/libkse/arch/ia64/include/atomic_ops.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/ia64/include/atomic_ops.h,v 1.2 2007/10/09 13:42:24 obrien Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libkse/arch/ia64/include/pthread_md.h b/lib/libkse/arch/ia64/include/pthread_md.h
index c5fef187f584f..94625cf9d5180 100644
--- a/lib/libkse/arch/ia64/include/pthread_md.h
+++ b/lib/libkse/arch/ia64/include/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/ia64/include/pthread_md.h,v 1.19 2007/10/09 13:42:24 obrien Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
diff --git a/lib/libkse/arch/powerpc/Makefile.inc b/lib/libkse/arch/powerpc/Makefile.inc
index f4417a6ceb874..04e45ba93b6ed 100644
--- a/lib/libkse/arch/powerpc/Makefile.inc
+++ b/lib/libkse/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/arch/powerpc/Makefile.inc,v 1.2 2007/10/09 13:42:24 obrien Exp $
 
 # XXX temporary
 CFLAGS+=-DSYSTEM_SCOPE_ONLY
diff --git a/lib/libkse/arch/powerpc/include/atomic_ops.h b/lib/libkse/arch/powerpc/include/atomic_ops.h
index 8068e6f030a3e..0de790eda612c 100644
--- a/lib/libkse/arch/powerpc/include/atomic_ops.h
+++ b/lib/libkse/arch/powerpc/include/atomic_ops.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/powerpc/include/atomic_ops.h,v 1.2 2007/10/09 13:42:24 obrien Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libkse/arch/powerpc/include/pthread_md.h b/lib/libkse/arch/powerpc/include/pthread_md.h
index 2b13e4bc11cd1..ff5562aeeb8e4 100644
--- a/lib/libkse/arch/powerpc/include/pthread_md.h
+++ b/lib/libkse/arch/powerpc/include/pthread_md.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/powerpc/include/pthread_md.h,v 1.7 2007/10/09 13:42:24 obrien Exp $
  */
 
 /*
diff --git a/lib/libkse/arch/powerpc/powerpc/assym.c b/lib/libkse/arch/powerpc/powerpc/assym.c
index a8479e774585c..cd60686d2dd00 100644
--- a/lib/libkse/arch/powerpc/powerpc/assym.c
+++ b/lib/libkse/arch/powerpc/powerpc/assym.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/powerpc/powerpc/assym.c,v 1.2 2007/10/09 13:42:25 obrien Exp $
  */
 
 /* Used to generate mcontext_t offsets */
diff --git a/lib/libkse/arch/powerpc/powerpc/assym.s b/lib/libkse/arch/powerpc/powerpc/assym.s
index 7017c15153d5f..321468f92e812 100644
--- a/lib/libkse/arch/powerpc/powerpc/assym.s
+++ b/lib/libkse/arch/powerpc/powerpc/assym.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/powerpc/powerpc/assym.s,v 1.2 2007/10/09 13:42:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libkse/arch/powerpc/powerpc/context.S b/lib/libkse/arch/powerpc/powerpc/context.S
index 34d175ac69606..3e6944569723e 100644
--- a/lib/libkse/arch/powerpc/powerpc/context.S
+++ b/lib/libkse/arch/powerpc/powerpc/context.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/powerpc/powerpc/context.S,v 1.2 2007/10/09 13:42:25 obrien Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libkse/arch/powerpc/powerpc/enter_uts.S b/lib/libkse/arch/powerpc/powerpc/enter_uts.S
index 7cc4d7ff3df4f..aace50bb43e4c 100644
--- a/lib/libkse/arch/powerpc/powerpc/enter_uts.S
+++ b/lib/libkse/arch/powerpc/powerpc/enter_uts.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/powerpc/powerpc/enter_uts.S,v 1.2 2007/10/09 13:42:25 obrien Exp $");
 
 /*
  * _ppc32_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack,
diff --git a/lib/libkse/arch/powerpc/powerpc/pthread_md.c b/lib/libkse/arch/powerpc/powerpc/pthread_md.c
index 7aa5ee90f1865..5101ef210d092 100644
--- a/lib/libkse/arch/powerpc/powerpc/pthread_md.c
+++ b/lib/libkse/arch/powerpc/powerpc/pthread_md.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/powerpc/powerpc/pthread_md.c,v 1.5 2007/10/09 13:42:25 obrien Exp $");
 
 #include <stdlib.h>
 #include <strings.h>
diff --git a/lib/libkse/arch/sparc64/Makefile.inc b/lib/libkse/arch/sparc64/Makefile.inc
index 07107b4729af6..0cf46855fa6d9 100644
--- a/lib/libkse/arch/sparc64/Makefile.inc
+++ b/lib/libkse/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/arch/sparc64/Makefile.inc,v 1.2 2007/10/09 13:42:25 obrien Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libkse/arch/sparc64/include/atomic_ops.h b/lib/libkse/arch/sparc64/include/atomic_ops.h
index 4f4d8af28c82c..8422452e84904 100644
--- a/lib/libkse/arch/sparc64/include/atomic_ops.h
+++ b/lib/libkse/arch/sparc64/include/atomic_ops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/sparc64/include/atomic_ops.h,v 1.2 2007/10/09 13:42:25 obrien Exp $
  */
 
 #ifndef	_ATOMIC_OPS_H_
diff --git a/lib/libkse/arch/sparc64/include/pthread_md.h b/lib/libkse/arch/sparc64/include/pthread_md.h
index fac62c2bf1c41..cbd2b5c7efc86 100644
--- a/lib/libkse/arch/sparc64/include/pthread_md.h
+++ b/lib/libkse/arch/sparc64/include/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/sparc64/include/pthread_md.h,v 1.6 2007/10/09 13:42:25 obrien Exp $
  */
 
 /*
diff --git a/lib/libkse/arch/sparc64/sparc64/assym.s b/lib/libkse/arch/sparc64/sparc64/assym.s
index 3e22c9f6e1344..bbfdc99b0c559 100644
--- a/lib/libkse/arch/sparc64/sparc64/assym.s
+++ b/lib/libkse/arch/sparc64/sparc64/assym.s
@@ -2,7 +2,7 @@
  * Offsets into structures used from asm.  Must be kept in sync with
  * appropriate headers.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/arch/sparc64/sparc64/assym.s,v 1.3 2007/10/09 13:42:25 obrien Exp $
  */
 
 #define	UC_MCONTEXT	0x40
diff --git a/lib/libkse/arch/sparc64/sparc64/pthread_md.c b/lib/libkse/arch/sparc64/sparc64/pthread_md.c
index d6bf95d00d6dc..c03f5d05371f0 100644
--- a/lib/libkse/arch/sparc64/sparc64/pthread_md.c
+++ b/lib/libkse/arch/sparc64/sparc64/pthread_md.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/sparc64/sparc64/pthread_md.c,v 1.4 2007/10/09 13:42:25 obrien Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S b/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S
index ca6473ab18eae..9f3a237aeb881 100644
--- a/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S
+++ b/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S,v 1.4 2007/10/09 13:42:25 obrien Exp $");
 
 #include "assym.s"
 
diff --git a/lib/libkse/kse.map b/lib/libkse/kse.map
index e8888df5fba75..538af82fb14ce 100644
--- a/lib/libkse/kse.map
+++ b/lib/libkse/kse.map
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libkse/kse.map,v 1.1 2007/10/09 13:42:21 obrien Exp $ */
 
 /*
  * Use the same naming scheme as libc.
diff --git a/lib/libkse/support/Makefile.inc b/lib/libkse/support/Makefile.inc
index 956667fdef7d0..87589e487def5 100644
--- a/lib/libkse/support/Makefile.inc
+++ b/lib/libkse/support/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/support/Makefile.inc,v 1.9 2007/10/09 13:42:25 obrien Exp $
 
 .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
diff --git a/lib/libkse/support/thr_support.c b/lib/libkse/support/thr_support.c
index 2956e07a5d6b1..6cb91bef53283 100644
--- a/lib/libkse/support/thr_support.c
+++ b/lib/libkse/support/thr_support.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/support/thr_support.c,v 1.5 2007/10/09 13:42:25 obrien Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libkse/sys/Makefile.inc b/lib/libkse/sys/Makefile.inc
index fb4a108856953..05d8d1536b452 100644
--- a/lib/libkse/sys/Makefile.inc
+++ b/lib/libkse/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/sys/Makefile.inc,v 1.16 2007/10/09 13:42:26 obrien Exp $
 
 .PATH:	 ${.CURDIR}/sys
 
diff --git a/lib/libkse/sys/lock.c b/lib/libkse/sys/lock.c
index a4a28aff75091..808d1a62cb130 100644
--- a/lib/libkse/sys/lock.c
+++ b/lib/libkse/sys/lock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/sys/lock.c,v 1.11.4.1 2008/02/04 20:03:36 julian Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libkse/sys/lock.h b/lib/libkse/sys/lock.h
index 6102a0b7d60fc..4b746b0bd7e10 100644
--- a/lib/libkse/sys/lock.h
+++ b/lib/libkse/sys/lock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/sys/lock.h,v 1.8 2007/10/09 13:42:26 obrien Exp $
  */
 
 #ifndef _LOCK_H_
diff --git a/lib/libkse/sys/thr_error.c b/lib/libkse/sys/thr_error.c
index 0ba34e0d00926..2689d792f15af 100644
--- a/lib/libkse/sys/thr_error.c
+++ b/lib/libkse/sys/thr_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/sys/thr_error.c,v 1.10 2007/10/09 13:42:26 obrien Exp $
  */
 #include <pthread.h>
 #include "libc_private.h"
diff --git a/lib/libkse/test/Makefile b/lib/libkse/test/Makefile
index 5b5eb3c79a36a..c240e908325ff 100644
--- a/lib/libkse/test/Makefile
+++ b/lib/libkse/test/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/Makefile,v 1.14 2007/10/09 13:42:26 obrien Exp $
 #
 # Automated test suite for libpthread (pthreads).
 #
diff --git a/lib/libkse/test/README b/lib/libkse/test/README
index 8f625a1438e73..c0e2859ee33b2 100644
--- a/lib/libkse/test/README
+++ b/lib/libkse/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libkse/test/README,v 1.3 2007/10/09 13:42:26 obrien Exp $
 
 This test suite is meant to test general functionality of pthreads, as well as
 provide a simple framework for regression tests.  In general, this test suite
diff --git a/lib/libkse/test/guard_b.c b/lib/libkse/test/guard_b.c
index 2e2703165dd6b..a34728f37a7ed 100644
--- a/lib/libkse/test/guard_b.c
+++ b/lib/libkse/test/guard_b.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/guard_b.c,v 1.4 2007/10/09 13:42:26 obrien Exp $
  *
  * Test thread stack guard functionality.
  */
diff --git a/lib/libkse/test/guard_b.exp b/lib/libkse/test/guard_b.exp
index cc6747094a154..0aff7f3bfed7a 100644
--- a/lib/libkse/test/guard_b.exp
+++ b/lib/libkse/test/guard_b.exp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/guard_b.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
 Test begin
 No overflow:
 Overflow:
diff --git a/lib/libkse/test/guard_s.pl b/lib/libkse/test/guard_s.pl
index 7802ff3c38d6f..24bd83d02d8e8 100644
--- a/lib/libkse/test/guard_s.pl
+++ b/lib/libkse/test/guard_s.pl
@@ -27,7 +27,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/guard_s.pl,v 1.2 2007/10/09 13:42:26 obrien Exp $
 #
 # Test thread stack guard functionality.  The C test program needs to be driven
 # by this script because it segfaults when the stack guard is hit.
diff --git a/lib/libkse/test/hello_b.c b/lib/libkse/test/hello_b.c
index 2eefa7f48bfe5..8a80e98a8b22d 100644
--- a/lib/libkse/test/hello_b.c
+++ b/lib/libkse/test/hello_b.c
@@ -2,7 +2,7 @@
  *
  * Back end C programs can be anything compilable.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/hello_b.c,v 1.2 2007/10/09 13:42:26 obrien Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libkse/test/hello_d.c b/lib/libkse/test/hello_d.c
index 6d77526f16c77..cce3008c2939e 100644
--- a/lib/libkse/test/hello_d.c
+++ b/lib/libkse/test/hello_d.c
@@ -2,7 +2,7 @@
  *
  * Simple diff mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/hello_d.c,v 1.2 2007/10/09 13:42:26 obrien Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libkse/test/hello_d.exp b/lib/libkse/test/hello_d.exp
index 47be080f357ad..e4a3e4e8ec5cb 100644
--- a/lib/libkse/test/hello_d.exp
+++ b/lib/libkse/test/hello_d.exp
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/hello_d.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
 Hello world
diff --git a/lib/libkse/test/hello_s.c b/lib/libkse/test/hello_s.c
index 942bf2dae0aea..6d436afcfc190 100644
--- a/lib/libkse/test/hello_s.c
+++ b/lib/libkse/test/hello_s.c
@@ -2,7 +2,7 @@
  *
  * Simple sequence mode test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/hello_s.c,v 1.2 2007/10/09 13:42:26 obrien Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libkse/test/join_leak_d.c b/lib/libkse/test/join_leak_d.c
index 6532ca5bfc746..1ba7269f92291 100644
--- a/lib/libkse/test/join_leak_d.c
+++ b/lib/libkse/test/join_leak_d.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/join_leak_d.c,v 1.2 2007/10/09 13:42:26 obrien Exp $
  *
  * Test for leaked joined threads.
  */
diff --git a/lib/libkse/test/join_leak_d.exp b/lib/libkse/test/join_leak_d.exp
index a54de72b8908b..8a1099efb22de 100644
--- a/lib/libkse/test/join_leak_d.exp
+++ b/lib/libkse/test/join_leak_d.exp
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/join_leak_d.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
 Test begin
 Test end
diff --git a/lib/libkse/test/mutex_d.c b/lib/libkse/test/mutex_d.c
index 2aa3b1df661dc..33b1b05cc3e26 100644
--- a/lib/libkse/test/mutex_d.c
+++ b/lib/libkse/test/mutex_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/mutex_d.c,v 1.6 2007/10/09 13:42:26 obrien Exp $
  */
 
 #include <sys/time.h>
diff --git a/lib/libkse/test/mutex_d.exp b/lib/libkse/test/mutex_d.exp
index dd2f7bd1e5260..075efebd94f3e 100644
--- a/lib/libkse/test/mutex_d.exp
+++ b/lib/libkse/test/mutex_d.exp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/mutex_d.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
 
 Testing pthread_mutex_init
 --------------------------
diff --git a/lib/libkse/test/propagate_s.pl b/lib/libkse/test/propagate_s.pl
index 6b8509043d980..dfe8674fd0a4a 100644
--- a/lib/libkse/test/propagate_s.pl
+++ b/lib/libkse/test/propagate_s.pl
@@ -31,7 +31,7 @@
 #
 # Verify that no cancellation points are propagated inside of libpthread.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/propagate_s.pl,v 1.3 2007/10/09 13:42:26 obrien Exp $
 #
 
 @CPOINTS = ("aio_suspend", "close", "creat", "fcntl", "fsync", "mq_receive",
diff --git a/lib/libkse/test/sem_d.c b/lib/libkse/test/sem_d.c
index b834591852d96..20d64067e188c 100644
--- a/lib/libkse/test/sem_d.c
+++ b/lib/libkse/test/sem_d.c
@@ -31,7 +31,7 @@
  *
  * sem test.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/sem_d.c,v 1.3 2007/10/09 13:42:26 obrien Exp $
  *
  ****************************************************************************/
 
diff --git a/lib/libkse/test/sem_d.exp b/lib/libkse/test/sem_d.exp
index cd86f12411092..0c6218ffd69ff 100644
--- a/lib/libkse/test/sem_d.exp
+++ b/lib/libkse/test/sem_d.exp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/sem_d.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
 Test begin
 Got semaphore
 Got semaphore
diff --git a/lib/libkse/test/sigsuspend_d.c b/lib/libkse/test/sigsuspend_d.c
index d405e3dbb01a3..5cc911697586f 100644
--- a/lib/libkse/test/sigsuspend_d.c
+++ b/lib/libkse/test/sigsuspend_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/sigsuspend_d.c,v 1.4 2007/10/09 13:42:26 obrien Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libkse/test/sigsuspend_d.exp b/lib/libkse/test/sigsuspend_d.exp
index 03c9a727799e9..adfc19df9e7b8 100644
--- a/lib/libkse/test/sigsuspend_d.exp
+++ b/lib/libkse/test/sigsuspend_d.exp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/sigsuspend_d.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
   -> Suspender thread signal handler caught signal 16
 Sigsuspend woke up by signal 16
   -> Suspender thread signal handler caught signal 16
diff --git a/lib/libkse/test/sigwait_d.c b/lib/libkse/test/sigwait_d.c
index f3ccd6b98491d..de9c2e4336c07 100644
--- a/lib/libkse/test/sigwait_d.c
+++ b/lib/libkse/test/sigwait_d.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/test/sigwait_d.c,v 1.3 2007/10/09 13:42:26 obrien Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libkse/test/sigwait_d.exp b/lib/libkse/test/sigwait_d.exp
index b9245be31f0ec..dab348f2c52cf 100644
--- a/lib/libkse/test/sigwait_d.exp
+++ b/lib/libkse/test/sigwait_d.exp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/sigwait_d.exp,v 1.2 2007/10/09 13:42:26 obrien Exp $
 Sigwait caught signal 16
 Sigwait caught signal 16
 Sigwait caught signal 30
diff --git a/lib/libkse/test/verify b/lib/libkse/test/verify
index 2863e5c3fa0c1..f0d93eb72ba17 100644
--- a/lib/libkse/test/verify
+++ b/lib/libkse/test/verify
@@ -33,7 +33,7 @@
 #
 # Test harness.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/test/verify,v 1.3 2007/10/09 13:42:26 obrien Exp $
 #
 #############################################################################
 
diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc
index 561be9371242a..f29592cdb2f54 100644
--- a/lib/libkse/thread/Makefile.inc
+++ b/lib/libkse/thread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libkse/thread/Makefile.inc,v 1.51 2007/10/09 13:42:27 obrien Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread
diff --git a/lib/libkse/thread/thr_accept.c b/lib/libkse/thread/thr_accept.c
index fc60fb47492bf..d33a73facdef6 100644
--- a/lib/libkse/thread/thr_accept.c
+++ b/lib/libkse/thread/thr_accept.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_accept.c,v 1.4 2007/10/09 13:42:27 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libkse/thread/thr_aio_suspend.c b/lib/libkse/thread/thr_aio_suspend.c
index 43a24143196ae..c1b2716e733c4 100644
--- a/lib/libkse/thread/thr_aio_suspend.c
+++ b/lib/libkse/thread/thr_aio_suspend.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_aio_suspend.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <aio.h>
diff --git a/lib/libkse/thread/thr_atfork.c b/lib/libkse/thread/thr_atfork.c
index a741329d071f9..98b55228f5fdd 100644
--- a/lib/libkse/thread/thr_atfork.c
+++ b/lib/libkse/thread/thr_atfork.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_atfork.c,v 1.3 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_attr_destroy.c b/lib/libkse/thread/thr_attr_destroy.c
index 0e2b2e114ea09..8dcafba2c6376 100644
--- a/lib/libkse/thread/thr_attr_destroy.c
+++ b/lib/libkse/thread/thr_attr_destroy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_destroy.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_attr_get_np.c b/lib/libkse/thread/thr_attr_get_np.c
index a63088f9c5b84..1864a5a66e1d3 100644
--- a/lib/libkse/thread/thr_attr_get_np.c
+++ b/lib/libkse/thread/thr_attr_get_np.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_get_np.c,v 1.6 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libkse/thread/thr_attr_getdetachstate.c b/lib/libkse/thread/thr_attr_getdetachstate.c
index 465ad28c7e465..f3b36d7571aa3 100644
--- a/lib/libkse/thread/thr_attr_getdetachstate.c
+++ b/lib/libkse/thread/thr_attr_getdetachstate.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getdetachstate.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getguardsize.c b/lib/libkse/thread/thr_attr_getguardsize.c
index 351015c20532d..ba7be7d483c54 100644
--- a/lib/libkse/thread/thr_attr_getguardsize.c
+++ b/lib/libkse/thread/thr_attr_getguardsize.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getguardsize.c,v 1.4 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_attr_getinheritsched.c b/lib/libkse/thread/thr_attr_getinheritsched.c
index eab19e36ea84c..371f738ac1ab1 100644
--- a/lib/libkse/thread/thr_attr_getinheritsched.c
+++ b/lib/libkse/thread/thr_attr_getinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getinheritsched.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getschedparam.c b/lib/libkse/thread/thr_attr_getschedparam.c
index ca2eed30c0f06..854dde60ef7f5 100644
--- a/lib/libkse/thread/thr_attr_getschedparam.c
+++ b/lib/libkse/thread/thr_attr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedparam.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getschedpolicy.c b/lib/libkse/thread/thr_attr_getschedpolicy.c
index dc952bdda5074..1c31c7d487321 100644
--- a/lib/libkse/thread/thr_attr_getschedpolicy.c
+++ b/lib/libkse/thread/thr_attr_getschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedpolicy.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getscope.c b/lib/libkse/thread/thr_attr_getscope.c
index ceb198fabe3ee..f2ccad80c9cf4 100644
--- a/lib/libkse/thread/thr_attr_getscope.c
+++ b/lib/libkse/thread/thr_attr_getscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getscope.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getstack.c b/lib/libkse/thread/thr_attr_getstack.c
index 79a92cb38174c..b5392ad447413 100644
--- a/lib/libkse/thread/thr_attr_getstack.c
+++ b/lib/libkse/thread/thr_attr_getstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getstack.c,v 1.3 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getstackaddr.c b/lib/libkse/thread/thr_attr_getstackaddr.c
index ed526daab1fc7..1c66182f9a962 100644
--- a/lib/libkse/thread/thr_attr_getstackaddr.c
+++ b/lib/libkse/thread/thr_attr_getstackaddr.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getstackaddr.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_getstacksize.c b/lib/libkse/thread/thr_attr_getstacksize.c
index 4ccced64c9fd4..b2eaefbc38018 100644
--- a/lib/libkse/thread/thr_attr_getstacksize.c
+++ b/lib/libkse/thread/thr_attr_getstacksize.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_getstacksize.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_init.c b/lib/libkse/thread/thr_attr_init.c
index af6260eaf43c0..14d294b29e2c3 100644
--- a/lib/libkse/thread/thr_attr_init.c
+++ b/lib/libkse/thread/thr_attr_init.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_init.c,v 1.13 2007/10/09 13:42:27 obrien Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c
index 8ff485bc469a7..c03d5ad3ad3b3 100644
--- a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c
+++ b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c,v 1.11 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setdetachstate.c b/lib/libkse/thread/thr_attr_setdetachstate.c
index ebffd206f3d16..d4e523f9519e6 100644
--- a/lib/libkse/thread/thr_attr_setdetachstate.c
+++ b/lib/libkse/thread/thr_attr_setdetachstate.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setdetachstate.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setguardsize.c b/lib/libkse/thread/thr_attr_setguardsize.c
index dedee8badc703..5c123a393bc1d 100644
--- a/lib/libkse/thread/thr_attr_setguardsize.c
+++ b/lib/libkse/thread/thr_attr_setguardsize.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setguardsize.c,v 1.8 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libkse/thread/thr_attr_setinheritsched.c b/lib/libkse/thread/thr_attr_setinheritsched.c
index 5182b7db38004..dadcdb60a87ce 100644
--- a/lib/libkse/thread/thr_attr_setinheritsched.c
+++ b/lib/libkse/thread/thr_attr_setinheritsched.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setinheritsched.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setschedparam.c b/lib/libkse/thread/thr_attr_setschedparam.c
index 61d741d6d4f26..0825face1d0ce 100644
--- a/lib/libkse/thread/thr_attr_setschedparam.c
+++ b/lib/libkse/thread/thr_attr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setschedparam.c,v 1.12 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setschedpolicy.c b/lib/libkse/thread/thr_attr_setschedpolicy.c
index fb24cb102f28f..9e4847d6e8a1e 100644
--- a/lib/libkse/thread/thr_attr_setschedpolicy.c
+++ b/lib/libkse/thread/thr_attr_setschedpolicy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setschedpolicy.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setscope.c b/lib/libkse/thread/thr_attr_setscope.c
index 3cc7f161afb1c..766c1b8b23fd8 100644
--- a/lib/libkse/thread/thr_attr_setscope.c
+++ b/lib/libkse/thread/thr_attr_setscope.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setscope.c,v 1.12 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setstack.c b/lib/libkse/thread/thr_attr_setstack.c
index bdccfd8473960..48e3bc6b5768b 100644
--- a/lib/libkse/thread/thr_attr_setstack.c
+++ b/lib/libkse/thread/thr_attr_setstack.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setstack.c,v 1.3 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setstackaddr.c b/lib/libkse/thread/thr_attr_setstackaddr.c
index f82729a51dfd3..b650d0f1ce41c 100644
--- a/lib/libkse/thread/thr_attr_setstackaddr.c
+++ b/lib/libkse/thread/thr_attr_setstackaddr.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setstackaddr.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_attr_setstacksize.c b/lib/libkse/thread/thr_attr_setstacksize.c
index 590e71e23390f..e18d640fd8d53 100644
--- a/lib/libkse/thread/thr_attr_setstacksize.c
+++ b/lib/libkse/thread/thr_attr_setstacksize.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_attr_setstacksize.c,v 1.11 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_autoinit.c b/lib/libkse/thread/thr_autoinit.c
index 95b2a853ca586..f7bcc41012ad5 100644
--- a/lib/libkse/thread/thr_autoinit.c
+++ b/lib/libkse/thread/thr_autoinit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_autoinit.c,v 1.3 2007/10/09 13:42:27 obrien Exp $
  */
 
 /*
diff --git a/lib/libkse/thread/thr_barrier.c b/lib/libkse/thread/thr_barrier.c
index c8be343484c4c..a771f74994b86 100644
--- a/lib/libkse/thread/thr_barrier.c
+++ b/lib/libkse/thread/thr_barrier.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_barrier.c,v 1.4 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_barrierattr.c b/lib/libkse/thread/thr_barrierattr.c
index 3384aeec8d005..38cab0bb3d018 100644
--- a/lib/libkse/thread/thr_barrierattr.c
+++ b/lib/libkse/thread/thr_barrierattr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_barrierattr.c,v 1.3 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_cancel.c b/lib/libkse/thread/thr_cancel.c
index bbf6fdf754ff9..616ca7bbd2915 100644
--- a/lib/libkse/thread/thr_cancel.c
+++ b/lib/libkse/thread/thr_cancel.c
@@ -1,6 +1,6 @@
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_cancel.c,v 1.34 2007/10/09 13:42:27 obrien Exp $
  */
 #include <sys/errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_clean.c b/lib/libkse/thread/thr_clean.c
index 0153e990daae5..fc1c3dbe461eb 100644
--- a/lib/libkse/thread/thr_clean.c
+++ b/lib/libkse/thread/thr_clean.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_clean.c,v 1.12 2007/10/09 13:42:27 obrien Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_close.c b/lib/libkse/thread/thr_close.c
index 66747afc602f4..99e383c329535 100644
--- a/lib/libkse/thread/thr_close.c
+++ b/lib/libkse/thread/thr_close.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_close.c,v 1.20 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_concurrency.c b/lib/libkse/thread/thr_concurrency.c
index 74e0e11693222..9a98bb6d6d152 100644
--- a/lib/libkse/thread/thr_concurrency.c
+++ b/lib/libkse/thread/thr_concurrency.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_concurrency.c,v 1.11 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_cond.c b/lib/libkse/thread/thr_cond.c
index 589f4b16d6252..10dc9023e8a1b 100644
--- a/lib/libkse/thread/thr_cond.c
+++ b/lib/libkse/thread/thr_cond.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_cond.c,v 1.57 2007/10/09 13:42:27 obrien Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_condattr_destroy.c b/lib/libkse/thread/thr_condattr_destroy.c
index 3805a62df62c1..7cdc4c04dd2c7 100644
--- a/lib/libkse/thread/thr_condattr_destroy.c
+++ b/lib/libkse/thread/thr_condattr_destroy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_condattr_destroy.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_condattr_init.c b/lib/libkse/thread/thr_condattr_init.c
index 0b8656618fea0..624f89a60cc61 100644
--- a/lib/libkse/thread/thr_condattr_init.c
+++ b/lib/libkse/thread/thr_condattr_init.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_condattr_init.c,v 1.11 2007/10/09 13:42:27 obrien Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_condattr_pshared.c b/lib/libkse/thread/thr_condattr_pshared.c
index 7cef4d9764a57..4ba3a157cada3 100644
--- a/lib/libkse/thread/thr_condattr_pshared.c
+++ b/lib/libkse/thread/thr_condattr_pshared.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_condattr_pshared.c,v 1.2 2007/10/09 13:42:27 obrien Exp $
  *
  */
 
diff --git a/lib/libkse/thread/thr_connect.c b/lib/libkse/thread/thr_connect.c
index 225d8b9ff8a98..7006cf484c4a9 100644
--- a/lib/libkse/thread/thr_connect.c
+++ b/lib/libkse/thread/thr_connect.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_connect.c,v 1.4 2007/10/09 13:42:27 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libkse/thread/thr_creat.c b/lib/libkse/thread/thr_creat.c
index 7528f0b3bc652..8ec2884473772 100644
--- a/lib/libkse/thread/thr_creat.c
+++ b/lib/libkse/thread/thr_creat.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_creat.c,v 1.10 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <fcntl.h>
diff --git a/lib/libkse/thread/thr_create.c b/lib/libkse/thread/thr_create.c
index f4bd47581d750..3ba3f9c0fbdc8 100644
--- a/lib/libkse/thread/thr_create.c
+++ b/lib/libkse/thread/thr_create.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_create.c,v 1.62 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_detach.c b/lib/libkse/thread/thr_detach.c
index 0c0c0c80677e7..be0ccf7bb8f97 100644
--- a/lib/libkse/thread/thr_detach.c
+++ b/lib/libkse/thread/thr_detach.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_detach.c,v 1.26 2007/10/09 13:42:27 obrien Exp $
  */
 #include <sys/types.h>
 #include <machine/atomic.h>
diff --git a/lib/libkse/thread/thr_equal.c b/lib/libkse/thread/thr_equal.c
index 0ac747acfe17e..db172ee246263 100644
--- a/lib/libkse/thread/thr_equal.c
+++ b/lib/libkse/thread/thr_equal.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_equal.c,v 1.9 2007/10/09 13:42:27 obrien Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libkse/thread/thr_execve.c b/lib/libkse/thread/thr_execve.c
index b90298169a0e5..f6eadb2186f50 100644
--- a/lib/libkse/thread/thr_execve.c
+++ b/lib/libkse/thread/thr_execve.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_execve.c,v 1.5 2007/10/09 13:42:27 obrien Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_exit.c b/lib/libkse/thread/thr_exit.c
index ba82fd1693b3b..8cefad867f622 100644
--- a/lib/libkse/thread/thr_exit.c
+++ b/lib/libkse/thread/thr_exit.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_exit.c,v 1.42 2007/10/09 13:42:27 obrien Exp $
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libkse/thread/thr_fcntl.c b/lib/libkse/thread/thr_fcntl.c
index af531b32aac5c..3a228b6319884 100644
--- a/lib/libkse/thread/thr_fcntl.c
+++ b/lib/libkse/thread/thr_fcntl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.22 2007/10/09 13:42:28 obrien Exp $
  */
 #include <stdarg.h>
 #include "namespace.h"
diff --git a/lib/libkse/thread/thr_find_thread.c b/lib/libkse/thread/thr_find_thread.c
index 780624e4804cd..1f7b58913a774 100644
--- a/lib/libkse/thread/thr_find_thread.c
+++ b/lib/libkse/thread/thr_find_thread.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_find_thread.c,v 1.16 2007/10/09 13:42:28 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_fork.c b/lib/libkse/thread/thr_fork.c
index 1fd212ed726ef..d9dcf8187f752 100644
--- a/lib/libkse/thread/thr_fork.c
+++ b/lib/libkse/thread/thr_fork.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_fork.c,v 1.39 2007/10/09 13:42:28 obrien Exp $
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libkse/thread/thr_fsync.c b/lib/libkse/thread/thr_fsync.c
index 9d170507d3c50..0c685003d6eea 100644
--- a/lib/libkse/thread/thr_fsync.c
+++ b/lib/libkse/thread/thr_fsync.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_fsync.c,v 1.17 2007/10/09 13:42:28 obrien Exp $
  */
 #include <unistd.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_getprio.c b/lib/libkse/thread/thr_getprio.c
index 426e77d61ae01..23e9d7a50470a 100644
--- a/lib/libkse/thread/thr_getprio.c
+++ b/lib/libkse/thread/thr_getprio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_getprio.c,v 1.13 2007/10/09 13:42:28 obrien Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libkse/thread/thr_getschedparam.c b/lib/libkse/thread/thr_getschedparam.c
index dca342fb14f3b..4dee906ff2842 100644
--- a/lib/libkse/thread/thr_getschedparam.c
+++ b/lib/libkse/thread/thr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_getschedparam.c,v 1.12 2007/10/09 13:42:28 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_info.c b/lib/libkse/thread/thr_info.c
index e8dc506371f40..6a2c7dc475edf 100644
--- a/lib/libkse/thread/thr_info.c
+++ b/lib/libkse/thread/thr_info.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_info.c,v 1.31 2007/10/09 13:42:28 obrien Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_init.c b/lib/libkse/thread/thr_init.c
index 5c8aac4b3f0fe..23689ace690ec 100644
--- a/lib/libkse/thread/thr_init.c
+++ b/lib/libkse/thread/thr_init.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_init.c,v 1.76 2007/10/09 13:42:28 obrien Exp $
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libkse/thread/thr_join.c b/lib/libkse/thread/thr_join.c
index 239603456a422..614840f4a53f6 100644
--- a/lib/libkse/thread/thr_join.c
+++ b/lib/libkse/thread/thr_join.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_join.c,v 1.32 2007/10/09 13:42:28 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c
index d6ecb7b1468f9..2151734dede93 100644
--- a/lib/libkse/thread/thr_kern.c
+++ b/lib/libkse/thread/thr_kern.c
@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_kern.c,v 1.125.4.1 2008/02/04 20:03:36 julian Exp $");
 
 #include <sys/types.h>
 #include <sys/kse.h>
diff --git a/lib/libkse/thread/thr_kill.c b/lib/libkse/thread/thr_kill.c
index 2aee0ac0e84f9..a7f4697abb184 100644
--- a/lib/libkse/thread/thr_kill.c
+++ b/lib/libkse/thread/thr_kill.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_kill.c,v 1.19 2007/10/09 13:42:28 obrien Exp $
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libkse/thread/thr_main_np.c b/lib/libkse/thread/thr_main_np.c
index 50fb9c8cbe767..b0ce757ba77d7 100644
--- a/lib/libkse/thread/thr_main_np.c
+++ b/lib/libkse/thread/thr_main_np.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libkse/thread/thr_main_np.c,v 1.7 2007/10/09 13:42:28 obrien Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_mattr_init.c b/lib/libkse/thread/thr_mattr_init.c
index b273babf1104e..afdedc77e486c 100644
--- a/lib/libkse/thread/thr_mattr_init.c
+++ b/lib/libkse/thread/thr_mattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mattr_init.c,v 1.11 2007/10/09 13:42:28 obrien Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_mattr_kind_np.c b/lib/libkse/thread/thr_mattr_kind_np.c
index f90f31aacc8c4..34d591b8a55a4 100644
--- a/lib/libkse/thread/thr_mattr_kind_np.c
+++ b/lib/libkse/thread/thr_mattr_kind_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mattr_kind_np.c,v 1.12 2007/10/09 13:42:28 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_mattr_pshared.c b/lib/libkse/thread/thr_mattr_pshared.c
index 03aff41b4a03d..8059b7cc9b7fb 100644
--- a/lib/libkse/thread/thr_mattr_pshared.c
+++ b/lib/libkse/thread/thr_mattr_pshared.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mattr_pshared.c,v 1.2 2007/10/09 13:42:28 obrien Exp $
  *
  */
 
diff --git a/lib/libkse/thread/thr_msync.c b/lib/libkse/thread/thr_msync.c
index 66e88c51e6142..b7707bcb336d8 100644
--- a/lib/libkse/thread/thr_msync.c
+++ b/lib/libkse/thread/thr_msync.c
@@ -3,7 +3,7 @@
  *
  * $OpenBSD: uthread_msync.c,v 1.2 1999/06/09 07:16:17 d Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_msync.c,v 1.11 2007/10/09 13:42:28 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_multi_np.c b/lib/libkse/thread/thr_multi_np.c
index f2bdd24bc5b86..66ffb159bd79d 100644
--- a/lib/libkse/thread/thr_multi_np.c
+++ b/lib/libkse/thread/thr_multi_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_multi_np.c,v 1.10 2007/10/09 13:42:28 obrien Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libkse/thread/thr_mutex.c b/lib/libkse/thread/thr_mutex.c
index 264e01e01d198..f017676142d96 100644
--- a/lib/libkse/thread/thr_mutex.c
+++ b/lib/libkse/thread/thr_mutex.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mutex.c,v 1.53.2.1 2007/11/14 09:54:48 kris Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_mutex_prioceiling.c b/lib/libkse/thread/thr_mutex_prioceiling.c
index f254346f9f3a1..096da2531d1d4 100644
--- a/lib/libkse/thread/thr_mutex_prioceiling.c
+++ b/lib/libkse/thread/thr_mutex_prioceiling.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mutex_prioceiling.c,v 1.10 2007/10/09 13:42:28 obrien Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_mutex_protocol.c b/lib/libkse/thread/thr_mutex_protocol.c
index 9e3e46b013851..fe04f38a7312c 100644
--- a/lib/libkse/thread/thr_mutex_protocol.c
+++ b/lib/libkse/thread/thr_mutex_protocol.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mutex_protocol.c,v 1.9 2007/10/09 13:42:28 obrien Exp $
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_mutexattr_destroy.c b/lib/libkse/thread/thr_mutexattr_destroy.c
index 86c051d2c8dc6..bd37ccc483e48 100644
--- a/lib/libkse/thread/thr_mutexattr_destroy.c
+++ b/lib/libkse/thread/thr_mutexattr_destroy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_mutexattr_destroy.c,v 1.11 2007/10/09 13:42:28 obrien Exp $
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_nanosleep.c b/lib/libkse/thread/thr_nanosleep.c
index 974cc20173e9b..8ec6b3850c858 100644
--- a/lib/libkse/thread/thr_nanosleep.c
+++ b/lib/libkse/thread/thr_nanosleep.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_nanosleep.c,v 1.28 2007/10/09 13:42:28 obrien Exp $
  */
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_once.c b/lib/libkse/thread/thr_once.c
index cd69cd6b10dc7..9c25c760b9263 100644
--- a/lib/libkse/thread/thr_once.c
+++ b/lib/libkse/thread/thr_once.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_once.c,v 1.13 2007/10/09 13:42:28 obrien Exp $
  */
 #include "namespace.h"
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_open.c b/lib/libkse/thread/thr_open.c
index 7d5035f73e8bb..8beed6b261101 100644
--- a/lib/libkse/thread/thr_open.c
+++ b/lib/libkse/thread/thr_open.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_open.c,v 1.19 2007/10/09 13:42:28 obrien Exp $
  *
  */
 #include <stdarg.h>
diff --git a/lib/libkse/thread/thr_pause.c b/lib/libkse/thread/thr_pause.c
index b3f0fe54a10ec..f46cca9af5e6c 100644
--- a/lib/libkse/thread/thr_pause.c
+++ b/lib/libkse/thread/thr_pause.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_pause.c,v 1.10 2007/10/09 13:42:28 obrien Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libkse/thread/thr_poll.c b/lib/libkse/thread/thr_poll.c
index 5e3890bc07c9d..610f1563505fe 100644
--- a/lib/libkse/thread/thr_poll.c
+++ b/lib/libkse/thread/thr_poll.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_poll.c,v 1.18 2007/10/09 13:42:28 obrien Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_printf.c b/lib/libkse/thread/thr_printf.c
index 2a4b12bf971ce..ee440c26f1b56 100644
--- a/lib/libkse/thread/thr_printf.c
+++ b/lib/libkse/thread/thr_printf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_printf.c,v 1.5 2007/10/09 13:42:28 obrien Exp $");
 
 #include <stdarg.h>
 #include <string.h>
diff --git a/lib/libkse/thread/thr_priority_queue.c b/lib/libkse/thread/thr_priority_queue.c
index f750a0178961d..07d5949778258 100644
--- a/lib/libkse/thread/thr_priority_queue.c
+++ b/lib/libkse/thread/thr_priority_queue.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_priority_queue.c,v 1.17 2007/10/09 13:42:28 obrien Exp $
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h
index 878c0cfa65046..72a0b9fc8274a 100644
--- a/lib/libkse/thread/thr_private.h
+++ b/lib/libkse/thread/thr_private.h
@@ -28,7 +28,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_private.h,v 1.131 2007/10/09 13:42:28 obrien Exp $
  */
 
 #ifndef _THR_PRIVATE_H
diff --git a/lib/libkse/thread/thr_pselect.c b/lib/libkse/thread/thr_pselect.c
index a0e94100e6c0d..c85613fd36822 100644
--- a/lib/libkse/thread/thr_pselect.c
+++ b/lib/libkse/thread/thr_pselect.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_pselect.c,v 1.7 2007/10/09 13:42:29 obrien Exp $");
 
 #include <sys/select.h>
 #include <sys/time.h>
diff --git a/lib/libkse/thread/thr_pspinlock.c b/lib/libkse/thread/thr_pspinlock.c
index 5836fdebcc581..f8e4b90a0e0df 100644
--- a/lib/libkse/thread/thr_pspinlock.c
+++ b/lib/libkse/thread/thr_pspinlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_pspinlock.c,v 1.5 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_raise.c b/lib/libkse/thread/thr_raise.c
index ad4aa39b080bd..1875ae71b38f6 100644
--- a/lib/libkse/thread/thr_raise.c
+++ b/lib/libkse/thread/thr_raise.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_raise.c,v 1.3 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_read.c b/lib/libkse/thread/thr_read.c
index 8fd349a0fb024..db07343b82442 100644
--- a/lib/libkse/thread/thr_read.c
+++ b/lib/libkse/thread/thr_read.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_read.c,v 1.21 2007/10/09 13:42:29 obrien Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_readv.c b/lib/libkse/thread/thr_readv.c
index 46b08dc8a04a2..fa1c696615e8b 100644
--- a/lib/libkse/thread/thr_readv.c
+++ b/lib/libkse/thread/thr_readv.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_readv.c,v 1.22 2007/10/09 13:42:29 obrien Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_resume_np.c b/lib/libkse/thread/thr_resume_np.c
index eb7bcf3dfb713..ba85e2ee41a59 100644
--- a/lib/libkse/thread/thr_resume_np.c
+++ b/lib/libkse/thread/thr_resume_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_resume_np.c,v 1.21 2007/10/09 13:42:29 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_rtld.c b/lib/libkse/thread/thr_rtld.c
index e8130735fb4df..358cbb43763e9 100644
--- a/lib/libkse/thread/thr_rtld.c
+++ b/lib/libkse/thread/thr_rtld.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_rtld.c,v 1.7 2007/10/09 13:42:29 obrien Exp $
  */
 #include <sys/cdefs.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_rwlock.c b/lib/libkse/thread/thr_rwlock.c
index a0b36de208937..8ee83a2953641 100644
--- a/lib/libkse/thread/thr_rwlock.c
+++ b/lib/libkse/thread/thr_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_rwlock.c,v 1.16 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_rwlockattr.c b/lib/libkse/thread/thr_rwlockattr.c
index 174b28f000a53..85da00b3dec16 100644
--- a/lib/libkse/thread/thr_rwlockattr.c
+++ b/lib/libkse/thread/thr_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_rwlockattr.c,v 1.10 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_select.c b/lib/libkse/thread/thr_select.c
index 2913c69108563..868025f6c3f7e 100644
--- a/lib/libkse/thread/thr_select.c
+++ b/lib/libkse/thread/thr_select.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_select.c,v 1.29 2007/10/09 13:42:29 obrien Exp $
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_self.c b/lib/libkse/thread/thr_self.c
index e016b95cb9d21..8ab8705ee9c0b 100644
--- a/lib/libkse/thread/thr_self.c
+++ b/lib/libkse/thread/thr_self.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_self.c,v 1.10 2007/10/09 13:42:29 obrien Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libkse/thread/thr_sem.c b/lib/libkse/thread/thr_sem.c
index 21746bbe7f440..313f123e6ae99 100644
--- a/lib/libkse/thread/thr_sem.c
+++ b/lib/libkse/thread/thr_sem.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sem.c,v 1.20 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libkse/thread/thr_seterrno.c b/lib/libkse/thread/thr_seterrno.c
index 0b83ff098adab..08fe46f62ce41 100644
--- a/lib/libkse/thread/thr_seterrno.c
+++ b/lib/libkse/thread/thr_seterrno.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_seterrno.c,v 1.9 2007/10/09 13:42:29 obrien Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libkse/thread/thr_setprio.c b/lib/libkse/thread/thr_setprio.c
index 2f67e8176ef1b..9468c26c5d354 100644
--- a/lib/libkse/thread/thr_setprio.c
+++ b/lib/libkse/thread/thr_setprio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_setprio.c,v 1.13 2007/10/09 13:42:29 obrien Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libkse/thread/thr_setschedparam.c b/lib/libkse/thread/thr_setschedparam.c
index 8f5154caea250..c58604ebd77ce 100644
--- a/lib/libkse/thread/thr_setschedparam.c
+++ b/lib/libkse/thread/thr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_setschedparam.c,v 1.15 2007/10/09 13:42:29 obrien Exp $
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libkse/thread/thr_sig.c b/lib/libkse/thread/thr_sig.c
index 228722169fdb7..7e594f8b2df30 100644
--- a/lib/libkse/thread/thr_sig.c
+++ b/lib/libkse/thread/thr_sig.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sig.c,v 1.87 2007/10/09 13:42:29 obrien Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_sigaction.c b/lib/libkse/thread/thr_sigaction.c
index bfb67fefad0b7..953dc5e2d7b10 100644
--- a/lib/libkse/thread/thr_sigaction.c
+++ b/lib/libkse/thread/thr_sigaction.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sigaction.c,v 1.26 2007/10/09 13:42:29 obrien Exp $
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_sigaltstack.c b/lib/libkse/thread/thr_sigaltstack.c
index 8ebbdee7d51c8..e8c1023cda59c 100644
--- a/lib/libkse/thread/thr_sigaltstack.c
+++ b/lib/libkse/thread/thr_sigaltstack.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_sigaltstack.c,v 1.4 2007/10/09 13:42:29 obrien Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libkse/thread/thr_sigmask.c b/lib/libkse/thread/thr_sigmask.c
index b08ba06fe0abb..fd0fbafbf03db 100644
--- a/lib/libkse/thread/thr_sigmask.c
+++ b/lib/libkse/thread/thr_sigmask.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sigmask.c,v 1.22 2007/10/09 13:42:29 obrien Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_sigpending.c b/lib/libkse/thread/thr_sigpending.c
index 5c666bf53459d..207969ddecaf2 100644
--- a/lib/libkse/thread/thr_sigpending.c
+++ b/lib/libkse/thread/thr_sigpending.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sigpending.c,v 1.18 2007/10/09 13:42:29 obrien Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_sigprocmask.c b/lib/libkse/thread/thr_sigprocmask.c
index f6468342e04c2..597848b682130 100644
--- a/lib/libkse/thread/thr_sigprocmask.c
+++ b/lib/libkse/thread/thr_sigprocmask.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sigprocmask.c,v 1.20 2007/10/09 13:42:29 obrien Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_sigsuspend.c b/lib/libkse/thread/thr_sigsuspend.c
index 7e56eae2a0108..638fd8bd9d163 100644
--- a/lib/libkse/thread/thr_sigsuspend.c
+++ b/lib/libkse/thread/thr_sigsuspend.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sigsuspend.c,v 1.30 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_sigwait.c b/lib/libkse/thread/thr_sigwait.c
index 532251c8bcf9e..84c9c3e113d1e 100644
--- a/lib/libkse/thread/thr_sigwait.c
+++ b/lib/libkse/thread/thr_sigwait.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sigwait.c,v 1.38 2007/10/09 13:42:29 obrien Exp $
  */
 #include <signal.h>
 #include <sys/param.h>
diff --git a/lib/libkse/thread/thr_single_np.c b/lib/libkse/thread/thr_single_np.c
index 572000671724f..e27e53bdba5b8 100644
--- a/lib/libkse/thread/thr_single_np.c
+++ b/lib/libkse/thread/thr_single_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_single_np.c,v 1.9 2007/10/09 13:42:29 obrien Exp $
  */
 #include <pthread.h>
 #include <pthread_np.h>
diff --git a/lib/libkse/thread/thr_sleep.c b/lib/libkse/thread/thr_sleep.c
index 0a1187641dba0..3d7e228d4ced4 100644
--- a/lib/libkse/thread/thr_sleep.c
+++ b/lib/libkse/thread/thr_sleep.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_sleep.c,v 1.11 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <unistd.h>
diff --git a/lib/libkse/thread/thr_spec.c b/lib/libkse/thread/thr_spec.c
index f373d8ee1bf8f..d9177c9fb47da 100644
--- a/lib/libkse/thread/thr_spec.c
+++ b/lib/libkse/thread/thr_spec.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_spec.c,v 1.25.2.1 2007/11/26 02:39:52 davidxu Exp $
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_spinlock.c b/lib/libkse/thread/thr_spinlock.c
index 8a6e0d64d2f28..c4c0e6ac324f1 100644
--- a/lib/libkse/thread/thr_spinlock.c
+++ b/lib/libkse/thread/thr_spinlock.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_spinlock.c,v 1.26 2007/10/09 13:42:29 obrien Exp $
  *
  */
 
diff --git a/lib/libkse/thread/thr_stack.c b/lib/libkse/thread/thr_stack.c
index f634055c0e565..3119e1040bed1 100644
--- a/lib/libkse/thread/thr_stack.c
+++ b/lib/libkse/thread/thr_stack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_stack.c,v 1.11 2007/10/09 13:42:29 obrien Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/lib/libkse/thread/thr_suspend_np.c b/lib/libkse/thread/thr_suspend_np.c
index 37ca78345bb7a..6b0f5d00518d0 100644
--- a/lib/libkse/thread/thr_suspend_np.c
+++ b/lib/libkse/thread/thr_suspend_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_suspend_np.c,v 1.22 2007/10/09 13:42:29 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_switch_np.c b/lib/libkse/thread/thr_switch_np.c
index 247b87947fdb4..1b1cd4e6aaa0f 100644
--- a/lib/libkse/thread/thr_switch_np.c
+++ b/lib/libkse/thread/thr_switch_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_switch_np.c,v 1.9 2007/10/09 13:42:29 obrien Exp $
  */
 #include <errno.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_symbols.c b/lib/libkse/thread/thr_symbols.c
index 248fad93871e6..96a252adb83af 100644
--- a/lib/libkse/thread/thr_symbols.c
+++ b/lib/libkse/thread/thr_symbols.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_symbols.c,v 1.6 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_system.c b/lib/libkse/thread/thr_system.c
index 5e4fe1cc0220d..eca31edb12d49 100644
--- a/lib/libkse/thread/thr_system.c
+++ b/lib/libkse/thread/thr_system.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_system.c,v 1.10 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_tcdrain.c b/lib/libkse/thread/thr_tcdrain.c
index e231d5272d923..33d585b45ef68 100644
--- a/lib/libkse/thread/thr_tcdrain.c
+++ b/lib/libkse/thread/thr_tcdrain.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_tcdrain.c,v 1.10 2007/10/09 13:42:29 obrien Exp $
  */
 
 #include <termios.h>
diff --git a/lib/libkse/thread/thr_vfork.c b/lib/libkse/thread/thr_vfork.c
index 428c1294b822e..ed237257843ad 100644
--- a/lib/libkse/thread/thr_vfork.c
+++ b/lib/libkse/thread/thr_vfork.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_vfork.c,v 1.5 2007/10/09 13:42:29 obrien Exp $
  */
 #include <unistd.h>
 
diff --git a/lib/libkse/thread/thr_wait.c b/lib/libkse/thread/thr_wait.c
index 8f61a0c0c0ad2..fb9b4aa1de222 100644
--- a/lib/libkse/thread/thr_wait.c
+++ b/lib/libkse/thread/thr_wait.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_wait.c,v 1.10 2007/10/09 13:42:30 obrien Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_wait4.c b/lib/libkse/thread/thr_wait4.c
index 6810e6586149f..a7a98ac1c7791 100644
--- a/lib/libkse/thread/thr_wait4.c
+++ b/lib/libkse/thread/thr_wait4.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_wait4.c,v 1.22 2007/10/09 13:42:30 obrien Exp $
  */
 #include <sys/types.h>
 
diff --git a/lib/libkse/thread/thr_waitpid.c b/lib/libkse/thread/thr_waitpid.c
index 1244c125e4554..b38f5dc70c614 100644
--- a/lib/libkse/thread/thr_waitpid.c
+++ b/lib/libkse/thread/thr_waitpid.c
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_waitpid.c,v 1.10 2007/10/09 13:42:30 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_write.c b/lib/libkse/thread/thr_write.c
index 65965401e8078..b5d6c3c9f6e3b 100644
--- a/lib/libkse/thread/thr_write.c
+++ b/lib/libkse/thread/thr_write.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_write.c,v 1.27 2007/10/09 13:42:30 obrien Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_writev.c b/lib/libkse/thread/thr_writev.c
index 9cda908166f1c..c876f099b16ed 100644
--- a/lib/libkse/thread/thr_writev.c
+++ b/lib/libkse/thread/thr_writev.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_writev.c,v 1.27 2007/10/09 13:42:30 obrien Exp $
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_yield.c b/lib/libkse/thread/thr_yield.c
index 7665ac6949711..1eaa080036c17 100644
--- a/lib/libkse/thread/thr_yield.c
+++ b/lib/libkse/thread/thr_yield.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkse/thread/thr_yield.c,v 1.18 2007/10/09 13:42:30 obrien Exp $
  */
 #include <pthread.h>
 #include "thr_private.h"
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 50b254b87bb49..9131582b4f170 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libkvm/Makefile,v 1.17 2006/10/09 05:12:54 kmacy Exp $
 
 LIB=	kvm
 SHLIBDIR?= /lib
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index f694fd800735a..82e1837f6cc0a 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.15 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd January 29, 2004
 .Dt KVM 3
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 418a15dd7da02..f6fb8369d441b 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.31 2007/06/15 11:35:11 simokawa Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index 8d40ed3623db5..8ee0153e9fd69 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkvm/kvm.h,v 1.17 2007/01/08 17:35:36 imp Exp $
  */
 
 #ifndef _KVM_H_
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index 462447946954b..568d7842ab38f 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.22 2007/06/15 11:35:11 simokawa Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index 631aff6003648..c37d6c98ac243 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.4 2007/01/08 18:25:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/elf32.h>
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index 6541fb2c60b61..d9355196827c2 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_file.c,v 1.18 2007/01/08 17:35:36 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
index 3ce5c72a3a81d..8fd45d11ce33d 100644
--- a/lib/libkvm/kvm_geterr.3
+++ b/lib/libkvm/kvm_geterr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_geterr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_geterr.3,v 1.9 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETERR 3
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index 22bfd92d95781..24f26b7879d26 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getfiles.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getfiles.3,v 1.16 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd April 19, 1994
 .Dt KVM_GETFILES 3
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
index 6587b1a913fcf..5cc0510d77000 100644
--- a/lib/libkvm/kvm_getloadavg.3
+++ b/lib/libkvm/kvm_getloadavg.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getloadavg.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getloadavg.3,v 1.11 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETLOADAVG 3
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index e4777e7028626..8d75c7ab77f21 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getloadavg.c,v 1.10 2007/01/08 17:35:36 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index 92e858e35ad89..fb3218da390f3 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.21 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd September 27, 2003
 .Dt KVM_GETPROCS 3
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index edd2068de4d1d..1d760b227e93d 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_getswapinfo.3,v 1.13 2004/07/31 18:49:53 imp Exp $
 .\"
 .Dd January 22, 1999
 .Dt KVM_SWAPINFO 3
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index bc9d293b71ed0..d1c0c5de619f6 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.27 2007/02/07 17:43:10 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 523cfa684f3da..e73e720aa7fcf 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.21 2007/06/15 11:35:11 simokawa Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_ia64.c b/lib/libkvm/kvm_ia64.c
index eac58335ff451..3916473cfefc5 100644
--- a/lib/libkvm/kvm_ia64.c
+++ b/lib/libkvm/kvm_ia64.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.8 2007/05/19 13:11:26 marcel Exp $ */
 /*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
 
 /*
diff --git a/lib/libkvm/kvm_minidump_amd64.c b/lib/libkvm/kvm_minidump_amd64.c
index bf5c468ccc150..4d8480bc6b31c 100644
--- a/lib/libkvm/kvm_minidump_amd64.c
+++ b/lib/libkvm/kvm_minidump_amd64.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.2 2006/06/05 08:51:14 delphij Exp $");
 
 /*
  * AMD64 machine dependent routines for kvm and minidumps. 
diff --git a/lib/libkvm/kvm_minidump_i386.c b/lib/libkvm/kvm_minidump_i386.c
index de50866e7f0b2..4125cba9bac2d 100644
--- a/lib/libkvm/kvm_minidump_i386.c
+++ b/lib/libkvm/kvm_minidump_i386.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.2 2006/06/05 08:51:14 delphij Exp $");
 
 /*
  * AMD64 machine dependent routines for kvm and minidumps. 
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index a151a3b2ef3ca..1d28d4abde17d 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_nlist.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_nlist.3,v 1.11 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_NLIST 3
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index 1b62482d0146f..859abb1951599 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_open.3,v 1.18 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd January 29, 2004
 .Dt KVM_OPEN 3
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index 24ab7fbdcec3f..757bf36df4483 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_powerpc.c,v 1.3 2005/06/29 22:39:41 peter Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index e791b41b2fb5f..0305b1461e7e3 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm_private.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libkvm/kvm_private.h,v 1.12 2007/06/15 11:35:11 simokawa Exp $
  */
 
 struct __kvm {
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index f945bb3f0588e..2de78ef8b0bd0 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.94 2007/09/21 04:11:34 jeff Exp $");
 
 /*
  * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index a2efd3c2bbc04..192c07fd031fc 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_read.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libkvm/kvm_read.3,v 1.11 2007/01/08 17:35:36 imp Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_READ 3
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
index bafd08c078518..d8b6ec8435e3f 100644
--- a/lib/libkvm/kvm_sparc.c
+++ b/lib/libkvm/kvm_sparc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.7 2007/01/08 17:35:36 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index b8e9f693f5c0c..16027b9ec5429 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.9 2007/01/08 17:35:36 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 97d27520a1a85..1f877d25e22a9 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmagic/Makefile,v 1.10 2007/05/21 02:49:05 deischen Exp $
 # Copyright (c) David E. O'Brien, 2000-2004
 
 CONTRDIR=	${.CURDIR}/../../contrib/file
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index 65e4a6a59ad9a..dfbc04b319818 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmagic/config.h,v 1.6.4.1 2008/02/06 18:26:38 obrien Exp $ */
 
 #include <osreldate.h>
 
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index a98b409cda039..4b1b8f799940c 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmd/Makefile,v 1.42 2005/03/09 19:23:04 cperciva Exp $
 
 LIB=	md
 SHLIBDIR?= /lib
diff --git a/lib/libmd/i386/rmd160.S b/lib/libmd/i386/rmd160.S
index 7ccfb22daf128..3b6569233dd9c 100644
--- a/lib/libmd/i386/rmd160.S
+++ b/lib/libmd/i386/rmd160.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmd/i386/rmd160.S,v 1.4 2007/05/14 05:00:37 cperciva Exp $ */
 /* Run the C pre-processor over this file with one of the following defined
  * ELF - elf object files,
  * OUT - a.out object files,
diff --git a/lib/libmd/i386/sha.S b/lib/libmd/i386/sha.S
index 1e5201f5cb890..1e4eab5196f9c 100644
--- a/lib/libmd/i386/sha.S
+++ b/lib/libmd/i386/sha.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmd/i386/sha.S,v 1.3 2007/05/14 05:00:37 cperciva Exp $ */
 /* -*- Fundamental -*- Emacs' assembler mode hoses this file */
 #ifndef PIC
 /* Run the C pre-processor over this file with one of the following defined
diff --git a/lib/libmd/md2.copyright b/lib/libmd/md2.copyright
index acef7bab5be66..545af1c2afd17 100644
--- a/lib/libmd/md2.copyright
+++ b/lib/libmd/md2.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md2.copyright,v 1.5 1999/08/28 00:05:04 peter Exp $
 Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md2.h b/lib/libmd/md2.h
index f0229f56c1236..f064c5a202142 100644
--- a/lib/libmd/md2.h
+++ b/lib/libmd/md2.h
@@ -1,5 +1,5 @@
 /* MD2.H - header file for MD2C.C
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md2.h,v 1.10 2006/01/17 15:35:56 phk Exp $
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/md2c.c b/lib/libmd/md2c.c
index 47994572831af..c7e895472b79b 100644
--- a/lib/libmd/md2c.c
+++ b/lib/libmd/md2c.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/md2c.c,v 1.11 2006/01/17 15:35:56 phk Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmd/md4.copyright b/lib/libmd/md4.copyright
index e4502073a1ce9..0c170052918a0 100644
--- a/lib/libmd/md4.copyright
+++ b/lib/libmd/md4.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md4.copyright,v 1.5 1999/08/28 00:05:05 peter Exp $
 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index 4773513725224..834368dc854fd 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/md4.h,v 1.11 2006/01/17 15:35:56 phk Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index 1211a98b41725..758421172154a 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/md4c.c,v 1.10 2006/01/17 15:35:56 phk Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
 
diff --git a/lib/libmd/md5.copyright b/lib/libmd/md5.copyright
index b718bf8b5ebe9..f5ecc5bd48fd5 100644
--- a/lib/libmd/md5.copyright
+++ b/lib/libmd/md5.copyright
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/md5.copyright,v 1.5 1999/08/28 00:05:06 peter Exp $
 Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 rights reserved.
 .Pp
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index d09739010d7e0..56f0af5465ace 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.17 2006/01/17 15:35:56 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index c0567c5b11fed..ab10c3a8d7da5 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.30 2006/01/17 15:35:56 phk Exp $
 .\"
 .Dd February 11, 1999
 .Dt MDX 3
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index e69e5e5fa24a8..4175f12262587 100644
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/mdXhl.c,v 1.19 2006/01/17 15:35:56 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libmd/mddriver.c b/lib/libmd/mddriver.c
index c12c5fb5b9905..d54eef3a4c2c2 100644
--- a/lib/libmd/mddriver.c
+++ b/lib/libmd/mddriver.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/mddriver.c,v 1.7 2001/09/30 21:56:22 dillon Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3
index 6c2f21c79ae3c..c16716e62e257 100644
--- a/lib/libmd/ripemd.3
+++ b/lib/libmd/ripemd.3
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" 	From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/ripemd.3,v 1.15 2005/02/13 22:25:13 ru Exp $
 .\"
 .Dd February 26, 1999
 .Dt RIPEMD 3
diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h
index 2ff35cc1ba2d6..e037c3683876f 100644
--- a/lib/libmd/ripemd.h
+++ b/lib/libmd/ripemd.h
@@ -57,7 +57,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/ripemd.h,v 1.3 2006/01/17 15:35:56 phk Exp $
  */
 
 #ifndef HEADER_RIPEMD_H
diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c
index e01f1e048a778..825aa8ad526af 100644
--- a/lib/libmd/rmd160c.c
+++ b/lib/libmd/rmd160c.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/rmd160c.c,v 1.7 2006/01/17 15:35:56 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/rmddriver.c b/lib/libmd/rmddriver.c
index 29084a962b6e8..1d81a87d0a946 100644
--- a/lib/libmd/rmddriver.c
+++ b/lib/libmd/rmddriver.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/rmddriver.c,v 1.3 2001/09/30 21:56:22 dillon Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index f4e2f192b5395..1905533c32965 100644
--- a/lib/libmd/sha.3
+++ b/lib/libmd/sha.3
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" 	From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/sha.3,v 1.19 2005/06/16 19:01:06 ru Exp $
 .\"
 .Dd February 25, 1999
 .Dt SHA 3
diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index 8a0b7c263a50e..7bb12c2d78167 100644
--- a/lib/libmd/sha.h
+++ b/lib/libmd/sha.h
@@ -54,7 +54,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/sha.h,v 1.5 2006/01/17 15:35:56 phk Exp $
  */
 
 #ifndef _SHA_H_
diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c
index b35b7f275ffde..e20d4a851d1c6 100644
--- a/lib/libmd/sha0c.c
+++ b/lib/libmd/sha0c.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/sha0c.c,v 1.6 2006/01/17 15:35:56 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c
index ba3278abfff49..bda67cc34d12b 100644
--- a/lib/libmd/sha1c.c
+++ b/lib/libmd/sha1c.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/sha1c.c,v 1.5 2006/01/17 15:35:56 phk Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libmd/sha256.3 b/lib/libmd/sha256.3
index fb96100733b43..6b447f358aaa7 100644
--- a/lib/libmd/sha256.3
+++ b/lib/libmd/sha256.3
@@ -7,7 +7,7 @@
 .\" ----------------------------------------------------------------------------
 .\"
 .\" 	From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmd/sha256.3,v 1.4 2005/11/17 13:00:00 ru Exp $
 .\"
 .Dd September 14, 2005
 .Dt SHA256 3
diff --git a/lib/libmd/sha256.h b/lib/libmd/sha256.h
index ce51787a737ea..5829130472638 100644
--- a/lib/libmd/sha256.h
+++ b/lib/libmd/sha256.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmd/sha256.h,v 1.2 2006/01/17 15:35:56 phk Exp $
  */
 
 #ifndef _SHA256_H_
diff --git a/lib/libmd/sha256c.c b/lib/libmd/sha256c.c
index c95fd318a5aa5..99c8600895217 100644
--- a/lib/libmd/sha256c.c
+++ b/lib/libmd/sha256c.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/sha256c.c,v 1.2 2006/01/17 15:35:56 phk Exp $");
 
 #include <sys/endian.h>
 #include <sys/types.h>
diff --git a/lib/libmd/shadriver.c b/lib/libmd/shadriver.c
index 7f799fb2aaf4f..f3e0e3456282b 100644
--- a/lib/libmd/shadriver.c
+++ b/lib/libmd/shadriver.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmd/shadriver.c,v 1.4 2005/03/09 19:23:04 cperciva Exp $");
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
    rights reserved.
diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile
index 6114bf70ae9f8..b7eee7a246f85 100644
--- a/lib/libmemstat/Makefile
+++ b/lib/libmemstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmemstat/Makefile,v 1.6 2007/05/21 02:49:05 deischen Exp $
 
 WARNS?=		3
 LIB=		memstat
diff --git a/lib/libmemstat/libmemstat.3 b/lib/libmemstat/libmemstat.3
index 82ec53abee673..2f04e1f5d9907 100644
--- a/lib/libmemstat/libmemstat.3
+++ b/lib/libmemstat/libmemstat.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmemstat/libmemstat.3,v 1.11 2005/11/21 17:18:34 ru Exp $
 .\"
 .Dd June 27, 2005
 .Os
diff --git a/lib/libmemstat/memstat.c b/lib/libmemstat/memstat.c
index 28e48138642be..0bec44a3a4a7a 100644
--- a/lib/libmemstat/memstat.c
+++ b/lib/libmemstat/memstat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat.c,v 1.7 2005/08/01 19:07:39 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libmemstat/memstat.h b/lib/libmemstat/memstat.h
index aaa85702e0c55..71f7612ac17db 100644
--- a/lib/libmemstat/memstat.h
+++ b/lib/libmemstat/memstat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat.h,v 1.11 2007/03/15 10:44:18 rwatson Exp $
  */
 
 #ifndef _MEMSTAT_H_
diff --git a/lib/libmemstat/memstat_all.c b/lib/libmemstat/memstat_all.c
index bd74b8acbe4c4..6a385a2ee1eb3 100644
--- a/lib/libmemstat/memstat_all.c
+++ b/lib/libmemstat/memstat_all.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_all.c,v 1.3 2005/08/06 13:54:03 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libmemstat/memstat_internal.h b/lib/libmemstat/memstat_internal.h
index 7123518e283a1..8d699e28c4d19 100644
--- a/lib/libmemstat/memstat_internal.h
+++ b/lib/libmemstat/memstat_internal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_internal.h,v 1.6 2005/08/01 13:18:21 rwatson Exp $
  */
 
 #ifndef _MEMSTAT_INTERNAL_H_
diff --git a/lib/libmemstat/memstat_malloc.c b/lib/libmemstat/memstat_malloc.c
index 70320f5861d11..ab7bdd037cc08 100644
--- a/lib/libmemstat/memstat_malloc.c
+++ b/lib/libmemstat/memstat_malloc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_malloc.c,v 1.7 2007/05/21 18:16:04 rwatson Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index b24721fae5d9d..19987d03bbfa6 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libmemstat/memstat_uma.c,v 1.17 2006/02/11 19:21:39 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index bf96cc778707b..259c58906f0dc 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmilter/Makefile,v 1.7 2007/04/09 01:45:30 gshapiro Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 2aed4e94a1f37..61e8eaa3b92c4 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libmp/Makefile,v 1.12 2007/05/21 02:49:05 deischen Exp $
 
 LIB=		mp
 SHLIB_MAJOR=	6
diff --git a/lib/libmp/libmp.3 b/lib/libmp/libmp.3
index 9be21d7b0de43..99352b735ded3 100644
--- a/lib/libmp/libmp.3
+++ b/lib/libmp/libmp.3
@@ -28,7 +28,7 @@
 .\" manual page, but it does document what appears to be the "traditional"
 .\" libmp interface.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libmp/libmp.3,v 1.5 2003/08/30 05:35:46 seanc Exp $
 .\"
 .\" See above for rationale for this date.
 .Dd September 7, 1989
diff --git a/lib/libmp/mp.h b/lib/libmp/mp.h
index 4c2c94d05fc84..dbe5023484aa6 100644
--- a/lib/libmp/mp.h
+++ b/lib/libmp/mp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libmp/mp.h,v 1.2 2003/01/28 23:03:15 markm Exp $ */
 
 #ifndef _MP_H_
 #define _MP_H_
diff --git a/lib/libmp/mpasbn.c b/lib/libmp/mpasbn.c
index 797960def73d0..0d2d82f795f51 100644
--- a/lib/libmp/mpasbn.c
+++ b/lib/libmp/mpasbn.c
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.5 2006/07/30 19:29:26 simon Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/lib/libncp/CREDITS b/lib/libncp/CREDITS
index 43380553e8f90..0ca5463fb9d6d 100644
--- a/lib/libncp/CREDITS
+++ b/lib/libncp/CREDITS
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncp/CREDITS,v 1.1 1999/10/12 11:56:37 bp Exp $
 
 In the development of NetWare client for FreeBSD next sources was used:
 
diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile
index 6f1274c41aede..a43b8dace7fd0 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libncp/Makefile,v 1.9 2007/05/21 02:49:05 deischen Exp $
 
 LIB=		ncp
 
diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c
index d658b5aaabaab..cdda5332c4961 100644
--- a/lib/libncp/ipx.c
+++ b/lib/libncp/ipx.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ipx.c,v 1.8 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/lib/libncp/ipxsap.h b/lib/libncp/ipxsap.h
index 2b26b6adbbac1..5dc30cc7863dd 100644
--- a/lib/libncp/ipxsap.h
+++ b/lib/libncp/ipxsap.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libncp/ipxsap.h,v 1.3 2007/02/26 12:07:08 rwatson Exp $
  */
 #ifndef _IPXSAP_H_
 #define _IPXSAP_H_
diff --git a/lib/libncp/ncpl_bind.c b/lib/libncp/ncpl_bind.c
index d7c64ede86c46..459cf4b9fb85c 100644
--- a/lib/libncp/ncpl_bind.c
+++ b/lib/libncp/ncpl_bind.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_bind.c,v 1.5 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/types.h>
 #include <arpa/inet.h>
diff --git a/lib/libncp/ncpl_conn.c b/lib/libncp/ncpl_conn.c
index 669f8362cb87b..088277c1ad97e 100644
--- a/lib/libncp/ncpl_conn.c
+++ b/lib/libncp/ncpl_conn.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_conn.c,v 1.11 2007/01/09 23:27:39 imp Exp $");
 
 /*
  *
diff --git a/lib/libncp/ncpl_crypt.c b/lib/libncp/ncpl_crypt.c
index bc304c0cb2e24..bfd60f092e1f3 100644
--- a/lib/libncp/ncpl_crypt.c
+++ b/lib/libncp/ncpl_crypt.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_crypt.c,v 1.2 2001/09/30 22:01:18 dillon Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libncp/ncpl_file.c b/lib/libncp/ncpl_file.c
index 042ae5aa23c8d..c71d6bd169afc 100644
--- a/lib/libncp/ncpl_file.c
+++ b/lib/libncp/ncpl_file.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_file.c,v 1.7 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/lib/libncp/ncpl_misc.c b/lib/libncp/ncpl_misc.c
index 67d19a9132822..321c890358b87 100644
--- a/lib/libncp/ncpl_misc.c
+++ b/lib/libncp/ncpl_misc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_misc.c,v 1.7 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libncp/ncpl_msg.c b/lib/libncp/ncpl_msg.c
index f2a687454a774..56401f265662f 100644
--- a/lib/libncp/ncpl_msg.c
+++ b/lib/libncp/ncpl_msg.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_msg.c,v 1.4 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_net.c b/lib/libncp/ncpl_net.c
index e59bc113b64c0..8188cba783152 100644
--- a/lib/libncp/ncpl_net.c
+++ b/lib/libncp/ncpl_net.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_net.c,v 1.4 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libncp/ncpl_nls.c b/lib/libncp/ncpl_nls.c
index 3ca83d67e1f94..2d64e9be9c43a 100644
--- a/lib/libncp/ncpl_nls.c
+++ b/lib/libncp/ncpl_nls.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_nls.c,v 1.7 2007/01/09 23:27:39 imp Exp $");
 
 /*
  * Languages support. Currently is very primitive.
diff --git a/lib/libncp/ncpl_queue.c b/lib/libncp/ncpl_queue.c
index 0512ce92d8ad3..926f99007076c 100644
--- a/lib/libncp/ncpl_queue.c
+++ b/lib/libncp/ncpl_queue.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_queue.c,v 1.5 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/lib/libncp/ncpl_rcfile.c b/lib/libncp/ncpl_rcfile.c
index deb16c78554ff..8a147bbc44d13 100644
--- a/lib/libncp/ncpl_rcfile.c
+++ b/lib/libncp/ncpl_rcfile.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_rcfile.c,v 1.5 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/lib/libncp/ncpl_rpc.c b/lib/libncp/ncpl_rpc.c
index 87c601adece82..115b5f1ed7bc2 100644
--- a/lib/libncp/ncpl_rpc.c
+++ b/lib/libncp/ncpl_rpc.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_rpc.c,v 1.5 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libncp/ncpl_subr.c b/lib/libncp/ncpl_subr.c
index 3c328ce3c0c88..f89ea86551c45 100644
--- a/lib/libncp/ncpl_subr.c
+++ b/lib/libncp/ncpl_subr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.12 2007/01/09 23:27:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libncp/sap.c b/lib/libncp/sap.c
index c7f8da1503241..b0708dc47b3c8 100644
--- a/lib/libncp/sap.c
+++ b/lib/libncp/sap.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libncp/sap.c,v 1.5 2007/01/09 23:27:39 imp Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 5d09abfc1014e..d18db54d9f893 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libnetgraph/Makefile,v 1.12 2007/05/21 02:49:05 deischen Exp $
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
 LIB=		netgraph
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index dfc75f5268e42..2853f82d7bc1e 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libnetgraph/debug.c,v 1.9 2005/10/25 20:58:30 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h
index 748ca7bb7571c..58dd77513ce4c 100644
--- a/lib/libnetgraph/internal.h
+++ b/lib/libnetgraph/internal.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/internal.h,v 1.5 2007/05/14 14:18:41 mav Exp $
  * $Whistle: internal.h,v 1.5 1999/01/20 00:57:22 archie Exp $
  */
 
diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c
index 534d1d181d48b..3e24ee2235141 100644
--- a/lib/libnetgraph/msg.c
+++ b/lib/libnetgraph/msg.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libnetgraph/msg.c,v 1.14 2007/05/14 14:18:41 mav Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index d2ef8bd8c8fe5..87dc5c4ed2f6a 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libnetgraph/netgraph.3,v 1.23 2004/07/04 04:03:37 jmallett Exp $
 .\" $Whistle: netgraph.3,v 1.7 1999/01/25 07:14:06 archie Exp $
 .\"
 .Dd January 27, 2004
diff --git a/lib/libnetgraph/netgraph.h b/lib/libnetgraph/netgraph.h
index 4eb15bd8bd892..21038a488a5cd 100644
--- a/lib/libnetgraph/netgraph.h
+++ b/lib/libnetgraph/netgraph.h
@@ -36,7 +36,7 @@
  *
  * Author: Archie Cobbs <archie@whistle.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libnetgraph/netgraph.h,v 1.4 2004/01/27 20:25:14 ru Exp $
  * $Whistle: netgraph.h,v 1.7 1999/01/20 00:57:23 archie Exp $
  */
 
diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c
index fca3900913df8..2b99bc3f60c3f 100644
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libnetgraph/sock.c,v 1.9 2006/10/17 16:56:29 glebius Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index dd8f859651529..c2d3c789e75fc 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libngatm/Makefile,v 1.7 2007/05/21 02:49:05 deischen Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 45f35b9bee036..6f601590bf1c4 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libopie
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libopie/Makefile,v 1.22 2007/05/21 02:49:06 deischen Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
diff --git a/lib/libopie/config.h b/lib/libopie/config.h
index b6ad39bbbf03a..8eb9c58921931 100644
--- a/lib/libopie/config.h
+++ b/lib/libopie/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libopie/config.h,v 1.4 2002/01/03 16:04:57 ache Exp $ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
diff --git a/lib/libopie/opieextra.c b/lib/libopie/opieextra.c
index 6e2b6b88328c8..1e7c1620bb04f 100644
--- a/lib/libopie/opieextra.c
+++ b/lib/libopie/opieextra.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libopie/opieextra.c,v 1.3 2002/03/22 00:12:20 markm Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 088e8a03b4f58..11d4a84a26958 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/Makefile,v 1.3 2003/03/09 20:06:34 obrien Exp $
 
 # The modules must be built first, because they are built into the
 # static version of libpam.
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index ec21817944599..76e5f5fb91deb 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/Makefile.inc,v 1.18 2007/06/18 18:47:54 rafan Exp $
 
 .ifdef PAM_DEBUG
 DEBUG_FLAGS+=	-DDEBUG
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 6c819409743b4..c58166019c4d7 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.54 2005/06/17 08:14:42 des Exp $
 
 OPENPAM=	${.CURDIR}/../../../contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
diff --git a/lib/libpam/libpam/pam_debug_log.c b/lib/libpam/libpam/pam_debug_log.c
index c3fe8e3f84673..5523034fe64ba 100644
--- a/lib/libpam/libpam/pam_debug_log.c
+++ b/lib/libpam/libpam/pam_debug_log.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/libpam/pam_debug_log.c,v 1.8 2002/04/14 16:44:04 des Exp $");
 
 #include <libgen.h>
 #include <stdarg.h>
diff --git a/lib/libpam/libpam/pam_std_option.c b/lib/libpam/libpam/pam_std_option.c
index a9ddfba51a263..6ff35563eb4c9 100644
--- a/lib/libpam/libpam/pam_std_option.c
+++ b/lib/libpam/libpam/pam_std_option.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/libpam/pam_std_option.c,v 1.10 2002/04/14 18:30:03 des Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libpam/libpam/security/pam_mod_misc.h b/lib/libpam/libpam/security/pam_mod_misc.h
index c9fc8d7701878..126f3022d7a53 100644
--- a/lib/libpam/libpam/security/pam_mod_misc.h
+++ b/lib/libpam/libpam/security/pam_mod_misc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.13 2006/07/17 11:48:52 stefanf Exp $
  */
 
 #ifndef PAM_MOD_MISC_H
diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile
index cacf0115da7a8..9247187e9bc29 100644
--- a/lib/libpam/modules/Makefile
+++ b/lib/libpam/modules/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/Makefile,v 1.19 2003/03/09 20:06:34 obrien Exp $
 
 .include "modules.inc"
 
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index d4f2bb3e05458..47d77eef5e72d 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.22 2006/03/19 08:52:48 ru Exp $
 
 PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c570cfd2f77c3..dd2b288e36b87 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.20 2006/03/17 18:54:27 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile
index 6d0fc0ef7a56b..018d7a7e26acf 100644
--- a/lib/libpam/modules/pam_chroot/Makefile
+++ b/lib/libpam/modules/pam_chroot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_chroot/Makefile,v 1.1 2003/03/30 22:58:23 des Exp $
 
 LIB=		pam_chroot
 SRCS=		pam_chroot.c
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.8 b/lib/libpam/modules/pam_chroot/pam_chroot.8
index 1bb48008d7812..08cf1c6188992 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.8
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_chroot/pam_chroot.8,v 1.4 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd February 10, 2003
 .Dt PAM_CHROOT 8
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.c b/lib/libpam/modules/pam_chroot/pam_chroot.c
index 447e5f78dd104..49f53aca03699 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.c
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_chroot/pam_chroot.c,v 1.3 2003/04/30 00:40:24 des Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
index 3bf819692747a..c01782f79f1a7 100644
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.7 2003/03/09 20:06:34 obrien Exp $
 
 LIB=	pam_deny
 SRCS=	pam_deny.c
diff --git a/lib/libpam/modules/pam_deny/pam_deny.8 b/lib/libpam/modules/pam_deny/pam_deny.8
index d9544be9b09f6..4ca5c8f58400a 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.8
+++ b/lib/libpam/modules/pam_deny/pam_deny.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_deny/pam_deny.8,v 1.4 2001/08/15 20:05:30 markm Exp $
 .\"
 .Dd July 7, 2001
 .Dt PAM_DENY 8
diff --git a/lib/libpam/modules/pam_deny/pam_deny.c b/lib/libpam/modules/pam_deny/pam_deny.c
index 3d491b158e42e..020e065ab474d 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.c
+++ b/lib/libpam/modules/pam_deny/pam_deny.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_deny/pam_deny.c,v 1.10 2005/06/10 06:16:13 des Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile
index 6f239460e9b0a..5b123d56133be 100644
--- a/lib/libpam/modules/pam_echo/Makefile
+++ b/lib/libpam/modules/pam_echo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_echo/Makefile,v 1.2 2003/03/09 20:06:35 obrien Exp $
 
 LIB=	pam_echo
 SRCS=	pam_echo.c
diff --git a/lib/libpam/modules/pam_echo/pam_echo.8 b/lib/libpam/modules/pam_echo/pam_echo.8
index b162b5b1e4b58..0ba857893c948 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.8
+++ b/lib/libpam/modules/pam_echo/pam_echo.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_echo/pam_echo.8,v 1.4 2004/07/02 23:52:16 ru Exp $
 .\"
 .Dd February 6, 2003
 .Dt PAM_ECHO 8
diff --git a/lib/libpam/modules/pam_echo/pam_echo.c b/lib/libpam/modules/pam_echo/pam_echo.c
index ff008597b9214..3bebc486d5193 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.c
+++ b/lib/libpam/modules/pam_echo/pam_echo.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_echo/pam_echo.c,v 1.4 2003/12/11 13:55:15 des Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile
index 0cf4268a27a8b..b197664cc6bd4 100644
--- a/lib/libpam/modules/pam_exec/Makefile
+++ b/lib/libpam/modules/pam_exec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_exec/Makefile,v 1.2 2003/03/09 20:06:35 obrien Exp $
 
 LIB=	pam_exec
 SRCS=	pam_exec.c
diff --git a/lib/libpam/modules/pam_exec/pam_exec.8 b/lib/libpam/modules/pam_exec/pam_exec.8
index 311d64c492a9b..47f3a96a5f7b2 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.8
+++ b/lib/libpam/modules/pam_exec/pam_exec.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_exec/pam_exec.8,v 1.6 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd February 1, 2005
 .Dt PAM_EXEC 8
diff --git a/lib/libpam/modules/pam_exec/pam_exec.c b/lib/libpam/modules/pam_exec/pam_exec.c
index b27718f56cc92..ba394e2079d89 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.c
+++ b/lib/libpam/modules/pam_exec/pam_exec.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_exec/pam_exec.c,v 1.6 2006/11/10 23:33:25 des Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile
index 8bca1aab86dd1..2219dad72fa85 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile
+++ b/lib/libpam/modules/pam_ftpusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_ftpusers/Makefile,v 1.2 2003/03/09 20:06:35 obrien Exp $
 
 LIB=	pam_ftpusers
 SRCS=	pam_ftpusers.c
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
index 380e3b026c708..69642cce95ae6 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8,v 1.2 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd April 17, 2002
 .Dt PAM_FTPUSERS 8
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
index 421955ab250ec..389b2e0a95ed7 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c,v 1.1 2002/05/08 00:30:10 des Exp $");
 
 #include <ctype.h>
 #include <grp.h>
diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile
index 73b072a477956..7607450dda307 100644
--- a/lib/libpam/modules/pam_group/Makefile
+++ b/lib/libpam/modules/pam_group/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_group/Makefile,v 1.1 2003/02/06 14:27:48 des Exp $
 
 LIB=		pam_group
 SRCS=		pam_group.c
diff --git a/lib/libpam/modules/pam_group/pam_group.8 b/lib/libpam/modules/pam_group/pam_group.8
index 832841b4c6993..1ee17e87fae5a 100644
--- a/lib/libpam/modules/pam_group/pam_group.8
+++ b/lib/libpam/modules/pam_group/pam_group.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_group/pam_group.8,v 1.3 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd February 6, 2003
 .Dt PAM_GROUP 8
diff --git a/lib/libpam/modules/pam_group/pam_group.c b/lib/libpam/modules/pam_group/pam_group.c
index a9d5fc32df1c3..f3168e167f8bd 100644
--- a/lib/libpam/modules/pam_group/pam_group.c
+++ b/lib/libpam/modules/pam_group/pam_group.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_group/pam_group.c,v 1.4 2003/12/11 13:55:15 des Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile
index ccc192e5378ae..a174e84e48a9f 100644
--- a/lib/libpam/modules/pam_guest/Makefile
+++ b/lib/libpam/modules/pam_guest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_guest/Makefile,v 1.1 2003/05/31 16:52:58 des Exp $
 
 LIB=		pam_guest
 SRCS=		pam_guest.c
diff --git a/lib/libpam/modules/pam_guest/pam_guest.8 b/lib/libpam/modules/pam_guest/pam_guest.8
index 0bd175524f7ea..29cf852083925 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.8
+++ b/lib/libpam/modules/pam_guest/pam_guest.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_guest/pam_guest.8,v 1.4 2004/07/05 06:39:03 ru Exp $
 .\"
 .Dd May 26, 2003
 .Dt PAM_GUEST 8
diff --git a/lib/libpam/modules/pam_guest/pam_guest.c b/lib/libpam/modules/pam_guest/pam_guest.c
index 110edcec0ed4e..096498a56ec57 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.c
+++ b/lib/libpam/modules/pam_guest/pam_guest.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_guest/pam_guest.c,v 1.1 2003/05/31 16:52:58 des Exp $");
 
 #include <string.h>
 
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
index a90236c6aca47..9688fe20caca4 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.15 2005/07/08 14:53:45 kensmith Exp $
 
 LIB=	pam_krb5
 SRCS=	pam_krb5.c
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.8 b/lib/libpam/modules/pam_krb5/pam_krb5.8
index 3e0db91e009a2..f7a455aa87272 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.8
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.8
@@ -1,6 +1,6 @@
 .\"
 .\" $Id: pam_krb5.5,v 1.5 2000/01/05 00:59:56 fcusack Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.6 2001/11/24 23:41:32 dd Exp $
 .Dd January 15, 1999
 .Dt PAM_KRB5 8
 .Os
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c
index 0ed57f93208ae..8701fd37285bd 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.23 2005/07/07 14:16:38 kensmith Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile
index 1cb19990c81f0..c000e19b5b310 100644
--- a/lib/libpam/modules/pam_ksu/Makefile
+++ b/lib/libpam/modules/pam_ksu/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $
 
 LIB=	pam_ksu
 SRCS=	pam_ksu.c
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.8 b/lib/libpam/modules/pam_ksu/pam_ksu.8
index 614dc9ef78f87..08322b79eb47f 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.8
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.8,v 1.3 2002/12/12 08:19:47 ru Exp $
 .\"
 .Dd May 15, 2002
 .Dt PAM_KSU 8
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c
index 80a395a8abd90..2539c4e48d4d7 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.c
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.c,v 1.5 2004/02/10 10:13:21 des Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index f0b96c4d7da7f..911be918bda39 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_lastlog/Makefile,v 1.5 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_lastlog
 SRCS=	pam_lastlog.c
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.8 b/lib/libpam/modules/pam_lastlog/pam_lastlog.8
index 9fc7e452ae6b9..0e0415f07f488 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.8
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.8,v 1.7 2005/01/21 10:38:42 ru Exp $
 .\"
 .Dd January 24, 2002
 .Dt PAM_LASTLOG 8
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
index 817d1f3ba7933..a4d5ac7e79f6f 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.23 2007/07/22 15:17:29 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
index 5679a62f7fba2..1d5d95912421a 100644
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.6 2006/03/06 12:31:25 yar Exp $
 
 LIB=	pam_login_access
 SRCS=	pam_login_access.c login_access.c
diff --git a/lib/libpam/modules/pam_login_access/login.access.5 b/lib/libpam/modules/pam_login_access/login.access.5
index 034d8b7a19451..dfdca191b112f 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 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/login.access.5,v 1.17 2006/09/13 18:34:32 joel Exp $
 .\"
 .Dd September 13, 2006
 .Dt LOGIN.ACCESS 5
diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index dacb9d7c432e8..e0e18bc4d6bd7 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -14,7 +14,7 @@ static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/login_access.c,v 1.13 2007/05/25 07:50:18 des Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.8 b/lib/libpam/modules/pam_login_access/pam_login_access.8
index 02f0d2d945bdf..e7e5e9436c5ac 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.8
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.8,v 1.6 2006/03/06 13:15:12 yar Exp $
 .\"
 .Dd January 24, 2002
 .Dt PAM_LOGIN_ACCESS 8
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.c b/lib/libpam/modules/pam_login_access/pam_login_access.c
index 945d5eb913a79..9caf1612dd343 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.c
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.c,v 1.11 2004/02/10 10:13:21 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.h b/lib/libpam/modules/pam_login_access/pam_login_access.h
index 38c304958042a..95f7dc1942488 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.h
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.h,v 1.2 2002/03/14 23:27:57 des Exp $
  */
 
 extern int login_access(const char *, const char *);
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
index ba5a7d4aa770a..f76b7da2206ff 100644
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.7 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_nologin
 SRCS=	pam_nologin.c
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.8 b/lib/libpam/modules/pam_nologin/pam_nologin.8
index 9448bf2456546..4f9bda4d02e00 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.8
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.8,v 1.7 2007/06/14 13:07:06 yar Exp $
 .\"
 .Dd June 10, 2007
 .Dt PAM_NOLOGIN 8
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.c b/lib/libpam/modules/pam_nologin/pam_nologin.c
index 1be63d287b8d3..289891bd1a94c 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.c
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.c,v 1.13 2007/06/14 13:07:06 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile
index fbc12788e9ca3..2a0171178d9b9 100644
--- a/lib/libpam/modules/pam_opie/Makefile
+++ b/lib/libpam/modules/pam_opie/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_opie/Makefile,v 1.9 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_opie
 SRCS=	pam_opie.c
diff --git a/lib/libpam/modules/pam_opie/pam_opie.8 b/lib/libpam/modules/pam_opie/pam_opie.8
index 968985a6c9f67..759d6738d21e2 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.8
+++ b/lib/libpam/modules/pam_opie/pam_opie.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_opie/pam_opie.8,v 1.9 2002/12/27 12:15:31 schweikh Exp $
 .\"
 .Dd July 7, 2001
 .Dt PAM_OPIE 8
diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c
index bfb875f883174..e58a9e90517d5 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.c
+++ b/lib/libpam/modules/pam_opie/pam_opie.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_opie/pam_opie.c,v 1.26 2006/09/15 13:42:38 des Exp $");
 
 #include <sys/types.h>
 #include <opie.h>
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile b/lib/libpam/modules/pam_opieaccess/Makefile
index 1554a882ba301..4e031138f0341 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile
+++ b/lib/libpam/modules/pam_opieaccess/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_opieaccess/Makefile,v 1.4 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_opieaccess
 SRCS=	${LIB}.c
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
index 07a66a4e84fde..1cb2ea8434ab5 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8,v 1.9 2004/07/02 23:52:17 ru Exp $
 .\"
 .Dd January 21, 2002
 .Dt PAM_OPIEACCESS 8
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
index 035111553d5ec..bb015fd82db2c 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c,v 1.16 2004/02/10 20:42:33 cperciva Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile
index 905afe1c7eb6d..c3add1f1edc59 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_passwdqc/Makefile,v 1.6 2003/03/09 20:06:36 obrien Exp $
 
 SRCDIR=	${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}
diff --git a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
index 408f77d2707d3..fa17f291aca1e 100644
--- a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
+++ b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8,v 1.5 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd April 15, 2002
 .Dt PAM_PASSWDQC 8
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
index dbbd5b5d58134..23e194a515d00 100644
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.7 2003/03/09 20:06:36 obrien Exp $
 
 LIB=	pam_permit
 SRCS=	pam_permit.c
diff --git a/lib/libpam/modules/pam_permit/pam_permit.8 b/lib/libpam/modules/pam_permit/pam_permit.8
index c7d98ab48e165..40f68c64227d9 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.8
+++ b/lib/libpam/modules/pam_permit/pam_permit.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_permit/pam_permit.8,v 1.3 2001/07/13 09:09:50 ru Exp $
 .\"
 .Dd July 7, 2001
 .Dt PAM_PERMIT 8
diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c
index fe0a4ed2958b0..25a8d693e8ebc 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.c
+++ b/lib/libpam/modules/pam_permit/pam_permit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_permit/pam_permit.c,v 1.8 2002/04/12 22:27:22 des Exp $");
 
 #include <stddef.h>
 
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index 88e4357a4b262..1d4165fa58e95 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.13 2004/07/28 05:48:30 kan Exp $
 
 LIB=	pam_radius
 SRCS=	pam_radius.c
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index 25e7312c29a32..5e4defd851be2 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.17 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd October 28, 2002
 .Dt PAM_RADIUS 8
diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c
index 306c4b7810d72..eeed77f4344a7 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.c
+++ b/lib/libpam/modules/pam_radius/pam_radius.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.24 2007/01/20 08:52:04 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile
index 866267e63e117..4aa7731cbfebb 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile
+++ b/lib/libpam/modules/pam_rhosts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_rhosts/Makefile,v 1.2 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_rhosts
 SRCS=	pam_rhosts.c
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.8 b/lib/libpam/modules/pam_rhosts/pam_rhosts.8
index 8adfcc6ed5ae0..fa8b80250b9fc 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.8
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_rhosts/pam_rhosts.8,v 1.3 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd December 5, 2001
 .Dt PAM_RHOSTS 8
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.c b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
index 4ba6ade378348..965493f4b1640 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.c
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_rhosts/pam_rhosts.c,v 1.3 2003/12/11 13:55:16 des Exp $");
 
 #include <pwd.h>
 #include <stddef.h>
diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile
index 8582daae97c5a..12860fef6462d 100644
--- a/lib/libpam/modules/pam_rootok/Makefile
+++ b/lib/libpam/modules/pam_rootok/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_rootok/Makefile,v 1.6 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_rootok
 SRCS=	pam_rootok.c
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.8 b/lib/libpam/modules/pam_rootok/pam_rootok.8
index 4203fbd246b73..ced6cf442ead1 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.8
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_rootok/pam_rootok.8,v 1.4 2001/08/15 20:05:31 markm Exp $
 .\"
 .Dd July 8, 2001
 .Dt PAM_ROOTOK 8
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c
index 16fab1f22cc58..1ad149d5daa0f 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.c
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_rootok/pam_rootok.c,v 1.8 2002/04/12 22:27:23 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
index 8eb3e6e7a6d1e..ad0a563337c55 100644
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_securetty/Makefile,v 1.5 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_securetty
 SRCS=	pam_securetty.c
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.8 b/lib/libpam/modules/pam_securetty/pam_securetty.8
index 5825fb452a7a8..66e92a11a6cbe 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.8
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_securetty/pam_securetty.8,v 1.6 2002/03/14 23:27:58 des Exp $
 .\"
 .Dd July 8, 2001
 .Dt PAM_SECURETTY 8
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.c b/lib/libpam/modules/pam_securetty/pam_securetty.c
index f58274a2ff47f..67fd4859204ca 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.c
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_securetty/pam_securetty.c,v 1.13 2004/02/10 10:13:21 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
index 50718e1798460..1aecd82f18083 100644
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_self/Makefile,v 1.4 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_self
 SRCS=	pam_self.c
diff --git a/lib/libpam/modules/pam_self/pam_self.8 b/lib/libpam/modules/pam_self/pam_self.8
index d021434770c60..8dd9e14a3a9ae 100644
--- a/lib/libpam/modules/pam_self/pam_self.8
+++ b/lib/libpam/modules/pam_self/pam_self.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_self/pam_self.8,v 1.11 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd December 5, 2001
 .Dt PAM_SELF 8
diff --git a/lib/libpam/modules/pam_self/pam_self.c b/lib/libpam/modules/pam_self/pam_self.c
index 63df46c0f984c..1ff1e14e1de26 100644
--- a/lib/libpam/modules/pam_self/pam_self.c
+++ b/lib/libpam/modules/pam_self/pam_self.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_self/pam_self.c,v 1.9 2002/04/12 22:27:24 des Exp $");
 
 #define _BSD_SOURCE
 
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index f7dcd0c5424df..6eab7c7c655c6 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -1,5 +1,5 @@
 # PAM module for SSH
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.25 2006/05/13 21:38:14 des Exp $
 
 SSHDIR=	${.CURDIR}/../../../../crypto/openssh
 
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8
index 07e3176bb66a0..4300f370c5b2a 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.8
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.8,v 1.14 2005/09/22 05:35:24 des Exp $
 .\"
 .Dd November 26, 2001
 .Dt PAM_SSH 8
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 095f90eae1b14..0e899aa0958c8 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.44 2006/09/30 20:33:42 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
index 053812ac5178d..71573baf09dac 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.8 2003/03/09 20:06:37 obrien Exp $
 
 LIB=	pam_tacplus
 SRCS=	pam_tacplus.c
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.8 b/lib/libpam/modules/pam_tacplus/pam_tacplus.8
index 03faf0cee7de6..f1944a0685d51 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.8
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.8
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.8,v 1.4 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd August 2, 1999
 .Dt PAM_TACPLUS 8
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
index 7f860c3b370f3..c0cdf544f88d7 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.c,v 1.14 2003/05/31 17:19:03 des Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 7235a51e868c6..321bdfec5244b 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.21.2.1 2007/10/23 15:41:33 ru Exp $
 
 NO_PROFILE=
 NO_INSTALLLIB=
diff --git a/lib/libpam/modules/pam_unix/pam_unix.8 b/lib/libpam/modules/pam_unix/pam_unix.8
index 60667e69e74d4..ffabcbb1aab5d 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.8
+++ b/lib/libpam/modules/pam_unix/pam_unix.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.13 2007/03/27 09:59:15 yar Exp $
 .\"
 .Dd March 27, 2007
 .Dt PAM_UNIX 8
diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c
index 46b5f4729bc6d..935f484dd15af 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.c
+++ b/lib/libpam/modules/pam_unix/pam_unix.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.52 2007/03/27 09:59:15 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 6863573ba0e8b..1bd7d43784885 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $FreeBSD$
+# $FreeBSD: src/lib/libpcap/Makefile,v 1.39.2.1 2007/10/19 03:04:02 mlaier Exp $
 
 SHLIBDIR?= /lib
 
diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index a96d891808381..f517aabb4c48b 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libpcap/config.h,v 1.5.10.1 2007/10/19 03:04:02 mlaier Exp $ */
 /* This is an edited copy of the config.h generated by configure. */
 
 /* config.h.  Generated by configure.  */
diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index c2560bdf80422..35829819511bb 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libpmc/Makefile,v 1.4 2005/06/09 19:45:06 jkoshy Exp $
 
 LIB=	pmc
 
diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c
index 348f77076c1e6..770ca0a394e9e 100644
--- a/lib/libpmc/libpmc.c
+++ b/lib/libpmc/libpmc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.11 2007/04/11 04:52:09 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index aee4c9a9da1d7..22eb9e865a1f3 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.13 2007/04/12 09:16:54 jkoshy Exp $
 .\"
 .Dd February 25, 2006
 .Os
diff --git a/lib/libpmc/pmc.h b/lib/libpmc/pmc.h
index ee3f772551b14..eb1e19d245700 100644
--- a/lib/libpmc/pmc.h
+++ b/lib/libpmc/pmc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpmc/pmc.h,v 1.3 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 #ifndef _PMC_H_
diff --git a/lib/libpmc/pmclog.3 b/lib/libpmc/pmclog.3
index 688445a4524a2..0a240efe22017 100644
--- a/lib/libpmc/pmclog.3
+++ b/lib/libpmc/pmclog.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libpmc/pmclog.3,v 1.6 2006/09/17 21:27:35 ru Exp $
 .\"
 .Dd March 26, 2006
 .Os
diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c
index fcd4a4f2a653f..005c6745b7160 100644
--- a/lib/libpmc/pmclog.c
+++ b/lib/libpmc/pmclog.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.4 2006/03/26 12:20:53 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/lib/libpmc/pmclog.h b/lib/libpmc/pmclog.h
index 90fb19330d5df..9f824c5763278 100644
--- a/lib/libpmc/pmclog.h
+++ b/lib/libpmc/pmclog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libpmc/pmclog.h,v 1.3 2006/03/26 12:20:53 jkoshy Exp $
  */
 
 #ifndef	_PMCLOG_H_
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index f4855dc85a728..88667672cfd06 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libradius/Makefile,v 1.15 2007/05/21 02:49:06 deischen Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index 095d6e9a58aab..4cd2edd24f337 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libradius/libradius.3,v 1.17 2004/04/27 15:00:29 ru Exp $
 .\"
 .Dd April 27, 2004
 .Dt LIBRADIUS 3
diff --git a/lib/libradius/radius.conf.5 b/lib/libradius/radius.conf.5
index 6fa5cd78a587b..b4d326e9bf24b 100644
--- a/lib/libradius/radius.conf.5
+++ b/lib/libradius/radius.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libradius/radius.conf.5,v 1.8 2004/07/02 23:52:18 ru Exp $
 .\"
 .Dd October 30, 1999
 .Dt RADIUS.CONF 5
diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index b21447ef9c410..9a25417340fd7 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libradius/radlib.c,v 1.13 2007/04/04 02:59:54 kan Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libradius/radlib.h b/lib/libradius/radlib.h
index 2c42c3a9f40e8..e6cacc250b798 100644
--- a/lib/libradius/radlib.h
+++ b/lib/libradius/radlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib.h,v 1.7 2004/04/27 15:00:29 ru Exp $
  */
 
 #ifndef _RADLIB_H_
diff --git a/lib/libradius/radlib_private.h b/lib/libradius/radlib_private.h
index d323cbd5fcc97..07269a657ffad 100644
--- a/lib/libradius/radlib_private.h
+++ b/lib/libradius/radlib_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libradius/radlib_private.h,v 1.6 2004/04/27 15:00:29 ru Exp $
  */
 
 #ifndef RADLIB_PRIVATE_H
diff --git a/lib/libradius/radlib_vs.h b/lib/libradius/radlib_vs.h
index 8b3a75e79d6a7..c9ab743396fea 100644
--- a/lib/libradius/radlib_vs.h
+++ b/lib/libradius/radlib_vs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libradius/radlib_vs.h,v 1.3 2004/04/27 15:00:29 ru Exp $
  */
 
 #ifndef _RADLIB_VS_H_
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 3939a6af24f07..c363e673775ea 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
-# $FreeBSD$
+# $FreeBSD: src/lib/librpcsvc/Makefile,v 1.22 2006/03/17 18:54:27 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/librpcsvc/rnusers.c b/lib/librpcsvc/rnusers.c
index 49cab076e4764..1e35a3cfb7329 100644
--- a/lib/librpcsvc/rnusers.c
+++ b/lib/librpcsvc/rnusers.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/rnusers.c,v 1.3 2003/10/26 03:43:35 peter Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rnusers.c	1.2 91/03/11 TIRPC 1.0; from 1.7 89/03/24 SMI";
diff --git a/lib/librpcsvc/rstat.c b/lib/librpcsvc/rstat.c
index 1c19c4e841d46..7df89a64c1fe8 100644
--- a/lib/librpcsvc/rstat.c
+++ b/lib/librpcsvc/rstat.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/rstat.c,v 1.4 2003/10/26 03:43:35 peter Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rstat.c	1.2 91/03/11 TIRPC 1.0; from 1.6 89/03/24 SMI";
diff --git a/lib/librpcsvc/rwall.c b/lib/librpcsvc/rwall.c
index dd7b590d9506d..84831c3e27448 100644
--- a/lib/librpcsvc/rwall.c
+++ b/lib/librpcsvc/rwall.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/rwall.c,v 1.3 2003/10/26 03:43:35 peter Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rwall.c	1.2 91/03/11 TIRPC 1.0; from  1.3 89/03/24 SMI";
diff --git a/lib/librpcsvc/secretkey.c b/lib/librpcsvc/secretkey.c
index f45544546bb67..db40259796f64 100644
--- a/lib/librpcsvc/secretkey.c
+++ b/lib/librpcsvc/secretkey.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/secretkey.c,v 1.3 2002/03/21 23:53:40 obrien Exp $");
 
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)secretkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index ed6cbefcc14e2..c73ff918e425d 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/xcrypt.c,v 1.5 2005/05/31 21:19:14 stefanf Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index e7c59145fa2e0..00a4fac517c81 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/yp_passwd.c,v 1.7 2003/10/26 03:43:35 peter Exp $");
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index 1d2848d4ea615..45374d4b04db6 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/librpcsvc/yp_update.c,v 1.7 2003/10/26 03:43:35 peter Exp $");
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index 00d8cda009ea3..29a6563aa1a33 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/librt/Makefile,v 1.5 2007/05/13 14:12:39 deischen Exp $
 
 LIB=rt
 SHLIB_MAJOR= 1
diff --git a/lib/librt/Version.map b/lib/librt/Version.map
index 161bb766cc477..cbe24876379cd 100644
--- a/lib/librt/Version.map
+++ b/lib/librt/Version.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/librt/Version.map,v 1.1 2007/04/29 14:01:45 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/librt/aio.c b/lib/librt/aio.c
index 25d766283fd05..4de64c8f736b7 100644
--- a/lib/librt/aio.c
+++ b/lib/librt/aio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librt/aio.c,v 1.5 2006/03/24 03:24:27 davidxu Exp $
  *
  */
 
diff --git a/lib/librt/mq.c b/lib/librt/mq.c
index 9bdb5037cd4f6..11db9cf5d400a 100644
--- a/lib/librt/mq.c
+++ b/lib/librt/mq.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librt/mq.c,v 1.5 2006/03/07 08:28:07 davidxu Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/librt/sigev_thread.c b/lib/librt/sigev_thread.c
index 928ba1eea127b..9c3868d29224d 100644
--- a/lib/librt/sigev_thread.c
+++ b/lib/librt/sigev_thread.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librt/sigev_thread.c,v 1.8 2006/03/29 04:20:53 deischen Exp $
  *
  */
 
diff --git a/lib/librt/sigev_thread.h b/lib/librt/sigev_thread.h
index 7e30c2a16fd5f..4378e63b26e33 100644
--- a/lib/librt/sigev_thread.h
+++ b/lib/librt/sigev_thread.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librt/sigev_thread.h,v 1.3 2006/03/07 08:28:07 davidxu Exp $
  *
  */
 
diff --git a/lib/librt/timer.c b/lib/librt/timer.c
index f02e7616bd1f1..2a2b4014a2b57 100644
--- a/lib/librt/timer.c
+++ b/lib/librt/timer.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/librt/timer.c,v 1.5 2006/03/08 00:34:54 davidxu Exp $
  *
  */
 
diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile
index b166befc287e9..2f4b14bbead9f 100644
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsbuf/Makefile,v 1.5 2003/08/18 15:25:39 obrien Exp $
 
 LIB=	sbuf
 SHLIBDIR?= /lib
diff --git a/lib/libsdp/Makefile b/lib/libsdp/Makefile
index 5f205c856520d..77a89ef5a7c5e 100644
--- a/lib/libsdp/Makefile
+++ b/lib/libsdp/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/09/07 20:34:19 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/lib/libsdp/Makefile,v 1.5 2007/05/21 02:49:06 deischen Exp $
 
 LIB=		sdp
 MAN=		sdp.3
diff --git a/lib/libsdp/sdp-int.h b/lib/libsdp/sdp-int.h
index d8a064d1e382d..1b7daca31a717 100644
--- a/lib/libsdp/sdp-int.h
+++ b/lib/libsdp/sdp-int.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp-int.h,v 1.1 2003/09/01 23:01:07 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/sdp-int.h,v 1.2 2004/01/09 18:19:12 emax Exp $
  */
 
 #ifndef _SDP_INT_H_
diff --git a/lib/libsdp/sdp.3 b/lib/libsdp/sdp.3
index c51b6f9e2e60f..4e4330453cb31 100644
--- a/lib/libsdp/sdp.3
+++ b/lib/libsdp/sdp.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sdp.3,v 1.1 2003/09/07 20:34:19 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libsdp/sdp.3,v 1.10 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd May 27, 2005
 .Dt SDP 3
diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h
index 96bde638a43c9..266643125488f 100644
--- a/lib/libsdp/sdp.h
+++ b/lib/libsdp/sdp.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp.h,v 1.3 2003/09/05 00:33:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/sdp.h,v 1.7 2006/08/26 23:16:35 markus Exp $
  */
 
 #ifndef _SDP_H_
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 868fbe562ffeb..ade2829bda981 100644
--- a/lib/libsdp/search.c
+++ b/lib/libsdp/search.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/search.c,v 1.7.10.1 2007/11/21 17:36:14 emax Exp $
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c
index 2667966c78228..bd245926b7d99 100644
--- a/lib/libsdp/service.c
+++ b/lib/libsdp/service.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: service.c,v 1.1 2004/01/13 19:32:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/service.c,v 1.1 2004/01/20 20:48:25 emax Exp $
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/session.c b/lib/libsdp/session.c
index a31f3278dc0fa..6f95366bca04e 100644
--- a/lib/libsdp/session.c
+++ b/lib/libsdp/session.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: session.c,v 1.2 2003/09/04 22:12:13 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/session.c,v 1.3 2004/01/09 22:44:28 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c
index b996bd22160dc..8a296bcaf5d45 100644
--- a/lib/libsdp/util.c
+++ b/lib/libsdp/util.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: util.c,v 1.5 2003/09/08 02:29:35 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/lib/libsdp/util.c,v 1.7 2006/08/26 23:16:35 markus Exp $
  */
 
 #include <netinet/in.h>
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 38c780617e7d6..c7dc06ea66559 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsm/Makefile,v 1.12 2007/04/09 01:45:30 gshapiro Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index e7ed8e52c8479..c45c6d74ca410 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmb/Makefile,v 1.11 2007/05/21 02:49:06 deischen Exp $
 
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile
index b796deb5acd7a..df2f09d92900a 100644
--- a/lib/libsmdb/Makefile
+++ b/lib/libsmdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmdb/Makefile,v 1.7 2004/10/24 15:32:33 ru Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmdb
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
index 2e835fd76fddf..662e0504d85d4 100644
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libsmutil/Makefile,v 1.7 2004/10/24 15:32:33 ru Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsmutil
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index c2fc7a4f70916..8ac8dc5360fa5 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libstand/Makefile,v 1.57.2.1 2007/10/18 12:08:52 nyan Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
diff --git a/lib/libstand/__main.c b/lib/libstand/__main.c
index 1c7e67703e0d6..a592b4f9ead79 100644
--- a/lib/libstand/__main.c
+++ b/lib/libstand/__main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/__main.c,v 1.2 2001/09/30 22:27:59 dillon Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libstand/arm/_setjmp.S b/lib/libstand/arm/_setjmp.S
index 631213f217e10..592446c56772b 100644
--- a/lib/libstand/arm/_setjmp.S
+++ b/lib/libstand/arm/_setjmp.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/arm/_setjmp.S,v 1.1 2004/05/14 12:24:51 cognet Exp $");
 
 #define SOFTFLOAT /* XXX */
 /*
diff --git a/lib/libstand/arp.c b/lib/libstand/arp.c
index e6175325f31a5..8d061ab456e7d 100644
--- a/lib/libstand/arp.c
+++ b/lib/libstand/arp.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/arp.c,v 1.4 2007/01/09 01:02:03 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/assert.c b/lib/libstand/assert.c
index b42435824ae8c..76209c50d648b 100644
--- a/lib/libstand/assert.c
+++ b/lib/libstand/assert.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/assert.c,v 1.7 2001/10/29 07:07:25 mike Exp $");
 
 #include <assert.h>
 
diff --git a/lib/libstand/bcd.c b/lib/libstand/bcd.c
index 7bd67c91620a6..337e1b3f9dfc0 100644
--- a/lib/libstand/bcd.c
+++ b/lib/libstand/bcd.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bcd.c,v 1.3 2001/09/30 22:28:00 dillon Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libstand/bootp.c b/lib/libstand/bootp.c
index b1bc5437e01e4..e3d0782d2ba1d 100644
--- a/lib/libstand/bootp.c
+++ b/lib/libstand/bootp.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bootp.c,v 1.6 2007/01/09 01:02:03 imp Exp $");
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/lib/libstand/bootp.h b/lib/libstand/bootp.h
index ed9101f3ea89a..c11daf1be8818 100644
--- a/lib/libstand/bootp.h
+++ b/lib/libstand/bootp.h
@@ -19,7 +19,7 @@
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/bootp.h,v 1.2 2000/08/11 08:36:12 ps Exp $
  */
 
 
diff --git a/lib/libstand/bootparam.c b/lib/libstand/bootparam.c
index e4d2f1022c925..730f4098e8658 100644
--- a/lib/libstand/bootparam.c
+++ b/lib/libstand/bootparam.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bootparam.c,v 1.2 2001/09/30 22:28:00 dillon Exp $");
 
 /*
  * RPC/bootparams
diff --git a/lib/libstand/bswap.c b/lib/libstand/bswap.c
index a9bd323b7f62c..69ebf897fceee 100644
--- a/lib/libstand/bswap.c
+++ b/lib/libstand/bswap.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bswap.c,v 1.2 2001/09/30 22:28:00 dillon Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = "$NetBSD: bswap32.c,v 1.1 1997/10/09 15:42:33 bouyer Exp $";
diff --git a/lib/libstand/bzipfs.c b/lib/libstand/bzipfs.c
index d4d3adf89bf33..d81ea1a886128 100644
--- a/lib/libstand/bzipfs.c
+++ b/lib/libstand/bzipfs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/bzipfs.c,v 1.7 2005/05/17 16:22:54 obrien Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index 449480b5531ed..2c8ea09c09407 100644
--- a/lib/libstand/cd9660.c
+++ b/lib/libstand/cd9660.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/cd9660.c,v 1.12 2005/10/18 13:35:08 des Exp $");
 
 /*
  * Stand-alone ISO9660 file reading package.
diff --git a/lib/libstand/close.c b/lib/libstand/close.c
index 61b1b0d99ffe7..8dafba85eb385 100644
--- a/lib/libstand/close.c
+++ b/lib/libstand/close.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/close.c,v 1.4 2007/01/09 01:02:03 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/closeall.c b/lib/libstand/closeall.c
index a66142676354d..a0588f82b3398 100644
--- a/lib/libstand/closeall.c
+++ b/lib/libstand/closeall.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/closeall.c,v 1.3 2007/01/09 01:02:03 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/dev.c b/lib/libstand/dev.c
index 482c082117233..c52baf9b7d4e1 100644
--- a/lib/libstand/dev.c
+++ b/lib/libstand/dev.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/dev.c,v 1.3 2007/01/09 01:02:03 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/lib/libstand/dosfs.c b/lib/libstand/dosfs.c
index 161d330083761..bf1a01b57efbc 100644
--- a/lib/libstand/dosfs.c
+++ b/lib/libstand/dosfs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/dosfs.c,v 1.8 2004/10/03 15:58:20 stefanf Exp $");
 
 /*
  * Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems,
diff --git a/lib/libstand/environment.c b/lib/libstand/environment.c
index c30b7306eee9a..71de28d80a870 100644
--- a/lib/libstand/environment.c
+++ b/lib/libstand/environment.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/environment.c,v 1.7 2007/04/04 03:29:02 kan Exp $");
 
 /*
  * Manage an environment-like space in which string variables may be stored.
diff --git a/lib/libstand/ether.c b/lib/libstand/ether.c
index 50a8934ca1fc1..33d87ed8e2155 100644
--- a/lib/libstand/ether.c
+++ b/lib/libstand/ether.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ether.c,v 1.5 2007/01/09 01:02:03 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/ext2fs.c b/lib/libstand/ext2fs.c
index 1bd78e20acb1a..4f23c62cc7955 100644
--- a/lib/libstand/ext2fs.c
+++ b/lib/libstand/ext2fs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ext2fs.c,v 1.6 2004/10/03 15:58:20 stefanf Exp $");
 
 /*-
  * Copyright (c) 1993
diff --git a/lib/libstand/fstat.c b/lib/libstand/fstat.c
index 13bed08d085f6..14e88c999da9b 100644
--- a/lib/libstand/fstat.c
+++ b/lib/libstand/fstat.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/fstat.c,v 1.5 2007/01/09 01:02:03 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/getopt.c b/lib/libstand/getopt.c
index bb57fcd49e75a..67b5e3c4d5c6d 100644
--- a/lib/libstand/getopt.c
+++ b/lib/libstand/getopt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/getopt.c,v 1.3 2007/01/09 01:02:03 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
diff --git a/lib/libstand/gets.c b/lib/libstand/gets.c
index 575134c30a09b..d07318e7c9f9b 100644
--- a/lib/libstand/gets.c
+++ b/lib/libstand/gets.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/gets.c,v 1.5 2007/01/09 01:02:03 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/globals.c b/lib/libstand/globals.c
index 03108232fff03..6e88b5ef93a86 100644
--- a/lib/libstand/globals.c
+++ b/lib/libstand/globals.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/globals.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/lib/libstand/gzipfs.c b/lib/libstand/gzipfs.c
index 0d7c59b263ac5..b8d6a2f5517b7 100644
--- a/lib/libstand/gzipfs.c
+++ b/lib/libstand/gzipfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/gzipfs.c,v 1.13 2004/01/21 20:12:23 jhb Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/i386/_setjmp.S b/lib/libstand/i386/_setjmp.S
index 84df89e891c1a..7f176e96f0a31 100644
--- a/lib/libstand/i386/_setjmp.S
+++ b/lib/libstand/i386/_setjmp.S
@@ -32,7 +32,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libstand/i386/_setjmp.S,v 1.6 2007/01/09 01:02:04 imp Exp $"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libstand/if_ether.h b/lib/libstand/if_ether.h
index 7783c413f2062..0d3d4c984f397 100644
--- a/lib/libstand/if_ether.h
+++ b/lib/libstand/if_ether.h
@@ -30,7 +30,7 @@
  *
  *	@(#)if_ether.h	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/if_ether.h,v 1.4 2007/01/09 01:02:03 imp Exp $
  */
 
 /*
diff --git a/lib/libstand/in_cksum.c b/lib/libstand/in_cksum.c
index e6051bf166563..b0bdddb84dafd 100644
--- a/lib/libstand/in_cksum.c
+++ b/lib/libstand/in_cksum.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/in_cksum.c,v 1.5 2007/01/09 01:02:03 imp Exp $");
 
 #include <sys/types.h>
 #include <machine/endian.h>
diff --git a/lib/libstand/inet_ntoa.c b/lib/libstand/inet_ntoa.c
index 5bc85335412a3..23abb63f6d524 100644
--- a/lib/libstand/inet_ntoa.c
+++ b/lib/libstand/inet_ntoa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/inet_ntoa.c,v 1.5 2007/01/09 01:02:03 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libstand/ioctl.c b/lib/libstand/ioctl.c
index a4512af05ed24..a734a6e6fd057 100644
--- a/lib/libstand/ioctl.c
+++ b/lib/libstand/ioctl.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ioctl.c,v 1.4 2007/01/09 01:02:03 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/iodesc.h b/lib/libstand/iodesc.h
index 0da1946dbf30f..50be9378a54fe 100644
--- a/lib/libstand/iodesc.h
+++ b/lib/libstand/iodesc.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/iodesc.h,v 1.2 2007/01/09 01:02:03 imp Exp $
  */
 
 #ifndef __SYS_LIBNETBOOT_IODESC_H
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index d1c544ca76875..790a7b71be5f1 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libstand/libstand.3,v 1.34 2005/11/24 11:14:06 ru Exp $
 .\"
 .Dd August 6, 2004
 .Dt LIBSTAND 3
diff --git a/lib/libstand/lseek.c b/lib/libstand/lseek.c
index f656d59865053..11aab015bd7a6 100644
--- a/lib/libstand/lseek.c
+++ b/lib/libstand/lseek.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/lseek.c,v 1.5 2007/01/09 01:02:03 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/net.c b/lib/libstand/net.c
index bfa690bb5be0c..68886f1769cc2 100644
--- a/lib/libstand/net.c
+++ b/lib/libstand/net.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/net.c,v 1.7 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/net.h b/lib/libstand/net.h
index 9434c3ca31f9f..d9774c3b6dc5d 100644
--- a/lib/libstand/net.h
+++ b/lib/libstand/net.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/net.h,v 1.5 2007/01/09 01:02:04 imp Exp $
  */
 
 #ifndef _KERNEL	/* XXX - see <netinet/in.h> */
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index c260690c503c7..1e04b4bef1eab 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/netif.c,v 1.5 2002/03/21 23:38:48 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libstand/netif.h b/lib/libstand/netif.h
index dac285107a735..3c7fdd7d3811a 100644
--- a/lib/libstand/netif.h
+++ b/lib/libstand/netif.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: netif.h,v 1.4 1995/09/14 23:45:30 pk Exp $	*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libstand/netif.h,v 1.2 2000/08/03 09:08:29 jhb Exp $ */
 
 #ifndef __SYS_LIBNETBOOT_NETIF_H
 #define __SYS_LIBNETBOOT_NETIF_H
diff --git a/lib/libstand/nfs.c b/lib/libstand/nfs.c
index 1c439a899ab7c..b62880c00b740 100644
--- a/lib/libstand/nfs.c
+++ b/lib/libstand/nfs.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/lib/libstand/nfsv2.h b/lib/libstand/nfsv2.h
index a6f1c4f770ffe..675ffd1ee7338 100644
--- a/lib/libstand/nfsv2.h
+++ b/lib/libstand/nfsv2.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libstand/nfsv2.h,v 1.4 2007/01/09 01:02:04 imp Exp $ */
 /*	$NetBSD: nfsv2.h,v 1.2 1996/02/26 23:05:23 gwr Exp $	*/
 
 /*
diff --git a/lib/libstand/nullfs.c b/lib/libstand/nullfs.c
index e4c0b7cbc467b..7d1163602acb5 100644
--- a/lib/libstand/nullfs.c
+++ b/lib/libstand/nullfs.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/nullfs.c,v 1.7 2007/01/09 01:02:04 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/open.c b/lib/libstand/open.c
index acbda1c9ed311..c8f144632fcbe 100644
--- a/lib/libstand/open.c
+++ b/lib/libstand/open.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/open.c,v 1.7 2007/01/09 01:02:04 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/pager.c b/lib/libstand/pager.c
index a966b0bd79920..fa601d46a209b 100644
--- a/lib/libstand/pager.c
+++ b/lib/libstand/pager.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/pager.c,v 1.6 2001/09/30 22:28:01 dillon Exp $");
 
 #include "stand.h"
 #include <string.h>
diff --git a/lib/libstand/powerpc/_setjmp.S b/lib/libstand/powerpc/_setjmp.S
index 5a30810b54ffc..8aac8d84b572b 100644
--- a/lib/libstand/powerpc/_setjmp.S
+++ b/lib/libstand/powerpc/_setjmp.S
@@ -4,7 +4,7 @@
 
 #if (defined(LIBC_SCCS) || defined(LIBC_RCS)) && !defined(lint)
 	.text
-	.asciz "$FreeBSD$"
+	.asciz "$FreeBSD: src/lib/libstand/powerpc/_setjmp.S,v 1.3 2000/11/10 06:10:28 benno Exp $"
 #endif
 
 /*
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index 56642824eaa1d..9870ed42fdcf4 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/printf.c,v 1.10 2007/01/09 01:02:04 imp Exp $");
 
 /*
  * Standaloneified version of the FreeBSD kernel printf family.
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index 3a18eed8b31cd..fab5cd715247c 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/qdivrem.c,v 1.6 2007/01/09 01:02:04 imp Exp $");
 
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
diff --git a/lib/libstand/quad.h b/lib/libstand/quad.h
index 0ff27ff66356f..ed1d8e2b7bbed 100644
--- a/lib/libstand/quad.h
+++ b/lib/libstand/quad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/quad.h,v 1.4 2007/01/09 01:02:04 imp Exp $
  */
 
 /*
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index 4cd6dd4d4ef36..d502a5f0dd743 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/random.c,v 1.6 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libstand/rarp.c b/lib/libstand/rarp.c
index 07ec1ccd4c78c..0a6798b3f0726 100644
--- a/lib/libstand/rarp.c
+++ b/lib/libstand/rarp.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/rarp.c,v 1.4 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/read.c b/lib/libstand/read.c
index 4c67dbeb3b5e5..87d27a6fe222d 100644
--- a/lib/libstand/read.c
+++ b/lib/libstand/read.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/read.c,v 1.6 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/readdir.c b/lib/libstand/readdir.c
index e49d93d15ed6c..e2fb1b0b82987 100644
--- a/lib/libstand/readdir.c
+++ b/lib/libstand/readdir.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/readdir.c,v 1.2 2001/09/30 22:28:01 dillon Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/rpc.c b/lib/libstand/rpc.c
index b48c57457deb9..f002c8fdd72db 100644
--- a/lib/libstand/rpc.c
+++ b/lib/libstand/rpc.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/rpc.c,v 1.4 2007/01/09 01:02:04 imp Exp $");
 
 /*
  * RPC functions used by NFS and bootparams.
diff --git a/lib/libstand/rpc.h b/lib/libstand/rpc.h
index e06ce416921da..317d1502c6efa 100644
--- a/lib/libstand/rpc.h
+++ b/lib/libstand/rpc.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/rpc.h,v 1.2 2007/01/09 01:02:04 imp Exp $
  */
 
 /* XXX defines we can't easily get from system includes */
diff --git a/lib/libstand/rpcv2.h b/lib/libstand/rpcv2.h
index b59a760198d24..3d01b7f040516 100644
--- a/lib/libstand/rpcv2.h
+++ b/lib/libstand/rpcv2.h
@@ -33,7 +33,7 @@
  *
  *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/rpcv2.h,v 1.2 2007/01/09 01:02:04 imp Exp $
  */
 
 /*
diff --git a/lib/libstand/saioctl.h b/lib/libstand/saioctl.h
index 5f888ff855f2d..50798fcdb5751 100644
--- a/lib/libstand/saioctl.h
+++ b/lib/libstand/saioctl.h
@@ -30,7 +30,7 @@
  *
  *	@(#)saioctl.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/saioctl.h,v 1.2 2007/01/09 01:02:04 imp Exp $
  */
 
 /* ioctl's -- for disks just now */
diff --git a/lib/libstand/sbrk.c b/lib/libstand/sbrk.c
index 93d94e4824512..65438abbd1b04 100644
--- a/lib/libstand/sbrk.c
+++ b/lib/libstand/sbrk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/sbrk.c,v 1.5 2004/10/03 15:58:20 stefanf Exp $");
 
 /*
  * Minimal sbrk() emulation required for malloc support.
diff --git a/lib/libstand/sparc64/_setjmp.S b/lib/libstand/sparc64/_setjmp.S
index 50c924e8424b0..26c09f5edebdc 100644
--- a/lib/libstand/sparc64/_setjmp.S
+++ b/lib/libstand/sparc64/_setjmp.S
@@ -42,7 +42,7 @@
 #endif /* LIBC_SCCS and not lint */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/sparc64/_setjmp.S,v 1.3 2007/01/09 01:02:05 imp Exp $");
 
 #define	_JB_FP		0x0
 #define	_JB_PC		0x8
diff --git a/lib/libstand/splitfs.c b/lib/libstand/splitfs.c
index af28704bc4658..f8c54b36fed2c 100644
--- a/lib/libstand/splitfs.c
+++ b/lib/libstand/splitfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/splitfs.c,v 1.8 2005/05/20 12:55:38 charnier Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 12c188afcee4c..b676c6caa619d 100644
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/stand.h,v 1.42 2007/01/09 01:02:04 imp Exp $
  * From	$NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $	
  */
 
diff --git a/lib/libstand/stat.c b/lib/libstand/stat.c
index addee5d2f4710..a504aadf4ba87 100644
--- a/lib/libstand/stat.c
+++ b/lib/libstand/stat.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/stat.c,v 1.3 2007/01/09 01:02:04 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 7ef3f59d9d3c6..de92514fa6e99 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strcasecmp.c,v 1.4 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/cdefs.h>
 #include <string.h>
diff --git a/lib/libstand/strdup.c b/lib/libstand/strdup.c
index 45a541432cf53..2c718f0b297e2 100644
--- a/lib/libstand/strdup.c
+++ b/lib/libstand/strdup.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strdup.c,v 1.3 2007/01/09 01:02:04 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libstand/strerror.c b/lib/libstand/strerror.c
index 56571efaa0efb..2d952d33a7735 100644
--- a/lib/libstand/strerror.c
+++ b/lib/libstand/strerror.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strerror.c,v 1.3 2007/01/09 01:02:04 imp Exp $");
 
 #include "stand.h"
 
diff --git a/lib/libstand/strtol.c b/lib/libstand/strtol.c
index ec5daf0bb87a3..bbff621632ba2 100644
--- a/lib/libstand/strtol.c
+++ b/lib/libstand/strtol.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/strtol.c,v 1.4 2007/01/09 01:02:04 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libstand/tftp.c b/lib/libstand/tftp.c
index fd1b4ee7a9216..53eb2f3fbe04b 100644
--- a/lib/libstand/tftp.c
+++ b/lib/libstand/tftp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/tftp.c,v 1.12.10.1 2007/10/28 15:41:11 marius Exp $");
 
 /*
  * Simple TFTP implementation for libsa.
diff --git a/lib/libstand/twiddle.c b/lib/libstand/twiddle.c
index e0a4c08f27bac..bc6adfa012d26 100644
--- a/lib/libstand/twiddle.c
+++ b/lib/libstand/twiddle.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/twiddle.c,v 1.4 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/types.h>
 #include "stand.h"
diff --git a/lib/libstand/udp.c b/lib/libstand/udp.c
index a95cedebdf586..b7b16689a7c63 100644
--- a/lib/libstand/udp.c
+++ b/lib/libstand/udp.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.6 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index 280b74e356993..0873e6de68035 100644
--- a/lib/libstand/ufs.c
+++ b/lib/libstand/ufs.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/ufs.c,v 1.16 2007/01/09 01:02:04 imp Exp $");
 
 /*
  *	Stand-alone file reading package.
diff --git a/lib/libstand/write.c b/lib/libstand/write.c
index dccdb8bb2b4fd..a91f7907cc70c 100644
--- a/lib/libstand/write.c
+++ b/lib/libstand/write.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/write.c,v 1.7 2007/01/09 01:02:04 imp Exp $");
 
 #include <sys/param.h>
 #include "stand.h"
diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c
index aa8ccd03c0fac..3fd75a7ea92f9 100644
--- a/lib/libstand/zalloc.c
+++ b/lib/libstand/zalloc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/zalloc.c,v 1.7 2002/12/19 23:23:20 dillon Exp $");
 
 /*
  * LIB/MEMORY/ZALLOC.C	- self contained low-overhead memory pool/allocation 
diff --git a/lib/libstand/zalloc_defs.h b/lib/libstand/zalloc_defs.h
index 2544f59a63496..31d95a15381db 100644
--- a/lib/libstand/zalloc_defs.h
+++ b/lib/libstand/zalloc_defs.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_defs.h,v 1.15 2005/05/31 20:01:18 jhb Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index 3161fc37dcba5..cfb8f6c5e63a7 100644
--- a/lib/libstand/zalloc_malloc.c
+++ b/lib/libstand/zalloc_malloc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.9 2004/02/25 00:52:14 grehan Exp $");
 
 /*
  * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk
diff --git a/lib/libstand/zalloc_mem.h b/lib/libstand/zalloc_mem.h
index c872da17da73e..2dbd1a9786640 100644
--- a/lib/libstand/zalloc_mem.h
+++ b/lib/libstand/zalloc_mem.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_mem.h,v 1.3 1999/08/28 00:05:35 peter Exp $
  */
 
 /*
diff --git a/lib/libstand/zalloc_protos.h b/lib/libstand/zalloc_protos.h
index c90bd5a3cd358..2466f1fea551c 100644
--- a/lib/libstand/zalloc_protos.h
+++ b/lib/libstand/zalloc_protos.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libstand/zalloc_protos.h,v 1.3 1999/08/28 00:05:35 peter Exp $
  */
 
 Library void *znalloc(struct MemPool *mpool, iaddr_t bytes);
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 703b525c7b9d3..aade1baa4e363 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libtacplus/Makefile,v 1.8 2007/05/21 02:49:07 deischen Exp $
 
 LIB=		tacplus
 SRCS=		taclib.c
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 9ce6c4a1746b9..749653a7bb831 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libtacplus/libtacplus.3,v 1.14 2006/10/28 10:53:39 maxim Exp $
 .\"
 .Dd September 2, 1998
 .Dt LIBTACPLUS 3
diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c
index 6ac3c72501c67..ee717443a0c95 100644
--- a/lib/libtacplus/taclib.c
+++ b/lib/libtacplus/taclib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libtacplus/taclib.c,v 1.6 2005/02/14 17:42:56 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libtacplus/taclib.h b/lib/libtacplus/taclib.h
index 2ef36b9efd50d..53d9c10a49023 100644
--- a/lib/libtacplus/taclib.h
+++ b/lib/libtacplus/taclib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib.h,v 1.2 2002/09/25 23:18:51 pst Exp $
  */
 
 #ifndef _TACLIB_H_
diff --git a/lib/libtacplus/taclib_private.h b/lib/libtacplus/taclib_private.h
index bbc1990c92692..a261941d48e3a 100644
--- a/lib/libtacplus/taclib_private.h
+++ b/lib/libtacplus/taclib_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/lib/libtacplus/taclib_private.h,v 1.2 2002/09/25 23:18:51 pst Exp $
  */
 
 #ifndef TACLIB_PRIVATE_H
diff --git a/lib/libtacplus/tacplus.conf.5 b/lib/libtacplus/tacplus.conf.5
index e68982d3d627f..aad579d89632c 100644
--- a/lib/libtacplus/tacplus.conf.5
+++ b/lib/libtacplus/tacplus.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libtacplus/tacplus.conf.5,v 1.7 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd July 29, 1998
 .Dt TACPLUS.CONF 5
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 37eb8f6da8014..ae434b3716bca 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-# $FreeBSD$
+# $FreeBSD: src/lib/libtelnet/Makefile,v 1.24 2006/07/31 13:29:35 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index a0f4069920b5e..011be3080e710 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/Makefile,v 1.28 2007/10/09 23:31:10 obrien Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libthr/arch/amd64/Makefile.inc b/lib/libthr/arch/amd64/Makefile.inc
index 6e6d577bce15d..ad627cdf88264 100644
--- a/lib/libthr/arch/amd64/Makefile.inc
+++ b/lib/libthr/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/lib/libthr/arch/amd64/Makefile.inc,v 1.2 2005/04/02 01:19:57 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/amd64/amd64/pthread_md.c b/lib/libthr/arch/amd64/amd64/pthread_md.c
index b661657b44c22..84aa3f8981a93 100644
--- a/lib/libthr/arch/amd64/amd64/pthread_md.c
+++ b/lib/libthr/arch/amd64/amd64/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/amd64/amd64/pthread_md.c,v 1.2 2006/04/04 03:26:05 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/amd64/include/pthread_md.h b/lib/libthr/arch/amd64/include/pthread_md.h
index 6814cacceee0c..a3c44aaca130f 100644
--- a/lib/libthr/arch/amd64/include/pthread_md.h
+++ b/lib/libthr/arch/amd64/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/amd64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/arm/Makefile.inc b/lib/libthr/arch/arm/Makefile.inc
index 508d2b49a1e5a..c0751f95c6b03 100644
--- a/lib/libthr/arch/arm/Makefile.inc
+++ b/lib/libthr/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/arm/Makefile.inc,v 1.2 2005/04/07 22:06:05 cognet Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/arm/arm/pthread_md.c b/lib/libthr/arch/arm/arm/pthread_md.c
index 7ca2b25dcf9cb..9d86bff9f8b52 100644
--- a/lib/libthr/arch/arm/arm/pthread_md.c
+++ b/lib/libthr/arch/arm/arm/pthread_md.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/arm/arm/pthread_md.c,v 1.2 2005/10/29 13:40:31 davidxu Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h
index 0164da6f4c381..8f4d28d647b08 100644
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/arm/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/i386/Makefile.inc b/lib/libthr/arch/i386/Makefile.inc
index 508d2b49a1e5a..6b52b47b33408 100644
--- a/lib/libthr/arch/i386/Makefile.inc
+++ b/lib/libthr/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/i386/Makefile.inc,v 1.2 2005/04/02 01:19:58 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/i386/i386/pthread_md.c b/lib/libthr/arch/i386/i386/pthread_md.c
index a8b31d503ea70..5be51ef7e04eb 100644
--- a/lib/libthr/arch/i386/i386/pthread_md.c
+++ b/lib/libthr/arch/i386/i386/pthread_md.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/i386/i386/pthread_md.c,v 1.7 2006/04/04 03:26:06 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/i386/include/pthread_md.h b/lib/libthr/arch/i386/include/pthread_md.h
index 1f629e176fb1a..f5f286944f851 100644
--- a/lib/libthr/arch/i386/include/pthread_md.h
+++ b/lib/libthr/arch/i386/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/i386/include/pthread_md.h,v 1.8 2006/12/15 11:52:00 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/ia64/Makefile.inc b/lib/libthr/arch/ia64/Makefile.inc
index c07c0975d5cae..ca831e8e94ee9 100644
--- a/lib/libthr/arch/ia64/Makefile.inc
+++ b/lib/libthr/arch/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.2 2005/04/02 01:19:58 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/ia64/ia64/pthread_md.c b/lib/libthr/arch/ia64/ia64/pthread_md.c
index c2ad71a4f7758..b43ab94e1485a 100644
--- a/lib/libthr/arch/ia64/ia64/pthread_md.c
+++ b/lib/libthr/arch/ia64/ia64/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/ia64/ia64/pthread_md.c,v 1.4 2006/09/01 21:01:11 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/ia64/include/pthread_md.h b/lib/libthr/arch/ia64/include/pthread_md.h
index 0cff7c9c9665f..2f16531de5e7d 100644
--- a/lib/libthr/arch/ia64/include/pthread_md.h
+++ b/lib/libthr/arch/ia64/include/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/ia64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $
  */
 
 #ifndef _PTHREAD_MD_H_
diff --git a/lib/libthr/arch/powerpc/Makefile.inc b/lib/libthr/arch/powerpc/Makefile.inc
index 508d2b49a1e5a..f145b8ebe8d14 100644
--- a/lib/libthr/arch/powerpc/Makefile.inc
+++ b/lib/libthr/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/powerpc/Makefile.inc,v 1.2 2005/04/02 01:19:59 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h
index 2abbbdc1fce63..2cdd5451d1c95 100644
--- a/lib/libthr/arch/powerpc/include/pthread_md.h
+++ b/lib/libthr/arch/powerpc/include/pthread_md.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/powerpc/include/pthread_md.h,v 1.5 2006/12/15 11:52:01 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/powerpc/powerpc/pthread_md.c b/lib/libthr/arch/powerpc/powerpc/pthread_md.c
index 66f043e294a7c..af144dc869251 100644
--- a/lib/libthr/arch/powerpc/powerpc/pthread_md.c
+++ b/lib/libthr/arch/powerpc/powerpc/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/powerpc/powerpc/pthread_md.c,v 1.3 2006/09/01 06:15:00 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/arch/sparc64/Makefile.inc b/lib/libthr/arch/sparc64/Makefile.inc
index 508d2b49a1e5a..8f6246545c7ef 100644
--- a/lib/libthr/arch/sparc64/Makefile.inc
+++ b/lib/libthr/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/arch/sparc64/Makefile.inc,v 1.3 2005/04/02 01:19:59 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
diff --git a/lib/libthr/arch/sparc64/include/pthread_md.h b/lib/libthr/arch/sparc64/include/pthread_md.h
index 8bfa5f47cfa7f..843f655e7cd4a 100644
--- a/lib/libthr/arch/sparc64/include/pthread_md.h
+++ b/lib/libthr/arch/sparc64/include/pthread_md.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/sparc64/include/pthread_md.h,v 1.2 2006/12/15 11:52:01 davidxu Exp $
  */
 
 /*
diff --git a/lib/libthr/arch/sparc64/sparc64/pthread_md.c b/lib/libthr/arch/sparc64/sparc64/pthread_md.c
index 3f8e10560df10..ea589deca92fe 100644
--- a/lib/libthr/arch/sparc64/sparc64/pthread_md.c
+++ b/lib/libthr/arch/sparc64/sparc64/pthread_md.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/arch/sparc64/sparc64/pthread_md.c,v 1.1 2005/04/02 01:19:59 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3
index 87e5e6475d7ae..5c1e826ec1d69 100644
--- a/lib/libthr/libthr.3
+++ b/lib/libthr/libthr.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libthr/libthr.3,v 1.3.10.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd October 19, 2007
 .Os
diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map
index 1995fda1135d5..2711d8136a0b2 100644
--- a/lib/libthr/pthread.map
+++ b/lib/libthr/pthread.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/pthread.map,v 1.18 2007/05/13 14:12:39 deischen Exp $
  */
 
 /*
diff --git a/lib/libthr/support/Makefile.inc b/lib/libthr/support/Makefile.inc
index bcf4393a2f599..ac631f8e4a2f6 100644
--- a/lib/libthr/support/Makefile.inc
+++ b/lib/libthr/support/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/support/Makefile.inc,v 1.1 2005/04/23 02:48:58 davidxu Exp $
 
 .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/sys/Makefile.inc
index 70c6dda60b74c..b8aad558dfb3f 100644
--- a/lib/libthr/sys/Makefile.inc
+++ b/lib/libthr/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/sys/Makefile.inc,v 1.3 2005/04/02 01:20:00 davidxu Exp $
 
 .PATH:	 ${.CURDIR}/sys
 
diff --git a/lib/libthr/sys/thr_error.c b/lib/libthr/sys/thr_error.c
index 45295c5e211dc..00475653daede 100644
--- a/lib/libthr/sys/thr_error.c
+++ b/lib/libthr/sys/thr_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/sys/thr_error.c,v 1.3 2006/07/12 03:44:05 davidxu Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc
index bdae92e971a1c..1698fda320a84 100644
--- a/lib/libthr/thread/Makefile.inc
+++ b/lib/libthr/thread/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthr/thread/Makefile.inc,v 1.16 2006/04/04 02:57:49 davidxu Exp $
 
 # thr sources
 .PATH: ${.CURDIR}/thread
diff --git a/lib/libthr/thread/thr_atfork.c b/lib/libthr/thread/thr_atfork.c
index 0c57cc20a2784..f821bf9b97d38 100644
--- a/lib/libthr/thread/thr_atfork.c
+++ b/lib/libthr/thread/thr_atfork.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_atfork.c,v 1.3 2006/09/06 04:04:10 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index ffb0453354ae4..b949677fdb5ab 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.c
@@ -90,7 +90,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_attr.c,v 1.8 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c
index c425569c226e5..2179033c59ab1 100644
--- a/lib/libthr/thread/thr_autoinit.c
+++ b/lib/libthr/thread/thr_autoinit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_autoinit.c,v 1.2 2003/05/23 09:48:20 mtm Exp $
  */
 
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c
index bbd444708dee4..1246d56246c74 100644
--- a/lib/libthr/thread/thr_barrier.c
+++ b/lib/libthr/thread/thr_barrier.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_barrier.c,v 1.8 2006/12/05 23:46:11 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c
index 32b9723445c0a..350cb096c805d 100644
--- a/lib/libthr/thread/thr_barrierattr.c
+++ b/lib/libthr/thread/thr_barrierattr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_barrierattr.c,v 1.3 2006/04/04 02:57:49 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index bf93fdcae4da9..cbf79a567ce9f 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.16 2006/12/05 05:01:57 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_clean.c b/lib/libthr/thread/thr_clean.c
index 9922798169549..e0bcb19d689f7 100644
--- a/lib/libthr/thread/thr_clean.c
+++ b/lib/libthr/thread/thr_clean.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_clean.c,v 1.5 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c
index 61f0c4a5d4028..5239234f70df0 100644
--- a/lib/libthr/thread/thr_concurrency.c
+++ b/lib/libthr/thread/thr_concurrency.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_concurrency.c,v 1.3 2006/04/04 02:57:49 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c
index 85eecaaf1ee5e..ad6298637c3bf 100644
--- a/lib/libthr/thread/thr_cond.c
+++ b/lib/libthr/thread/thr_cond.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.23 2006/12/12 03:08:49 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_condattr.c b/lib/libthr/thread/thr_condattr.c
index c8f170334299a..9185190f544b4 100644
--- a/lib/libthr/thread/thr_condattr.c
+++ b/lib/libthr/thread/thr_condattr.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_condattr.c,v 1.3 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index abab2123a06dd..b9ed046ebd7e8 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.36 2006/12/15 11:52:01 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c
index bfcb6e63f71c5..6cfc748171928 100644
--- a/lib/libthr/thread/thr_detach.c
+++ b/lib/libthr/thread/thr_detach.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_detach.c,v 1.11 2006/04/04 02:57:49 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_equal.c b/lib/libthr/thread/thr_equal.c
index 2f602b5788f21..74fc729c49bc2 100644
--- a/lib/libthr/thread/thr_equal.c
+++ b/lib/libthr/thread/thr_equal.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_equal.c,v 1.3 2007/01/12 07:26:20 imp Exp $
  */
 #include "namespace.h"
 #include <pthread.h>
diff --git a/lib/libthr/thread/thr_event.c b/lib/libthr/thread/thr_event.c
index cdab9d741f1e7..ee71d3c9e4f79 100644
--- a/lib/libthr/thread/thr_event.c
+++ b/lib/libthr/thread/thr_event.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_event.c,v 1.2 2006/09/06 04:04:10 davidxu Exp $
  */
 
 #include "thr_private.h"
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c
index 1e533f5b2ef8d..ac66f155243b7 100644
--- a/lib/libthr/thread/thr_exit.c
+++ b/lib/libthr/thread/thr_exit.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.23 2007/01/12 07:26:20 imp Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c
index 713e0b5f8d1ef..bcd7876e21f0f 100644
--- a/lib/libthr/thread/thr_fork.c
+++ b/lib/libthr/thread/thr_fork.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_fork.c,v 1.8 2007/01/12 07:26:20 imp Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_getprio.c b/lib/libthr/thread/thr_getprio.c
index f0d1a296952e0..a5b10eb7b3fac 100644
--- a/lib/libthr/thread/thr_getprio.c
+++ b/lib/libthr/thread/thr_getprio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_getprio.c,v 1.3 2007/01/12 07:26:20 imp Exp $
  */
 #include "namespace.h"
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_getschedparam.c b/lib/libthr/thread/thr_getschedparam.c
index b36d7241bd9c1..31e5ac6e4eddf 100644
--- a/lib/libthr/thread/thr_getschedparam.c
+++ b/lib/libthr/thread/thr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_getschedparam.c,v 1.9 2006/09/21 04:21:30 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_info.c b/lib/libthr/thread/thr_info.c
index 2da6da2f187e2..14c2305cf853c 100644
--- a/lib/libthr/thread/thr_info.c
+++ b/lib/libthr/thread/thr_info.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_info.c,v 1.10 2007/04/05 07:20:31 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index d35834c409b15..3d2b9a9a83b04 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.46.2.1 2007/11/14 01:10:12 kris Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c
index 139c74c7925c1..d1cef4d21654e 100644
--- a/lib/libthr/thread/thr_join.c
+++ b/lib/libthr/thread/thr_join.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.23 2006/11/28 11:05:31 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c
index 649a973aabdc9..ec2e63a1df09f 100644
--- a/lib/libthr/thread/thr_kern.c
+++ b/lib/libthr/thread/thr_kern.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_kern.c,v 1.21 2006/09/21 04:21:30 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_kill.c b/lib/libthr/thread/thr_kill.c
index 97d4fe6d2b20d..a724c824460d2 100644
--- a/lib/libthr/thread/thr_kill.c
+++ b/lib/libthr/thread/thr_kill.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_kill.c,v 1.3 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_list.c b/lib/libthr/thread/thr_list.c
index e23e57d44f77a..8083d17fe2daa 100644
--- a/lib/libthr/thread/thr_list.c
+++ b/lib/libthr/thread/thr_list.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_list.c,v 1.11 2006/11/24 09:57:38 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c
index bfa8b87e95313..3f22811cdac38 100644
--- a/lib/libthr/thread/thr_main_np.c
+++ b/lib/libthr/thread/thr_main_np.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_main_np.c,v 1.3 2006/04/04 02:57:49 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_multi_np.c b/lib/libthr/thread/thr_multi_np.c
index 339a21dcfe6d4..c2a39239056c5 100644
--- a/lib/libthr/thread/thr_multi_np.c
+++ b/lib/libthr/thread/thr_multi_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_multi_np.c,v 1.3 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 3d78c1bf495fe..606d5b628de96 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.54.2.2 2007/12/13 02:29:17 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_mutexattr.c b/lib/libthr/thread/thr_mutexattr.c
index c7bdde2e84cc0..85811aaf8ea99 100644
--- a/lib/libthr/thread/thr_mutexattr.c
+++ b/lib/libthr/thread/thr_mutexattr.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.7 2007/01/12 07:26:20 imp Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index 4fe392cec685c..288b351af56d6 100644
--- a/lib/libthr/thread/thr_once.c
+++ b/lib/libthr/thread/thr_once.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.5 2006/02/15 23:05:03 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c
index 7d32ae717eb71..3cfa4f8db5ff8 100644
--- a/lib/libthr/thread/thr_printf.c
+++ b/lib/libthr/thread/thr_printf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_printf.c,v 1.5 2005/04/02 01:20:00 davidxu Exp $
  */
 
 #include <stdarg.h>
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 313074f20bd5f..b3374a2a8f086 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.78.2.1 2007/11/14 01:10:12 kris Exp $
  */
 
 #ifndef _THR_PRIVATE_H
diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c
index d5684fc00768a..7d31583009612 100644
--- a/lib/libthr/thread/thr_pspinlock.c
+++ b/lib/libthr/thread/thr_pspinlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.5 2006/12/15 11:52:01 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_resume_np.c b/lib/libthr/thread/thr_resume_np.c
index b477a66c5d99e..ea338e600e3c2 100644
--- a/lib/libthr/thread/thr_resume_np.c
+++ b/lib/libthr/thread/thr_resume_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_resume_np.c,v 1.11 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c
index 827b962d95ee2..cef3715b4e80d 100644
--- a/lib/libthr/thread/thr_rtld.c
+++ b/lib/libthr/thread/thr_rtld.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.3 2006/04/04 02:57:49 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index 81d1459762454..336ffb6545274 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.10 2006/04/23 11:23:37 davidxu Exp $
  */
 
 #include <errno.h>
diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c
index b47d16700d74b..4674bda2674ba 100644
--- a/lib/libthr/thread/thr_rwlockattr.c
+++ b/lib/libthr/thread/thr_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlockattr.c,v 1.2 2006/04/04 02:57:49 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_self.c b/lib/libthr/thread/thr_self.c
index 72cda7ea75b17..833440eb370df 100644
--- a/lib/libthr/thread/thr_self.c
+++ b/lib/libthr/thread/thr_self.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_self.c,v 1.5 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index 6dbf7f4303b81..419ac873677a4 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/thread/thr_sem.c
@@ -27,7 +27,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.9 2006/11/24 09:57:38 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_setprio.c b/lib/libthr/thread/thr_setprio.c
index b1b2352535ab7..cf2701ace09aa 100644
--- a/lib/libthr/thread/thr_setprio.c
+++ b/lib/libthr/thread/thr_setprio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_setprio.c,v 1.8 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_setschedparam.c b/lib/libthr/thread/thr_setschedparam.c
index 59d62dcda1ef9..b0fbe0eb1b219 100644
--- a/lib/libthr/thread/thr_setschedparam.c
+++ b/lib/libthr/thread/thr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_setschedparam.c,v 1.17 2006/09/21 04:21:30 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index 1be544bb7188d..93afb07173361 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.23 2006/12/06 00:15:35 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_single_np.c b/lib/libthr/thread/thr_single_np.c
index 81bdf8c1e916c..02ff6a613acb4 100644
--- a/lib/libthr/thread/thr_single_np.c
+++ b/lib/libthr/thread/thr_single_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_single_np.c,v 1.3 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c
index 06d128704f5fe..59500cdb24289 100644
--- a/lib/libthr/thread/thr_spec.c
+++ b/lib/libthr/thread/thr_spec.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.6.2.1 2007/11/09 21:15:58 marius Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c
index c0e57b0c3bd63..0f30b205899a2 100644
--- a/lib/libthr/thread/thr_spinlock.c
+++ b/lib/libthr/thread/thr_spinlock.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_spinlock.c,v 1.15 2007/01/12 07:26:20 imp Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index 9376086552d76..7fd2cf01f3f01 100644
--- a/lib/libthr/thread/thr_stack.c
+++ b/lib/libthr/thread/thr_stack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.7 2006/04/04 02:57:49 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_suspend_np.c b/lib/libthr/thread/thr_suspend_np.c
index d5fb3b0bc8ec2..3cb8a053fd5f7 100644
--- a/lib/libthr/thread/thr_suspend_np.c
+++ b/lib/libthr/thread/thr_suspend_np.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_suspend_np.c,v 1.8 2007/01/12 07:26:20 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c
index f6ffb072bae58..30c5796e07746 100644
--- a/lib/libthr/thread/thr_switch_np.c
+++ b/lib/libthr/thread/thr_switch_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_switch_np.c,v 1.2 2006/04/04 02:57:49 davidxu Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c
index ea323c58cce7c..3f47e626e18e1 100644
--- a/lib/libthr/thread/thr_symbols.c
+++ b/lib/libthr/thread/thr_symbols.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_symbols.c,v 1.4 2007/01/12 07:26:21 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c
index 74a0950100297..9c51f04dc677d 100644
--- a/lib/libthr/thread/thr_syscalls.c
+++ b/lib/libthr/thread/thr_syscalls.c
@@ -28,7 +28,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.16 2007/01/12 07:26:21 imp Exp $
  */
 
 /*
diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c
index 0a5ee6a31113c..0a25a7cd250a0 100644
--- a/lib/libthr/thread/thr_umtx.c
+++ b/lib/libthr/thread/thr_umtx.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.12 2007/05/09 08:39:33 davidxu Exp $
  *
  */
 
diff --git a/lib/libthr/thread/thr_umtx.h b/lib/libthr/thread/thr_umtx.h
index 1a60c1a178c22..8200fc8fb163c 100644
--- a/lib/libthr/thread/thr_umtx.h
+++ b/lib/libthr/thread/thr_umtx.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.10 2006/12/20 04:43:34 davidxu Exp $
  */
 
 #ifndef _THR_FBSD_UMTX_H_
diff --git a/lib/libthr/thread/thr_yield.c b/lib/libthr/thread/thr_yield.c
index c3f68f29df0bd..1857accd52dbe 100644
--- a/lib/libthr/thread/thr_yield.c
+++ b/lib/libthr/thread/thr_yield.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthr/thread/thr_yield.c,v 1.3 2007/01/12 07:26:21 imp Exp $
  */
 
 #include "namespace.h"
diff --git a/lib/libthread_db/Makefile b/lib/libthread_db/Makefile
index d8e1975762421..587129e13004f 100644
--- a/lib/libthread_db/Makefile
+++ b/lib/libthread_db/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.10 2007/05/21 02:49:07 deischen Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libthread_db/Symbol.map b/lib/libthread_db/Symbol.map
index 65e78d47205b3..88426be1d424d 100644
--- a/lib/libthread_db/Symbol.map
+++ b/lib/libthread_db/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthread_db/Symbol.map,v 1.2 2007/04/29 14:05:22 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/lib/libthread_db/arch/amd64/libc_r_md.c b/lib/libthread_db/arch/amd64/libc_r_md.c
index 6c53953235bee..a902b4695dbb8 100644
--- a/lib/libthread_db/arch/amd64/libc_r_md.c
+++ b/lib/libthread_db/arch/amd64/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 2a635c6d128a9..8c3be35353d63 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/amd64/libpthread_md.c,v 1.4 2007/05/25 13:43:14 delphij Exp $");
 
 #include <sys/procfs.h>
 #include <string.h>
diff --git a/lib/libthread_db/arch/arm/libpthread_md.c b/lib/libthread_db/arch/arm/libpthread_md.c
index a444598c24dda..6b6baaebc1188 100644
--- a/lib/libthread_db/arch/arm/libpthread_md.c
+++ b/lib/libthread_db/arch/arm/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/arm/libpthread_md.c,v 1.1.2.1 2007/12/02 14:44:34 cognet Exp $");
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/libthread_db/arch/i386/libc_r_md.c b/lib/libthread_db/arch/i386/libc_r_md.c
index de27b682a8040..546a2b9aa97ff 100644
--- a/lib/libthread_db/arch/i386/libc_r_md.c
+++ b/lib/libthread_db/arch/i386/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/i386/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/i386/libpthread_md.c b/lib/libthread_db/arch/i386/libpthread_md.c
index dc14e6080872a..53613c11ee5bb 100644
--- a/lib/libthread_db/arch/i386/libpthread_md.c
+++ b/lib/libthread_db/arch/i386/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/i386/libpthread_md.c,v 1.2 2005/05/31 09:43:04 dfr Exp $");
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/libthread_db/arch/ia64/libc_r_md.c b/lib/libthread_db/arch/ia64/libc_r_md.c
index 6c53953235bee..530ee55a11e66 100644
--- a/lib/libthread_db/arch/ia64/libc_r_md.c
+++ b/lib/libthread_db/arch/ia64/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/ia64/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/ia64/libpthread_md.c b/lib/libthread_db/arch/ia64/libpthread_md.c
index 7553ed117eae4..374f7d54a0a5d 100644
--- a/lib/libthread_db/arch/ia64/libpthread_md.c
+++ b/lib/libthread_db/arch/ia64/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/ia64/libpthread_md.c,v 1.3 2004/07/18 19:29:38 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <ucontext.h>
diff --git a/lib/libthread_db/arch/powerpc/libc_r_md.c b/lib/libthread_db/arch/powerpc/libc_r_md.c
index c6139f7f78919..6b6e9f33ea363 100644
--- a/lib/libthread_db/arch/powerpc/libc_r_md.c
+++ b/lib/libthread_db/arch/powerpc/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/powerpc/libc_r_md.c,v 1.1 2006/08/04 17:55:55 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/powerpc/libpthread_md.c b/lib/libthread_db/arch/powerpc/libpthread_md.c
index a8a95bd7aa485..f6e67830379cc 100644
--- a/lib/libthread_db/arch/powerpc/libpthread_md.c
+++ b/lib/libthread_db/arch/powerpc/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/powerpc/libpthread_md.c,v 1.2 2007/05/01 18:28:08 marcel Exp $");
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/libthread_db/arch/sparc64/libc_r_md.c b/lib/libthread_db/arch/sparc64/libc_r_md.c
index 6c53953235bee..3c15470bb6d61 100644
--- a/lib/libthread_db/arch/sparc64/libc_r_md.c
+++ b/lib/libthread_db/arch/sparc64/libc_r_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/sparc64/libc_r_md.c,v 1.1 2004/07/18 04:17:14 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <machine/setjmp.h>
diff --git a/lib/libthread_db/arch/sparc64/libpthread_md.c b/lib/libthread_db/arch/sparc64/libpthread_md.c
index 7553ed117eae4..f683e063f673d 100644
--- a/lib/libthread_db/arch/sparc64/libpthread_md.c
+++ b/lib/libthread_db/arch/sparc64/libpthread_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/arch/sparc64/libpthread_md.c,v 1.3 2004/07/18 19:29:38 marcel Exp $");
 
 #include <sys/procfs.h>
 #include <ucontext.h>
diff --git a/lib/libthread_db/libc_r_db.c b/lib/libthread_db/libc_r_db.c
index 10f7df1b0d7f5..d09c6411c48ca 100644
--- a/lib/libthread_db/libc_r_db.c
+++ b/lib/libthread_db/libc_r_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libc_r_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $");
 
 #include <machine/setjmp.h>
 #include <proc_service.h>
diff --git a/lib/libthread_db/libpthread_db.c b/lib/libthread_db/libpthread_db.c
index 021410c28f347..a463d9afdbcd8 100644
--- a/lib/libthread_db/libpthread_db.c
+++ b/lib/libthread_db/libpthread_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libpthread_db.c,v 1.14 2006/05/17 05:12:42 davidxu Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/libthread_db/libpthread_db.h b/lib/libthread_db/libpthread_db.h
index 188da48427322..9ae5805c68690 100644
--- a/lib/libthread_db/libpthread_db.h
+++ b/lib/libthread_db/libpthread_db.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthread_db/libpthread_db.h,v 1.4 2006/05/17 05:12:42 davidxu Exp $
  */
 
 #ifndef _LIBPTHREAD_DB_H_
diff --git a/lib/libthread_db/libthr_db.c b/lib/libthread_db/libthr_db.c
index 148da1480e032..afc2444147876 100644
--- a/lib/libthread_db/libthr_db.c
+++ b/lib/libthread_db/libthr_db.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/libthr_db.c,v 1.12 2006/05/17 05:14:45 davidxu Exp $");
 
 #include <proc_service.h>
 #include <stddef.h>
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index dc14a36de858f..a8d7026371cd5 100644
--- a/lib/libthread_db/thread_db.c
+++ b/lib/libthread_db/thread_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.4 2006/10/20 14:15:42 davidxu Exp $");
 
 #include <proc_service.h>
 #include <stddef.h>
diff --git a/lib/libthread_db/thread_db.h b/lib/libthread_db/thread_db.h
index a05274e382542..b46f9844f9a37 100644
--- a/lib/libthread_db/thread_db.h
+++ b/lib/libthread_db/thread_db.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.6 2005/05/31 09:43:03 dfr Exp $
  */
 
 #ifndef _THREAD_DB_H_
diff --git a/lib/libthread_db/thread_db_int.h b/lib/libthread_db/thread_db_int.h
index 2e5ecba71c8db..0c4cb02ff5b6b 100644
--- a/lib/libthread_db/thread_db_int.h
+++ b/lib/libthread_db/thread_db_int.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libthread_db/thread_db_int.h,v 1.3 2005/05/31 09:43:03 dfr Exp $
  */
 
 #ifndef _THREAD_DB_INT_H_
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index 8d1d9acf206bf..954af5073e57a 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libufs/Makefile,v 1.14 2006/10/31 21:21:48 pjd Exp $
 
 LIB=	ufs
 SHLIBDIR?= /lib
diff --git a/lib/libufs/block.c b/lib/libufs/block.c
index c4ff304827074..d1bb852944830 100644
--- a/lib/libufs/block.c
+++ b/lib/libufs/block.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/block.c,v 1.10 2003/10/07 07:12:22 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/bread.3 b/lib/libufs/bread.3
index 80aa921f91e61..4df1361424ebc 100644
--- a/lib/libufs/bread.3
+++ b/lib/libufs/bread.3
@@ -7,7 +7,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/bread.3,v 1.6 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt BREAD 3
diff --git a/lib/libufs/cgread.3 b/lib/libufs/cgread.3
index 38edf17ea14f7..26adb5199984c 100644
--- a/lib/libufs/cgread.3
+++ b/lib/libufs/cgread.3
@@ -8,7 +8,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/cgread.3,v 1.7 2006/10/31 21:21:48 pjd Exp $
 .\"
 .Dd June 4, 2003
 .Dt CGREAD 3
diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c
index 2185682e098f4..827dae4684742 100644
--- a/lib/libufs/cgroup.c
+++ b/lib/libufs/cgroup.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.4 2006/10/31 21:21:48 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c
index d8bef61f89170..9307f30e1b1ca 100644
--- a/lib/libufs/inode.c
+++ b/lib/libufs/inode.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/inode.c,v 1.6 2003/06/19 22:12:54 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/libufs.3 b/lib/libufs/libufs.3
index 6a2c7f6aa7391..6e84bdd008278 100644
--- a/lib/libufs/libufs.3
+++ b/lib/libufs/libufs.3
@@ -5,7 +5,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/libufs.3,v 1.9 2006/10/31 21:21:48 pjd Exp $
 .\"
 .Dd June 4, 2003
 .Dt LIBUFS 3
diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h
index 92ab3482a2f73..d22708715ee3c 100644
--- a/lib/libufs/libufs.h
+++ b/lib/libufs/libufs.h
@@ -24,7 +24,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libufs/libufs.h,v 1.12 2006/10/31 21:21:48 pjd Exp $
  */
 
 #ifndef	__LIBUFS_H__
diff --git a/lib/libufs/sblock.c b/lib/libufs/sblock.c
index c9125f28ad345..a9186faf3cd81 100644
--- a/lib/libufs/sblock.c
+++ b/lib/libufs/sblock.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/sblock.c,v 1.10 2003/06/09 09:32:29 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/sbread.3 b/lib/libufs/sbread.3
index e59365a80b271..497032136f106 100644
--- a/lib/libufs/sbread.3
+++ b/lib/libufs/sbread.3
@@ -7,7 +7,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/sbread.3,v 1.5 2004/07/05 06:53:34 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt SBREAD 3
diff --git a/lib/libufs/type.c b/lib/libufs/type.c
index 9b7470a33a84b..089f962556dd0 100644
--- a/lib/libufs/type.c
+++ b/lib/libufs/type.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libufs/type.c,v 1.16 2007/03/16 03:13:28 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libufs/ufs_disk_close.3 b/lib/libufs/ufs_disk_close.3
index a659116a4f542..427408c82058d 100644
--- a/lib/libufs/ufs_disk_close.3
+++ b/lib/libufs/ufs_disk_close.3
@@ -9,7 +9,7 @@
 .\"
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libufs/ufs_disk_close.3,v 1.6 2005/01/21 10:27:09 ru Exp $
 .\"
 .Dd June 4, 2003
 .Dt UFS_DISK_CLOSE 3
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 2323403a1c36d..ba14008217eb2 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libugidfw/Makefile,v 1.8 2007/05/21 02:49:07 deischen Exp $
 
 LIB=		ugidfw
 SHLIB_MAJOR=	3
diff --git a/lib/libugidfw/bsde_get_rule.3 b/lib/libugidfw/bsde_get_rule.3
index a3b6691eaa9aa..fa4fb0e5bc4eb 100644
--- a/lib/libugidfw/bsde_get_rule.3
+++ b/lib/libugidfw/bsde_get_rule.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.5 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd February 24, 2004
 .Os
diff --git a/lib/libugidfw/bsde_get_rule_count.3 b/lib/libugidfw/bsde_get_rule_count.3
index bf441e150d9c3..15b9884593276 100644
--- a/lib/libugidfw/bsde_get_rule_count.3
+++ b/lib/libugidfw/bsde_get_rule_count.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule_count.3,v 1.3 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 7, 2003
 .Os
diff --git a/lib/libugidfw/bsde_parse_rule.3 b/lib/libugidfw/bsde_parse_rule.3
index d510cab26a2e0..3c69ad5dbef2f 100644
--- a/lib/libugidfw/bsde_parse_rule.3
+++ b/lib/libugidfw/bsde_parse_rule.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_parse_rule.3,v 1.3 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 7, 2003
 .Os
diff --git a/lib/libugidfw/bsde_rule_to_string.3 b/lib/libugidfw/bsde_rule_to_string.3
index 44144069a5249..567d598ed9dba 100644
--- a/lib/libugidfw/bsde_rule_to_string.3
+++ b/lib/libugidfw/bsde_rule_to_string.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/bsde_rule_to_string.3,v 1.3 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 7, 2003
 .Os
diff --git a/lib/libugidfw/libugidfw.3 b/lib/libugidfw/libugidfw.3
index 3ff407c1609be..09209b3a0f3c1 100644
--- a/lib/libugidfw/libugidfw.3
+++ b/lib/libugidfw/libugidfw.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.8 2006/04/23 17:06:17 dwmalone Exp $
 .\"
 .Dd February 25, 2004
 .Os
diff --git a/lib/libugidfw/ugidfw.c b/lib/libugidfw/ugidfw.c
index 341ac25f4a6be..ceb0191d5ebf7 100644
--- a/lib/libugidfw/ugidfw.c
+++ b/lib/libugidfw/ugidfw.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.11 2006/04/23 17:06:17 dwmalone Exp $
  */
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/lib/libugidfw/ugidfw.h b/lib/libugidfw/ugidfw.h
index 5b7fcf25a9f9d..24a2bd8b32d19 100644
--- a/lib/libugidfw/ugidfw.h
+++ b/lib/libugidfw/ugidfw.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.5 2006/04/23 17:06:17 dwmalone Exp $
  */
 
 #ifndef _UGIDFW_H
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 23b4068823268..9e2270e3b60a6 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libusbhid/Makefile,v 1.11 2007/05/21 02:49:07 deischen Exp $
 
 LIB=	usbhid
 MAN=	usbhid.3
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index d278ddb8d8753..4505362284698 100644
--- a/lib/libusbhid/data.c
+++ b/lib/libusbhid/data.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6 2003/04/09 01:52:48 mdodd Exp $");
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index 4afdb61ce19ba..8c7d2ceb7c7ff 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c
index 3abc036644bad..e4ed230b5a4ea 100644
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10 2004/02/11 21:09:13 emax Exp $");
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c
index 280ef69aae8cf..b1030e5572f49 100644
--- a/lib/libusbhid/usage.c
+++ b/lib/libusbhid/usage.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $");
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index a11709b87d1af..2dcc3bf775029 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libusbhid/usbhid.3,v 1.18 2005/11/24 11:26:36 ru Exp $
 .\"
 .Dd December 29, 2001
 .Dt USBHID 3
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index af3228f17c426..42e0b994861fd 100644
--- a/lib/libusbhid/usbhid.h
+++ b/lib/libusbhid/usbhid.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.11 2004/06/03 15:04:24 des Exp $
  *
  */
 
diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h
index 7ed04e5edea1f..83c7b8d75466c 100644
--- a/lib/libusbhid/usbvar.h
+++ b/lib/libusbhid/usbvar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libusbhid/usbvar.h,v 1.2 2002/03/27 16:07:18 joe Exp $
  *
  */
 
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 773dd74873899..99cae71b71e2c 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$FreeBSD: src/lib/libutil/Makefile,v 1.66 2007/09/01 06:19:11 pjd Exp $
 
 SHLIBDIR?= /lib
 
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index fe23d12b2b9f1..7efb511279c0d 100644
--- a/lib/libutil/_secure_path.3
+++ b/lib/libutil/_secure_path.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/_secure_path.3,v 1.13 2005/01/20 09:17:07 ru Exp $
 .\"
 .Dd May 2, 1997
 .Os
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index 363378b0d6499..1fb1bed3eaff0 100644
--- a/lib/libutil/_secure_path.c
+++ b/lib/libutil/_secure_path.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/_secure_path.c,v 1.9 2004/12/18 12:31:12 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 3a1bb4dd4dbf9..241f1f101bd66 100644
--- a/lib/libutil/auth.3
+++ b/lib/libutil/auth.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/auth.3,v 1.10 2005/01/20 09:17:07 ru Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 748c3ad84bd7f..2028a17f66f1e 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/auth.c,v 1.6 2003/06/14 18:42:37 markm Exp $");
 
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/lib/libutil/auth.conf.5 b/lib/libutil/auth.conf.5
index be10eb85fdf0b..a64868c2c268f 100644
--- a/lib/libutil/auth.conf.5
+++ b/lib/libutil/auth.conf.5
@@ -11,7 +11,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/auth.conf.5,v 1.8 2005/01/21 12:07:46 ru Exp $
 .\"
 .Dd October 7, 1998
 .Dt AUTH.CONF 5
diff --git a/lib/libutil/expand_number.3 b/lib/libutil/expand_number.3
index 92e8961c58fc8..f670e06eb987c 100644
--- a/lib/libutil/expand_number.3
+++ b/lib/libutil/expand_number.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/expand_number.3,v 1.3 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd April 16, 2007
 .Dt EXPAND_NUMBER 3
diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c
index 5cc260820bb20..fb7ffe0115e78 100644
--- a/lib/libutil/expand_number.c
+++ b/lib/libutil/expand_number.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/expand_number.c,v 1.2 2007/09/05 14:27:13 pjd Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libutil/flopen.3 b/lib/libutil/flopen.3
index 97a48f169cd64..807ba7e43b88b 100644
--- a/lib/libutil/flopen.3
+++ b/lib/libutil/flopen.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.6 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd May 10, 2007
 .Dt FLOPEN 3
diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c
index 23742f7ceec75..97d7732491025 100644
--- a/lib/libutil/flopen.c
+++ b/lib/libutil/flopen.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.9 2007/08/03 09:20:28 des Exp $");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index cd78437e3eb4d..482d0a9a3a501 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/fparseln.3,v 1.11 2005/01/11 20:50:50 ru Exp $
 .\"
 .\" Copyright (c) 1997 Christos Zoulas.  All rights reserved.
 .\"
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 0624f0e4ea31b..36e9eb7a433b1 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/fparseln.c,v 1.6 2003/10/18 10:04:16 markm Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/lib/libutil/humanize_number.3 b/lib/libutil/humanize_number.3
index 76d5677cb5669..48a58f2b5b287 100644
--- a/lib/libutil/humanize_number.3
+++ b/lib/libutil/humanize_number.3
@@ -1,5 +1,5 @@
 .\"	$NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.12 2007/09/28 15:31:44 obrien Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 21d5e3962c45f..f7055a6c549aa 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2 2004/09/25 14:11:34 pjd Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/lib/libutil/kld.3 b/lib/libutil/kld.3
index cc34fa1a04063..53f0a058860c9 100644
--- a/lib/libutil/kld.3
+++ b/lib/libutil/kld.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/kld.3,v 1.4 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd February 18, 2006
 .Os
diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c
index bc806409f10ed..19be8e626e133 100644
--- a/lib/libutil/kld.c
+++ b/lib/libutil/kld.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/kld.c,v 1.2 2006/05/25 04:01:04 delphij Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index 1df9510361893..a1db435dcfe20 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.45 2007/09/01 06:19:11 pjd Exp $
  */
 
 #ifndef _LIBUTIL_H_
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
index d88f719485d2a..70ff01a251f54 100644
--- a/lib/libutil/login.3
+++ b/lib/libutil/login.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login.3,v 1.10 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 12fc348755e34..f0822c1c5bdb5 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -29,7 +29,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login.c,v 1.12 2007/01/09 01:02:05 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index b4c96f2987671..6b618ace92abb 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.60 2006/10/10 08:15:08 ru Exp $
 .\"
 .Dd October 9, 2006
 .Dt LOGIN.CONF 5
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index 3750bd69182ba..d388f254a00bb 100644
--- a/lib/libutil/login_auth.3
+++ b/lib/libutil/login_auth.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_auth.3,v 1.14 2001/10/01 16:09:18 ru Exp $
 .\"
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index ce9a2e47c316e..a4bd8ad119ba7 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_auth.c,v 1.14 2003/06/14 18:42:37 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 7ecefffb2a3ec..a6f1f66a6bb3c 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_cap.3,v 1.37 2007/06/14 09:33:37 yar Exp $
 .\"
 .Dd June 14, 2007
 .Os
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 529ce82273222..e87862aec33e7 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.34 2007/06/14 06:42:49 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index a7cb4c67e8f0a..7860c99317b46 100644
--- a/lib/libutil/login_cap.h
+++ b/lib/libutil/login_cap.h
@@ -22,7 +22,7 @@
  * Low-level routines relating to the user capabilities database
  *
  *	Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp
- * $FreeBSD$
+ * $FreeBSD: src/lib/libutil/login_cap.h,v 1.9 2003/10/18 10:04:16 markm Exp $
  */
 
 #ifndef _LOGIN_CAP_H_
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index ca5b2cebf972d..e0afe3c11792f 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.19 2006/06/17 07:25:58 maxim Exp $
 .\"
 .Dd December 28, 1996
 .Os
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 39f114f2d49fb..93a8e5f363520 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_class.c,v 1.25 2007/05/01 18:50:33 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index c65fc9b8328a8..acfb89b278e48 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_crypt.c,v 1.5 2002/04/08 11:04:56 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/lib/libutil/login_ok.3 b/lib/libutil/login_ok.3
index 1bb6236c243ba..3fab5a3e95380 100644
--- a/lib/libutil/login_ok.3
+++ b/lib/libutil/login_ok.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.15 2006/11/05 19:00:08 trhodes Exp $
 .\"
 .Dd January 2, 1997
 .Os
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index 26971a9f5f1fc..355df881050a0 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_ok.c,v 1.12 2006/01/16 00:28:11 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index e1f57cea173cd..4e1b411d7b2c2 100644
--- a/lib/libutil/login_times.3
+++ b/lib/libutil/login_times.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_times.3,v 1.15 2004/07/02 23:52:19 ru Exp $
 .\"
 .Dd January 2, 1997
 .Os
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index 10e88dd5a5f3b..d73adeb5fb359 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_times.c,v 1.11 2006/01/16 11:54:07 rwatson Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libutil/login_tty.3 b/lib/libutil/login_tty.3
index 6303d685e0348..a35d6dfeb9726 100644
--- a/lib/libutil/login_tty.3
+++ b/lib/libutil/login_tty.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/login_tty.3,v 1.10 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 51299bdd82a68..8e5c023df5ec5 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/login_tty.c,v 1.10 2007/01/09 01:02:05 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/logout.3 b/lib/libutil/logout.3
index 426fe087040a2..819acf608815b 100644
--- a/lib/libutil/logout.3
+++ b/lib/libutil/logout.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/logout.3,v 1.12 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index fe907e56f7204..6a21b32bd1e7f 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/logout.c,v 1.12 2007/01/09 01:02:05 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/logwtmp.3 b/lib/libutil/logwtmp.3
index 16903fbde79b2..a0d00319ff0b5 100644
--- a/lib/libutil/logwtmp.3
+++ b/lib/libutil/logwtmp.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/logwtmp.3,v 1.11 2001/10/11 11:02:50 yar Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index a7b84111a9423..55eecb6b065ba 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/logwtmp.c,v 1.21 2007/01/09 01:02:05 imp Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/pidfile.3 b/lib/libutil/pidfile.3
index a188304a1984a..24c39ca43ba96 100644
--- a/lib/libutil/pidfile.3
+++ b/lib/libutil/pidfile.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.5.2.1 2007/10/15 10:49:05 kib Exp $
 .\"
 .Dd August 22, 2005
 .Dt PIDFILE 3
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index ecf0fac48f1a5..3d9a8f2ff4819 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/pidfile.c,v 1.7.2.1 2007/10/15 10:49:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index 61eb15399098f..79c787d566879 100644
--- a/lib/libutil/property.3
+++ b/lib/libutil/property.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/property.3,v 1.18 2005/01/20 09:17:07 ru Exp $
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index a944f9d2fb238..70f3dc39115d2 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/property.c,v 1.14 2005/11/28 16:30:16 jhb Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/libutil/pty.3 b/lib/libutil/pty.3
index 35f0b828ce2f1..70c811ec004de 100644
--- a/lib/libutil/pty.3
+++ b/lib/libutil/pty.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/pty.3,v 1.13 2004/07/02 23:52:19 ru Exp $
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index d6885ba0b6d67..b805f85a13969 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.17.2.2.2.1 2008/01/14 22:55:54 cperciva Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index 69232fb512c2a..9bded87490b6f 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -39,7 +39,7 @@
 static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/libutil/pw_util.c,v 1.38 2007/01/09 01:02:05 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index fd64d4c6966e5..3148e272f4874 100644
--- a/lib/libutil/realhostname.3
+++ b/lib/libutil/realhostname.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/realhostname.3,v 1.10 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd April 6, 1999
 .Os
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 6a1b82f34631e..3fffcdb6e1c5e 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/realhostname.c,v 1.18 2005/05/13 16:31:09 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 9f7f0dfb0224e..d1bf063330909 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -49,7 +49,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/realhostname_sa.3,v 1.11 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd January 11, 2000
 .Os
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index ec78a3503609a..4f9828c3828b6 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/stub.c,v 1.3 2003/10/18 10:04:16 markm Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index f01e884e7870d..c3708124dd6fe 100644
--- a/lib/libutil/trimdomain.3
+++ b/lib/libutil/trimdomain.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/trimdomain.3,v 1.8 2004/07/02 23:52:20 ru Exp $
 .\"
 .Dd April 7, 1999
 .Os
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index 85c27e0a1c10c..97f90ef70c738 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/trimdomain.c,v 1.6 2005/10/05 04:42:20 brooks Exp $");
 
 #include <sys/param.h>
 
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 5f75c7f94e99c..7ed6bcbe83d6d 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libutil/uucplock.3,v 1.19 2005/02/13 22:25:14 ru Exp $
 .\" "
 .Dd March 30, 1997
 .Os
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index afbfaa4d05374..5304ebf897efd 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libutil/uucplock.c,v 1.17 2007/01/09 01:02:05 imp Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 9362ea1b3c673..e06c12c455847 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libvgl/Makefile,v 1.12 2007/05/21 02:49:08 deischen Exp $
 LIB=	vgl
 SHLIB_MAJOR= 5
 CFLAGS+=-Wall -I${.CURDIR}
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index ec99d26c7126b..1fe72d1863f94 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/bitmap.c,v 1.9 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index 5c437ad453345..7002d80783eb8 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/keyboard.c,v 1.7 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index 8506a1bc87293..f3fc92ec46772 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/main.c,v 1.15 2004/06/08 12:24:47 stefanf Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index 4f9dc6210530b..c7d8cbe90a78d 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/mouse.c,v 1.6 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index b7d789a57a7c8..273b3cde2f7a5 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/simple.c,v 1.8 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <signal.h>
 #include <sys/fbio.h>
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index 757702f126551..30fce56b690dd 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libvgl/text.c,v 1.8 2002/06/02 20:05:39 schweikh Exp $");
 
 #include <stdio.h>
 #include <sys/fbio.h>
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index ca628f75e62d1..dab27ca4a60b4 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libvgl/vgl.3,v 1.31 2006/10/21 15:12:36 maxim Exp $
 .Dd November 7, 1999
 .Dt VGL 3
 .Os
diff --git a/lib/libvgl/vgl.h b/lib/libvgl/vgl.h
index 1b843829d72b2..24a5c387c6c67 100644
--- a/lib/libvgl/vgl.h
+++ b/lib/libvgl/vgl.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libvgl/vgl.h,v 1.8 2002/06/02 20:05:39 schweikh Exp $
  */
 
 #ifndef _VGL_H_
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 5c655ab033270..7b96ea5e700cd 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.22 2007/05/21 02:49:08 deischen Exp $
 #
 
 .include <bsd.own.mk>
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index b7a3aff578d11..8df5a92994bd5 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/liby/Makefile,v 1.13 2005/07/20 14:35:26 ru Exp $
 
 LIB=		y
 SRCS=	main.c yyerror.c
diff --git a/lib/liby/main.c b/lib/liby/main.c
index 4301ca1f4a587..af001045741f2 100644
--- a/lib/liby/main.c
+++ b/lib/liby/main.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/liby/main.c,v 1.5 2007/01/09 01:02:05 imp Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index 6cdcd603a062d..2b8da3ed10810 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/liby/yyerror.c,v 1.4 2007/01/09 01:02:05 imp Exp $");
 
 #ifndef lint
 static char sccsid[] = "@(#)yyerror.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index 45f9e7e4fcec9..5040e638b3c4d 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libypclnt/Makefile,v 1.16 2007/05/21 02:49:08 deischen Exp $
 
 LIB=	ypclnt
 SHLIB_MAJOR= 3
diff --git a/lib/libypclnt/ypclnt.h b/lib/libypclnt/ypclnt.h
index 9cd204827726f..f380bb02f92f2 100644
--- a/lib/libypclnt/ypclnt.h
+++ b/lib/libypclnt/ypclnt.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt.h,v 1.4 2006/07/28 21:34:37 stefanf Exp $
  */
 
 #ifndef _YPCLNT_H_INCLUDED
diff --git a/lib/libypclnt/ypclnt_connect.c b/lib/libypclnt/ypclnt_connect.c
index 25d2f9ffb1c39..5dfedcb55d420 100644
--- a/lib/libypclnt/ypclnt_connect.c
+++ b/lib/libypclnt/ypclnt_connect.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_connect.c,v 1.2 2006/07/28 21:34:37 stefanf Exp $
  */
 
 #include <sys/param.h>
diff --git a/lib/libypclnt/ypclnt_error.c b/lib/libypclnt/ypclnt_error.c
index a7d986f19dd9e..40075b5dcbdd1 100644
--- a/lib/libypclnt/ypclnt_error.c
+++ b/lib/libypclnt/ypclnt_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_error.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <stdarg.h>
diff --git a/lib/libypclnt/ypclnt_free.c b/lib/libypclnt/ypclnt_free.c
index f5e78a42054e6..975083b8a109a 100644
--- a/lib/libypclnt/ypclnt_free.c
+++ b/lib/libypclnt/ypclnt_free.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_free.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libypclnt/ypclnt_get.c b/lib/libypclnt/ypclnt_get.c
index 8a709719959ee..e242a13d4ec35 100644
--- a/lib/libypclnt/ypclnt_get.c
+++ b/lib/libypclnt/ypclnt_get.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_get.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include "ypclnt.h"
diff --git a/lib/libypclnt/ypclnt_new.c b/lib/libypclnt/ypclnt_new.c
index 650cfdd62f7ef..a6cb21f10e629 100644
--- a/lib/libypclnt/ypclnt_new.c
+++ b/lib/libypclnt/ypclnt_new.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_new.c,v 1.1 2002/04/13 06:20:02 des Exp $
  */
 
 #include <stdlib.h>
diff --git a/lib/libypclnt/ypclnt_passwd.c b/lib/libypclnt/ypclnt_passwd.c
index c7ee7eafb1085..0d6e28709d2da 100644
--- a/lib/libypclnt/ypclnt_passwd.c
+++ b/lib/libypclnt/ypclnt_passwd.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libypclnt/ypclnt_passwd.c,v 1.7 2006/07/28 21:34:37 stefanf Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade
index 4ee4eebedb639..436a8369cb958 100644
--- a/lib/libz/FREEBSD-upgrade
+++ b/lib/libz/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libz/FREEBSD-upgrade,v 1.1 2005/05/11 03:50:50 kientzle Exp $
 
 ZLib 1.2.2
 
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 63383b4d97b6d..2897f0cdfb711 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libz/Makefile,v 1.17 2005/06/03 15:25:13 imp Exp $
 #
 
 LIB=		z
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 0aa03e9f9973a..79fb0af76271e 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/gzio.c,v 1.12 2006/03/23 14:09:21 des Exp $");
 
 #include <stdio.h>
 
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c
index b29d14aea4845..96061e3ba54f4 100644
--- a/lib/libz/minigzip.c
+++ b/lib/libz/minigzip.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.15 2006/03/23 14:09:21 des Exp $");
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h
index 205db95c0f196..4f56e2c06ac2d 100644
--- a/lib/libz/zconf.h
+++ b/lib/libz/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $FreeBSD$ */
+/* @(#) $FreeBSD: src/lib/libz/zconf.h,v 1.10 2006/03/23 14:09:21 des Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/lib/libz/zopen.c b/lib/libz/zopen.c
index 025899f0dc057..0e77ddb21efa4 100644
--- a/lib/libz/zopen.c
+++ b/lib/libz/zopen.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libz/zopen.c,v 1.2 2001/09/30 22:39:00 dillon Exp $");
 
 #include <stdio.h>
 #include <zlib.h>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 48aeba623222f..19f71a4708e3a 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/Makefile,v 1.78 2007/05/21 02:49:08 deischen Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map
index fd5c37bd31fa4..25cbdf8aea53b 100644
--- a/lib/msun/Symbol.map
+++ b/lib/msun/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/Symbol.map,v 1.4 2007/04/29 14:05:20 deischen Exp $
  */
 FBSD_1.0 {
 	__fe_dfl_env;
diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc
index d4696a607dbc9..972951467dd9a 100644
--- a/lib/msun/amd64/Makefile.inc
+++ b/lib/msun/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/amd64/Makefile.inc,v 1.5 2006/03/27 23:59:44 deischen Exp $
 
 ARCH_SRCS = e_sqrt.S e_sqrtf.S s_llrint.S s_llrintf.S s_lrint.S s_lrintf.S \
 	    s_remquo.S s_remquof.S s_scalbn.S s_scalbnf.S s_scalbnl.S
diff --git a/lib/msun/amd64/Symbol.map b/lib/msun/amd64/Symbol.map
index f4c13a4483228..4d48690ed03e6 100644
--- a/lib/msun/amd64/Symbol.map
+++ b/lib/msun/amd64/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/amd64/Symbol.map,v 1.2 2007/04/29 14:05:21 deischen Exp $
  */
 FBSD_1.0 {
 	fesetexceptflag;
diff --git a/lib/msun/amd64/e_sqrt.S b/lib/msun/amd64/e_sqrt.S
index f4b4f62b5ce02..0429cceb3656c 100644
--- a/lib/msun/amd64/e_sqrt.S
+++ b/lib/msun/amd64/e_sqrt.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrt.S,v 1.2 2005/02/04 14:08:32 das Exp $")
 	
 ENTRY(sqrt)
 	sqrtsd	%xmm0, %xmm0
diff --git a/lib/msun/amd64/e_sqrtf.S b/lib/msun/amd64/e_sqrtf.S
index 25f4dfc5bf845..471fa668026ff 100644
--- a/lib/msun/amd64/e_sqrtf.S
+++ b/lib/msun/amd64/e_sqrtf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrtf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 ENTRY(sqrtf)
 	sqrtss	%xmm0, %xmm0
diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c
index cf07c8ba1f8d4..d65f1dc412e30 100644
--- a/lib/msun/amd64/fenv.c
+++ b/lib/msun/amd64/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/amd64/fenv.c,v 1.4 2007/01/05 07:15:26 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/amd64/fenv.h b/lib/msun/amd64/fenv.h
index b4d7379e8ff0e..d806b20fa75d1 100644
--- a/lib/msun/amd64/fenv.h
+++ b/lib/msun/amd64/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/amd64/fenv.h,v 1.6 2007/01/06 21:46:23 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/amd64/s_llrint.S b/lib/msun/amd64/s_llrint.S
index ab098465cd578..b81c73a452d36 100644
--- a/lib/msun/amd64/s_llrint.S
+++ b/lib/msun/amd64/s_llrint.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_llrint.S,v 1.1 2005/01/15 03:32:28 das Exp $")
 	
 /* sizeof(long) == sizeof(long long) */
 #define	fn	llrint
diff --git a/lib/msun/amd64/s_llrintf.S b/lib/msun/amd64/s_llrintf.S
index e810e40b640da..d62cfcbc410db 100644
--- a/lib/msun/amd64/s_llrintf.S
+++ b/lib/msun/amd64/s_llrintf.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_llrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 /* sizeof(long) == sizeof(long long) */
 #define	fn	llrintf
diff --git a/lib/msun/amd64/s_lrint.S b/lib/msun/amd64/s_lrint.S
index 9059a38f84de3..161b7319b6939 100644
--- a/lib/msun/amd64/s_lrint.S
+++ b/lib/msun/amd64/s_lrint.S
@@ -27,7 +27,7 @@
 #include <machine/asm.h>
 
 #ifndef fn
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrint.S,v 1.1 2005/01/15 03:32:28 das Exp $")
 #define	fn	lrint
 #endif
 
diff --git a/lib/msun/amd64/s_lrintf.S b/lib/msun/amd64/s_lrintf.S
index cc27d208ae4aa..506e834d57944 100644
--- a/lib/msun/amd64/s_lrintf.S
+++ b/lib/msun/amd64/s_lrintf.S
@@ -27,7 +27,7 @@
 #include <machine/asm.h>
 
 #ifndef fn
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 #define	fn	lrintf
 #endif
 
diff --git a/lib/msun/amd64/s_remquo.S b/lib/msun/amd64/s_remquo.S
index eb113d718e86d..19f3b532538b9 100644
--- a/lib/msun/amd64/s_remquo.S
+++ b/lib/msun/amd64/s_remquo.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquo.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquo)
 	movsd	%xmm0,-8(%rsp)
diff --git a/lib/msun/amd64/s_remquof.S b/lib/msun/amd64/s_remquof.S
index 0833f5b984b5b..02b604fa43e0f 100644
--- a/lib/msun/amd64/s_remquof.S
+++ b/lib/msun/amd64/s_remquof.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquof.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquof)
 	movss	%xmm0,-4(%rsp)
diff --git a/lib/msun/amd64/s_scalbn.S b/lib/msun/amd64/s_scalbn.S
index c9ac808b9b037..6942e1892321e 100644
--- a/lib/msun/amd64/s_scalbn.S
+++ b/lib/msun/amd64/s_scalbn.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbn.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(scalbn)
 	movsd	%xmm0,-8(%rsp)
diff --git a/lib/msun/amd64/s_scalbnf.S b/lib/msun/amd64/s_scalbnf.S
index a9b9f803bdaf0..d7b9ab73941b1 100644
--- a/lib/msun/amd64/s_scalbnf.S
+++ b/lib/msun/amd64/s_scalbnf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnf.S,v 1.2 2005/09/12 20:54:00 das Exp $")
 
 ENTRY(scalbnf)
 	movss	%xmm0,-8(%rsp)
diff --git a/lib/msun/amd64/s_scalbnl.S b/lib/msun/amd64/s_scalbnl.S
index 8dfa810757afb..57629a4ffe5ff 100644
--- a/lib/msun/amd64/s_scalbnl.S
+++ b/lib/msun/amd64/s_scalbnl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnl)
diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc
index 7d9e10b0a99d5..25cccffdd723b 100644
--- a/lib/msun/arm/Makefile.inc
+++ b/lib/msun/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/arm/Makefile.inc,v 1.2 2006/03/27 23:59:44 deischen Exp $
 
 LDBL_PREC = 53
 SYM_MAPS += ${.CURDIR}/arm/Symbol.map
diff --git a/lib/msun/arm/Symbol.map b/lib/msun/arm/Symbol.map
index 312117719b428..130fe45146080 100644
--- a/lib/msun/arm/Symbol.map
+++ b/lib/msun/arm/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/arm/Symbol.map,v 1.2 2007/04/29 14:05:21 deischen Exp $
  */
 FBSD_1.0 {
 };
diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c
index a6781e0e715e2..469f198c3a480 100644
--- a/lib/msun/arm/fenv.c
+++ b/lib/msun/arm/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/arm/fenv.c,v 1.1 2004/06/06 10:03:59 das Exp $
  */
 
 #include <fenv.h>
diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h
index d540ae2d5dbb1..e7a88604bc593 100644
--- a/lib/msun/arm/fenv.h
+++ b/lib/msun/arm/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/arm/fenv.h,v 1.5 2005/03/16 19:03:45 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index 98d2247ae0912..e0a5b73676d84 100644
--- a/lib/msun/bsdsrc/b_exp.c
+++ b/lib/msun/bsdsrc/b_exp.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_exp.c,v 1.7 2004/12/16 20:40:37 das Exp $");
 
 
 /* EXP(X)
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index b9f1473e0c8be..8401985b7cef6 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)log.c	8.2 (Berkeley) 11/30/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_log.c,v 1.8 2005/09/19 11:28:19 bde Exp $");
 
 #include <math.h>
 #include <errno.h>
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index 5593bbd95dc35..8b3649797f0f4 100644
--- a/lib/msun/bsdsrc/b_tgamma.c
+++ b/lib/msun/bsdsrc/b_tgamma.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)gamma.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_tgamma.c,v 1.9 2007/05/02 15:24:49 bde Exp $");
 
 /*
  * This code by P. McIlroy, Oct 1992;
diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h
index 04a4b6e3d788d..2a3b246ce5a00 100644
--- a/lib/msun/bsdsrc/mathimpl.h
+++ b/lib/msun/bsdsrc/mathimpl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mathimpl.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/bsdsrc/mathimpl.h,v 1.7 2005/11/18 05:03:12 bde Exp $
  */
 
 #ifndef _MATHIMPL_H_
diff --git a/lib/msun/i387/Makefile.inc b/lib/msun/i387/Makefile.inc
index aa1837f0ea45c..53754dbba1597 100644
--- a/lib/msun/i387/Makefile.inc
+++ b/lib/msun/i387/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/i387/Makefile.inc,v 1.9 2006/07/05 20:06:42 bde Exp $
 
 ARCH_SRCS = e_exp.S e_fmod.S e_log.S e_log10.S \
 	    e_remainder.S e_sqrt.S s_ceil.S s_copysign.S \
diff --git a/lib/msun/i387/Symbol.map b/lib/msun/i387/Symbol.map
index aa81690107057..7e01ba1b74c85 100644
--- a/lib/msun/i387/Symbol.map
+++ b/lib/msun/i387/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/i387/Symbol.map,v 1.2 2007/04/29 14:05:21 deischen Exp $
  */
 FBSD_1.0 {
 	__has_sse;
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index 9c8740700d36f..008a6e12fc8a8 100644
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_exp.S,v 1.11 2005/10/30 12:21:02 bde Exp $")
 
 /* e^x = 2^(x * log2(e)) */
 ENTRY(exp)
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index 71c4c3062ee57..233476f4f00b3 100644
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_fmod.S,v 1.8 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(fmod)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index 0d06940a670b1..caaac87076cd2 100644
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_log.S,v 1.7 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(log)
 	fldln2
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index edc13ffb8bd23..7695ef6cc1b62 100644
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_log10.S,v 1.7 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(log10)
 	fldlg2
diff --git a/lib/msun/i387/e_log10f.S b/lib/msun/i387/e_log10f.S
index 44410bc2b8ecf..2dd670827b957 100644
--- a/lib/msun/i387/e_log10f.S
+++ b/lib/msun/i387/e_log10f.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_log10f.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_log10f.S,v 1.1 1996/07/03 16:50:22 jtc Exp $") */
 
 ENTRY(log10f)
diff --git a/lib/msun/i387/e_logf.S b/lib/msun/i387/e_logf.S
index e66c844e20efd..9f3bd00d5255f 100644
--- a/lib/msun/i387/e_logf.S
+++ b/lib/msun/i387/e_logf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_logf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_logf.S,v 1.2 1996/07/06 00:15:45 jtc Exp $") */
 
 ENTRY(logf)
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index ff2f1426ec14b..5f0d679556534 100644
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.8 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(remainder)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_remainderf.S b/lib/msun/i387/e_remainderf.S
index 4093c8a289b54..6d1ca794431e1 100644
--- a/lib/msun/i387/e_remainderf.S
+++ b/lib/msun/i387/e_remainderf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_remainderf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $") */
 
 ENTRY(remainderf)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index 554beb706eb1d..b7e9621e802f2 100644
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/e_sqrt.S,v 1.7 2005/02/04 14:08:32 das Exp $")
 
 ENTRY(sqrt)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/e_sqrtf.S b/lib/msun/i387/e_sqrtf.S
index 9d78725030cd6..86c56a9d55e71 100644
--- a/lib/msun/i387/e_sqrtf.S
+++ b/lib/msun/i387/e_sqrtf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/e_sqrtf.S,v 1.2 2005/02/04 14:08:32 das Exp $");
 /* RCSID("$NetBSD: e_sqrtf.S,v 1.2 1995/05/08 23:50:14 jtc Exp $") */
 
 ENTRY(sqrtf)
diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c
index ace2d323d0531..46c0bbf9acaf0 100644
--- a/lib/msun/i387/fenv.c
+++ b/lib/msun/i387/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/i387/fenv.c,v 1.3 2007/01/05 07:15:26 das Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/i387/fenv.h b/lib/msun/i387/fenv.h
index c4eab02d9dfcc..223b02980ac23 100644
--- a/lib/msun/i387/fenv.h
+++ b/lib/msun/i387/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/i387/fenv.h,v 1.6 2007/01/06 21:46:23 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index e805d8524bb99..8e73b38fe3ae9 100644
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_ceil.S,v 1.7 1999/08/28 00:06:11 peter Exp $")
 
 ENTRY(ceil)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_ceilf.S b/lib/msun/i387/s_ceilf.S
index 473d30951d2ba..152ca7bdef310 100644
--- a/lib/msun/i387/s_ceilf.S
+++ b/lib/msun/i387/s_ceilf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceilf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $");
 /* RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $") */
 
 ENTRY(ceilf)
diff --git a/lib/msun/i387/s_ceill.S b/lib/msun/i387/s_ceill.S
index ae64abfecaf8a..b6c3c41be374e 100644
--- a/lib/msun/i387/s_ceill.S
+++ b/lib/msun/i387/s_ceill.S
@@ -4,7 +4,7 @@
  */
 	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceill.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(ceill)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S
index ec28b452bfa76..6ecc7703a927c 100644
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_copysign.S,v 1.6 1999/08/28 00:06:11 peter Exp $")
 
 ENTRY(copysign)
 	movl	16(%esp),%edx
diff --git a/lib/msun/i387/s_copysignf.S b/lib/msun/i387/s_copysignf.S
index e78ad24b71d3f..c3fc898d5afd8 100644
--- a/lib/msun/i387/s_copysignf.S
+++ b/lib/msun/i387/s_copysignf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_copysignf.S,v 1.3 1995/05/08 23:53:25 jtc Exp $") */
 
 ENTRY(copysignf)
diff --git a/lib/msun/i387/s_copysignl.S b/lib/msun/i387/s_copysignl.S
index 7878591d387e7..4c3a374e02e22 100644
--- a/lib/msun/i387/s_copysignl.S
+++ b/lib/msun/i387/s_copysignl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(copysignl)
 	movl	24(%esp),%edx
diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S
index a73ba0621229f..c38cb7b207d36 100644
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_cos.S,v 1.6 1999/08/28 00:06:12 peter Exp $")
 
 ENTRY(cos)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S
index b27b7d1149dfb..4835b0e06e693 100644
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_finite.S,v 1.7 1999/08/28 00:06:12 peter Exp $")
 
 ENTRY(finite)
 	movl	8(%esp),%eax
diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S
index 66c1d9f9d0f59..722f83d6cdb49 100644
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_floor.S,v 1.7 1999/08/28 00:06:12 peter Exp $")
 
 ENTRY(floor)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_floorf.S b/lib/msun/i387/s_floorf.S
index f1000fef76597..5d39acd1ccd3e 100644
--- a/lib/msun/i387/s_floorf.S
+++ b/lib/msun/i387/s_floorf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $");
 /* RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $") */
 
 ENTRY(floorf)
diff --git a/lib/msun/i387/s_floorl.S b/lib/msun/i387/s_floorl.S
index a0bb048e4a7da..3cde33552f1ec 100644
--- a/lib/msun/i387/s_floorl.S
+++ b/lib/msun/i387/s_floorl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(floorl)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_llrint.S b/lib/msun/i387/s_llrint.S
index 1b8a638266797..b266e5ca07f90 100644
--- a/lib/msun/i387/s_llrint.S
+++ b/lib/msun/i387/s_llrint.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrint.S,v 1.1 2005/01/11 23:10:53 das Exp $"); 
 	
 ENTRY(llrint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_llrintf.S b/lib/msun/i387/s_llrintf.S
index 4f398b6dd1b8b..e1edb090ff686 100644
--- a/lib/msun/i387/s_llrintf.S
+++ b/lib/msun/i387/s_llrintf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 ENTRY(llrintf)
 	flds	4(%esp)
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index 9e09f840c40c1..d3f8d9d933ec3 100644
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_logb.S,v 1.7 2000/06/06 12:12:36 bde Exp $")
 
 ENTRY(logb)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_logbf.S b/lib/msun/i387/s_logbf.S
index 4cfa02b86f7d7..26bc484e43eab 100644
--- a/lib/msun/i387/s_logbf.S
+++ b/lib/msun/i387/s_logbf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_logbf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_logbf.S,v 1.3 1995/05/09 00:15:12 jtc Exp $") */
 
 ENTRY(logbf)
diff --git a/lib/msun/i387/s_lrint.S b/lib/msun/i387/s_lrint.S
index 82269c884d53f..022783cbf2cee 100644
--- a/lib/msun/i387/s_lrint.S
+++ b/lib/msun/i387/s_lrint.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrint.S,v 1.1 2005/01/11 23:10:53 das Exp $"); 
 	
 ENTRY(lrint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_lrintf.S b/lib/msun/i387/s_lrintf.S
index b9915fa5d0710..ac126f0fdcbf6 100644
--- a/lib/msun/i387/s_lrintf.S
+++ b/lib/msun/i387/s_lrintf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 	
 ENTRY(lrintf)
 	flds	4(%esp)
diff --git a/lib/msun/i387/s_remquo.S b/lib/msun/i387/s_remquo.S
index fd8af5ef8b3cf..f75283929c8f5 100644
--- a/lib/msun/i387/s_remquo.S
+++ b/lib/msun/i387/s_remquo.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquo.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquo)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/s_remquof.S b/lib/msun/i387/s_remquof.S
index 70a43f4b4b393..40d24b898c012 100644
--- a/lib/msun/i387/s_remquof.S
+++ b/lib/msun/i387/s_remquof.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquof.S,v 1.1 2005/03/25 04:40:44 das Exp $"); 
 	
 ENTRY(remquof)
 	flds	8(%esp)
diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S
index 79da080d71102..ccda3142ac1b2 100644
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_rint.S,v 1.6 1999/08/28 00:06:13 peter Exp $")
 
 ENTRY(rint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_rintf.S b/lib/msun/i387/s_rintf.S
index 646dcb516cee7..ad45267cd4cb6 100644
--- a/lib/msun/i387/s_rintf.S
+++ b/lib/msun/i387/s_rintf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_rintf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_rintf.S,v 1.3 1995/05/09 00:17:22 jtc Exp $") */
 
 ENTRY(rintf)
diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S
index c00e1fb137e02..4600603aa01d2 100644
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_scalbn.S,v 1.7 1999/08/28 00:06:13 peter Exp $")
 
 ENTRY(scalbn)
 	fildl	12(%esp)
diff --git a/lib/msun/i387/s_scalbnf.S b/lib/msun/i387/s_scalbnf.S
index 3c84749b6c42c..3e1ac41a9361b 100644
--- a/lib/msun/i387/s_scalbnf.S
+++ b/lib/msun/i387/s_scalbnf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnf.S,v 1.2 2005/03/07 04:52:43 das Exp $");
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnf)
diff --git a/lib/msun/i387/s_scalbnl.S b/lib/msun/i387/s_scalbnl.S
index c166326b6d165..512ab615cb5e2 100644
--- a/lib/msun/i387/s_scalbnl.S
+++ b/lib/msun/i387/s_scalbnl.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnl.S,v 1.1 2005/03/07 04:52:57 das Exp $");
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnl)
diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S
index 13f1f3e762824..eddbc8262d27a 100644
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_significand.S,v 1.7 2000/06/06 12:12:36 bde Exp $")
 
 ENTRY(significand)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_significandf.S b/lib/msun/i387/s_significandf.S
index 99299814353b2..6096ef007552d 100644
--- a/lib/msun/i387/s_significandf.S
+++ b/lib/msun/i387/s_significandf.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_significandf.S,v 1.1 2005/01/13 18:58:25 das Exp $");
 /* RCSID("$NetBSD: s_significandf.S,v 1.3 1995/05/09 00:24:07 jtc Exp $") */
 
 ENTRY(significandf)
diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S
index d152352abf2f7..c3d65fd7f0c1e 100644
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_sin.S,v 1.6 1999/08/28 00:06:14 peter Exp $")
 
 ENTRY(sin)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S
index d0cbc0aabd977..925e11a1188ae 100644
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$FreeBSD$")
+RCSID("$FreeBSD: src/lib/msun/i387/s_tan.S,v 1.6 1999/08/28 00:06:14 peter Exp $")
 
 ENTRY(tan)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_trunc.S b/lib/msun/i387/s_trunc.S
index 91926d7373c48..1d78e1ca5dd58 100644
--- a/lib/msun/i387/s_trunc.S
+++ b/lib/msun/i387/s_trunc.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_trunc.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(trunc)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_truncf.S b/lib/msun/i387/s_truncf.S
index 000136738dfcf..8afaf3ebc769e 100644
--- a/lib/msun/i387/s_truncf.S
+++ b/lib/msun/i387/s_truncf.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $")
 
 ENTRY(truncf)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_truncl.S b/lib/msun/i387/s_truncl.S
index b20b06ebcfc44..cd5df1cf1bf41 100644
--- a/lib/msun/i387/s_truncl.S
+++ b/lib/msun/i387/s_truncl.S
@@ -4,7 +4,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncl.S,v 1.1 2005/04/16 21:12:55 das Exp $")
 
 ENTRY(truncl)
 	pushl	%ebp
diff --git a/lib/msun/ia64/Makefile.inc b/lib/msun/ia64/Makefile.inc
index c941c66bb473e..1a62f2573ed84 100644
--- a/lib/msun/ia64/Makefile.inc
+++ b/lib/msun/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/ia64/Makefile.inc,v 1.3 2006/03/27 23:59:45 deischen Exp $
 
 ARCH_SRCS = s_fma.S s_fmaf.S s_fmal.S
 LDBL_PREC = 64
diff --git a/lib/msun/ia64/Symbol.map b/lib/msun/ia64/Symbol.map
index 00ed4eef4223a..d3ffcb5f45913 100644
--- a/lib/msun/ia64/Symbol.map
+++ b/lib/msun/ia64/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/ia64/Symbol.map,v 1.2 2007/04/29 14:05:21 deischen Exp $
  */
 FBSD_1.0 {
 	feupdateenv;
diff --git a/lib/msun/ia64/fenv.c b/lib/msun/ia64/fenv.c
index 95a580998e57e..182d37e47daac 100644
--- a/lib/msun/ia64/fenv.c
+++ b/lib/msun/ia64/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/ia64/fenv.c,v 1.2 2004/06/11 02:35:30 das Exp $
  */
 
 #include <sys/types.h>
diff --git a/lib/msun/ia64/fenv.h b/lib/msun/ia64/fenv.h
index 6f0240f7b2269..8c6b65b5e2b37 100644
--- a/lib/msun/ia64/fenv.h
+++ b/lib/msun/ia64/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/ia64/fenv.h,v 1.4 2005/03/16 19:03:45 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/ia64/s_fma.S b/lib/msun/ia64/s_fma.S
index 3e693592fce85..2da6c17be0f08 100644
--- a/lib/msun/ia64/s_fma.S
+++ b/lib/msun/ia64/s_fma.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fma.S,v 1.1 2005/01/22 09:53:18 das Exp $")
 
 ENTRY(fma, 3)
 {
diff --git a/lib/msun/ia64/s_fmaf.S b/lib/msun/ia64/s_fmaf.S
index 1e122bb525ebd..320051baa9714 100644
--- a/lib/msun/ia64/s_fmaf.S
+++ b/lib/msun/ia64/s_fmaf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fmaf.S,v 1.1 2005/01/22 09:53:18 das Exp $")
 
 ENTRY(fmaf, 3)
 {
diff --git a/lib/msun/ia64/s_fmal.S b/lib/msun/ia64/s_fmal.S
index c24a1dee62a0a..7b8c4079c4780 100644
--- a/lib/msun/ia64/s_fmal.S
+++ b/lib/msun/ia64/s_fmal.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/ia64/s_fmal.S,v 1.1 2005/03/07 04:53:11 das Exp $")
 
 ENTRY(fmal, 3)
 {
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index aa73699fa25b5..49568b2199c30 100644
--- a/lib/msun/man/acos.3
+++ b/lib/msun/man/acos.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acos.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/acos.3,v 1.14 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt ACOS 3
diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3
index cd04bb78cfce6..9a77eba398ba7 100644
--- a/lib/msun/man/acosh.3
+++ b/lib/msun/man/acosh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acosh.3	5.2 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/acosh.3,v 1.12 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt ACOSH 3
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index f7e84042bfdf8..39c7c41d82fe4 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asin.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/asin.3,v 1.16 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt ASIN 3
diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3
index 6dba2176bf828..463a468b3cf98 100644
--- a/lib/msun/man/asinh.3
+++ b/lib/msun/man/asinh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asinh.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/asinh.3,v 1.11 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd May 6, 1991
 .Dt ASINH 3
diff --git a/lib/msun/man/atan.3 b/lib/msun/man/atan.3
index 2c2bd6448445f..a69b307d8d9e2 100644
--- a/lib/msun/man/atan.3
+++ b/lib/msun/man/atan.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atan.3,v 1.11 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd May 2, 1991
 .Dt ATAN 3
diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3
index 6619297183ed4..5697f7a9f6718 100644
--- a/lib/msun/man/atan2.3
+++ b/lib/msun/man/atan2.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan2.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atan2.3,v 1.15 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt ATAN2 3
diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3
index 0638a1fb05919..d7394077e75e9 100644
--- a/lib/msun/man/atanh.3
+++ b/lib/msun/man/atanh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atanh.3	5.2 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/atanh.3,v 1.14 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt ATANH 3
diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3
index 47ddb3df388a5..49134f1825dc5 100644
--- a/lib/msun/man/ceil.3
+++ b/lib/msun/man/ceil.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ceil.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ceil.3,v 1.16 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 13, 2005
 .Dt CEIL 3
diff --git a/lib/msun/man/cimag.3 b/lib/msun/man/cimag.3
index 10a3b2cb405e4..069e8480d0243 100644
--- a/lib/msun/man/cimag.3
+++ b/lib/msun/man/cimag.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cimag.3,v 1.2 2005/01/13 10:43:01 ru Exp $
 .\"
 .Dd August 7, 2004
 .Dt CIMAG 3
diff --git a/lib/msun/man/copysign.3 b/lib/msun/man/copysign.3
index 40cc7513323e6..17c72de9d8794 100644
--- a/lib/msun/man/copysign.3
+++ b/lib/msun/man/copysign.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/copysign.3,v 1.2 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 26, 2005
 .Dt COPYSIGN 3
diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3
index 3566c6f584b42..f5b7ee203af23 100644
--- a/lib/msun/man/cos.3
+++ b/lib/msun/man/cos.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cos.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cos.3,v 1.12 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd May 2, 1991
 .Dt COS 3
diff --git a/lib/msun/man/cosh.3 b/lib/msun/man/cosh.3
index 517ec61395dc3..807c1ae056587 100644
--- a/lib/msun/man/cosh.3
+++ b/lib/msun/man/cosh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cosh.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/cosh.3,v 1.13 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt COSH 3
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index 46886b0506aa9..1b38e5f163b01 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)erf.3	6.4 (Berkeley) 4/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/erf.3,v 1.12 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd April 20, 1991
 .Dt ERF 3
diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3
index b470f1cccd7b0..9612cf468b950 100644
--- a/lib/msun/man/exp.3
+++ b/lib/msun/man/exp.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)exp.3	6.12 (Berkeley) 7/31/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/exp.3,v 1.23 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd April 5, 2005
 .Dt EXP 3
diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3
index 9b5a5ce823177..4a3937e3bc4b2 100644
--- a/lib/msun/man/fabs.3
+++ b/lib/msun/man/fabs.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fabs.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fabs.3,v 1.12 2007/01/09 01:02:05 imp Exp $
 .\"
 .Dd October 25, 2003
 .Dt FABS 3
diff --git a/lib/msun/man/fdim.3 b/lib/msun/man/fdim.3
index 2de2e320ab4f6..ca4e5ec0799c2 100644
--- a/lib/msun/man/fdim.3
+++ b/lib/msun/man/fdim.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fdim.3,v 1.1 2004/06/30 07:04:01 das Exp $
 .\"
 .Dd June 29, 2004
 .Dt FDIM 3
diff --git a/lib/msun/man/feclearexcept.3 b/lib/msun/man/feclearexcept.3
index 217642c858e70..073de67b83fdb 100644
--- a/lib/msun/man/feclearexcept.3
+++ b/lib/msun/man/feclearexcept.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/feclearexcept.3,v 1.3 2005/01/14 09:12:05 ru Exp $
 .\"
 .Dd May 8, 2004
 .Dt FECLEAREXCEPT 3
diff --git a/lib/msun/man/feenableexcept.3 b/lib/msun/man/feenableexcept.3
index 40bb892ebce75..0b790e7a32871 100644
--- a/lib/msun/man/feenableexcept.3
+++ b/lib/msun/man/feenableexcept.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/feenableexcept.3,v 1.1 2005/03/16 19:04:28 das Exp $
 .\"
 .Dd March 16, 2005
 .Dt FEENABLEEXCEPT 3
diff --git a/lib/msun/man/fegetenv.3 b/lib/msun/man/fegetenv.3
index c99663ed1a4b7..2e386adad4612 100644
--- a/lib/msun/man/fegetenv.3
+++ b/lib/msun/man/fegetenv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fegetenv.3,v 1.1 2004/06/06 10:06:26 das Exp $
 .\"
 .Dd May 8, 2004
 .Dt FEGETENV 3
diff --git a/lib/msun/man/fegetround.3 b/lib/msun/man/fegetround.3
index c6cd417dc9adb..9384158804654 100644
--- a/lib/msun/man/fegetround.3
+++ b/lib/msun/man/fegetround.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fegetround.3,v 1.2 2005/01/14 09:12:05 ru Exp $
 .\"
 .Dd May 8, 2004
 .Dt FEGETROUND 3
diff --git a/lib/msun/man/fenv.3 b/lib/msun/man/fenv.3
index 728874e16fe97..7f7b9dff7ec2c 100644
--- a/lib/msun/man/fenv.3
+++ b/lib/msun/man/fenv.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fenv.3,v 1.6 2007/01/05 07:14:26 das Exp $
 .\"
 .Dd March 16, 2005
 .Dt FENV 3
diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3
index 5314f964d4bb7..359a6b45d392e 100644
--- a/lib/msun/man/floor.3
+++ b/lib/msun/man/floor.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)floor.3	6.5 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/floor.3,v 1.18 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd January 13, 2005
 .Dt FLOOR 3
diff --git a/lib/msun/man/fma.3 b/lib/msun/man/fma.3
index ce3086db85145..078a6e2b22410 100644
--- a/lib/msun/man/fma.3
+++ b/lib/msun/man/fma.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fma.3,v 1.3 2005/11/24 09:25:10 joel Exp $
 .\"
 .Dd January 22, 2005
 .Dt FMA 3
diff --git a/lib/msun/man/fmax.3 b/lib/msun/man/fmax.3
index 71cb7d932f369..03249a3f4d7e4 100644
--- a/lib/msun/man/fmax.3
+++ b/lib/msun/man/fmax.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fmax.3,v 1.2 2005/01/14 09:12:05 ru Exp $
 .\"
 .Dd June 29, 2004
 .Dt FMAX 3
diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3
index 9a73675bee554..f1e5072e04d0a 100644
--- a/lib/msun/man/fmod.3
+++ b/lib/msun/man/fmod.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fmod.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/fmod.3,v 1.9 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd May 2, 1991
 .Dt FMOD 3
diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3
index 2b353f78b6870..31ff5c5ec805b 100644
--- a/lib/msun/man/hypot.3
+++ b/lib/msun/man/hypot.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hypot.3	6.7 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.14 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt HYPOT 3
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index c99a6282abdef..33031e31826e4 100644
--- a/lib/msun/man/ieee.3
+++ b/lib/msun/man/ieee.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.24 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd January 26, 2005
 .Dt IEEE 3
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index 60e7a723b5243..a6e8dc2b9129d 100644
--- a/lib/msun/man/ieee_test.3
+++ b/lib/msun/man/ieee_test.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ieee_test.3,v 1.14 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd November 6, 2005
 .Dt IEEE_TEST 3
diff --git a/lib/msun/man/ilogb.3 b/lib/msun/man/ilogb.3
index ac8797e9070aa..8f9fd9f5b56df 100644
--- a/lib/msun/man/ilogb.3
+++ b/lib/msun/man/ilogb.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/ilogb.3,v 1.4 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd November 6, 2005
 .Dt ILOGB 3
diff --git a/lib/msun/man/j0.3 b/lib/msun/man/j0.3
index 54998652789e2..0e984c1a0afb4 100644
--- a/lib/msun/man/j0.3
+++ b/lib/msun/man/j0.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)j0.3	6.7 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/j0.3,v 1.14 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt J0 3
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index aaa4d7c4918e5..9695d5a1faeed 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lgamma.3,v 1.23 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd January 14, 2005
 .Dt LGAMMA 3
diff --git a/lib/msun/man/lrint.3 b/lib/msun/man/lrint.3
index bae9c454563b2..d7de09331c34a 100644
--- a/lib/msun/man/lrint.3
+++ b/lib/msun/man/lrint.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lrint.3,v 1.2 2005/01/13 10:43:01 ru Exp $
 .\"
 .Dd January 11, 2005
 .Dt LRINT 3
diff --git a/lib/msun/man/lround.3 b/lib/msun/man/lround.3
index a98229dbb3b4a..d3e53c22f196d 100644
--- a/lib/msun/man/lround.3
+++ b/lib/msun/man/lround.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/lround.3,v 1.4 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd April 7, 2005
 .Dt LROUND 3
diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3
index b47d0a5666b35..6a23cc27188f2 100644
--- a/lib/msun/man/math.3
+++ b/lib/msun/man/math.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)math.3	6.10 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/math.3,v 1.28 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd November 6, 2005
 .Dt MATH 3
diff --git a/lib/msun/man/nextafter.3 b/lib/msun/man/nextafter.3
index c8c4aa34a5db6..830d8f6df95e8 100644
--- a/lib/msun/man/nextafter.3
+++ b/lib/msun/man/nextafter.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/nextafter.3,v 1.3 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd May 4, 2005
 .Dt NEXTAFTER 3
diff --git a/lib/msun/man/remainder.3 b/lib/msun/man/remainder.3
index 56233832ae43b..af0b8d82f1700 100644
--- a/lib/msun/man/remainder.3
+++ b/lib/msun/man/remainder.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/remainder.3,v 1.5 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd March 24, 2005
 .Dt REMAINDER 3
diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3
index c716f8d0277d8..b08e569fbe420 100644
--- a/lib/msun/man/rint.3
+++ b/lib/msun/man/rint.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rint.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/rint.3,v 1.12 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd July 5, 2004
 .Dt RINT 3
diff --git a/lib/msun/man/round.3 b/lib/msun/man/round.3
index 24b3970c8245b..b077d77338b3b 100644
--- a/lib/msun/man/round.3
+++ b/lib/msun/man/round.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/round.3,v 1.6 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd April 7, 2005
 .Dt ROUND 3
diff --git a/lib/msun/man/scalbn.3 b/lib/msun/man/scalbn.3
index 64dfe95d9a85b..e091da7f0dddf 100644
--- a/lib/msun/man/scalbn.3
+++ b/lib/msun/man/scalbn.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/scalbn.3,v 1.4 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd March 4, 2005
 .Dt SCALBN 3
diff --git a/lib/msun/man/signbit.3 b/lib/msun/man/signbit.3
index dd0a39fcee155..b749671202921 100644
--- a/lib/msun/man/signbit.3
+++ b/lib/msun/man/signbit.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/signbit.3,v 1.1 2004/07/19 08:16:10 das Exp $
 .\"
 .Dd July 18, 2004
 .Dt SIGNBIT 3
diff --git a/lib/msun/man/sin.3 b/lib/msun/man/sin.3
index 008c009d35b0a..3996f7d602c29 100644
--- a/lib/msun/man/sin.3
+++ b/lib/msun/man/sin.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sin.3	6.7 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sin.3,v 1.10 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd April 19, 1991
 .Dt SIN 3
diff --git a/lib/msun/man/sinh.3 b/lib/msun/man/sinh.3
index a2a2d8ce44397..c4acb919f3f59 100644
--- a/lib/msun/man/sinh.3
+++ b/lib/msun/man/sinh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sinh.3	6.6 (Berkeley) 4/19/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sinh.3,v 1.13 2007/01/09 01:02:06 imp Exp $
 .Dd January 14, 2005
 .Dt SINH 3
 .Os
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index 0f67d6077ff97..0f25009d8dd69 100644
--- a/lib/msun/man/sqrt.3
+++ b/lib/msun/man/sqrt.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sqrt.3	6.4 (Berkeley) 5/6/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/sqrt.3,v 1.13 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd May 6, 1991
 .Dt SQRT 3
diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3
index d665b566df014..a0bd5d8a57e92 100644
--- a/lib/msun/man/tan.3
+++ b/lib/msun/man/tan.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tan.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/tan.3,v 1.10 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd May 2, 1991
 .Dt TAN 3
diff --git a/lib/msun/man/tanh.3 b/lib/msun/man/tanh.3
index 699abe5d94dc5..402ec07821e74 100644
--- a/lib/msun/man/tanh.3
+++ b/lib/msun/man/tanh.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tanh.3	5.1 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/tanh.3,v 1.11 2007/01/09 01:02:06 imp Exp $
 .\"
 .Dd May 2, 1991
 .Dt TANH 3
diff --git a/lib/msun/man/trunc.3 b/lib/msun/man/trunc.3
index 7d9e82882ae6a..cb6c26f5462c4 100644
--- a/lib/msun/man/trunc.3
+++ b/lib/msun/man/trunc.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/msun/man/trunc.3,v 1.3 2005/06/15 19:04:04 ru Exp $
 .\"
 .Dd April 16, 2005
 .Dt TRUNC 3
diff --git a/lib/msun/powerpc/Makefile.inc b/lib/msun/powerpc/Makefile.inc
index bc6244894e96c..06d8030fb1700 100644
--- a/lib/msun/powerpc/Makefile.inc
+++ b/lib/msun/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/powerpc/Makefile.inc,v 1.2 2006/03/27 23:59:45 deischen Exp $
 
 LDBL_PREC = 53
 SYM_MAPS += ${.CURDIR}/powerpc/Symbol.map
diff --git a/lib/msun/powerpc/Symbol.map b/lib/msun/powerpc/Symbol.map
index 312117719b428..9b664b4a0a379 100644
--- a/lib/msun/powerpc/Symbol.map
+++ b/lib/msun/powerpc/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/powerpc/Symbol.map,v 1.2 2007/04/29 14:05:21 deischen Exp $
  */
 FBSD_1.0 {
 };
diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c
index 04bbeafc58924..a8fa87a9cc21a 100644
--- a/lib/msun/powerpc/fenv.c
+++ b/lib/msun/powerpc/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/powerpc/fenv.c,v 1.1 2004/06/06 10:05:10 das Exp $
  */
 
 #include <fenv.h>
diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h
index 3010472e14f3c..3fd238975f4f0 100644
--- a/lib/msun/powerpc/fenv.h
+++ b/lib/msun/powerpc/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.3 2005/03/16 19:03:45 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/sparc64/Makefile.inc b/lib/msun/sparc64/Makefile.inc
index 052dc4dd2b265..330d02b580a5d 100644
--- a/lib/msun/sparc64/Makefile.inc
+++ b/lib/msun/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/msun/sparc64/Makefile.inc,v 1.3 2006/03/27 23:59:45 deischen Exp $
 
 ARCH_SRCS= e_sqrt.S e_sqrtf.S
 LDBL_PREC= 113
diff --git a/lib/msun/sparc64/Symbol.map b/lib/msun/sparc64/Symbol.map
index 312117719b428..efe4b8ee63828 100644
--- a/lib/msun/sparc64/Symbol.map
+++ b/lib/msun/sparc64/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/sparc64/Symbol.map,v 1.2 2007/04/29 14:05:21 deischen Exp $
  */
 FBSD_1.0 {
 };
diff --git a/lib/msun/sparc64/e_sqrt.S b/lib/msun/sparc64/e_sqrt.S
index 8c90c164b0429..95f79a6d14162 100644
--- a/lib/msun/sparc64/e_sqrt.S
+++ b/lib/msun/sparc64/e_sqrt.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/sparc64/e_sqrt.S,v 1.1 2005/02/21 18:27:57 das Exp $")
 
 ENTRY(sqrt)
 	retl
diff --git a/lib/msun/sparc64/e_sqrtf.S b/lib/msun/sparc64/e_sqrtf.S
index bf63f33d1d00b..e1f7cf6f27c9b 100644
--- a/lib/msun/sparc64/e_sqrtf.S
+++ b/lib/msun/sparc64/e_sqrtf.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/lib/msun/sparc64/e_sqrtf.S,v 1.1 2005/02/21 18:27:57 das Exp $")
 
 ENTRY(sqrtf)
 	retl
diff --git a/lib/msun/sparc64/fenv.c b/lib/msun/sparc64/fenv.c
index 6e8220f7ec0b1..79a0f64de72ab 100644
--- a/lib/msun/sparc64/fenv.c
+++ b/lib/msun/sparc64/fenv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/sparc64/fenv.c,v 1.1 2004/06/06 10:05:57 das Exp $
  */
 
 #include <fenv.h>
diff --git a/lib/msun/sparc64/fenv.h b/lib/msun/sparc64/fenv.h
index 82732991349bc..684c4a27d6dde 100644
--- a/lib/msun/sparc64/fenv.h
+++ b/lib/msun/sparc64/fenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/sparc64/fenv.h,v 1.3 2005/03/16 19:03:46 das Exp $
  */
 
 #ifndef	_FENV_H_
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index b021a1e5ac364..8ba672a7d07b8 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acos.c,v 1.10 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_acos(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index 0688edf1c3b9b..a11f48ee6f669 100644
--- a/lib/msun/src/e_acosf.c
+++ b/lib/msun/src/e_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c
index 25e11c3bede9d..ccb1521f0b499 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.8 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_acosh(x)
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index 5138d72521767..52579140bc44f 100644
--- a/lib/msun/src/e_acoshf.c
+++ b/lib/msun/src/e_acoshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.7 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index 044c1be95aac2..1ba7026265621 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asin.c,v 1.11 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_asin(x)
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index c0cf8a4e07273..1405fafc6dfdd 100644
--- a/lib/msun/src/e_asinf.c
+++ b/lib/msun/src/e_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.9 2005/12/04 13:52:46 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index a05a840298984..073f81b4c9c64 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.10 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_atan2(y,x)
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index af011318d6490..466d5d40b1da7 100644
--- a/lib/msun/src/e_atan2f.c
+++ b/lib/msun/src/e_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.7 2004/06/02 17:09:05 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c
index 9a896699031f1..604875c24caab 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.7 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index c7cf3e00840ca..64ebd3d698da0 100644
--- a/lib/msun/src/e_atanhf.c
+++ b/lib/msun/src/e_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c
index f8a2b9b32bb40..40a943a21b433 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.8 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_cosh(x)
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index ebd659e0b1280..f9df9b043010e 100644
--- a/lib/msun/src/e_coshf.c
+++ b/lib/msun/src/e_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.7 2005/11/13 00:08:23 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index 60b8b2a14811f..e261895edbaa0 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_exp.c,v 1.10 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_exp(x)
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index b9eb0fcee54b3..4e06556b9377c 100644
--- a/lib/msun/src/e_expf.c
+++ b/lib/msun/src/e_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_expf.c,v 1.10 2005/11/30 04:56:49 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index b731ce15c56e8..3b3c169959f69 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.9 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* 
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index e3865c4d44d5a..8b487ac68cbfe 100644
--- a/lib/msun/src/e_fmodf.c
+++ b/lib/msun/src/e_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_fmodf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c
index e3ebd7cefed48..f52ff17a79f43 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.7 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_gamma(x)
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index 48b981a895481..be8339d76be12 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.7 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_gamma_r(x, signgamp)
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index da31d9fd8818e..b5c2ec12320a5 100644
--- a/lib/msun/src/e_gammaf.c
+++ b/lib/msun/src/e_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf.c,v 1.6 2002/05/28 17:03:12 alfred Exp $";
 #endif
 
 /* __ieee754_gammaf(x)
diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c
index c14870d239ac4..d4300c3bd9c2b 100644
--- a/lib/msun/src/e_gammaf_r.c
+++ b/lib/msun/src/e_gammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_gammaf_r.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 /* __ieee754_gammaf_r(x, signgamp)
diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c
index e2f82acf7f7c8..11385f5182418 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.9 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_hypot(x,y)
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index 0624a39606eaf..354075ade84e0 100644
--- a/lib/msun/src/e_hypotf.c
+++ b/lib/msun/src/e_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.9 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c
index 493f0efa3214d..d99bf11578c78 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0.c,v 1.8 2005/02/04 18:26:05 das Exp $";
 #endif
 
 /* __ieee754_j0(x), __ieee754_y0(x)
diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c
index 6d9858207cf62..b872406bbf371 100644
--- a/lib/msun/src/e_j0f.c
+++ b/lib/msun/src/e_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.7 2002/05/28 18:15:03 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c
index a01b812a23d0f..4dbf222bda6e1 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_j1(x), __ieee754_y1(x)
diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c
index 6ccc0697f10a9..539399e4f2dba 100644
--- a/lib/msun/src/e_j1f.c
+++ b/lib/msun/src/e_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c
index ca26230b02e03..413b22da6c8d6 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jn.c,v 1.9 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index 17a7008616eaa..029dba65b77d7 100644
--- a/lib/msun/src/e_jnf.c
+++ b/lib/msun/src/e_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index 39d3f852718bd..87ad41a1b0866 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_lgamma(x)
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index 7f2767fe96b53..bb19b90ff899c 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.9 2007/05/02 16:54:22 bde Exp $";
 #endif
 
 /* __ieee754_lgamma_r(x, signgamp)
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index 4fcf943a04ba0..b1f48d579ea25 100644
--- a/lib/msun/src/e_lgammaf.c
+++ b/lib/msun/src/e_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* __ieee754_lgammaf(x)
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index 12bcaa3aa8dbd..77d09022f407b 100644
--- a/lib/msun/src/e_lgammaf_r.c
+++ b/lib/msun/src/e_lgammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.10 2007/05/02 16:54:22 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index ed3c401a9dd7d..2d12cf6809fb4 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log.c,v 1.13 2007/06/14 05:57:13 bde Exp $";
 #endif
 
 /* __ieee754_log(x)
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 871a44a3753ed..e84c0c75e0b9c 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10.c,v 1.11 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_log10(x)
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index beb2271bbd8b5..347308874ad7c 100644
--- a/lib/msun/src/e_log10f.c
+++ b/lib/msun/src/e_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_log10f.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c
index 175c95593d4fa..3bdde1bb63d87 100644
--- a/lib/msun/src/e_logf.c
+++ b/lib/msun/src/e_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_logf.c,v 1.9 2006/07/07 04:33:08 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index 95d0855e85193..d213132534540 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_pow.c,v 1.11 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_pow(x,y) return x**y
diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c
index 09fb59cdf4199..41f08ddbb682a 100644
--- a/lib/msun/src/e_powf.c
+++ b/lib/msun/src/e_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_powf.c,v 1.12 2004/06/01 19:33:30 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 5b4a08dec293b..121ba292e0ed8 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.8 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_rem_pio2(x,y)
diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c
index 261323b3f2c65..5231cd408ab33 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.19 2005/11/23 03:03:09 bde Exp $";
 #endif
 
 /* __ieee754_rem_pio2f(x,y)
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index 1cea6c1b6db20..46932a282ceaf 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.10 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_remainder(x,p)
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index 7841bdceb682a..4045088d11f88 100644
--- a/lib/msun/src/e_remainderf.c
+++ b/lib/msun/src/e_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index f7d46d0816a07..b81666e3a19aa 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.12 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index e0e7c02753bc0..224cd3118d9cd 100644
--- a/lib/msun/src/e_scalbf.c
+++ b/lib/msun/src/e_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.12 2006/07/05 17:34:57 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c
index 09b0597a2ae64..7584b27b219f9 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.9 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_sinh(x)
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index 50388fa9324f0..02e753f927a27 100644
--- a/lib/msun/src/e_sinhf.c
+++ b/lib/msun/src/e_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.8 2005/11/13 00:41:46 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index 3b3b2a7f19b0b..d75cb10ac7154 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.10 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /* __ieee754_sqrt(x)
diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c
index 7eba4d07f92ce..edc9ef2c5470a 100644
--- a/lib/msun/src/e_sqrtf.c
+++ b/lib/msun/src/e_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_sqrtf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c
index dfd9867865819..00916d7e39ff7 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.10 2005/10/26 12:36:18 bde Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index 6a0afe9e92a08..ff08d5fbddffb 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -16,7 +16,7 @@
 
 #ifndef INLINE_KERNEL_COSDF
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.15 2005/11/30 11:51:17 bde Exp $";
 #endif
 #endif
 
diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c
index 61f7dce26129b..7116f315cabcf 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.7 2005/02/04 18:26:06 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/k_rem_pio2f.c b/lib/msun/src/k_rem_pio2f.c
index 958c8639a0d3b..35c28f522396b 100644
--- a/lib/msun/src/k_rem_pio2f.c
+++ b/lib/msun/src/k_rem_pio2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2f.c,v 1.8 2005/10/11 07:56:05 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index fe2a56c00e9db..ae06a9d31625e 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sin.c,v 1.10 2005/11/02 13:06:49 bde Exp $";
 #endif
 
 /* __kernel_sin( x, y, iy)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index 79f32a1bab428..e45dc4271b9ad 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -16,7 +16,7 @@
 
 #ifndef INLINE_KERNEL_SINDF
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.13 2005/11/30 11:51:17 bde Exp $";
 #endif
 #endif
 
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index 13737d0cc08cf..82fe15517c2ca 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -12,7 +12,7 @@
 
 /* INDENT OFF */
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tan.c,v 1.12 2005/11/02 14:01:45 bde Exp $";
 #endif
 
 /* __kernel_tan( x, y, k )
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index bdda30aec3ed4..6574030d37316 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -15,7 +15,7 @@
 
 #ifndef INLINE_KERNEL_TANDF
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.20 2005/11/28 11:46:20 bde Exp $";
 #endif
 #endif
 
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index a5d16c548a76a..c5364e4cb4356 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.62 2007/01/07 07:54:21 das Exp $
  */
 
 #ifndef _MATH_H_
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index 9b38480d788d8..ca1ddd580e68d 100644
--- a/lib/msun/src/math_private.h
+++ b/lib/msun/src/math_private.h
@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/math_private.h,v 1.20 2005/11/28 04:58:57 bde Exp $
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index 95a539dc60493..079007f6ae8de 100644
--- a/lib/msun/src/s_asinh.c
+++ b/lib/msun/src/s_asinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinh.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* asinh(x)
diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c
index 6dcfc5b038440..73dc7981477ac 100644
--- a/lib/msun/src/s_asinhf.c
+++ b/lib/msun/src/s_asinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.8 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index 5ef6700c58dbb..23d7aa8331048 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atan.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /* atan(x)
diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c
index d4a500f53b6df..f90b35dcdc060 100644
--- a/lib/msun/src/s_atanf.c
+++ b/lib/msun/src/s_atanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c
index 545b0e776a4fc..c0f1b3ebaa70e 100644
--- a/lib/msun/src/s_cbrt.c
+++ b/lib/msun/src/s_cbrt.c
@@ -13,7 +13,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.14 2005/12/20 01:21:30 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c
index ea7b3cdf2383c..8baf63397170f 100644
--- a/lib/msun/src/s_cbrtf.c
+++ b/lib/msun/src/s_cbrtf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.17 2007/05/29 07:13:07 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 210b7ee61ddfa..e5440e2965284 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c
index 96a0f4879f94d..5c465b36c1638 100644
--- a/lib/msun/src/s_ceilf.c
+++ b/lib/msun/src/s_ceilf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ceill.c b/lib/msun/src/s_ceill.c
index 1de973b0f62d3..7e8817c11aa1d 100644
--- a/lib/msun/src/s_ceill.c
+++ b/lib/msun/src/s_ceill.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_cimag.c b/lib/msun/src/s_cimag.c
index 03ddf79cc0f1a..e4be0b30f6190 100644
--- a/lib/msun/src/s_cimag.c
+++ b/lib/msun/src/s_cimag.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_cimag.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_cimagf.c b/lib/msun/src/s_cimagf.c
index 6f943d8b4df20..1e0f53fd7b1fe 100644
--- a/lib/msun/src/s_cimagf.c
+++ b/lib/msun/src/s_cimagf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_cimagf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_cimagl.c b/lib/msun/src/s_cimagl.c
index 7f531d0fc29e8..a87677eff8767 100644
--- a/lib/msun/src/s_cimagl.c
+++ b/lib/msun/src/s_cimagl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_cimagl.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_conj.c b/lib/msun/src/s_conj.c
index 1d0011bea1309..d47a15d9868fb 100644
--- a/lib/msun/src/s_conj.c
+++ b/lib/msun/src/s_conj.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_conj.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_conjf.c b/lib/msun/src/s_conjf.c
index ea951b9a90122..24e0398f739a5 100644
--- a/lib/msun/src/s_conjf.c
+++ b/lib/msun/src/s_conjf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_conjf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_conjl.c b/lib/msun/src/s_conjl.c
index e6cb2efa4f379..13d80c2411022 100644
--- a/lib/msun/src/s_conjl.c
+++ b/lib/msun/src/s_conjl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_conjl.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index 7b0fc386954f8..f37be0d2c5b20 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysign.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c
index df5304f80530b..79c44800c4c9d 100644
--- a/lib/msun/src/s_copysignf.c
+++ b/lib/msun/src/s_copysignf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_copysignf.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_copysignl.c b/lib/msun/src/s_copysignl.c
index 8d39f841db201..1bb755bed5540 100644
--- a/lib/msun/src/s_copysignl.c
+++ b/lib/msun/src/s_copysignl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_copysignl.c,v 1.2 2007/01/07 07:54:21 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index 17afa34e77576..0faf91ee2b37f 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cos.c,v 1.10 2005/10/24 14:08:36 bde Exp $";
 #endif
 
 /* cos(x)
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index b800a8e5896ef..31adadebbc98e 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.15 2005/11/30 06:47:18 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_creal.c b/lib/msun/src/s_creal.c
index 3295ff281b03c..ad14cdf66809f 100644
--- a/lib/msun/src/s_creal.c
+++ b/lib/msun/src/s_creal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_creal.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_crealf.c b/lib/msun/src/s_crealf.c
index 5819b86b790fd..a5c1562938f56 100644
--- a/lib/msun/src/s_crealf.c
+++ b/lib/msun/src/s_crealf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_crealf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_creall.c b/lib/msun/src/s_creall.c
index e4946f9fd0885..1531d166f81fd 100644
--- a/lib/msun/src/s_creall.c
+++ b/lib/msun/src/s_creall.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_creall.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
 #include <complex.h>
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index 8461425ac8c91..f33a2a55d0e84 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* double erf(double x)
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index 6bb24cfd94d80..24e053c2bd757 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_erff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_exp2.c b/lib/msun/src/s_exp2.c
index 8dce338a3df12..ddf70f1dde810 100644
--- a/lib/msun/src/s_exp2.c
+++ b/lib/msun/src/s_exp2.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.1 2005/04/05 02:57:15 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_exp2f.c b/lib/msun/src/s_exp2f.c
index 1bc026a3f0eb6..d251059516d1e 100644
--- a/lib/msun/src/s_exp2f.c
+++ b/lib/msun/src/s_exp2f.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.1 2005/04/05 02:57:15 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c
index 1bf4aa62f754b..57aa3f20cf3b0 100644
--- a/lib/msun/src/s_expm1.c
+++ b/lib/msun/src/s_expm1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /* expm1(x)
diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c
index f8191b2d64ba2..a670a72c56c3e 100644
--- a/lib/msun/src/s_expm1f.c
+++ b/lib/msun/src/s_expm1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c
index 15529e58576fa..0dfa9405eb8c7 100644
--- a/lib/msun/src/s_fabs.c
+++ b/lib/msun/src/s_fabs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabs.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c
index 6b7d0a16dd277..2200705c6a99c 100644
--- a/lib/msun/src/s_fabsf.c
+++ b/lib/msun/src/s_fabsf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_fabsf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fabsl.c b/lib/msun/src/s_fabsl.c
index f150dddb842c0..200a9a5275323 100644
--- a/lib/msun/src/s_fabsl.c
+++ b/lib/msun/src/s_fabsl.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_fabsl.c,v 1.2 2003/10/25 19:53:28 des Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_fdim.c b/lib/msun/src/s_fdim.c
index 2f347fda6fe0c..6ec10dfe66cd6 100644
--- a/lib/msun/src/s_fdim.c
+++ b/lib/msun/src/s_fdim.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fdim.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index 8e7c1752f56e3..704d1d8ccf33a 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finite.c,v 1.8 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c
index a8ccb92b427c3..b43063968e914 100644
--- a/lib/msun/src/s_finitef.c
+++ b/lib/msun/src/s_finitef.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_finitef.c,v 1.6 2002/05/28 17:51:46 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 16fc7f6200121..acc32146b1981 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floor.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c
index d4bb6c5a0ef05..70a71f3de431b 100644
--- a/lib/msun/src/s_floorf.c
+++ b/lib/msun/src/s_floorf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floorl.c b/lib/msun/src/s_floorl.c
index 9dd13b6cb1cc1..2ef0acc9f015c 100644
--- a/lib/msun/src/s_floorl.c
+++ b/lib/msun/src/s_floorl.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c
index c6d27bdf6032d..6ed5698e39555 100644
--- a/lib/msun/src/s_fma.c
+++ b/lib/msun/src/s_fma.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fma.c,v 1.4 2005/03/18 02:27:59 das Exp $");
 
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c
index 1b483b7406791..0e90180d0d768 100644
--- a/lib/msun/src/s_fmaf.c
+++ b/lib/msun/src/s_fmaf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.1 2005/01/22 09:53:18 das Exp $");
 
 /*
  * Fused multiply-add: Compute x * y + z with a single rounding error.
diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c
index 160477864c18e..232a2d330c479 100644
--- a/lib/msun/src/s_fmal.c
+++ b/lib/msun/src/s_fmal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.3 2007/01/07 07:54:21 das Exp $");
 
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c
index b51b8655eb8f9..6e619febaba74 100644
--- a/lib/msun/src/s_fmax.c
+++ b/lib/msun/src/s_fmax.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmax.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c
index 423da54517e83..a97eeb520a35e 100644
--- a/lib/msun/src/s_fmaxf.c
+++ b/lib/msun/src/s_fmaxf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmaxl.c b/lib/msun/src/s_fmaxl.c
index 0ac48a976cc44..5ed4ee034bf8b 100644
--- a/lib/msun/src/s_fmaxl.c
+++ b/lib/msun/src/s_fmaxl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c
index 3500c84a1c84a..76c1c12e7552c 100644
--- a/lib/msun/src/s_fmin.c
+++ b/lib/msun/src/s_fmin.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fmin.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c
index 76a5c76a997da..bd1d24157503b 100644
--- a/lib/msun/src/s_fminf.c
+++ b/lib/msun/src/s_fminf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fminf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_fminl.c b/lib/msun/src/s_fminl.c
index f9d3ebb058524..63395df297192 100644
--- a/lib/msun/src/s_fminl.c
+++ b/lib/msun/src/s_fminl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_fminl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c
index 1b5b9bd682b5f..d89e135f0990a 100644
--- a/lib/msun/src/s_frexp.c
+++ b/lib/msun/src/s_frexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexp.c,v 1.10 2005/03/07 21:27:37 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index 477807bcb2e29..3bc9814c82368 100644
--- a/lib/msun/src/s_frexpf.c
+++ b/lib/msun/src/s_frexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.9 2007/06/11 07:48:52 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_frexpl.c b/lib/msun/src/s_frexpl.c
index d34f55d9f4f80..20b316706f1a0 100644
--- a/lib/msun/src/s_frexpl.c
+++ b/lib/msun/src/s_frexpl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_frexpl.c,v 1.1 2005/03/07 04:54:51 das Exp $
  */
 
 #include <float.h>
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index 69077af334963..bd4a44b085280 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogb.c,v 1.9 2004/10/09 17:14:28 stefanf Exp $";
 #endif
 
 /* ilogb(double x)
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index ff588139a5c9c..3c9c4deefaec0 100644
--- a/lib/msun/src/s_ilogbf.c
+++ b/lib/msun/src/s_ilogbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.7 2004/10/09 17:14:28 stefanf Exp $";
 #endif
 
 #include <limits.h>
diff --git a/lib/msun/src/s_ilogbl.c b/lib/msun/src/s_ilogbl.c
index a6a4708562db7..406ad56dbcf8a 100644
--- a/lib/msun/src/s_ilogbl.c
+++ b/lib/msun/src/s_ilogbl.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ilogbl.c,v 1.1 2004/10/11 18:13:52 stefanf Exp $";
 #endif
 
 #include <float.h>
diff --git a/lib/msun/src/s_isfinite.c b/lib/msun/src/s_isfinite.c
index c9d1bd7a1347d..394505d2a9977 100644
--- a/lib/msun/src/s_isfinite.c
+++ b/lib/msun/src/s_isfinite.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_isfinite.c,v 1.1 2004/07/09 03:32:39 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c
index 5de99ad0ff3b1..4715715aec0bc 100644
--- a/lib/msun/src/s_isnan.c
+++ b/lib/msun/src/s_isnan.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_isnan.c,v 1.8 2004/08/05 01:46:11 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_isnormal.c b/lib/msun/src/s_isnormal.c
index 49f2a74346b37..1345dbafda148 100644
--- a/lib/msun/src/s_isnormal.c
+++ b/lib/msun/src/s_isnormal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_isnormal.c,v 1.1 2004/07/09 03:32:39 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_llrint.c b/lib/msun/src/s_llrint.c
index 7c959ec950ae9..fba9784f8dad5 100644
--- a/lib/msun/src/s_llrint.c
+++ b/lib/msun/src/s_llrint.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llrint.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		double
 #define	roundit		rint
diff --git a/lib/msun/src/s_llrintf.c b/lib/msun/src/s_llrintf.c
index 7ec6015238d31..49fe58d810924 100644
--- a/lib/msun/src/s_llrintf.c
+++ b/lib/msun/src/s_llrintf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llrintf.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		float
 #define	roundit		rintf
diff --git a/lib/msun/src/s_llround.c b/lib/msun/src/s_llround.c
index 827dfc1f63677..36451cae5d2e1 100644
--- a/lib/msun/src/s_llround.c
+++ b/lib/msun/src/s_llround.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llround.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		double
 #define	roundit		round
diff --git a/lib/msun/src/s_llroundf.c b/lib/msun/src/s_llroundf.c
index c037a18d5708a..3799ef0ecd9fa 100644
--- a/lib/msun/src/s_llroundf.c
+++ b/lib/msun/src/s_llroundf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		float
 #define	roundit		roundf
diff --git a/lib/msun/src/s_llroundl.c b/lib/msun/src/s_llroundl.c
index 02c44eb4bdece..f0e0294fa3549 100644
--- a/lib/msun/src/s_llroundl.c
+++ b/lib/msun/src/s_llroundl.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #define type		long double
 #define	roundit		roundl
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 0ee69a6ab358a..56e1516d60b37 100644
--- a/lib/msun/src/s_log1p.c
+++ b/lib/msun/src/s_log1p.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.8 2005/12/04 12:28:33 bde Exp $";
 #endif
 
 /* double log1p(double x)
diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c
index eb0f4affa7ad9..8364da0721311 100644
--- a/lib/msun/src/s_log1pf.c
+++ b/lib/msun/src/s_log1pf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.9 2005/12/04 12:30:44 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index f667bf285c2f5..30edb8749e859 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logb.c,v 1.10 2005/12/03 11:57:19 bde Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c
index 97ccd02abe869..c54928c7b5629 100644
--- a/lib/msun/src/s_logbf.c
+++ b/lib/msun/src/s_logbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.8 2005/12/03 11:57:19 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_lrint.c b/lib/msun/src/s_lrint.c
index 27ff5ffbbb9b0..81eabaaa9a96e 100644
--- a/lib/msun/src/s_lrint.c
+++ b/lib/msun/src/s_lrint.c
@@ -29,7 +29,7 @@
 #include <math.h>
 
 #ifndef type
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lrint.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 #define type		double
 #define	roundit		rint
 #define dtype		long
diff --git a/lib/msun/src/s_lrintf.c b/lib/msun/src/s_lrintf.c
index a757ded233a3f..546a099feffa5 100644
--- a/lib/msun/src/s_lrintf.c
+++ b/lib/msun/src/s_lrintf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lrintf.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		float
 #define	roundit		rintf
diff --git a/lib/msun/src/s_lround.c b/lib/msun/src/s_lround.c
index 3cff4898ab4f2..bf193616c1d90 100644
--- a/lib/msun/src/s_lround.c
+++ b/lib/msun/src/s_lround.c
@@ -30,7 +30,7 @@
 #include <math.h>
 
 #ifndef type
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lround.c,v 1.2 2005/04/08 00:52:16 das Exp $");
 #define type		double
 #define	roundit		round
 #define dtype		long
diff --git a/lib/msun/src/s_lroundf.c b/lib/msun/src/s_lroundf.c
index e24fe7f81902e..c78a561af1ffb 100644
--- a/lib/msun/src/s_lroundf.c
+++ b/lib/msun/src/s_lroundf.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		float
 #define	roundit		roundf
diff --git a/lib/msun/src/s_lroundl.c b/lib/msun/src/s_lroundl.c
index e410827e26220..6947ebf9dc063 100644
--- a/lib/msun/src/s_lroundl.c
+++ b/lib/msun/src/s_lroundl.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #define type		long double
 #define	roundit		roundl
diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c
index ab13191b90047..9f4a9e8c6f3d9 100644
--- a/lib/msun/src/s_modf.c
+++ b/lib/msun/src/s_modf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modf.c,v 1.8 2007/01/06 21:22:38 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c
index 4436764ecb240..0ff6a440e2e29 100644
--- a/lib/msun/src/s_modff.c
+++ b/lib/msun/src/s_modff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modff.c,v 1.8 2007/01/06 21:22:57 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_modfl.c b/lib/msun/src/s_modfl.c
index 3dcdf86c17ff1..a298f9786d819 100644
--- a/lib/msun/src/s_modfl.c
+++ b/lib/msun/src/s_modfl.c
@@ -33,7 +33,7 @@
  * is preserved.
  * ====================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_modfl.c,v 1.1 2007/01/07 07:54:21 das Exp $
  */
 
 #include <float.h>
diff --git a/lib/msun/src/s_nearbyint.c b/lib/msun/src/s_nearbyint.c
index a075d2f48d63e..0fd36aa1dc1b5 100644
--- a/lib/msun/src/s_nearbyint.c
+++ b/lib/msun/src/s_nearbyint.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_nearbyint.c,v 1.1 2004/07/06 04:46:08 das Exp $");
 
 #include <fenv.h>
 #include <math.h>
diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c
index 674e9c10dea5e..3ed0361cff107 100644
--- a/lib/msun/src/s_nextafter.c
+++ b/lib/msun/src/s_nextafter.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafter.c,v 1.11 2005/03/07 21:27:37 das Exp $";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index b8a112527749e..ebeac4a2cd9bb 100644
--- a/lib/msun/src/s_nextafterf.c
+++ b/lib/msun/src/s_nextafterf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.10 2005/03/07 04:55:58 das Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_nextafterl.c b/lib/msun/src/s_nextafterl.c
index a74dd79a9090b..eacfd339bd6c9 100644
--- a/lib/msun/src/s_nextafterl.c
+++ b/lib/msun/src/s_nextafterl.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nextafterl.c,v 1.1 2005/03/07 04:56:46 das Exp $";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nexttoward.c b/lib/msun/src/s_nexttoward.c
index a493c83ff317d..55da4ad5a04e7 100644
--- a/lib/msun/src/s_nexttoward.c
+++ b/lib/msun/src/s_nexttoward.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nexttoward.c,v 1.1 2005/03/07 04:56:46 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_nexttowardf.c b/lib/msun/src/s_nexttowardf.c
index 38005aec2e364..54156e68e3069 100644
--- a/lib/msun/src/s_nexttowardf.c
+++ b/lib/msun/src/s_nexttowardf.c
@@ -10,7 +10,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.1 2005/03/07 04:57:38 das Exp $";
 #endif
 
 #include <float.h>
diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c
index 8756c2a3d0bb2..e38595c4c074a 100644
--- a/lib/msun/src/s_remquo.c
+++ b/lib/msun/src/s_remquo.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_remquo.c,v 1.1 2005/03/25 04:40:44 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c
index 3141642116a25..0fa74c8db1f9c 100644
--- a/lib/msun/src/s_remquof.c
+++ b/lib/msun/src/s_remquof.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_remquof.c,v 1.1 2005/03/25 04:40:44 das Exp $");
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index 0a7bfc47a4323..a88d7b72febfc 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rint.c,v 1.13 2005/12/03 07:38:35 bde Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index 32697fbe9cd10..677421aca395d 100644
--- a/lib/msun/src/s_rintf.c
+++ b/lib/msun/src/s_rintf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.10 2005/12/03 09:00:29 bde Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index 65de31b6373aa..e71b087b5fab0 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_round.c,v 1.4 2005/12/02 13:45:06 bde Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index 952e8e79549d0..6d66e5260b700 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_roundf.c,v 1.4 2005/12/02 13:45:06 bde Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index a70b617cf923f..c81d1f58b6ac2 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_roundl.c,v 1.2 2005/12/02 13:45:06 bde Exp $");
 
 #include <math.h>
 
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index d609d4e8b3d49..81846b0634ccc 100644
--- a/lib/msun/src/s_scalbln.c
+++ b/lib/msun/src/s_scalbln.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_scalbln.c,v 1.2 2005/03/07 04:57:50 das Exp $");
 
 #include <limits.h>
 #include <math.h>
diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c
index e7efaabbf5594..ed5b5710d0493 100644
--- a/lib/msun/src/s_scalbn.c
+++ b/lib/msun/src/s_scalbn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbn.c,v 1.11 2005/03/07 21:27:37 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c
index 7666c74ab22c2..46c7baf6e38a0 100644
--- a/lib/msun/src/s_scalbnf.c
+++ b/lib/msun/src/s_scalbnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnf.c,v 1.8 2005/03/07 04:52:43 das Exp $";
 #endif
 
 #include <sys/cdefs.h>
diff --git a/lib/msun/src/s_scalbnl.c b/lib/msun/src/s_scalbnl.c
index fc89f8d8ac5d0..c645d0071bd5e 100644
--- a/lib/msun/src/s_scalbnl.c
+++ b/lib/msun/src/s_scalbnl.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnl.c,v 1.1 2005/03/07 04:52:58 das Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_signbit.c b/lib/msun/src/s_signbit.c
index 01eb3ab8b2e62..ffc08f3d0dd73 100644
--- a/lib/msun/src/s_signbit.c
+++ b/lib/msun/src/s_signbit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/msun/src/s_signbit.c,v 1.1 2004/07/19 08:16:10 das Exp $
  */
 
 #include <math.h>
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index a91bcde3c2d29..08bb303edc9ff 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significand.c,v 1.9 2003/07/23 04:53:47 peter Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c
index c11a08956e09d..b3e341dd5f027 100644
--- a/lib/msun/src/s_significandf.c
+++ b/lib/msun/src/s_significandf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index af9ee628b0161..e893e23370c5a 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sin.c,v 1.10 2005/10/24 14:08:36 bde Exp $";
 #endif
 
 /* sin(x)
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index 5842014bb8096..9dc3caeb015af 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.14 2005/11/28 06:15:10 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index d707ecd1dcbbf..7f0b4a0170428 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tan.c,v 1.10 2005/11/02 14:01:45 bde Exp $";
 #endif
 
 /* tan(x)
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index 9a8355598aee4..7e80d69b8a394 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.14 2005/11/28 05:35:32 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c
index a05ad30e4173c..a0e047952f291 100644
--- a/lib/msun/src/s_tanh.c
+++ b/lib/msun/src/s_tanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanh.c,v 1.8 2006/07/05 22:59:33 bde Exp $";
 #endif
 
 /* Tanh(x)
diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c
index 8f062c8d32468..0aca6cc8fd863 100644
--- a/lib/msun/src/s_tanhf.c
+++ b/lib/msun/src/s_tanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.8 2005/12/11 11:40:55 bde Exp $";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_trunc.c b/lib/msun/src/s_trunc.c
index cce9e1592ef8a..d8c76a782178a 100644
--- a/lib/msun/src/s_trunc.c
+++ b/lib/msun/src/s_trunc.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $");
 
 /*
  * trunc(x)
diff --git a/lib/msun/src/s_truncf.c b/lib/msun/src/s_truncf.c
index 384eaee55006c..efec266531b77 100644
--- a/lib/msun/src/s_truncf.c
+++ b/lib/msun/src/s_truncf.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_truncf.c,v 1.1 2004/06/20 09:25:43 das Exp $");
 
 /*
  * truncf(x)
diff --git a/lib/msun/src/s_truncl.c b/lib/msun/src/s_truncl.c
index c475b904dccfd..39926a516f54b 100644
--- a/lib/msun/src/s_truncl.c
+++ b/lib/msun/src/s_truncl.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.4 2005/04/28 19:45:55 stefanf Exp $";
 #endif
 
 /*
diff --git a/lib/msun/src/w_cabs.c b/lib/msun/src/w_cabs.c
index a33a41faabdc5..577e5e0bc9351 100644
--- a/lib/msun/src/w_cabs.c
+++ b/lib/msun/src/w_cabs.c
@@ -7,7 +7,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.4 2001/06/13 15:16:30 ru Exp $";
 #endif /* not lint */
 
 #include <complex.h>
diff --git a/lib/msun/src/w_cabsf.c b/lib/msun/src/w_cabsf.c
index e7bfe220a9a5b..fac152f9ad316 100644
--- a/lib/msun/src/w_cabsf.c
+++ b/lib/msun/src/w_cabsf.c
@@ -7,7 +7,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/lib/msun/src/w_cabsf.c,v 1.3 2001/06/13 15:16:30 ru Exp $";
 #endif /* not lint */
 
 #include <complex.h>
diff --git a/lib/msun/src/w_dremf.c b/lib/msun/src/w_dremf.c
index 4bfcff27f7027..e83ac0e0b0d6b 100644
--- a/lib/msun/src/w_dremf.c
+++ b/lib/msun/src/w_dremf.c
@@ -4,7 +4,7 @@
  * Written by J.T. Conklin, <jtc@wimsey.com>
  * Placed into the Public Domain, 1994.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/msun/src/w_dremf.c,v 1.3 2004/07/28 05:53:18 kan Exp $ */
 
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile
index 05cd7a29bb28e..b4387a7b2a38d 100644
--- a/lib/ncurses/Makefile
+++ b/lib/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/Makefile,v 1.2 2007/03/09 12:11:56 rafan Exp $
 
 SUBDIR=	ncurses form menu panel \
 	ncursesw formw menuw panelw
diff --git a/lib/ncurses/Makefile.inc b/lib/ncurses/Makefile.inc
index 89c6348a5d851..170f86351707d 100644
--- a/lib/ncurses/Makefile.inc
+++ b/lib/ncurses/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/Makefile.inc,v 1.2 2007/03/09 09:54:07 rafan Exp $
 
 # This is to include src/lib/Makefile.inc
 
diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk
index d01e17a413bde..d421e717a9ec8 100644
--- a/lib/ncurses/config.mk
+++ b/lib/ncurses/config.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/config.mk,v 1.4 2007/07/21 00:27:17 rafan Exp $
 
 # This Makefile is shared by libncurses, libform, libmenu, libpanel.
 
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index fe89d4546aace..2c5b7ea2b9efd 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/form/Makefile,v 1.14 2007/05/25 02:27:46 rafan Exp $
 
 .include "${.CURDIR}/../config.mk"
 
diff --git a/lib/ncurses/formw/Makefile b/lib/ncurses/formw/Makefile
index 54885034ff397..684f028f3c6af 100644
--- a/lib/ncurses/formw/Makefile
+++ b/lib/ncurses/formw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/formw/Makefile,v 1.1 2007/03/09 12:11:57 rafan Exp $
 
 ENABLE_WIDEC=
 
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index a853d8c8a83a7..73e4a07d353af 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/menu/Makefile,v 1.16 2007/05/25 02:27:46 rafan Exp $
 
 .include "${.CURDIR}/../config.mk"
 
diff --git a/lib/ncurses/menuw/Makefile b/lib/ncurses/menuw/Makefile
index d5a100f0cffd5..50d15a8760b83 100644
--- a/lib/ncurses/menuw/Makefile
+++ b/lib/ncurses/menuw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/menuw/Makefile,v 1.1 2007/03/09 12:11:57 rafan Exp $
 
 ENABLE_WIDEC=
 
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index e26922dd14c5b..2be56ba61e2d0 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/ncurses/Makefile,v 1.92.2.1 2007/10/23 15:41:34 ru Exp $
 
 SHLIBDIR?=	/lib
 
diff --git a/lib/ncurses/ncurses/ncurses_cfg.h b/lib/ncurses/ncurses/ncurses_cfg.h
index 28745eae3fef1..64600d7ba3f2d 100644
--- a/lib/ncurses/ncurses/ncurses_cfg.h
+++ b/lib/ncurses/ncurses/ncurses_cfg.h
@@ -44,7 +44,7 @@
  *	ftp://invisible-island.net/autoconf/
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/ncurses/ncurses/ncurses_cfg.h,v 1.8 2007/03/09 12:11:57 rafan Exp $ */
 
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H
diff --git a/lib/ncurses/ncurses/pathnames.h b/lib/ncurses/ncurses/pathnames.h
index a0875ae399134..803be1e8328da 100644
--- a/lib/ncurses/ncurses/pathnames.h
+++ b/lib/ncurses/ncurses/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/lib/ncurses/ncurses/pathnames.h,v 1.3 2007/01/20 07:43:46 rafan Exp $
  */
 
 #define	_PATH_DEF	".termcap /usr/share/misc/termcap"
diff --git a/lib/ncurses/ncurses/termcap.c b/lib/ncurses/ncurses/termcap.c
index f88e42ef5c0f9..798733b44e08d 100644
--- a/lib/ncurses/ncurses/termcap.c
+++ b/lib/ncurses/ncurses/termcap.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/ncurses/ncurses/termcap.c,v 1.9 2007/01/20 07:46:44 rafan Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)termcap.c	8.1 (Berkeley) 6/4/93";
diff --git a/lib/ncurses/ncursesw/Makefile b/lib/ncurses/ncursesw/Makefile
index 277c90b2f0733..74490b9c02ac4 100644
--- a/lib/ncurses/ncursesw/Makefile
+++ b/lib/ncurses/ncursesw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/ncursesw/Makefile,v 1.1 2007/03/09 12:11:57 rafan Exp $
 
 ENABLE_WIDEC=
 
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 12b8b066dc126..ad1857583f311 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/panel/Makefile,v 1.15 2007/05/25 02:27:46 rafan Exp $
 
 .include "${.CURDIR}/../config.mk"
 
diff --git a/lib/ncurses/panelw/Makefile b/lib/ncurses/panelw/Makefile
index 7642e34906f78..a1fd83a353d17 100644
--- a/lib/ncurses/panelw/Makefile
+++ b/lib/ncurses/panelw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/ncurses/panelw/Makefile,v 1.1 2007/03/09 12:11:58 rafan Exp $
 
 ENABLE_WIDEC=
 
diff --git a/libexec/Makefile b/libexec/Makefile
index 6a32d10c20ff7..e17541181fc73 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/Makefile,v 1.77 2007/07/03 12:46:04 mlaier Exp $
 
 .include <bsd.own.mk>
 
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 05deedc6127fc..4c164445fa378 100644
--- a/libexec/Makefile.inc
+++ b/libexec/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/Makefile.inc,v 1.4 2002/02/04 02:33:49 kris Exp $
 
 BINDIR?=	/usr/libexec
 WFORMAT?=	1
diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL
index af8be572d5cd0..4b1b49dd3a264 100644
--- a/libexec/atrun/LEGAL
+++ b/libexec/atrun/LEGAL
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/atrun/LEGAL,v 1.5 1999/08/28 00:09:11 peter Exp $
 
 -----BEGIN PGP SIGNED MESSAGE-----
 
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 4e3d4ccace588..274cce9be255f 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index a7cef873eeef5..fcfa56cf3c517 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/atrun/atrun.c,v 1.26 2007/06/15 12:02:16 yar Exp $";
 #endif /* not lint */
 
 /* System Headers */
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index ec373b3420bcc..e9951a235bfd5 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.13 2007/06/17 14:02:31 yar Exp $
 .Dd June 17, 2007
 .Dt ATRUN 8
 .Os
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index f75c3331cf2c7..0720967a61579 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/atrun/gloadavg.c,v 1.6 2007/06/15 10:12:37 yar Exp $";
 #endif /* not lint */
 
 #ifndef __FreeBSD__
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 48890ce54b59e..3ead6ca6843be 100644
--- a/libexec/atrun/gloadavg.h
+++ b/libexec/atrun/gloadavg.h
@@ -25,5 +25,5 @@
 
 double gloadavg(void);
 #if 0
-static char atrun_h_rcsid[] = "$FreeBSD$";
+static char atrun_h_rcsid[] = "$FreeBSD: src/libexec/atrun/gloadavg.h,v 1.4 1999/08/28 00:09:12 peter Exp $";
 #endif
diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce
index 60838d5e978ef..2befcc8bd77dd 100644
--- a/libexec/bootpd/Announce
+++ b/libexec/bootpd/Announce
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Announce,v 1.5 1999/08/28 00:09:13 peter Exp $
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/Changes b/libexec/bootpd/Changes
index d797ea1fa9e55..668fdcdd44ec1 100644
--- a/libexec/bootpd/Changes
+++ b/libexec/bootpd/Changes
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Changes,v 1.5 1999/08/28 00:09:13 peter Exp $
 
 Changes, most recent first
 Date, <email> Real Name
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index 830577a57def6..d0eb2594f8738 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile,v 1.9 2001/03/26 14:22:02 ru Exp $
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
diff --git a/libexec/bootpd/Makefile.UNIX b/libexec/bootpd/Makefile.UNIX
index 5b2c186bcb4bb..09936d2023187 100644
--- a/libexec/bootpd/Makefile.UNIX
+++ b/libexec/bootpd/Makefile.UNIX
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile.UNIX,v 1.5 1999/08/28 00:09:14 peter Exp $
 #
 # Makefile for the BOOTP programs:
 #   bootpd	- BOOTP server daemon
diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc
index 829da300445d3..52b80b3f59c6e 100644
--- a/libexec/bootpd/Makefile.inc
+++ b/libexec/bootpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Makefile.inc,v 1.4 1999/08/28 00:09:14 peter Exp $
 
 BINDIR?=	/usr/libexec
diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems
index c7f9951946b3b..277d8ad15b440 100644
--- a/libexec/bootpd/Problems
+++ b/libexec/bootpd/Problems
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/Problems,v 1.5 1999/08/28 00:09:15 peter Exp $
 
 Common problems and ways to work around them:
 
diff --git a/libexec/bootpd/README b/libexec/bootpd/README
index a88cca5b64508..26a6f99431129 100644
--- a/libexec/bootpd/README
+++ b/libexec/bootpd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/README,v 1.5 1999/08/28 00:09:15 peter Exp $
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/bootp.h b/libexec/bootpd/bootp.h
index c3a3909287bad..9b2f3d242eada 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/bootp.h,v 1.6 2001/09/25 21:02:10 iedowse Exp $
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index b3818589017a7..694d7465249ad 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/bootpd.8,v 1.20 2004/07/02 21:28:48 ru Exp $
 .\"
 .Dd February 10, 2004
 .Dt BOOTPD 8
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index b0a49b5cea9a4..c664b01cfb791 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -38,7 +38,7 @@ SOFTWARE.
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/bootpd.c,v 1.24 2005/12/24 22:22:16 trhodes Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/libexec/bootpd/bootpd.h b/libexec/bootpd/bootpd.h
index 86c1b3da8b647..ee25199cbbe4d 100644
--- a/libexec/bootpd/bootpd.h
+++ b/libexec/bootpd/bootpd.h
@@ -24,7 +24,7 @@ SOFTWARE.
 /*
  * bootpd.h -- common header file for all the modules of the bootpd program.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/bootpd.h,v 1.2 1999/11/12 10:11:48 marcel Exp $
  */
 
 #include "bptypes.h"
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 93a982c2d384f..4d5bd6307f993 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/bootpgw/Makefile,v 1.6 2004/12/21 08:47:03 ru Exp $
 
 PROG=	bootpgw
 NO_MAN=
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
index f180fd66713f0..e729a70cfb746 100644
--- a/libexec/bootpd/bootpgw/bootpgw.c
+++ b/libexec/bootpd/bootpgw/bootpgw.c
@@ -31,7 +31,7 @@ SOFTWARE.
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/bootpgw/bootpgw.c,v 1.6 2003/02/05 13:45:25 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index c10d26b75217e..b1dbb03f84673 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/bootptab.5,v 1.11 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index 9bce37e07f29b..1efbdd3e3fe84 100644
--- a/libexec/bootpd/bootptab.mcs
+++ b/libexec/bootpd/bootptab.mcs
@@ -2,7 +2,7 @@
 # Last update: gwr, Sun Dec 12 19:00:00 EDT 1993
 # Blank lines and lines beginning with '#' are ignored.
 #
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/bootptab.mcs,v 1.5 1999/08/28 00:09:17 peter Exp $
 #
 # Legend:	(see bootptab.5)
 #	first field -- hostname (not indented)
diff --git a/libexec/bootpd/bptypes.h b/libexec/bootpd/bptypes.h
index e27cc832c5fec..933f34df9750b 100644
--- a/libexec/bootpd/bptypes.h
+++ b/libexec/bootpd/bptypes.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$
+/* $FreeBSD: src/libexec/bootpd/bptypes.h,v 1.2 1999/11/12 10:11:48 marcel Exp $
  */
 
 #ifndef	BPTYPES_H
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
index 3b2bd973cbf17..22ea7a63282ac 100644
--- a/libexec/bootpd/dovend.c
+++ b/libexec/bootpd/dovend.c
@@ -1,7 +1,7 @@
 /*
  * dovend.c : Inserts all but the first few vendor options.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/dovend.c,v 1.8 2002/05/28 18:36:43 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/dovend.h b/libexec/bootpd/dovend.h
index ef3b62de71262..c1342ff793e0f 100644
--- a/libexec/bootpd/dovend.h
+++ b/libexec/bootpd/dovend.h
@@ -1,5 +1,5 @@
 /* dovend.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/dovend.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 extern int dovend_rfc1497(struct host *hp, u_char *buf, int len);
 extern int insert_ip(int, struct in_addr_list *, u_char **, int *);
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 43e94ec4cef2b..c739c0a58369f 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/dumptab.c,v 1.9 2002/05/28 18:36:43 alfred Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index e4dc1b66b9e21..a0f94bbdc2172 100644
--- a/libexec/bootpd/getether.c
+++ b/libexec/bootpd/getether.c
@@ -7,7 +7,7 @@
  * If you figure out how to do this on another system,
  * please let me know.  <gwr@mc.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/getether.c,v 1.14 2002/12/30 21:18:03 schweikh Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.h b/libexec/bootpd/getether.h
index 026df158b50ce..1435747395856 100644
--- a/libexec/bootpd/getether.h
+++ b/libexec/bootpd/getether.h
@@ -1,4 +1,4 @@
 /* getether.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/getether.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 extern int getether(char *ifname, char *eaptr);
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index 64e5edadb6799..6e368c15eb416 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/getif.c,v 1.8 2004/07/29 18:05:20 kan Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getif.h b/libexec/bootpd/getif.h
index a2c86cfba04b6..9b02003a5faaa 100644
--- a/libexec/bootpd/getif.h
+++ b/libexec/bootpd/getif.h
@@ -1,4 +1,4 @@
 /* getif.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/getif.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 extern struct ifreq *getif(int, struct in_addr *);
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
index 146e87e69356f..a8d7f41e96ab3 100644
--- a/libexec/bootpd/hash.c
+++ b/libexec/bootpd/hash.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/hash.c,v 1.7 2002/05/28 18:36:43 alfred Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/hash.h b/libexec/bootpd/hash.h
index 22cdc04332c26..fa89957c72a5c 100644
--- a/libexec/bootpd/hash.h
+++ b/libexec/bootpd/hash.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 /*
  * Generalized hash table ADT
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hash.h,v 1.3 2002/05/28 18:36:43 alfred Exp $
  *
  * Provides multiple, dynamically-allocated, variable-sized hash tables on
  * various data and keys.
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index de264cc83a5f1..104c074566369 100644
--- a/libexec/bootpd/hwaddr.c
+++ b/libexec/bootpd/hwaddr.c
@@ -2,7 +2,7 @@
  * hwaddr.c - routines that deal with hardware addresses.
  * (i.e. Ethernet)
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hwaddr.c,v 1.9 2002/10/13 11:27:36 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h
index bd68857648a14..233e2d15982e2 100644
--- a/libexec/bootpd/hwaddr.h
+++ b/libexec/bootpd/hwaddr.h
@@ -1,7 +1,7 @@
 /* 
  * hwaddr.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/hwaddr.h,v 1.7 2002/05/28 18:36:43 alfred Exp $
  */
 
 #ifndef	HWADDR_H
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index 54b3f62242f7f..b3ef9d23cf898 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/lookup.c,v 1.7 1999/08/28 00:09:19 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/lookup.h b/libexec/bootpd/lookup.h
index 4940f054696ab..43d12895108b7 100644
--- a/libexec/bootpd/lookup.h
+++ b/libexec/bootpd/lookup.h
@@ -1,5 +1,5 @@
 /* lookup.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/lookup.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 #include "bptypes.h"	/* for int32, u_int32 */
 
diff --git a/libexec/bootpd/patchlevel.h b/libexec/bootpd/patchlevel.h
index fc79f18b4068c..df5b94b00f6c0 100644
--- a/libexec/bootpd/patchlevel.h
+++ b/libexec/bootpd/patchlevel.h
@@ -1,7 +1,7 @@
 /* 
  * patchlevel.h 
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/patchlevel.h,v 1.5 1999/08/28 00:09:19 peter Exp $
  */
 
 #define VERSION 	"2.4"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
index ab583d485db4e..9cb1a2fa06721 100644
--- a/libexec/bootpd/readfile.c
+++ b/libexec/bootpd/readfile.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/readfile.c,v 1.11 2002/08/25 13:07:51 charnier Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/readfile.h b/libexec/bootpd/readfile.h
index be9cada237790..e24c2be86d793 100644
--- a/libexec/bootpd/readfile.h
+++ b/libexec/bootpd/readfile.h
@@ -1,5 +1,5 @@
 /* readfile.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/readfile.h,v 1.2 2002/05/28 18:31:41 alfred Exp $ */
 
 #include "bptypes.h"
 #include "hash.h"
diff --git a/libexec/bootpd/report.c b/libexec/bootpd/report.c
index 290e19e74063d..38aabc89a730f 100644
--- a/libexec/bootpd/report.c
+++ b/libexec/bootpd/report.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/report.c,v 1.5 2002/05/28 18:31:41 alfred Exp $ */
 
 /*
  * report() - calls syslog
diff --git a/libexec/bootpd/report.h b/libexec/bootpd/report.h
index 55cec5c76845a..15964fbca2688 100644
--- a/libexec/bootpd/report.h
+++ b/libexec/bootpd/report.h
@@ -1,5 +1,5 @@
 /* report.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/report.h,v 1.5 2002/05/28 18:36:43 alfred Exp $ */
 
 extern void report_init(int nolog);
 extern void report(int, const char *, ...) __printflike(2, 3);
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 45845699bfe0b..f51d46ef65503 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/rtmsg.c,v 1.12 2003/02/05 13:45:25 charnier Exp $");
 
 #include <sys/param.h>
 /*
diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile
index e905bffa76969..49ce256edafd0 100644
--- a/libexec/bootpd/tools/Makefile
+++ b/libexec/bootpd/tools/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/Makefile,v 1.4 1999/08/28 00:09:23 peter Exp $
 
 SUBDIR=	bootpef bootptest
 
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 4d7876162d287..81a9bd902c36c 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -1,4 +1,4 @@
 # Makefile.inc
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/Makefile.inc,v 1.6 2001/03/26 14:22:03 ru Exp $
 
 BINDIR=		/usr/sbin
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index 9436561d4a662..a3b6ae88a5c4c 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/bootpef/Makefile,v 1.6 2001/03/26 14:22:03 ru Exp $
 
 PROG=	bootpef
 MAN=	bootpef.8
diff --git a/libexec/bootpd/tools/bootpef/bootpef.8 b/libexec/bootpd/tools/bootpef/bootpef.8
index 841b01cd4ff6f..16f47777c99b4 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.8
+++ b/libexec/bootpd/tools/bootpef/bootpef.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/tools/bootpef/bootpef.8,v 1.4 2002/07/06 19:18:38 charnier Exp $
 .\"
 .\" bootpef.8
 .Dd December 4, 1993
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index 04089c87b560b..2d662e7f95d7f 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.c
+++ b/libexec/bootpd/tools/bootpef/bootpef.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
- $FreeBSD$
+ $FreeBSD: src/libexec/bootpd/tools/bootpef/bootpef.c,v 1.7 2002/05/28 18:39:52 alfred Exp $
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index fae5127eebb3b..82e680778fd10 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $FreeBSD: src/libexec/bootpd/tools/bootptest/Makefile,v 1.8 2001/03/26 14:22:03 ru Exp $
 
 PROG=	bootptest
 MAN=	bootptest.8
diff --git a/libexec/bootpd/tools/bootptest/bootptest.8 b/libexec/bootpd/tools/bootptest/bootptest.8
index 888ff227f1242..242803d094d84 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.8
+++ b/libexec/bootpd/tools/bootptest/bootptest.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.8,v 1.5 2005/01/18 09:29:39 ru Exp $
 .\"
 .\" bootptest.8
 .Dd June 10, 1993
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 04909878f33f4..5e04af20fc726 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.c,v 1.8 2003/02/05 13:45:25 charnier Exp $");
 
 char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
 
diff --git a/libexec/bootpd/tools/bootptest/bootptest.h b/libexec/bootpd/tools/bootptest/bootptest.h
index a1891fe525562..88fcfbf79f983 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.h
+++ b/libexec/bootpd/tools/bootptest/bootptest.h
@@ -1,5 +1,5 @@
 /* bootptest.h */
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.h,v 1.2 2002/05/28 18:39:53 alfred Exp $ */
 /*
  * Hacks for sharing print-bootp.c between tcpdump and bootptest.
  */
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index 9ea450e10d90e..a1e0cd658764a 100644
--- a/libexec/bootpd/tools/bootptest/print-bootp.c
+++ b/libexec/bootpd/tools/bootptest/print-bootp.c
@@ -23,7 +23,7 @@
  * This file was copied from tcpdump-2.1.1 and modified.
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/tools/bootptest/print-bootp.c,v 1.7 2001/09/29 11:37:13 iedowse Exp $
  */
 
 #include <stdio.h>
diff --git a/libexec/bootpd/trygetea.c b/libexec/bootpd/trygetea.c
index 0ae63a3a2fbaf..54b8b0c87ba12 100644
--- a/libexec/bootpd/trygetea.c
+++ b/libexec/bootpd/trygetea.c
@@ -1,7 +1,7 @@
 /*
  * trygetea.c - test program for getether.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trygetea.c,v 1.5 1999/08/28 00:09:19 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trygetif.c b/libexec/bootpd/trygetif.c
index 0e2cca195b23d..1c4f28e9cea37 100644
--- a/libexec/bootpd/trygetif.c
+++ b/libexec/bootpd/trygetif.c
@@ -1,7 +1,7 @@
 /*
  * trygetif.c - test program for getif.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trygetif.c,v 1.5 1999/08/28 00:09:20 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trylook.c b/libexec/bootpd/trylook.c
index 9484d04b6da3d..e6705a62076af 100644
--- a/libexec/bootpd/trylook.c
+++ b/libexec/bootpd/trylook.c
@@ -1,7 +1,7 @@
 /*
  * trylook.c - test program for lookup.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/trylook.c,v 1.5 1999/08/28 00:09:20 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/tzone.c b/libexec/bootpd/tzone.c
index 354fb54ed373d..f671cdb06365b 100644
--- a/libexec/bootpd/tzone.c
+++ b/libexec/bootpd/tzone.c
@@ -3,7 +3,7 @@
  *
  * This is shared by bootpd and bootpef
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/bootpd/tzone.c,v 1.2 2000/11/10 12:19:53 dirk Exp $
  */
 
 #ifdef	SVR4
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index c501cccb8551f..9da389aa11335 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/comsat/Makefile,v 1.8 2001/03/26 14:22:03 ru Exp $
 
 PROG=	comsat
 MAN=	comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index 50b6b113b1d98..f72dd76421d9f 100644
--- a/libexec/comsat/comsat.8
+++ b/libexec/comsat/comsat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)comsat.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.14 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index ed14b1a2d2bc6..688631030651e 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)comsat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/comsat/comsat.c,v 1.17 2005/02/14 17:42:56 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index ae92564cda96b..c6091db6115e7 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/fingerd/Makefile,v 1.11 2004/03/29 09:29:51 pjd Exp $
 
 PROG=	fingerd
 DPADD=	${LIBUTIL}
diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8
index 232771ad0013b..932d42fa8357c 100644
--- a/libexec/fingerd/fingerd.8
+++ b/libexec/fingerd/fingerd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fingerd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/fingerd/fingerd.8,v 1.14 2005/01/18 09:29:39 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt FINGERD 8
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 0979c64a504bd..ec54df688d604 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fingerd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/fingerd/fingerd.c,v 1.25 2005/02/14 17:42:57 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index e415407fb9e67..541094c55573e 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-# $FreeBSD$
+# $FreeBSD: src/libexec/ftpd/Makefile,v 1.57 2006/06/05 15:50:34 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/libexec/ftpd/config.h b/libexec/ftpd/config.h
index 8e10bbb270dc6..5c42a5cbdf3ab 100644
--- a/libexec/ftpd/config.h
+++ b/libexec/ftpd/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/ftpd/config.h,v 1.1 2001/07/19 17:45:14 obrien Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 7c1cc8edd1db9..b0dab93704282 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ftpd/extern.h,v 1.19 2002/02/04 01:23:44 kris Exp $
  */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/ftpchroot.5 b/libexec/ftpd/ftpchroot.5
index 216ed3da4e278..5757742911507 100644
--- a/libexec/ftpd/ftpchroot.5
+++ b/libexec/ftpd/ftpchroot.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ftpd/ftpchroot.5,v 1.3 2003/06/01 19:52:36 ru Exp $
 .\"
 .Dd January 26, 2003
 .Dt FTPCHROOT 5
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 3c6ecb72d04ff..5e91d292f2768 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.66 2007/04/18 22:43:39 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index ae5d62c60e68c..35fb7a36d85bb 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.74 2007/04/20 09:08:20 trhodes Exp $
 .\"
 .Dd April 20, 2007
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 5095f20435d47..11342e38bc1d0 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.212 2007/04/18 22:43:39 yar Exp $");
 
 /*
  * FTP server.
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 29bea5cef0d0d..e0589b7da7399 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/logwtmp.c,v 1.13 2004/11/18 13:46:29 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index a8837a90c446d..24b74645baa8e 100644
--- a/libexec/ftpd/pathnames.h
+++ b/libexec/ftpd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ftpd/pathnames.h,v 1.11 1999/08/28 00:09:31 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 3c187b94daf9c..9edcefb67e4ad 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ftpd/popen.c,v 1.26 2004/11/18 13:46:29 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index 697e81ae0bb4f..c7e84226d6013 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/getty/Makefile,v 1.11 2002/02/04 02:33:50 kris Exp $
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index bc5a963c8a358..4fa3084f56355 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/chat.c,v 1.11 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 04f3287c9bb93..76fdf44b8a22e 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/extern.h,v 1.9 2005/04/06 17:42:24 stefanf Exp $
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 4ab5501b3f9a3..bc55f6f0acb57 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)getty.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/getty.8,v 1.16 2005/01/18 09:29:39 ru Exp $
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 7b475b1917811..e9e41553555ed 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/gettytab.5,v 1.41 2005/01/18 09:29:39 ru Exp $
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index e8b4143af6459..3addfe357e0f7 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)gettytab.h	8.2 (Berkeley) 3/30/94
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/gettytab.h,v 1.14 2003/06/10 18:30:41 yar Exp $
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index b832bb29fa8b2..9c8a4a6d2dab4 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: init.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/init.c,v 1.16 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index ad53411b57fb8..dea5a5d885108 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: main.c	8.1 (Berkeley) 6/20/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/main.c,v 1.47 2005/04/06 17:42:24 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 035e8b6c14b32..2c64fd1e4f01b 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/libexec/getty/pathnames.h,v 1.7 1999/08/28 00:09:36 peter Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 4938d7386dbf5..624e9edfb1eeb 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: subr.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/getty/subr.c,v 1.19 2004/06/25 10:11:28 phk Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index cf2423a9320db..8fba3f76447bd 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.19 2007/07/24 06:41:06 delphij Exp $
 .\" "
 .Dd May 27, 2005
 .Dt TTYS 5
diff --git a/libexec/lukemftpd/Makefile b/libexec/lukemftpd/Makefile
index 8ef420d9fcb4f..12c4345d333e0 100644
--- a/libexec/lukemftpd/Makefile
+++ b/libexec/lukemftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-# $FreeBSD$
+# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.18 2006/07/28 10:50:11 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/libexec/lukemftpd/config.h b/libexec/lukemftpd/config.h
index 0d4566a924c04..03b6d4452a088 100644
--- a/libexec/lukemftpd/config.h
+++ b/libexec/lukemftpd/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/config.h,v 1.4 2004/08/21 03:36:47 obrien Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/libexec/lukemftpd/nbsd2fbsd.h b/libexec/lukemftpd/nbsd2fbsd.h
index ac09bdfda57c0..3e08d5ba862fc 100644
--- a/libexec/lukemftpd/nbsd2fbsd.h
+++ b/libexec/lukemftpd/nbsd2fbsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/nbsd2fbsd.h,v 1.5 2006/08/31 17:02:05 obrien Exp $ */
 
 /* XXX: Depend on our system headers protecting against multiple includes. */
 #include <paths.h>
diff --git a/libexec/lukemftpd/nbsd_pidfile.h b/libexec/lukemftpd/nbsd_pidfile.h
index 23dbe38be9cc7..48f8af2d82898 100644
--- a/libexec/lukemftpd/nbsd_pidfile.h
+++ b/libexec/lukemftpd/nbsd_pidfile.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/nbsd_pidfile.h,v 1.1 2006/08/31 16:57:46 obrien Exp $ */
 
 #include <sys/stdint.h>
 #include <sysexits.h>
diff --git a/libexec/lukemftpd/util.h b/libexec/lukemftpd/util.h
index 91ce241953ea4..32eacdd9c045f 100644
--- a/libexec/lukemftpd/util.h
+++ b/libexec/lukemftpd/util.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/libexec/lukemftpd/util.h,v 1.1 2003/01/06 03:03:53 obrien Exp $ */
 
 #include <libutil.h>
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 57837d11166bc..807d2bbf6637f 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/mail.local/Makefile,v 1.21 2005/06/10 06:12:51 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/mail.local
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index d09f8127dc21d..10fe87876b7e6 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/makekey/Makefile,v 1.14 2004/02/05 22:44:23 ru Exp $
 
 PROG=	makekey
 MAN=	makekey.8
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 7f7f054d012b9..5afba778e57f5 100644
--- a/libexec/makekey/makekey.8
+++ b/libexec/makekey/makekey.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)makekey.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/makekey/makekey.8,v 1.15 2004/05/16 22:11:56 ru Exp $
 .\"
 .Dd October 8, 2003
 .Dt MAKEKEY 8
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index 2b541bf87b639..eb3cfb09fa198 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)makekey.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/makekey/makekey.c,v 1.9 2002/02/06 16:51:09 imp Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index 6941b8fde4140..db0756b9fec43 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/mknetid/Makefile,v 1.7 2001/08/21 15:39:15 ru Exp $
 
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index b4a39cbc12ec0..16ec6443cdeed 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/hash.c,v 1.7 2002/12/30 21:18:03 schweikh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 7918ae2e95f03..5821e4fd4634d 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/mknetid/hash.h,v 1.6 2002/02/17 19:09:20 imp Exp $
  */
 
 /* Groupid entry hung off a member_entry node. */
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index e70dc0038d9fe..0b3ff67e47bf6 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/mknetid/mknetid.8,v 1.16 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 66868664c3c51..a62fa57603c05 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/mknetid.c,v 1.13 2002/11/12 14:15:59 maxim Exp $";
 #endif /* not lint */
 
 #define LINSIZ 1024
diff --git a/libexec/mknetid/netid.5 b/libexec/mknetid/netid.5
index 011d8f507ec94..782256e1cba50 100644
--- a/libexec/mknetid/netid.5
+++ b/libexec/mknetid/netid.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.4 2005/01/18 09:29:40 ru Exp $
 .\"
 .Dd January 13, 1996
 .Dt NETID 5
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index b34ee11fcb39b..0749a39330a76 100644
--- a/libexec/mknetid/parse_group.c
+++ b/libexec/mknetid/parse_group.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/mknetid/parse_group.c,v 1.7 2002/02/17 19:09:20 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile
index 0f0c78eda4f13..85eaaf3a35fe0 100644
--- a/libexec/pppoed/Makefile
+++ b/libexec/pppoed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pppoed/Makefile,v 1.5 2005/01/28 16:08:05 ru Exp $
 
 PROG=	pppoed
 DPADD=	${LIBNETGRAPH}
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 2f783535b7678..63706a38468f3 100644
--- a/libexec/pppoed/pppoed.8
+++ b/libexec/pppoed/pppoed.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/pppoed/pppoed.8,v 1.18 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd November 8, 1999
 .Dt PPPOED 8
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index f07dd8c07d5d4..6e17d7c2bc6c4 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/pppoed/pppoed.c,v 1.27 2007/07/04 00:00:38 scf Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/pt_chown/Makefile b/libexec/pt_chown/Makefile
index d4f31bbfd688e..2eebc9d7efe0c 100644
--- a/libexec/pt_chown/Makefile
+++ b/libexec/pt_chown/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/pt_chown/Makefile,v 1.4 2005/01/28 16:08:05 ru Exp $
 
 PROG=	pt_chown
 BINOWN=	root
diff --git a/libexec/pt_chown/pt_chown.c b/libexec/pt_chown/pt_chown.c
index d89ffeaba87ee..3deaac684caa2 100644
--- a/libexec/pt_chown/pt_chown.c
+++ b/libexec/pt_chown/pt_chown.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/pt_chown/pt_chown.c,v 1.1 2003/01/02 20:44:41 jmallett Exp $");
 #endif /* not lint */
 
 #include <sys/stat.h>
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index 3a4099e4a8be1..bdafffe2ed0f1 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rbootd/Makefile,v 1.12 2002/02/04 02:33:50 kris Exp $
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index ddd9cfbc2ae6e..71a488cb9867a 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)bpf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/bpf.c,v 1.11 2002/02/07 23:57:00 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index 74ff341095f9e..66e43ea90b808 100644
--- a/libexec/rbootd/conf.c
+++ b/libexec/rbootd/conf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)conf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/conf.c,v 1.5 1999/08/28 00:09:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/defs.h b/libexec/rbootd/defs.h
index ff640c1629b5c..4532cd935bf71 100644
--- a/libexec/rbootd/defs.h
+++ b/libexec/rbootd/defs.h
@@ -43,7 +43,7 @@
  * From: Utah Hdr: defs.h 3.1 92/07/06
  * Author: Jeff Forys, University of Utah CSS
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rbootd/defs.h,v 1.4 2002/02/07 23:57:00 imp Exp $
  */
 
 #include "rmp.h"
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 2eb33e0a370e6..8ee8a4674919b 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)parseconf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/parseconf.c,v 1.11 2002/02/07 23:57:00 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index c00186f48facd..f57de0e0a3ccf 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -38,7 +38,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)rbootd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rbootd/rbootd.8,v 1.14 2004/07/02 21:28:48 ru Exp $
 .\"
 .\" Utah Hdr: rbootd.man 3.1 92/07/06
 .\" Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 942c7cb7133c2..8b2752e59e65f 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -55,7 +55,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/rbootd.c,v 1.14 2004/08/21 07:23:41 maxim Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 78c2488f9a841..5b8e0e0f26cc3 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)rmpproto.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/rmpproto.c,v 1.9 2004/05/24 11:59:16 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index 138bc4cc0078d..24f7246e9f126 100644
--- a/libexec/rbootd/utils.c
+++ b/libexec/rbootd/utils.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)utils.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rbootd/utils.c,v 1.8 2004/05/24 11:59:16 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index 708837141347f..2e6ca8281db3f 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/revnetgroup/Makefile,v 1.6 2001/03/26 14:22:06 ru Exp $
 
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 1180080235519..4e2ab98f83cad 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/hash.c,v 1.7 2002/02/07 23:57:01 imp Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index 2485901ed68e2..6e8a0eb31367e 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/revnetgroup/hash.h,v 1.7 2002/02/07 23:57:01 imp Exp $
  */
 
 /* Groupname entry hung off a member_entry node. */
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 67e1b14788d89..30dd328057299 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/parse_netgroup.c,v 1.9 2002/04/01 21:13:15 mike Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index 84cf9f91b007c..de953565ebb8b 100644
--- a/libexec/revnetgroup/revnetgroup.8
+++ b/libexec/revnetgroup/revnetgroup.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/revnetgroup/revnetgroup.8,v 1.14 2005/02/09 20:36:12 ru Exp $
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 505c482b3be88..f86337759ebd4 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/revnetgroup/revnetgroup.c,v 1.13 2005/02/09 20:36:12 ru Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 9807dc8e5ba30..81da02240942d 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rlogind/Makefile,v 1.21 2006/07/27 12:05:05 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index d861da5383947..c994f27fe2a03 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rlogind.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rlogind/rlogind.8,v 1.24 2005/02/09 20:23:36 ru Exp $
 .\"
 .Dd February 9, 2005
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index c4db3c7ae6bfc..09cc72a58a874 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -50,7 +50,7 @@ static const char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rlogind/rlogind.c,v 1.44 2005/05/13 16:31:09 ume Exp $");
 
 /*
  * remote login server:
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 331f6ab6e2b62..3b88cc86aee84 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rquotad/Makefile,v 1.6 2001/03/26 14:22:07 ru Exp $
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index 4e14da0b034c6..cc1a5bb04590a 100644
--- a/libexec/rpc.rquotad/rpc.rquotad.8
+++ b/libexec/rpc.rquotad/rpc.rquotad.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rquotad/rpc.rquotad.8,v 1.12 2005/01/18 09:29:40 ru Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index 6ca4c74612457..840b392513511 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.9 2005/02/14 17:42:57 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index be89814301716..5b092206f4f5a 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rstatd/Makefile,v 1.8 2004/02/04 10:20:43 ru Exp $
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8
index ebaa766efd88f..024b78f94bf81 100644
--- a/libexec/rpc.rstatd/rpc.rstatd.8
+++ b/libexec/rpc.rstatd/rpc.rstatd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rstatd/rpc.rstatd.8,v 1.8 2002/07/06 19:19:23 charnier Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RSTATD 8
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index c8f2b97b6bf84..69452a4ee701d 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -33,7 +33,7 @@ static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro
 static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.25 2003/06/02 02:34:36 obrien Exp $";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 362cdc486683c..c61fed1032019 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rstatd/rstatd.c,v 1.11 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index af43bd3e7cf3e..d272a997e7ca2 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rusersd/Makefile,v 1.8 2001/03/26 14:22:07 ru Exp $
 
 PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8
index 6efd47de9edeb..0e557e519add3 100644
--- a/libexec/rpc.rusersd/rpc.rusersd.8
+++ b/libexec/rpc.rusersd/rpc.rusersd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rusersd/rpc.rusersd.8,v 1.9 2002/07/06 19:19:25 charnier Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RUSERSD 8
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 8bd96924b29a8..e2bec5934acb5 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rusersd/rusers_proc.c,v 1.13 2003/06/02 02:35:18 obrien Exp $";
 #endif /* not lint */
 
 #ifdef DEBUG
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 1835e8e27aeb4..def9109066177 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rusersd/rusersd.c,v 1.11 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 83182e904b3ed..7c708d9f98cbd 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.rwalld/Makefile,v 1.7 2004/02/04 11:59:07 ru Exp $
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index d5e1472732a6e..841910b9b4d49 100644
--- a/libexec/rpc.rwalld/rpc.rwalld.8
+++ b/libexec/rpc.rwalld/rpc.rwalld.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.rwalld/rpc.rwalld.8,v 1.9 2004/07/02 21:28:49 ru Exp $
 .\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index 6bfe537705609..198c35c646505 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.rwalld/rwalld.c,v 1.13 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 1dd582de0082c..e9d531f60d795 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rpc.sprayd/Makefile,v 1.6 2001/03/26 14:22:08 ru Exp $
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8
index 8840043e5ed21..d0f2cc2a11de9 100644
--- a/libexec/rpc.sprayd/rpc.sprayd.8
+++ b/libexec/rpc.sprayd/rpc.sprayd.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rpc.sprayd/rpc.sprayd.8,v 1.9 2002/07/06 19:19:30 charnier Exp $
 .\"
 .Dd June 22, 1994
 .Dt RPC.SPRAYD 8
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 9c7cee1e105b8..0e597f74059e8 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/rpc.sprayd/sprayd.c,v 1.9 2005/02/14 17:42:58 stefanf Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 155314ad611fe..6e33a93532a93 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/rshd/Makefile,v 1.25 2005/01/28 16:08:05 ru Exp $
 
 PROG=	rshd
 MAN=	rshd.8
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index bc77108b5223c..2d8e359364d3a 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rshd/rshd.8,v 1.36 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index ec17251475463..037ba143b0e66 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rshd/rshd.c,v 1.51 2005/05/11 02:41:39 jmallett Exp $");
 
 /*
  * remote shell server:
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 39ec792a72c97..bbee7eb2394b5 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index 4b6d753e573e2..e889a7ef4c5e0 100644
--- a/libexec/rtld-aout/shlib.h
+++ b/libexec/rtld-aout/shlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $
  */
 
 /*
diff --git a/libexec/rtld-aout/support.c b/libexec/rtld-aout/support.c
index 71a84ffa12998..7442575f7cd37 100644
--- a/libexec/rtld-aout/support.c
+++ b/libexec/rtld-aout/support.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.7 2005/01/11 16:40:29 trhodes Exp $
  */
 #include <sys/types.h>
 #include <string.h>
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index da0340783f272..dac35f3738d9c 100644
--- a/libexec/rtld-aout/support.h
+++ b/libexec/rtld-aout/support.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.6 2005/01/11 16:40:29 trhodes Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 50e64a56068bc..8d632cc3a3e02 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.41 2007/05/16 23:24:15 marcel Exp $
 
 .include <bsd.own.mk>
 
diff --git a/libexec/rtld-elf/Symbol.map b/libexec/rtld-elf/Symbol.map
index 325362c8ad6e3..bb40cf444cae9 100644
--- a/libexec/rtld-elf/Symbol.map
+++ b/libexec/rtld-elf/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/Symbol.map,v 1.5 2007/07/11 23:07:37 kan Exp $
  */
 
 FBSD_1.0 {
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index 8a32adfc4121b..fdcce85309d60 100644
--- a/libexec/rtld-elf/amd64/reloc.c
+++ b/libexec/rtld-elf/amd64/reloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/amd64/reloc.c,v 1.18 2006/03/28 06:09:24 davidxu Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h
index c688eb1746d41..c335a7ae85c0e 100644
--- a/libexec/rtld-elf/amd64/rtld_machdep.h
+++ b/libexec/rtld-elf/amd64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_machdep.h,v 1.13 2006/03/29 12:29:01 des Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/amd64/rtld_start.S b/libexec/rtld-elf/amd64/rtld_start.S
index 4cdad22b05576..10c1553d49f8c 100644
--- a/libexec/rtld-elf/amd64/rtld_start.S
+++ b/libexec/rtld-elf/amd64/rtld_start.S
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.5 2004/03/21 01:43:39 peter Exp $
  */
 
 	.text
diff --git a/libexec/rtld-elf/arm/Makefile.inc b/libexec/rtld-elf/arm/Makefile.inc
index e8c0da7a1d7eb..4bb1113adbfcf 100644
--- a/libexec/rtld-elf/arm/Makefile.inc
+++ b/libexec/rtld-elf/arm/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/arm/Makefile.inc,v 1.3 2004/06/17 17:53:16 cognet Exp $
diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c
index e383892ee3a58..4c1f5af0a39db 100644
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/arm/reloc.c,v 1.4 2005/12/18 19:43:32 kan Exp $");
 #include <sys/param.h>
 #include <sys/mman.h>
 
diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h
index dd046a9d5ae83..0cc35d3e5d277 100644
--- a/libexec/rtld-elf/arm/rtld_machdep.h
+++ b/libexec/rtld-elf/arm/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/arm/rtld_machdep.h,v 1.5 2005/04/07 22:04:49 cognet Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/arm/rtld_start.S b/libexec/rtld-elf/arm/rtld_start.S
index da22c57317ea9..ae10c12536322 100644
--- a/libexec/rtld-elf/arm/rtld_start.S
+++ b/libexec/rtld-elf/arm/rtld_start.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/arm/rtld_start.S,v 1.3 2004/09/28 14:41:15 cognet Exp $");
 
 	.text
 	.align	0
diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index 3b7611c6e63d6..3a83b66360f93 100644
--- a/libexec/rtld-elf/debug.c
+++ b/libexec/rtld-elf/debug.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/debug.c,v 1.4 2003/06/19 16:09:18 mdodd Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index 98fdfb4929c93..5cb52e69fbf62 100644
--- a/libexec/rtld-elf/debug.h
+++ b/libexec/rtld-elf/debug.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/debug.h,v 1.7 2006/03/28 18:26:47 des Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/Symbol.map b/libexec/rtld-elf/i386/Symbol.map
index b80731087244e..c714ebc362f45 100644
--- a/libexec/rtld-elf/i386/Symbol.map
+++ b/libexec/rtld-elf/i386/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/Symbol.map,v 1.3 2007/04/29 14:05:22 deischen Exp $
  */
 
 FBSD_1.0 {
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index ec83bff982dcd..99d0a8d3f59ae 100644
--- a/libexec/rtld-elf/i386/reloc.c
+++ b/libexec/rtld-elf/i386/reloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.20 2006/03/28 06:09:24 davidxu Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index cbb13eb8595c0..228ead84d03b8 100644
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.11 2006/03/28 18:28:07 des Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S
index 9a6e2d5e5292d..65d900db5d906 100644
--- a/libexec/rtld-elf/i386/rtld_start.S
+++ b/libexec/rtld-elf/i386/rtld_start.S
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_start.S,v 1.4 2005/05/19 07:32:42 dfr Exp $
  */
 
 	.text
diff --git a/libexec/rtld-elf/ia64/Makefile.inc b/libexec/rtld-elf/ia64/Makefile.inc
index e8c0da7a1d7eb..3fb0f1f4a3c30 100644
--- a/libexec/rtld-elf/ia64/Makefile.inc
+++ b/libexec/rtld-elf/ia64/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/ia64/Makefile.inc,v 1.2 2007/05/16 23:19:51 marcel Exp $
diff --git a/libexec/rtld-elf/ia64/reloc.c b/libexec/rtld-elf/ia64/reloc.c
index 9a8d0670f63e3..cbfb9f3bf24e4 100644
--- a/libexec/rtld-elf/ia64/reloc.c
+++ b/libexec/rtld-elf/ia64/reloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/ia64/reloc.c,v 1.21 2006/09/01 06:07:26 marcel Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/ia64/rtld_machdep.h b/libexec/rtld-elf/ia64/rtld_machdep.h
index 5cb8bc27acbd9..b616182296280 100644
--- a/libexec/rtld-elf/ia64/rtld_machdep.h
+++ b/libexec/rtld-elf/ia64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/ia64/rtld_machdep.h,v 1.6 2006/08/31 19:42:39 marcel Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/ia64/rtld_start.S b/libexec/rtld-elf/ia64/rtld_start.S
index f41e5e51bd2b1..65548e21a5ed0 100644
--- a/libexec/rtld-elf/ia64/rtld_start.S
+++ b/libexec/rtld-elf/ia64/rtld_start.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/libexec/rtld-elf/ia64/rtld_start.S,v 1.4 2006/01/28 17:56:16 marcel Exp $	*/
 /*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
 
 /*
diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c
index 773456b1f74de..01c7f21dd7fc7 100644
--- a/libexec/rtld-elf/libmap.c
+++ b/libexec/rtld-elf/libmap.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.15 2006/01/31 06:08:28 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/libexec/rtld-elf/libmap.h b/libexec/rtld-elf/libmap.h
index 53b2ba1ec0bf9..6b0991d5e88a5 100644
--- a/libexec/rtld-elf/libmap.h
+++ b/libexec/rtld-elf/libmap.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/libmap.h,v 1.4 2005/02/04 02:46:41 mdodd Exp $
  */
 
 int	lm_init (char *);
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 3da5bee3b7fa5..1c350095dc429 100644
--- a/libexec/rtld-elf/malloc.c
+++ b/libexec/rtld-elf/malloc.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)malloc.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$FreeBSD: src/libexec/rtld-elf/malloc.c,v 1.11 2006/01/12 07:28:21 jasone Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index f489eddd56103..d7398f45308a7 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/map_object.c,v 1.18 2007/04/03 18:31:20 kan Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/powerpc/Makefile.inc b/libexec/rtld-elf/powerpc/Makefile.inc
index e8c0da7a1d7eb..4c1638b6c12dc 100644
--- a/libexec/rtld-elf/powerpc/Makefile.inc
+++ b/libexec/rtld-elf/powerpc/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/powerpc/Makefile.inc,v 1.1 2002/12/04 07:32:20 grehan Exp $
diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c
index ed3b6fab6e4a5..de8529e7eafdb 100644
--- a/libexec/rtld-elf/powerpc/reloc.c
+++ b/libexec/rtld-elf/powerpc/reloc.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/powerpc/reloc.c,v 1.8 2007/07/15 22:52:15 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/powerpc/rtld_machdep.h b/libexec/rtld-elf/powerpc/rtld_machdep.h
index 38e105dd2832c..1acc19f6a370a 100644
--- a/libexec/rtld-elf/powerpc/rtld_machdep.h
+++ b/libexec/rtld-elf/powerpc/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_machdep.h,v 1.4 2004/11/02 09:47:01 ssouhlal Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/powerpc/rtld_start.S b/libexec/rtld-elf/powerpc/rtld_start.S
index 86f76e6d282a4..cde441b2a8635 100644
--- a/libexec/rtld-elf/powerpc/rtld_start.S
+++ b/libexec/rtld-elf/powerpc/rtld_start.S
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_start.S,v 1.2 2003/05/29 22:58:26 kan Exp $
  */
 
 #include <machine/asm.h>
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index a677d5cae8e36..defdefb2c2569 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.46 2007/05/17 19:14:25 csjp Exp $
 .\"
 .Dd March 27, 2006
 .Dt RTLD 1
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 395079fc0defc..e1173ca4658db 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.124 2007/05/17 18:00:27 csjp Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index c7be5235578a9..7794f1c96e9a6 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.38 2007/04/03 18:31:20 kan Exp $
  */
 
 #ifndef RTLD_H /* { */
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
index 1d77fe105591c..e5715bbe60296 100644
--- a/libexec/rtld-elf/rtld_lock.c
+++ b/libexec/rtld-elf/rtld_lock.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/libexec/rtld-elf/sparc64/lockdflt.c,v 1.3 2002/10/09
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld_lock.c,v 1.4 2007/04/03 18:28:13 kan Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h
index cca4f18ed14ff..906e47218cd96 100644
--- a/libexec/rtld-elf/rtld_lock.h
+++ b/libexec/rtld-elf/rtld_lock.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/rtld_lock.h,v 1.2 2003/06/19 02:39:37 mdodd Exp $
  */
 
 #ifndef _RTLD_LOCK_H_
diff --git a/libexec/rtld-elf/rtld_tls.h b/libexec/rtld-elf/rtld_tls.h
index b85db59afb184..4e179343ee3a8 100644
--- a/libexec/rtld-elf/rtld_tls.h
+++ b/libexec/rtld-elf/rtld_tls.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/libexec/rtld-elf/rtld_tls.h,v 1.1 2004/08/03 08:50:58 dfr Exp $
  */
 
 /*
diff --git a/libexec/rtld-elf/sparc64/Makefile.inc b/libexec/rtld-elf/sparc64/Makefile.inc
index e8c0da7a1d7eb..fec0efc48c575 100644
--- a/libexec/rtld-elf/sparc64/Makefile.inc
+++ b/libexec/rtld-elf/sparc64/Makefile.inc
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/rtld-elf/sparc64/Makefile.inc,v 1.1 2002/03/13 02:40:39 jake Exp $
diff --git a/libexec/rtld-elf/sparc64/reloc.c b/libexec/rtld-elf/sparc64/reloc.c
index 23b73dde192c9..879dd9c122ca2 100644
--- a/libexec/rtld-elf/sparc64/reloc.c
+++ b/libexec/rtld-elf/sparc64/reloc.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/sparc64/reloc.c,v 1.15.2.1 2007/10/21 21:09:55 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/libexec/rtld-elf/sparc64/rtld_machdep.h b/libexec/rtld-elf/sparc64/rtld_machdep.h
index db2ce256c6cb5..9c445cdd3438c 100644
--- a/libexec/rtld-elf/sparc64/rtld_machdep.h
+++ b/libexec/rtld-elf/sparc64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_machdep.h,v 1.7 2004/08/03 08:51:00 dfr Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/sparc64/rtld_start.S b/libexec/rtld-elf/sparc64/rtld_start.S
index 58bdd1bbc944f..4834e0524266e 100644
--- a/libexec/rtld-elf/sparc64/rtld_start.S
+++ b/libexec/rtld-elf/sparc64/rtld_start.S
@@ -37,7 +37,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_start.S,v 1.6 2004/06/18 02:01:37 tmm Exp $
  */
 
 #include <machine/asm.h>
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index 7ee4c570c6b81..785e162940743 100644
--- a/libexec/rtld-elf/xmalloc.c
+++ b/libexec/rtld-elf/xmalloc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/rtld-elf/xmalloc.c,v 1.3 2003/06/19 05:28:26 mdodd Exp $
  */
 
 #include <err.h>
diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile
index 3e27c48315c44..94ea2b58ae31d 100644
--- a/libexec/save-entropy/Makefile
+++ b/libexec/save-entropy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/save-entropy/Makefile,v 1.4 2004/12/21 08:46:52 ru Exp $
 
 SCRIPTS=	save-entropy.sh
 NO_OBJ=
diff --git a/libexec/save-entropy/save-entropy.sh b/libexec/save-entropy/save-entropy.sh
index b5b37d40c3c7a..35ae14681f976 100755
--- a/libexec/save-entropy/save-entropy.sh
+++ b/libexec/save-entropy/save-entropy.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/libexec/save-entropy/save-entropy.sh,v 1.4 2006/08/28 06:41:50 dougb Exp $
 
 # This script is called by cron to store bits of randomness which are
 # then used to seed /dev/random on boot.
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
index 6fd2801f780d3..07c3e60f51035 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/2/95
-# $FreeBSD$
+# $FreeBSD: src/libexec/smrsh/Makefile,v 1.10 2005/06/10 06:12:51 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/smrsh
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index aa6df1bb9b67a..6c629ed8f4063 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/talkd/Makefile,v 1.9 2002/02/04 02:33:51 kris Exp $
 
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index ca64541d80edd..841822b605c01 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/announce.c,v 1.16 2003/04/03 05:13:27 jmallett Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/talkd/extern.h b/libexec/talkd/extern.h
index cb231a95d1348..3b7323643768a 100644
--- a/libexec/talkd/extern.h
+++ b/libexec/talkd/extern.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/talkd/extern.h,v 1.3 2003/04/03 05:13:27 jmallett Exp $
  */
 
 int	announce(CTL_MSG *, const char *);
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 6c39d8da72cc9..9fe04759e10ca 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/print.c,v 1.12 2003/04/03 05:13:27 jmallett Exp $";
 #endif /* not lint */
 
 /* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index d77f8a168bf46..0d324f947e7ac 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)process.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/process.c,v 1.11 2005/05/06 15:28:54 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 001e7d41db7a4..31aa498037aa3 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/table.c,v 1.9 2003/04/03 05:13:27 jmallett Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8
index b1944b7b56004..c2ab04c4ffcb0 100644
--- a/libexec/talkd/talkd.8
+++ b/libexec/talkd/talkd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talkd.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/talkd/talkd.8,v 1.7 2003/09/08 19:57:18 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt TALKD 8
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index e81cec6eb74d9..8712cb888322c 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talkd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/talkd/talkd.c,v 1.17 2004/06/14 22:44:13 bms Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile
index 6bb6080e3a33e..27d55ed2da4a3 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/tcpd/Makefile,v 1.6 2006/03/17 18:54:29 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 9a4adca83c282..ecc4f36b1e93e 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/telnetd/Makefile,v 1.31 2006/07/31 19:15:09 yar Exp $
 
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile
index 45d806857ef89..8525266185ed9 100644
--- a/libexec/tftp-proxy/Makefile
+++ b/libexec/tftp-proxy/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/libexec/tftp-proxy/Makefile,v 1.1 2007/07/03 12:46:05 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/tftp-proxy
 
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 75b16ae7f76e9..b16fde59dee8b 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $FreeBSD: src/libexec/tftpd/Makefile,v 1.9 2001/03/26 14:22:11 ru Exp $
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index 4bc04aacc2cfb..3283e90d69a9e 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tftpd.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.21 2007/06/03 15:32:06 bz Exp $
 .\"
 .Dd September 14, 2000
 .Dt TFTPD 8
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 7958bbb793a12..d4990be32ee1f 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tftpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.37 2005/05/31 17:22:53 maxim Exp $";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index 72978eb17d94c..0e525dd5becc9 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/libexec/ypxfr/Makefile,v 1.11 2002/02/04 02:33:51 kris Exp $
 
 PROG=	ypxfr
 SRCS=	yp_dblookup.c yp_dbwrite.c yp_error.c \
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index 488f9e4ad4462..57d7c5a9d795a 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/yp_dbwrite.c,v 1.11 2003/05/04 00:59:13 obrien Exp $");
 
 #include <db.h>
 #include <errno.h>
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 0d24b0de48b78..0118d91ef3d35 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/libexec/ypxfr/ypxfr.8,v 1.19 2005/02/13 22:25:15 ru Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index f843b645b6dd1..7e04fcfe346e7 100644
--- a/libexec/ypxfr/ypxfr_extern.h
+++ b/libexec/ypxfr/ypxfr_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/libexec/ypxfr/ypxfr_extern.h,v 1.11 2002/04/06 19:08:02 des Exp $
  */
 #include <sys/types.h>
 #include <limits.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 452b18667ad32..9b9e18a921f7a 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfr_getmap.c,v 1.12 2003/05/04 00:59:13 obrien Exp $");
 
 #include <stdio.h>
 #include <time.h>
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index f6b478a89d3c9..ccd6be512f334 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfr_main.c,v 1.20 2004/10/17 19:33:32 stefanf Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index 726abec8022d8..fd2334093341d 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfr_misc.c,v 1.17 2004/10/17 19:33:32 stefanf Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index b1424ac552fce..71bcee88744fc 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/libexec/ypxfr/ypxfrd_getmap.c,v 1.11 2003/10/26 04:32:53 peter Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/release/Makefile b/release/Makefile
index 0eb8007235b29..76ad69a7f8d9d 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile,v 1.924.2.4 2007/12/22 06:29:13 kensmith Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
diff --git a/release/Makefile.inc.docports b/release/Makefile.inc.docports
index 547174238f2a8..356555724cb4a 100644
--- a/release/Makefile.inc.docports
+++ b/release/Makefile.inc.docports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/Makefile.inc.docports,v 1.27 2007/04/11 15:24:58 ru Exp $
 #
 # List of (dependent) ports that are minimally required to be
 # checked out from CVS in order to get ${DOCPORTS} built and
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index 2cefa5a20818b..8c1a471b78aff 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.61.4.1 2008/01/23 20:22:47 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index a538d5b8764b7..7e82479c8ec17 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/amd64/mkisoimages.sh,v 1.11 2005/01/30 21:10:51 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/doc/Makefile b/release/doc/Makefile
index 787ec93ecbdfa..e883ab4099925 100644
--- a/release/doc/Makefile
+++ b/release/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/Makefile,v 1.8 2007/08/17 14:16:59 bmah Exp $
 #
 # The user can override the default language to build and install
 # with the RELNOTES_LANG variable.
diff --git a/release/doc/README b/release/doc/README
index 6ed0291f225bf..2d8a9d58543cc 100644
--- a/release/doc/README
+++ b/release/doc/README
@@ -1,7 +1,7 @@
 -*- text -*-
 RELNOTESng README
 Bruce A. Mah <bmah@freebsd.org>
-$FreeBSD$
+$FreeBSD: src/release/doc/README,v 1.11 2006/05/15 21:10:34 wilko Exp $
 
 This is the top-level directory for RELNOTESng, a re-write of
 FreeBSD's *.TXT documentation files.  They have been converted to
diff --git a/release/doc/de_DE.ISO8859-1/Makefile b/release/doc/de_DE.ISO8859-1/Makefile
index a5288af45d953..7ce017cbe919a 100644
--- a/release/doc/de_DE.ISO8859-1/Makefile
+++ b/release/doc/de_DE.ISO8859-1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/Makefile,v 1.2 2002/11/02 03:07:46 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/Makefile,v 1.4 2002/10/28 18:37:19 ue Exp $
 # basiert auf: 1.3
 
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/Makefile b/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
index 8019ccac94ddc..8b8fec80472db 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Documentation
 # The FreeBSD German Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/Makefile,v 1.1 2002/11/02 03:07:46 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/Makefile,v 1.1 2002/10/28 18:37:20 ue Exp $
 # basiert auf: 1.3
 
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml b/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
index 49d3af042562a..f4063dde7b24c 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
@@ -1,7 +1,7 @@
 <!--
   The FreeBSD Documentation Project
   The FreeBSD German Documentation Project
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.11 2003/05/27 16:11:08 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
   basiert auf: 1.15
 -->
@@ -39,7 +39,7 @@
       <corpauthor>The &os; Release Engineering Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.11 2003/05/27 16:11:08 alex Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/de_DE.ISO8859-1/errata/Makefile b/release/doc/de_DE.ISO8859-1/errata/Makefile
index de5344dfeec16..ddc5925baee0a 100644
--- a/release/doc/de_DE.ISO8859-1/errata/Makefile
+++ b/release/doc/de_DE.ISO8859-1/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/errata/Makefile,v 1.1 2002/03/12 18:35:39 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/Makefile,v 1.4 2002/03/10 18:26:34 ue Exp $
 # $Id: Makefile,v 1.5 2002/03/10 16:39:26 ue Exp $
 # basiert auf: 1.5
diff --git a/release/doc/de_DE.ISO8859-1/errata/article.sgml b/release/doc/de_DE.ISO8859-1/errata/article.sgml
index f7a8d284d1281..ec4c09a8deafb 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.sgml
@@ -41,7 +41,7 @@
       <corpauthor>Das &os; Projekt</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/errata/article.sgml,v 1.12 2004/08/22 09:53:23 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/Makefile b/release/doc/de_DE.ISO8859-1/hardware/Makefile
index db8c7f9024aa8..462e186117035 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/Makefile,v 1.3 2002/11/09 21:27:37 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/Makefile,v 1.4 2002/11/09 18:00:42 ue Exp $
 # basiert auf: 1.5
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc b/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc
index 6a72b8968270b..3456835c8d1a5 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc
+++ b/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/Makefile.inc,v 1.1 2002/03/12 18:35:39 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/Makefile.inc,v 1.2 2002/03/10 18:41:33 ue Exp $
 # $Id: Makefile.inc,v 1.5 2002/03/10 15:37:14 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
index 7b97c3801700e..f452d199f0db5 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile,v 1.1 2002/03/12 18:35:40 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/Makefile,v 1.3 2002/03/10 18:41:33 ue Exp $
 # $Id: Makefile,v 1.6 2002/03/10 15:37:14 ue Exp $
 # basiert auf: 1.6
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
index c09494b4f657f..01141689a7b66 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.3 2002/10/12 19:00:27 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.5 2002/10/12 18:02:21 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 30ceb44a084f7..fd139779fbf46 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.15 2003/05/27 16:11:08 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.35 2003/05/24 19:11:43 ue Exp $
   basiert auf: 1.60
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
index 94a9d0fc8f5f7..fdf9ee6bfae36 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml,v 1.2 2003/01/09 12:11:20 ue Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.sgml,v 1.4 2003/01/09 12:14:47 ue Exp $
 	basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
index 020bffc69d2a7..48dd5985e7890 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
@@ -34,7 +34,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.20 2003/05/27 16:11:08 alex Exp $</pubdate>
   </sect1info>
 
   <title>Unterst&uuml;tzte Ger&auml;te</title>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent b/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
index 7a8048bd23798..5e1f5f92114b5 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent,v 1.2 2002/10/12 19:00:28 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/hw.ent,v 1.4 2002/07/08 18:42:56 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
index 1ff4a5a9a12cb..2ed7842516241 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml,v 1.3 2003/05/27 16:11:08 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.sgml,v 1.6 2003/05/24 21:35:15 ue Exp $
   basiert auf: 1.6
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile b/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
index e8ec75f3dbce9..1b1f26c0263eb 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile,v 1.1 2002/03/12 18:35:41 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/Makefile,v 1.2 2002/03/10 18:41:36 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:15 ue Exp $
 # basiert auf: 1.5
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
index fdbf5d31d3b83..ed1b08d903bc1 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.4 2002/12/07 22:32:30 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.5 2002/12/07 21:09:09 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
index 5c5273b1244a3..6122d3f0ef5b3 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.5 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.13 2003/05/24 21:49:22 ue Exp $
   basiert auf: 1.11
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile b/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
index 5531a50226cd0..2ee93fc151a57 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile,v 1.1 2002/03/12 18:35:43 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/Makefile,v 1.2 2002/03/10 18:41:37 ue Exp $
 # $Id: Makefile,v 1.2 2002/03/10 15:37:16 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
index 01c6ef708f539..e19ae4313ed58 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml,v 1.5 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/article.sgml,v 1.6 2003/05/24 21:52:46 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 9119a2a330fbf..05870d3d52ea6 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.3 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.5 2003/05/24 22:16:24 ue Exp $
   basiert auf: 1.7
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile b/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
index 7b3a0a86844ce..708b2a92d0825 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile,v 1.1 2002/10/12 19:00:29 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/Makefile,v 1.1 2002/07/08 18:41:44 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
index 5911d341237e6..f492c3cd1ca16 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml,v 1.1 2002/10/12 19:00:29 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/article.sgml,v 1.2 2002/10/12 18:02:22 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 9dbc7047f4ea7..bcbe081ec7ce8 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.3 2003/01/14 07:12:30 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.3 2003/01/13 20:30:49 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
index 2ae7bfd36d182..0b0e7ce2d32cc 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile,v 1.2 2003/01/11 09:56:30 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/Makefile,v 1.3 2003/01/09 12:47:37 ue Exp $
 # basiert auf: 1.3
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
index 7e3b0ebc3d561..dfded69a29968 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml,v 1.4 2003/01/11 09:56:30 ue Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/article.sgml,v 1.7 2003/01/09 12:46:28 ue Exp $
 	basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index 9563a4fc146c4..a9cc353701324 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -6,7 +6,7 @@
 
 <sect1 id="support-dev">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.2 2003/01/14 07:12:30 ue Exp $</pubdate>
   </sect1info>
 
   <title>Unterst&uuml;tzte Ger&auml;te</title>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index 4b6b351adf470..71d4b3dfa6cea 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.8 2003/05/27 16:11:09 alex Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.10 2003/02/08 07:43:14 ue Exp $
 	basiert auf: 1.11
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/Makefile b/release/doc/de_DE.ISO8859-1/installation/Makefile
index 6f461f7c52def..5ee90372b8061 100644
--- a/release/doc/de_DE.ISO8859-1/installation/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/Makefile,v 1.5 2002/11/09 21:27:37 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/Makefile,v 1.6 2002/11/09 18:09:45 ue Exp $
 # basiert auf: 1.5
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/Makefile.inc b/release/doc/de_DE.ISO8859-1/installation/Makefile.inc
index 91a7fde2db20f..1eb30c64716af 100644
--- a/release/doc/de_DE.ISO8859-1/installation/Makefile.inc
+++ b/release/doc/de_DE.ISO8859-1/installation/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/Makefile.inc,v 1.1 2002/03/12 18:35:45 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/Makefile.inc,v 1.2 2002/03/10 18:41:39 ue Exp $
 # $Id: Makefile.inc,v 1.4 2002/03/10 15:37:17 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
index f0092048aecb8..9b5212260d748 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile,v 1.1 2002/03/12 18:35:46 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/Makefile,v 1.2 2002/03/10 18:41:40 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:17 ue Exp $
 # basiert auf: 1.4
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
index 16ca34e610fb0..0c44675a045e8 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.3 2002/10/12 19:00:29 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.4 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml b/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
index 8dd1c02441166..62a3d616811ff 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml,v 1.1 2002/03/12 18:35:47 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/abstract.sgml,v 1.3 2002/03/12 17:24:25 ue Exp $
   $Id: abstract.sgml,v 1.2 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml b/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
index 58396b8006e45..123b9f4c62a39 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml,v 1.2 2003/01/09 12:11:20 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.sgml,v 1.3 2003/01/09 12:17:18 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.ent b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
index 5ce38e015a2e2..55cb6efe25402 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.ent
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
@@ -1,7 +1,7 @@
 <!-- -*- sgml -*- -->
 
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/install.ent,v 1.1 2002/03/12 18:35:47 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.ent,v 1.2 2002/03/10 18:41:41 ue Exp $
   $Id: install.ent,v 1.3 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.sgml b/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
index 76588c371bf6e..2dfa8697f0a30 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
@@ -1,6 +1,6 @@
 <!--
 
-$FreeBSD$
+$FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/install.sgml,v 1.12 2007/02/08 05:04:17 rodrigc Exp $
 $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.sgml,v 1.18 2003/05/24 19:11:45 ue Exp $
 basiert auf: 1.20
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml b/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
index 99fc17fef5fe2..6bb0ab0520f9d 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml,v 1.3 2002/11/10 01:24:35 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/layout.sgml,v 1.5 2002/11/09 23:07:18 ue Exp $
   basiert auf: 1.6
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml b/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
index 0e7c726b95189..bc5f9e0072e60 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml,v 1.9 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/trouble.sgml,v 1.13 2003/05/24 19:11:45 ue Exp $
   basiert auf: 1.12
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
index 54539debfca22..640961ae2ee82 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.6 2003/05/27 16:11:09 alex Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.10 2003/05/24 19:11:45 ue Exp $
   basiert auf: 1.11
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
index c3eb92c6cf462..174c3c373ab25 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/i386/Makefile,v 1.1 2002/03/12 18:35:51 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/Makefile,v 1.2 2002/03/10 18:41:43 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:18 ue Exp $
 # basiert auf: 1.4
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
index 5e5f42f9316b5..bfa65ffda1b95 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.4 2002/12/07 22:32:31 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.5 2002/12/07 21:09:56 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
index b0e2b50807503..d20c898f5889b 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile,v 1.1 2002/11/09 21:27:38 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/Makefile,v 1.1 2002/11/09 20:07:25 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
index bcf65ce7d0b10..7450db27b3e88 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml,v 1.1 2002/11/09 21:27:38 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/article.sgml,v 1.1 2002/11/09 20:07:25 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
index 0e431f0899c9b..481a796c33392 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/10/12 19:00:30 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/07/08 18:41:45 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
index 916e1027e603d..19cc5545fcfbd 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml,v 1.1 2002/10/12 19:00:30 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/article.sgml,v 1.2 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
index 958e6aa03046d..6dd1f530c8371 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/03/14 18:32:27 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/03/14 18:23:47 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
index 473392e8002bd..da1ca31dfe7ce 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml,v 1.3 2002/11/16 12:14:21 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/article.sgml,v 1.3 2002/11/16 12:10:42 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
index 91b240b453ccf..720600d2635a2 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml,v 1.8 2003/01/14 07:12:31 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/install.sgml,v 1.10 2003/01/13 20:30:51 ue Exp $
   basiert auf: 1.14
   This file contains sparc64-specific installation instructions.
diff --git a/release/doc/de_DE.ISO8859-1/readme/Makefile b/release/doc/de_DE.ISO8859-1/readme/Makefile
index f65809eec366c..5a7e36c155fbe 100644
--- a/release/doc/de_DE.ISO8859-1/readme/Makefile
+++ b/release/doc/de_DE.ISO8859-1/readme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/readme/Makefile,v 1.1 2002/03/12 18:35:51 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/Makefile,v 1.2 2002/03/10 18:41:44 ue Exp $
 # $Id: Makefile,v 1.5 2002/03/10 15:37:18 ue Exp $
 # basiert auf: 1.7
diff --git a/release/doc/de_DE.ISO8859-1/readme/article.sgml b/release/doc/de_DE.ISO8859-1/readme/article.sgml
index a64f50f4efa23..0307d372d36b6 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.sgml
@@ -24,7 +24,7 @@
 
     <corpauthor>Das &os; Projekt</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/readme/article.sgml,v 1.12 2004/08/22 09:53:23 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/Makefile
index 968f906eb2712..49396cc9efc13 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/Makefile,v 1.3 2002/11/09 21:27:38 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/Makefile,v 1.4 2002/11/09 20:58:39 ue Exp $
 # basiert auf: 1.5
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc b/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc
index fbea3e1ebc79c..21c40ea75e26a 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc
+++ b/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/Makefile.inc,v 1.1 2002/03/12 18:35:52 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/Makefile.inc,v 1.2 2002/03/10 18:41:45 ue Exp $
 # $Id: Makefile.inc,v 1.3 2002/03/10 15:37:19 ue Exp $
 # basiert auf: 1.2
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
index 4d72656524979..e4c6cd110bb64 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile,v 1.1 2002/03/12 18:35:52 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/Makefile,v 1.2 2002/03/10 18:41:45 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:19 ue Exp $
 # basiert auf: 1.6
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
index ca3bf375d81da..887e88cec450f 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.3 2002/10/12 19:00:32 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.4 2002/10/12 18:02:24 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml b/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
index e4505c5c0c7ab..22862286a1994 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
@@ -7,7 +7,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.32 2006/02/26 04:57:16 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
index e7dc5f5c46538..8597f29d24545 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
@@ -1,7 +1,7 @@
 <!-- -*- sgml -*- -->
 
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent,v 1.2 2002/10/12 19:00:33 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/relnotes.ent,v 1.3 2002/07/08 18:52:50 ue Exp $
   basiert auf: 1.3
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
index 30d6a145ca332..9a2541b9221dc 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile,v 1.1 2002/03/12 18:35:53 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/Makefile,v 1.2 2002/03/10 18:41:47 ue Exp $
 # $Id: Makefile,v 1.3 2002/03/10 15:37:20 ue Exp $
 # basiert auf: 1.6
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
index 2420f67f01fcf..de92eb88af866 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.4 2002/12/07 22:32:31 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.6 2002/12/07 22:11:35 ue Exp $
   basiert auf: 1.4
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
index e106b467ed965..584bf71639f41 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile,v 1.1 2002/11/09 21:27:38 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/Makefile,v 1.1 2002/11/09 20:58:39 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
index 769af0af2714c..be66bfe5eeb4b 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml,v 1.2 2002/11/14 22:24:08 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/article.sgml,v 1.2 2002/11/10 10:47:53 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
index 33f8a62dbfe0d..cd9c619957c8b 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile,v 1.1 2002/10/12 19:00:33 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/Makefile,v 1.1 2002/07/08 18:41:46 ue Exp $
 # basiert auf: 1.1
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
index 49edccc09357c..6d3a1509e95fe 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml,v 1.1 2002/10/12 19:00:33 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/article.sgml,v 1.2 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.1
 -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
index 85ec1603c610a..908f20e202389 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile,v 1.1 2002/03/12 18:35:53 ue Exp $
 # $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/Makefile,v 1.1 2002/03/10 18:38:07 ue Exp $
 # $Id: Makefile,v 1.1 2002/03/10 16:05:35 ue Exp $
 # basiert auf: 1.1
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
index 4b121e13b148d..0d981dc62c6d4 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSD$
+  $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml,v 1.3 2002/10/12 19:00:33 ue Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/article.sgml,v 1.4 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.3
   -->
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/catalog b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
index 8530d26a582ba..9e648b293fbc1 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/catalog
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/de_DE.ISO8859-1/share/sgml/catalog,v 1.2 2002/10/12 19:00:34 ue Exp $ --
   -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/catalog,v 1.6 2002/10/12 18:02:25 ue Exp $ --
   -- basiert auf: 1.1 --
 
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
index 79f4a8753bb27..1926d96f70447 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD$
+	$FreeBSD: src/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.7 2003/05/27 16:11:10 alex Exp $
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.9 2003/05/24 22:43:52 ue Exp $
 	basiert auf: 1.7
 -->
diff --git a/release/doc/en_US.ISO8859-1/Makefile b/release/doc/en_US.ISO8859-1/Makefile
index 9a76627f826e7..f79ee35b6f9f7 100644
--- a/release/doc/en_US.ISO8859-1/Makefile
+++ b/release/doc/en_US.ISO8859-1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.8 2007/08/15 03:02:22 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 
diff --git a/release/doc/en_US.ISO8859-1/errata/Makefile b/release/doc/en_US.ISO8859-1/errata/Makefile
index c8ac2093f88a0..ec989cf774fe4 100644
--- a/release/doc/en_US.ISO8859-1/errata/Makefile
+++ b/release/doc/en_US.ISO8859-1/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/Makefile,v 1.5 2001/09/03 14:39:31 dd Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/en_US.ISO8859-1/errata/article.sgml b/release/doc/en_US.ISO8859-1/errata/article.sgml
index a765881d722e1..d002d94c9e9ec 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.sgml
+++ b/release/doc/en_US.ISO8859-1/errata/article.sgml
@@ -37,7 +37,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73 2005/04/19 09:42:25 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/hardware/Makefile b/release/doc/en_US.ISO8859-1/hardware/Makefile
index 182fb1e935e47..80b24448ea335 100644
--- a/release/doc/en_US.ISO8859-1/hardware/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.10 2007/02/19 02:46:12 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index d0ec0e6bc46e4..12163caa5de1c 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -18,7 +18,7 @@
 
   <corpauthor>The &os; Documentation Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.1.2.1 2008/02/06 19:47:28 delphij Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/readme/Makefile b/release/doc/en_US.ISO8859-1/readme/Makefile
index 05486df04aa9c..f76bd7c788f2a 100644
--- a/release/doc/en_US.ISO8859-1/readme/Makefile
+++ b/release/doc/en_US.ISO8859-1/readme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/Makefile,v 1.7 2001/09/03 14:39:32 dd Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/en_US.ISO8859-1/readme/article.sgml b/release/doc/en_US.ISO8859-1/readme/article.sgml
index fb4542a65410c..e76aef6d2f41b 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.sgml
+++ b/release/doc/en_US.ISO8859-1/readme/article.sgml
@@ -12,7 +12,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.40 2007/08/18 17:11:14 bmah Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/Makefile b/release/doc/en_US.ISO8859-1/relnotes/Makefile
index bd01e5fd9143f..37247dc568637 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.11 2006/12/07 17:45:45 hrs Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 55105e309ee8c..80c89efacee52 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -20,7 +20,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.20.2.3 2008/02/16 16:03:48 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/en_US.ISO8859-1/share/sgml/catalog b/release/doc/en_US.ISO8859-1/share/sgml/catalog
index 9995d5af1340f..7eb5ca7fa1f5a 100644
--- a/release/doc/en_US.ISO8859-1/share/sgml/catalog
+++ b/release/doc/en_US.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/catalog,v 1.1 2001/07/09 16:01:35 bmah Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/en_US.ISO8859-1/share/sgml/release.dsl b/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
index 7b1c975fb12ed..0ef5c90be11bb 100644
--- a/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl,v 1.8 2004/07/02 13:13:20 den Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
diff --git a/release/doc/fr_FR.ISO8859-1/Makefile b/release/doc/fr_FR.ISO8859-1/Makefile
index 9147d3f78e321..feafb47180076 100644
--- a/release/doc/fr_FR.ISO8859-1/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/Makefile,v 1.5 2002/11/02 14:16:09 gioria Exp $
 #      Original revision: 1.3
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
index 5bf7a1516988e..326dc96ca4336 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile,v 1.2 2003/01/18 18:03:01 gioria Exp $
 #      Original revision: 1.3
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml b/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
index 40c16340cb95a..12183dc6d3b44 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml,v 1.3 2003/07/27 18:10:24 gioria Exp $
      Original revision: 1.3
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -37,7 +37,7 @@
       <corpauthor>L'&eacute;quipe de confection des versions de &os;</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml,v 1.3 2003/07/27 18:10:24 gioria Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
diff --git a/release/doc/fr_FR.ISO8859-1/errata/Makefile b/release/doc/fr_FR.ISO8859-1/errata/Makefile
index df21579da984b..bef1f3cb07cf6 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/errata/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/errata/Makefile,v 1.1 2002/02/19 12:22:30 gioria Exp $
 #      Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/errata/article.sgml b/release/doc/fr_FR.ISO8859-1/errata/article.sgml
index 449b3dd6d46ea..4fe536ce4456c 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/errata/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/errata/article.sgml,v 1.6 2004/08/22 09:53:23 hrs Exp $
      Original revision: 1.9
 
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
@@ -40,7 +40,7 @@
     Le projet &os;
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/errata/article.sgml,v 1.6 2004/08/22 09:53:23 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/Makefile
index 81b8b6372da1f..c3067eadb7621 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/Makefile,v 1.1 2002/09/09 22:09:46 gioria Exp $
 #      Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc b/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc
index 02eb4ca80394d..3e2a93a080bbf 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc
+++ b/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc,v 1.2 2003/01/18 18:03:01 gioria Exp $
 #      Original revision: 1.2
 
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
index 68f2784af8a6b..e158d0d632b5f 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile,v 1.1 2002/09/09 22:09:46 gioria Exp $
 #      Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
index f70bed890889a..9aaebb1e3792c 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml,v 1.2 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.4
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 6b6128ab415f6..3b38b9557cd32 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id: proc-alpha.sgml,v 1.5 2002/09/29 17:03:01 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.6 2006/08/04 07:56:32 yar Exp $
      Original revision: 1.43
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
index 35883b1d00203..74d7716cdf9be 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml,v 1.3 2003/01/06 22:17:26 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
index 1fd74f0e5133f..aca62f5791985 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id: dev.sgml,v 1.3 2002/09/29 21:03:53 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.7 2002/11/09 11:32:40 gioria Exp $
      Original revision: 1.114
 -->
 <!--
@@ -39,7 +39,7 @@
 
 <sect1>
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.7 2002/11/09 11:32:40 gioria Exp $</pubdate>
   </sect1info>
 
   <title>P&eacute;riph&eacute;riques support&eacute;s</title>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent b/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
index 103c5673858b2..59566fea9048f 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.4
 -->
 <!-- -*- sgml -*- -->
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
index 0503345828d17..cf4f0a7bd06d3 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
index 4b7d052f03efc..310234fe3fae0 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile,v 1.1 2002/09/09 22:09:47 gioria Exp $
 #      Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
index 38228bb8e45ae..d1f37238dbfb1 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml,v 1.2 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
index 91e09f36d7155..86c797e05fc7d 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id: proc-i386.sgml,v 1.2 2002/09/28 23:23:21 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.3 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.3
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
index 180657b8fc540..3d9d5c27347e5 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile,v 1.1 2002/09/09 22:09:47 gioria Exp $
 #      Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
index 48ecd83910b1a..9b8472883eea4 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml,v 1.3 2002/11/09 11:32:41 gioria Exp $
      Original revision: 1.2
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 8319c1be9fd98..737a74720d819 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.1
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
index c900c54f0dc4c..af96eb6d3432a 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile,v 1.1 2002/09/09 22:09:47 gioria Exp $
 #      Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
index f1471b9dca3c8..922415c604517 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml,v 1.2 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.1
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 5166bb128f136..8f53a8b4286b9 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.2 2002/09/09 22:26:07 gioria Exp $
      Original revision: 1.1
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
index 51acc371b5d39..6c03bb8457e31 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile,v 1.1 2002/09/09 22:09:48 gioria Exp $
 #      Original revision: 1.1
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
index de8b4913e9213..efca27d29cfcc 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml,v 1.3 2002/09/29 22:12:28 gioria Exp $
      Original revision: 1.2
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index 4bc54a39b215c..8decaca0a8fde 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -3,12 +3,12 @@
      The FreeBSD French Documentation Project
 
      $Id: dev-sparc64.sgml,v 1.2 2002/09/28 23:01:52 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.2 2002/09/28 23:15:58 gioria Exp $
      Original revision: 1.1
 -->
 <sect1>
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.2 2002/09/28 23:15:58 gioria Exp $</pubdate>
   </sect1info>
 
   <title>P&eacute;riph&eacute;riques support&eacute;s</title>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index f434ac0874dc2..9f0f38291439a 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.2 2002/09/29 23:02:15 gioria Exp $
      Original revision: 1.4
 -->
 <sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/Makefile b/release/doc/fr_FR.ISO8859-1/installation/Makefile
index 81b8b6372da1f..b321a7da251be 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/Makefile,v 1.3 2002/10/19 21:49:09 gioria Exp $
 #      Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc b/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc
index a305abd65e883..63d634815689a 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc
+++ b/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc,v 1.2 2002/05/26 16:49:48 gioria Exp $
 #      Original revision: 1.2
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
index 30b5589ddbb2c..46b5139a66db2 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile,v 1.2 2002/05/26 16:49:48 gioria Exp $
 #      Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
index 78045ad37f364..4b676161d8ae0 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
index 34e7da3e62942..a376c9ce44f01 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml,v 1.3 2002/10/19 20:07:01 gioria Exp $
      Original revision: 1.2
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
index 8573012b061ac..e29fd6544797d 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml,v 1.3 2003/01/06 22:17:27 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
index 76db954deda96..dd80ea94fc589 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/install.ent,v 1.2 2002/05/26 16:49:48 gioria Exp $
      Original revision: 1.2
 -->
 <!-- -*- sgml -*- -->
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
index 895729c61f9bc..49c2e4db2da24 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml,v 1.9 2007/02/08 05:04:18 rodrigc Exp $
      Original revision: 1.14
 
      This file has architecture-dependent installation instructions, culled
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
index fe2147cbd4a5f..c097a269dd751 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml,v 1.4 2002/10/27 08:47:38 gioria Exp $
      Original revision: 1.5
 
      This section contains the contents of the old LAYOUT.TXT file.
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
index 940f66f7aed3f..77c6376ae9bf8 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml,v 1.4 2003/01/01 18:48:45 schweikh Exp $
      Original revision: 1.5
 
 	This file contains the comments of the old TROUBLE.TXT file.
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
index a2609aa8cf8e1..72eb1fd5852e8 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml,v 1.3 2003/03/08 09:56:09 markm Exp $
      Original revision: 1.7
 	This section contains the contents of the old UPGRADE.TXT
 	file.
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
index a377905e3dade..eee51096d3d64 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile,v 1.2 2002/05/26 16:49:48 gioria Exp $
 #      Original revision: 1.4
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
index dfbec1edd6918..51e7e10bc97d1 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
index 6ff53b66239bd..9c803a3811446 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
@@ -3,7 +3,7 @@
 #     The FreeBSD French Documentation Project
 #     $Id$
 #
-#     $FreeBSD$
+#     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile,v 1.1 2002/10/19 21:49:09 gioria Exp $
 #     Original revision: 1.1
 #
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
index 5e68d6e4d5557..4cd7811f36117 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml,v 1.1 2002/10/19 21:49:09 gioria Exp $
      Original revision: 1.1
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
index c3e7481e0ab38..e523041812db1 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
@@ -3,7 +3,7 @@
 #     The FreeBSD French Documentation Project
 #     $Id$
 #
-#     $FreeBSD$
+#     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile,v 1.1 2002/10/19 21:49:09 gioria Exp $
 #     Original revision: 1.1
 #
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
index cdbbc68fecfc2..9c21f65cdfda8 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml,v 1.1 2002/10/19 21:49:09 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
index 56270ecaad71b..21b06b3be7037 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml,v 1.1 2002/10/19 21:49:09 gioria Exp $
      Original revision: 1.12
      Ce fichier contient les instructions pour l'installation
      specifique aux systemes sparc64.
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile
index f10e16dcbb1da..0590bebd9f564 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/Makefile,v 1.3 2002/10/19 16:26:21 gioria Exp $
 #      Original revision: 1.4
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc
index 0815194c50a51..562b2db96d606 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc,v 1.2 2003/01/18 18:03:01 gioria Exp $
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/relnotes/${.CURDIR:T}
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
index eaff0b77c2ff0..78f15852f4913 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile,v 1.1 2002/02/23 23:03:20 gioria Exp $
 #      Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
index f641c0a85f8bd..955a887774501 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
index 5263ca4e85b7b..a74832cf99f92 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
@@ -3,13 +3,13 @@
      The FreeBSD French Documentation Project
 
      $Id: new.sgml,v 1.5 2002/09/28 21:57:12 eagle Exp $
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml,v 1.26 2002/10/19 16:26:29 gioria Exp $
      Original revision: 1.423
 -->
 <articleinfo>
   <title>&os;/&arch; &release.current; notes de version</title>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml,v 1.26 2002/10/19 16:26:29 gioria Exp $</pubdate>
 
   <corpauthor>Le Projet FreeBSD</corpauthor>
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
index 2051522133b8a..89753ea3ca85d 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent,v 1.4 2002/10/19 16:26:31 gioria Exp $
      Original revision: 1.3
 -->
 <!-- Text constants which probably don't need to be changed.-->
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
index 10faa9d1a6346..53b893a66914c 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
@@ -3,7 +3,7 @@
 #      The FreeBSD French Documentation Project
 #
 #      $Id$
-#      $FreeBSD$
+#      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile,v 1.2 2002/10/19 16:26:33 gioria Exp $
 #      Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
index 7c0714ee5dd62..35c2af83553d3 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml,v 1.3 2002/09/29 22:12:30 gioria Exp $
      Original revision: 1.3
 -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/share/sgml/catalog b/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
index 9995d5af1340f..57862d0eb5010 100644
--- a/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
+++ b/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/catalog,v 1.1 2002/02/19 09:37:04 gioria Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl b/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
index 2de7155d09d1b..a48e7bfe5cd80 100644
--- a/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
@@ -3,7 +3,7 @@
      The FreeBSD French Documentation Project
 
      $Id$
-     $FreeBSD$
+     $FreeBSD: src/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl,v 1.6 2003/05/23 10:30:27 hrs Exp $
      Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/Makefile b/release/doc/ja_JP.eucJP/Makefile
index eaccc8c52ead0..8635471fe5d52 100644
--- a/release/doc/ja_JP.eucJP/Makefile
+++ b/release/doc/ja_JP.eucJP/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/Makefile,v 1.5 2005/06/30 12:54:30 rushani Exp $
 # Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/..
diff --git a/release/doc/ja_JP.eucJP/errata/Makefile b/release/doc/ja_JP.eucJP/errata/Makefile
index f9bbcfd977edc..33493355f145b 100644
--- a/release/doc/ja_JP.eucJP/errata/Makefile
+++ b/release/doc/ja_JP.eucJP/errata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/errata/Makefile,v 1.3 2003/01/22 21:05:07 hrs Exp $
 # Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/errata/article.sgml b/release/doc/ja_JP.eucJP/errata/article.sgml
index 009dbd57a07d9..2bd6194d56ab3 100644
--- a/release/doc/ja_JP.eucJP/errata/article.sgml
+++ b/release/doc/ja_JP.eucJP/errata/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.32 2005/06/30 12:54:30 rushani Exp $
     Original revision: 1.73
 -->
 
@@ -50,7 +50,7 @@
 
     <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.32 2005/06/30 12:54:30 rushani Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/ja_JP.eucJP/hardware/Makefile b/release/doc/ja_JP.eucJP/hardware/Makefile
index 3154bd97d4a30..bfdf4e084bb5d 100644
--- a/release/doc/ja_JP.eucJP/hardware/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/Makefile,v 1.4 2003/06/28 17:38:01 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/hardware/Makefile.inc b/release/doc/ja_JP.eucJP/hardware/Makefile.inc
index bfcc09c801c63..cc1d3fd0da90f 100644
--- a/release/doc/ja_JP.eucJP/hardware/Makefile.inc
+++ b/release/doc/ja_JP.eucJP/hardware/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/Makefile.inc,v 1.2 2004/09/20 11:19:32 hrs Exp $
 # Original revision: 1.3
 
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
index f431bf9cb7a61..8a16666928437 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/alpha/Makefile,v 1.4 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml b/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
index 65c72c08c63f4..5b768a800fdd7 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml,v 1.3 2004/10/24 14:31:26 hrs Exp $
     Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
index fa57ac6b3d9b5..e79ed8b1e3196 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/amd64/Makefile,v 1.3 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml b/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
index 374409bb7e083..ee0ac1c5d1743 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml,v 1.3 2004/10/24 14:31:26 hrs Exp $ -->
 <!-- Original revision: 1.3 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
index 8741b88de973e..8d10b6d54df6c 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml,v 1.4 2004/09/20 11:19:32 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml b/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
index b21ca826b6d29..34a8be81cebf4 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml,v 1.4 2005/06/27 17:48:19 rushani Exp $
     Original revision: 1.7
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
index b0463c9497965..40fd2cb677d75 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
@@ -26,13 +26,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD$
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.32 2006/05/14 20:31:32 brueffer Exp $
         Original revision: 1.282
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.32 2006/05/14 20:31:32 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
diff --git a/release/doc/ja_JP.eucJP/hardware/common/hw.ent b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
index d31cd665c39a7..e302aafd24c68 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/hw.ent
+++ b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*- -->
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/hw.ent,v 1.3 2003/06/28 17:38:02 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/intro.sgml b/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
index e8a2345a002e1..b7f7d4a2f38b9 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/intro.sgml,v 1.4 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.7
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/Makefile b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
index 9673692d8a90c..39173b936e888 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/Makefile,v 1.3 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
index 00acf40d65e65..4eb015d9d7fc7 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/article.sgml,v 1.4 2004/10/24 14:31:26 hrs Exp $
     Original revision: 1.6
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
index 2aa3fc74e1f86..981798443841d 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml,v 1.8 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.14
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
index 97f4566847610..d4f197d12ba04 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/ia64/Makefile,v 1.3 2004/10/24 14:31:26 hrs Exp $
 # Original revision: 1.3
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml b/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
index 928734626cf94..f856d398b4861 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml,v 1.5 2004/10/24 14:31:26 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
index 47134b3c0d016..268736c8f8412 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml,v 1.5 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.9
 -->
 <sect1 id="proc-ia64">
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
index a83a68ca7908c..cd87a64cf29ff 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/pc98/Makefile,v 1.3 2004/10/24 14:31:27 hrs Exp $
 # Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml b/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
index ee77a3600d043..11311f109769c 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml,v 1.3 2004/10/24 14:31:27 hrs Exp $
     Original revision: 1.3
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
index 03df50efad8fa..79f049dd97769 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml,v 1.4 2004/12/29 17:11:02 hrs Exp $
     Original revision: 1.5
 -->
 <sect1 id="support-sys">
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
index 74724537b8fb7..c82ebda8e1755 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile,v 1.5 2004/10/24 14:31:27 hrs Exp $
 # Original revision: 1.4
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
index 92e3a8f800d6e..9c8de575c9822 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml,v 1.5 2004/10/24 14:31:27 hrs Exp $
     Original revision: 1.5
 -->
 
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
index 209e72c419d8b..a4106a1451c86 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml,v 1.6 2005/02/28 16:41:33 rushani Exp $
     Original revision: 1.12
 -->
 <sect1 id="support-sys">
diff --git a/release/doc/ja_JP.eucJP/relnotes/Makefile b/release/doc/ja_JP.eucJP/relnotes/Makefile
index 7a2bb96348603..761354bf16410 100644
--- a/release/doc/ja_JP.eucJP/relnotes/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/Makefile,v 1.6 2003/06/28 17:38:02 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/Makefile.inc b/release/doc/ja_JP.eucJP/relnotes/Makefile.inc
index a6dfcbe16433d..d91ffbefcb3d2 100644
--- a/release/doc/ja_JP.eucJP/relnotes/Makefile.inc
+++ b/release/doc/ja_JP.eucJP/relnotes/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/Makefile.inc,v 1.2 2001/09/04 17:48:06 hrs Exp $
 # Original revision: 1.2
 
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
index baf44f5c7d95f..0df1e3b35866b 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile,v 1.5 2002/06/25 18:54:38 hrs Exp $
 # Original revision: 1.6
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
index c1afb1df7bb44..d06df948e5580 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml,v 1.6 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.6
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
index 647128cdbda1e..0ac50cce5d3de 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile,v 1.1 2003/06/28 17:38:02 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
index 102a998a15370..b2b7728e65791 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
@@ -1,5 +1,5 @@
 <!--
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml,v 1.4 2004/09/20 11:59:34 hrs Exp $
     Original revision: 1.4
 -->
 
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
index c49592d91e95c..086269ca09cfa 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.98 2006/02/26 04:57:17 hrs Exp $
 
     Original revision: 1.663.2.5
 -->
@@ -11,7 +11,7 @@
 
   <corpauthor>FreeBSD ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.98 2006/02/26 04:57:17 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
index cfd39c89edb31..562565aa98bb5 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
+++ b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
@@ -3,7 +3,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent,v 1.5 2005/06/30 16:26:24 rushani Exp $
 
     Original revision: 1.3
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
index ed0d1e93a2ee8..4b4f67af6035d 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/i386/Makefile,v 1.6 2004/09/20 11:59:34 hrs Exp $
 # Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
index a075a64b80c41..d5e8748373fa2 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml,v 1.7 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.7
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
index 647128cdbda1e..f167397134ef4 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile,v 1.1 2003/01/05 20:40:43 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
index a8517b03b5639..e6f4b40809f19 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml,v 1.4 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.4
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
index 647128cdbda1e..60981a1242701 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile,v 1.1 2002/06/25 18:54:39 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
index aead305540d88..864b45e728c76 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml,v 1.4 2004/09/20 11:59:34 hrs Exp $ -->
 <!-- Original revision: 1.4 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
index 647128cdbda1e..1cf309d8e1fec 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile,v 1.2 2002/06/25 18:54:39 hrs Exp $
 # Original revision: 1.1
 
 RELN_ROOT?= ${.CURDIR}/../../..
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
index 1092349911044..8c328349cc680 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml,v 1.6 2004/09/20 11:59:34 hrs Exp $
 
     Original revision: 1.6
 -->
diff --git a/release/doc/ja_JP.eucJP/share/sgml/catalog b/release/doc/ja_JP.eucJP/share/sgml/catalog
index 19ce2927725b7..254b8fae7cd2c 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/catalog
+++ b/release/doc/ja_JP.eucJP/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/catalog,v 1.3 2004/10/24 14:31:27 hrs Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml b/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
index 57e4deacbb6b3..2fa528068c943 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
+++ b/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml,v 1.2 2005/06/27 17:48:20 rushani Exp $ -->
 
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e '&man.aac.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
 <!ENTITY hwlist.43922be022d49dabc274b2afffd0db8b '&man.adv.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë SCSI ¥³¥ó¥È¥í¡¼¥é¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£'>
diff --git a/release/doc/ja_JP.eucJP/share/sgml/release.dsl b/release/doc/ja_JP.eucJP/share/sgml/release.dsl
index 5cf5d795fa2a9..f51929d0a5024 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/release.dsl
+++ b/release/doc/ja_JP.eucJP/share/sgml/release.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/ja_JP.eucJP/share/sgml/release.dsl,v 1.12 2004/12/29 17:11:02 hrs Exp $ -->
 <!-- Original revision: 1.8 -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
diff --git a/release/doc/ru_RU.KOI8-R/Makefile b/release/doc/ru_RU.KOI8-R/Makefile
index f6c2f08cfa36e..7ec8a2ff5bf1b 100644
--- a/release/doc/ru_RU.KOI8-R/Makefile
+++ b/release/doc/ru_RU.KOI8-R/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/Makefile,v 1.9 2004/09/20 09:53:02 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/Makefile,v 1.8 2005/03/10 11:44:05 den Exp $
 # 
 # Original revision: 1.7
 #
diff --git a/release/doc/ru_RU.KOI8-R/errata/Makefile b/release/doc/ru_RU.KOI8-R/errata/Makefile
index 569e28c75f037..e6c733a620ad7 100644
--- a/release/doc/ru_RU.KOI8-R/errata/Makefile
+++ b/release/doc/ru_RU.KOI8-R/errata/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/Makefile,v 1.2 2004/06/29 07:55:42 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/Makefile,v 1.1 2004/09/10 13:56:40 den Exp $
 #
 # Original revision: 1.5
 #
diff --git a/release/doc/ru_RU.KOI8-R/errata/article.sgml b/release/doc/ru_RU.KOI8-R/errata/article.sgml
index a4ca7db58bd40..11d03eee017b4 100644
--- a/release/doc/ru_RU.KOI8-R/errata/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/errata/article.sgml
@@ -1,7 +1,7 @@
 <!--
    The FreeBSD Russian Documentation Project
 
-   $FreeBSD$
+   $FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.1 2004/09/10 13:56:40 den Exp $
    $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.5 2004/09/10 13:56:07 den Exp $
 
    Original revision: 1.72
@@ -34,7 +34,7 @@
     ðÒÏÅËÔ &os;
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.1 2004/09/10 13:56:40 den Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/Makefile b/release/doc/ru_RU.KOI8-R/hardware/Makefile
index 3e229cec0dec0..4d32dd8c08ddf 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/Makefile,v 1.2 2006/05/17 16:40:06 bmah Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/Makefile,v 1.1 2004/05/27 06:09:42 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc b/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc
index a693cd58b4584..29b602adcb442 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc
+++ b/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc,v 1.2 2004/08/11 10:25:20 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/Makefile.inc,v 1.2 2004/08/11 10:04:26 den Exp $
 #
 # Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
index 4b097f502f6fa..d0c4c35759f01 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile,v 1.3 2005/03/10 14:15:07 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile,v 1.3 2005/03/10 11:19:52 den Exp $
 #
 # Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
index dd7e6068b888e..ae35043aad8c2 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,v 1.5 2005/03/10 14:15:07 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,v 1.6 2005/03/10 11:04:19 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
index 3ee019da3d929..51b9dd1259663 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile,v 1.3 2005/03/10 14:15:07 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile,v 1.3 2005/03/10 11:19:53 den Exp $
 #
 # Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
index 11ff4d3f2125c..d4bde58f40699 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,v 1.5 2005/03/10 14:15:07 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
index 1cdd4a9e37432..fc66b2714836d 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml,v 1.3 2004/09/13 14:23:18 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml,v 1.3 2004/09/13 09:24:00 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
index 4c11f77691f84..155b6df8a3226 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,v 1.2 2005/04/25 12:22:25 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,v 1.2 2005/04/25 12:23:24 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
index 9fbdd134ead37..586cc380fba56 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.17 2006/05/14 20:31:32 brueffer Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $
 
      Original revision: 1.282
@@ -37,7 +37,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.17 2006/05/14 20:31:32 brueffer Exp $</pubdate>
   </sect1info>
 
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent b/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
index 3f86696b7c590..323a1a794b1fc 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent,v 1.1 2004/05/31 11:43:22 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent,v 1.1 2004/05/27 06:09:42 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
index 739191ef7d4fa..305babf991de1 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml,v 1.2 2004/09/10 13:56:40 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml,v 1.2 2004/09/06 14:05:02 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
index 3aa62b541d11a..643b82074f291 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile,v 1.3 2005/03/10 14:15:07 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile,v 1.3 2005/03/10 11:19:54 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
index ef074447f516b..8a686d8fb2185 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,v 1.5 2005/03/10 14:15:07 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
index 905a9a3ed12ca..4e3ccc311f04e 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml,v 1.2 2005/03/09 14:03:58 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
 
      Original revision: 1.14
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
index 126215b50db3f..d74749e69b153 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile,v 1.3 2005/03/10 14:15:08 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile,v 1.3 2005/03/10 11:19:54 den Exp $
 #
 # Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
index 1281aa45af5dd..973599cf3b0d0 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,v 1.5 2005/03/10 14:15:08 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
index 4656bd6edeb58..336c481099682 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml,v 1.2 2004/08/03 13:12:10 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml,v 1.2 2004/08/03 12:53:39 den Exp $
 
      Original revision: 1.9
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
index 6fc857fd2f889..e2064e00ce5db 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile,v 1.3 2005/03/10 14:15:08 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile,v 1.3 2005/03/10 11:19:55 den Exp $
 #
 # Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
index bab60c052ed28..e9f449af4bdab 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,v 1.5 2005/03/10 14:15:08 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,v 1.6 2005/03/10 11:04:21 den Exp $
 
      Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
index 224512b39546e..385e4f3e51983 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml,v 1.2 2005/03/09 14:03:59 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
index ead67c9359cfa..2cad03cabd75b 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile,v 1.3 2005/03/10 14:15:08 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile,v 1.3 2005/03/10 11:19:56 den Exp $
 #
 # Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
index 2b0fc786fb30d..f856ab376ff65 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,v 1.5 2005/03/10 14:15:08 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,v 1.6 2005/03/10 11:04:21 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
index 95fcebf0c260d..e33abcff986b6 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 13:14:46 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 12:23:40 den Exp $
 
      Original revision: 1.12
diff --git a/release/doc/ru_RU.KOI8-R/installation/Makefile b/release/doc/ru_RU.KOI8-R/installation/Makefile
index 53990ef4bfd91..3470922ab31fe 100644
--- a/release/doc/ru_RU.KOI8-R/installation/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/Makefile,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/Makefile,v 1.1 2004/06/24 08:39:17 den Exp $
 #
 # Original revision: 1.6
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/Makefile.inc b/release/doc/ru_RU.KOI8-R/installation/Makefile.inc
index 5f7b50f7de95e..36cc9d5cbee87 100644
--- a/release/doc/ru_RU.KOI8-R/installation/Makefile.inc
+++ b/release/doc/ru_RU.KOI8-R/installation/Makefile.inc
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/Makefile.inc,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/Makefile.inc,v 1.1 2004/06/24 08:39:17 den Exp $
 #
 # Original revision: 1.2
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
index 7241133f65b6d..32e66acb27c26 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile,v 1.1 2004/06/24 08:39:18 den Exp $
 #
 # Original revision: 1.4
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
index d43057bcbe270..14b0ae7a9ab7b 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml,v 1.5 2004/08/12 08:31:35 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
index 1c7ac4d9bbd54..fe8c536acc2c0 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile,v 1.1 2004/06/24 07:21:47 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile,v 1.1 2004/06/24 08:39:18 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
index b46561a82b383..cfec337cae574 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml,v 1.5 2004/08/12 08:31:35 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml b/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
index 00bca530ae811..5ca0fe8344fb8 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml,v 1.1 2004/06/24 08:39:18 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml,v 1.1 2004/06/24 07:21:47 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml b/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
index 0475eed4dd55e..74d5f8cfb4b68 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:35:03 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:12:32 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.ent b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
index cfe8a868d6173..2a2a933b89e85 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.ent
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.ent,v 1.1 2004/06/24 08:39:18 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.ent,v 1.1 2004/06/24 07:21:48 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.sgml b/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
index 30487d149d4d7..bcca55a095348 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
@@ -1,7 +1,7 @@
 <!--
 The FreeBSD Russian Documentation Project
 
-$FreeBSD$
+$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.9 2007/02/08 05:04:18 rodrigc Exp $
 $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:12:32 den Exp $
 
 Original revision: 1.32
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml b/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
index 48191b6bd553d..b7ecf7389ad69 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:29:07 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:30:11 den Exp $
 
 	Original revision: 1.10
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml b/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
index 4bc38b41e2e54..60b83a56bb404 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:35:03 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:12:32 den Exp $
 
 	Original revision: 1.19
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
index dffe1a55541ff..8b28a06155db7 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
@@ -1,7 +1,7 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD$
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml,v 1.3 2004/09/10 13:56:41 den Exp $
 	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml,v 1.3 2004/09/06 14:05:03 den Exp $
 
 	Original revision: 1.13
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
index b1d897d9b39fc..b88a88d31ace5 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/i386/Makefile,v 1.1 2004/06/24 08:39:19 den Exp $
 #
 # Original revision: 1.4
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml b/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
index 14199c01d8707..aade02982627a 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
index adf6a2a28548a..f2eb5edcc291f 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile,v 1.1 2004/06/24 08:39:19 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
index df280dba03dd9..621e62e9406d8 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
index 9cd2b17582bab..2816dc73bf2a2 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile,v 1.1 2004/06/24 08:39:19 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
index b6c1767f7c5b2..3ab03d1c6ef11 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
index ac6fb72e90aa0..78c17efa2d697 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile,v 1.1 2004/06/24 07:21:48 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile,v 1.1 2004/06/24 08:39:20 den Exp $
 #
 # Original revision: 1.1
 #
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
index 90b0ae44da0af..617a54de4092c 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml,v 1.4 2004/08/12 08:44:51 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.5
diff --git a/release/doc/ru_RU.KOI8-R/readme/Makefile b/release/doc/ru_RU.KOI8-R/readme/Makefile
index 9b6f10fff3284..59c186b94964e 100644
--- a/release/doc/ru_RU.KOI8-R/readme/Makefile
+++ b/release/doc/ru_RU.KOI8-R/readme/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Russian Documentation Project
 #
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/Makefile,v 1.1 2004/06/24 13:32:02 den Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/Makefile,v 1.1 2004/06/24 13:45:38 den Exp $
 #
 # Original revision: 1.7
 #
diff --git a/release/doc/ru_RU.KOI8-R/readme/article.sgml b/release/doc/ru_RU.KOI8-R/readme/article.sgml
index fa45cd9d1632b..d72ef20781b3f 100644
--- a/release/doc/ru_RU.KOI8-R/readme/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/readme/article.sgml
@@ -1,7 +1,7 @@
 <!--
    The FreeBSD Russian Documentation Project
 
-   $FreeBSD$
+   $FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:35:03 den Exp $
    $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:12:33 den Exp $
 
    Original revision: 1.37
@@ -21,7 +21,7 @@
 
     <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:35:03 den Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/Makefile
index 3729b20912845..abbf069c50846 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/Makefile,v 1.1 2004/05/21 11:59:56 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/Makefile,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc b/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc
index 214855f61379c..7399ec7fa761d 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc
+++ b/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc,v 1.1 2004/05/21 11:59:56 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/Makefile.inc,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.2
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
index 2587e1c086359..efc4df251651b 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
index 11ed2dc30d680..0ad1235b88737 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
index 97dedc60f8e26..02790744dab99 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile,v 1.1 2004/05/20 07:02:25 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
index 14ee728555311..a5568d37711fa 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml b/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
index 415ef6238fe99..8978a0d3bbe35 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
@@ -11,7 +11,7 @@
 
   <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.22 2006/02/26 04:57:17 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent b/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
index 96df30653d6e2..616d06d7b54f0 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent,v 1.1 2004/05/21 11:59:54 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent,v 1.1 2004/05/20 07:02:25 den Exp $
 
      Original revision: 1.3
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
index 2bbe5e9a9f415..6580195efaa94 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile,v 1.3 2004/09/02 06:22:17 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile,v 1.3 2004/09/02 05:50:33 den Exp $
 #
 # Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
index debdea7acc2c1..5dc37356fd3f2 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.7
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
index 62016749f7417..1882c7d555008 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile,v 1.1 2004/05/20 07:02:26 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
index 9c15d726694a3..d9a0adb647189 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
index 2abd4f2247171..aa4a868c5887a 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile,v 1.1 2004/05/21 11:59:55 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile,v 1.1 2004/05/20 07:02:26 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
index ede9cc3f093dd..f368211335c36 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
index 6084f36a61603..bfb9fc38e46b6 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile,v 1.1 2004/05/21 11:59:56 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile,v 1.1 2004/05/20 07:02:26 den Exp $
 #
 # Original revision: 1.1
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
index 957adaa190b40..cfd9dc8da3d4b 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml,v 1.5 2004/08/12 08:44:52 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml,v 1.7 2004/08/12 08:31:38 den Exp $
 
      Original revision: 1.6
diff --git a/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl b/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
index 7f36ca10d0521..7df23afeb4dc1 100644
--- a/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
+++ b/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl,v 1.3 2005/06/30 12:07:29 den Exp $
 # $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl,v 1.4 2005/06/30 12:11:18 den Exp $
 #
 # Auto-translate some device entities from English to Russian (KOI8-R)
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/catalog b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
index a8ea7378ae007..c0e6305344569 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/catalog
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
@@ -2,7 +2,7 @@
   -- Language-specific --
 
   -- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.3 2005/03/10 11:04:21 den Exp $ --
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.2 2005/03/10 14:15:08 den Exp $ --
 
   -- Original revision: 1.1 --
 
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml b/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
index 9084f8981e047..2cc931d28df17 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
@@ -9,7 +9,7 @@
      script to update this file (-o option).
      This script maintained in HEAD branch.
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.4 2005/06/30 12:07:29 den Exp $
      $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.5 2005/06/30 12:11:18 den Exp $
 -->
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e 'ëÏÎÔÒÏÌÌÅÒÙ, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÄÒÁÊ×ÅÒÏÍ &man.aac.4;, ×ËÌÀÞÁÑ:'>
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl b/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
index 96cf087b371e7..e9f04c4c5e402 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
@@ -2,7 +2,7 @@
   The FreeBSD Russian Documentation Project
 
   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl,v 1.5 2004/09/13 08:00:12 den Exp $
-  $FreeBSD$
+  $FreeBSD: src/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl,v 1.3 2004/09/13 14:24:46 den Exp $
   
   Original revision: 1.8
 -->
diff --git a/release/doc/share/examples/Makefile.relnotesng b/release/doc/share/examples/Makefile.relnotesng
index 68309a3432141..b64161e02d022 100644
--- a/release/doc/share/examples/Makefile.relnotesng
+++ b/release/doc/share/examples/Makefile.relnotesng
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.16.2.1.2.1 2007/12/27 19:34:32 bmah Exp $
 #
 # Sample makefile for rendering and uploading RELNOTESng files outside
 # the build tree.
diff --git a/release/doc/share/misc/dev.archlist.txt b/release/doc/share/misc/dev.archlist.txt
index 1a30f72b71c89..cad19f785385e 100644
--- a/release/doc/share/misc/dev.archlist.txt
+++ b/release/doc/share/misc/dev.archlist.txt
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.100.2.1.2.1 2008/02/06 19:47:28 delphij Exp $
 #
 
 #
diff --git a/release/doc/share/misc/man2hwnotes.pl b/release/doc/share/misc/man2hwnotes.pl
index 75b1af2072fdc..df7a24a4bdea2 100644
--- a/release/doc/share/misc/man2hwnotes.pl
+++ b/release/doc/share/misc/man2hwnotes.pl
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.14 2007/02/16 02:10:12 bmah Exp $
 #
 
 # Parse the list of supported hardware out of section 4 manual pages
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index 95d1e49578725..5d58d36d45667 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.14 2007/02/16 02:10:12 bmah Exp $
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
diff --git a/release/doc/share/sgml/Makefile b/release/doc/share/sgml/Makefile
index e15b14189e7c9..2bce679853803 100644
--- a/release/doc/share/sgml/Makefile
+++ b/release/doc/share/sgml/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/doc/share/sgml/Makefile,v 1.3 2007/02/16 02:10:12 bmah Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/share/sgml/catalog b/release/doc/share/sgml/catalog
index e456e6743159c..3dc20c751dceb 100644
--- a/release/doc/share/sgml/catalog
+++ b/release/doc/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Release-specific --
 
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/share/sgml/catalog,v 1.3 2001/06/11 01:48:17 ache Exp $ --
 
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
diff --git a/release/doc/share/sgml/default.dsl b/release/doc/share/sgml/default.dsl
index 58d82314f960b..8caa0a4b3ebe5 100644
--- a/release/doc/share/sgml/default.dsl
+++ b/release/doc/share/sgml/default.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/default.dsl,v 1.2 2001/06/02 23:12:23 dd Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN" CDATA DSSSL>
diff --git a/release/doc/share/sgml/release.dsl b/release/doc/share/sgml/release.dsl
index 1d41fc89b0926..8d4a226998f79 100644
--- a/release/doc/share/sgml/release.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.10 2005/11/28 06:24:19 hrs Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.html		"IGNORE">
diff --git a/release/doc/share/sgml/release.ent b/release/doc/share/sgml/release.ent
index c348e38a01c14..38c6fa1430478 100644
--- a/release/doc/share/sgml/release.ent
+++ b/release/doc/share/sgml/release.ent
@@ -1,6 +1,6 @@
 <!-- -*- sgml -*-
 
-     $FreeBSD$
+     $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.28.2.2.2.1 2007/12/27 19:34:32 bmah Exp $
 
      OS Release Information -->
 
diff --git a/release/doc/zh_CN.GB2312/Makefile b/release/doc/zh_CN.GB2312/Makefile
index fb0e938844015..10785ae841588 100644
--- a/release/doc/zh_CN.GB2312/Makefile
+++ b/release/doc/zh_CN.GB2312/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
 # Original Revision: 1.8
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.2.2.1 2007/12/09 23:37:38 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 
diff --git a/release/doc/zh_CN.GB2312/errata/Makefile b/release/doc/zh_CN.GB2312/errata/Makefile
index 58025c34e4448..fc328659e0283 100644
--- a/release/doc/zh_CN.GB2312/errata/Makefile
+++ b/release/doc/zh_CN.GB2312/errata/Makefile
@@ -1,5 +1,5 @@
 # Original Revision: 1.5
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/errata/Makefile,v 1.1.16.1 2007/12/09 23:37:38 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/zh_CN.GB2312/errata/article.sgml b/release/doc/zh_CN.GB2312/errata/article.sgml
index a2fc6a2cb6330..f918e7cfed958 100644
--- a/release/doc/zh_CN.GB2312/errata/article.sgml
+++ b/release/doc/zh_CN.GB2312/errata/article.sgml
@@ -40,7 +40,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.5 2006/03/07 02:29:21 delphij Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/hardware/Makefile b/release/doc/zh_CN.GB2312/hardware/Makefile
index e3dc6e0f2b39d..d6a066c0dba26 100644
--- a/release/doc/zh_CN.GB2312/hardware/Makefile
+++ b/release/doc/zh_CN.GB2312/hardware/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
 # Original Revision: 1.10
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/Makefile,v 1.1.18.1 2007/12/09 23:37:38 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/zh_CN.GB2312/hardware/article.sgml b/release/doc/zh_CN.GB2312/hardware/article.sgml
index eeb40c5559dcf..69b435543b065 100644
--- a/release/doc/zh_CN.GB2312/hardware/article.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/article.sgml
@@ -18,7 +18,7 @@
 
   <corpauthor>The &os; Documentation Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/article.sgml,v 1.1.2.2.2.1 2008/02/06 19:47:29 delphij Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/readme/Makefile b/release/doc/zh_CN.GB2312/readme/Makefile
index c2d2cf843f818..768f3ea0be34a 100644
--- a/release/doc/zh_CN.GB2312/readme/Makefile
+++ b/release/doc/zh_CN.GB2312/readme/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.7
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/readme/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR
diff --git a/release/doc/zh_CN.GB2312/readme/article.sgml b/release/doc/zh_CN.GB2312/readme/article.sgml
index 20510fa1a4139..cbc59401f232a 100644
--- a/release/doc/zh_CN.GB2312/readme/article.sgml
+++ b/release/doc/zh_CN.GB2312/readme/article.sgml
@@ -18,7 +18,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.3.2.1 2007/12/09 23:37:41 delphij Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/relnotes/Makefile b/release/doc/zh_CN.GB2312/relnotes/Makefile
index f932363d7829f..048c4eba57cb3 100644
--- a/release/doc/zh_CN.GB2312/relnotes/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/Makefile
@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 # Original Revision: 1.11
 #
-# $FreeBSD$
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile,v 1.2.2.1 2007/12/09 23:37:41 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/article.sgml b/release/doc/zh_CN.GB2312/relnotes/article.sgml
index b23da7478627e..5662da18c64fc 100644
--- a/release/doc/zh_CN.GB2312/relnotes/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/article.sgml
@@ -22,7 +22,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD$</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/article.sgml,v 1.1.2.2.2.3 2008/02/17 01:16:40 delphij Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
diff --git a/release/doc/zh_CN.GB2312/share/sgml/catalog b/release/doc/zh_CN.GB2312/share/sgml/catalog
index a4d71599493f9..0cd90984ee68b 100644
--- a/release/doc/zh_CN.GB2312/share/sgml/catalog
+++ b/release/doc/zh_CN.GB2312/share/sgml/catalog
@@ -2,7 +2,7 @@
   -- Language-specific --
 
   -- Original Revision: 1.1 --
-  -- $FreeBSD$ --
+  -- $FreeBSD: src/release/doc/zh_CN.GB2312/share/sgml/catalog,v 1.1 2004/10/15 06:43:48 delphij Exp $ --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
diff --git a/release/doc/zh_CN.GB2312/share/sgml/release.dsl b/release/doc/zh_CN.GB2312/share/sgml/release.dsl
index f8198d6978082..7d9e4c0a29569 100644
--- a/release/doc/zh_CN.GB2312/share/sgml/release.dsl
+++ b/release/doc/zh_CN.GB2312/share/sgml/release.dsl
@@ -1,5 +1,5 @@
 <!-- Original Revision: 1.8 -->
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/release/doc/zh_CN.GB2312/share/sgml/release.dsl,v 1.2 2006/03/05 15:07:57 delphij Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
diff --git a/release/fixit.profile b/release/fixit.profile
index 8a36fbeadcbaa..8cd2a85cec517 100644
--- a/release/fixit.profile
+++ b/release/fixit.profile
@@ -1,5 +1,5 @@
 :
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.profile,v 1.10.10.1.2.1 2008/01/23 20:06:27 kensmith Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
diff --git a/release/fixit.services b/release/fixit.services
index ff776b2b62658..a9f89f5ca5c45 100644
--- a/release/fixit.services
+++ b/release/fixit.services
@@ -3,7 +3,7 @@
 #
 # Stripped-down version.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/fixit.services,v 1.4 1999/08/28 01:33:10 peter Exp $
 #
 # WELL KNOWN PORT NUMBERS
 #
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index 2cefa5a20818b..b162bd0953212 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.61.4.1 2008/01/23 20:22:47 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf
index 93950ab4e65d0..63322def27c8e 100644
--- a/release/i386/fixit_crunch.conf
+++ b/release/i386/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.16 2007/07/02 14:01:43 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index 9bb3dbcaac850..c4c18ef853868 100644
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.14 2006/05/16 14:22:37 nyan Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/ia64/boot_crunch.conf b/release/ia64/boot_crunch.conf
index d133f49ac6517..9c852daae2a4f 100644
--- a/release/ia64/boot_crunch.conf
+++ b/release/ia64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.11.4.1 2008/01/23 20:22:47 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/ia64/mkisoimages.sh b/release/ia64/mkisoimages.sh
index 52a9f4a2c9dc9..3f420d7ed15d7 100644
--- a/release/ia64/mkisoimages.sh
+++ b/release/ia64/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index 104a953f685bc..20eae3d75509c 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.62.4.1 2008/01/23 20:22:47 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/pc98/fixit-small_crunch.conf b/release/pc98/fixit-small_crunch.conf
index 43a0a3c0dd170..f3ecf736c8071 100644
--- a/release/pc98/fixit-small_crunch.conf
+++ b/release/pc98/fixit-small_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.9 2007/05/22 11:32:55 nyan Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf
index 9295aeb97f4ef..fd25d9cc7b698 100644
--- a/release/pc98/fixit_crunch.conf
+++ b/release/pc98/fixit_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.15 2007/05/22 11:32:55 nyan Exp $
 
 buildopts -DRELEASE_CRUNCH
 
diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index e0c2833adf8a2..ea45a333798e9 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.19.2.1 2007/11/21 07:20:10 luigi Exp $
 #
 # Line starting with #PicoBSD contains PicoBSD build parameters
 #marker         def_sz  init    MFS_inodes      floppy_inodes
diff --git a/release/picobsd/bridge/PICOBSD.hints b/release/picobsd/bridge/PICOBSD.hints
index 580dd1a3381e5..849fa8c839c68 100644
--- a/release/picobsd/bridge/PICOBSD.hints
+++ b/release/picobsd/bridge/PICOBSD.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD.hints,v 1.1 2000/10/15 20:42:19 joe Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/release/picobsd/bridge/config b/release/picobsd/bridge/config
index 4183c2ef3d76d..7491c910159e2 100644
--- a/release/picobsd/bridge/config
+++ b/release/picobsd/bridge/config
@@ -1,5 +1,5 @@
 # configuration for picobsd build script.
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/config,v 1.5 2006/01/31 20:36:01 luigi Exp $
 # it should only contain variable definitions -- it is sourced
 # by the shell much like rc.conf* files
 
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
index b853ba3cded4c..cb2d8ca8987a8 100644
--- a/release/picobsd/bridge/crunch.conf
+++ b/release/picobsd/bridge/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.21.2.1 2007/11/21 07:20:10 luigi Exp $
 #
 # configuration file for "bridge" floppy.
 # Depending on your needs, almost surely you will need to
diff --git a/release/picobsd/build/Makefile.conf b/release/picobsd/build/Makefile.conf
index 22077b00193d6..3d0cdc2a389e3 100644
--- a/release/picobsd/build/Makefile.conf
+++ b/release/picobsd/build/Makefile.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/Makefile.conf,v 1.18.24.1 2007/11/21 07:20:10 luigi Exp $
 #
 # Makefile for building PICOBSD kernels and running crunchgen
 #
diff --git a/release/picobsd/build/mfs.mtree b/release/picobsd/build/mfs.mtree
index 5c8e70ce6b201..1ca6eee952e2b 100644
--- a/release/picobsd/build/mfs.mtree
+++ b/release/picobsd/build/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/mfs.mtree,v 1.3 2000/11/07 20:40:20 joe Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 42ee3291b5e6d..4e97abe149152 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/build/picobsd,v 1.39.2.1 2007/11/21 07:20:10 luigi Exp $
 # This file requires sysutils/makefs to run
 #
 # The new PicoBSD build script. Invoked as
diff --git a/release/picobsd/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index cf9673af6fbd6..d7a8c4cc04fd0 100644
--- a/release/picobsd/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/fstab,v 1.6 2002/03/08 03:55:19 luigi Exp $
 proc				/proc		procfs	rw 0 0
 /dev/fd0c			/fd	ufs	rw,noauto 0 0
 /dev/ad0s1			/dos		msdosfs	rw,noauto 0 0
diff --git a/release/picobsd/floppy.tree/etc/hosts b/release/picobsd/floppy.tree/etc/hosts
index d4f9c541def93..392e36849d00e 100644
--- a/release/picobsd/floppy.tree/etc/hosts
+++ b/release/picobsd/floppy.tree/etc/hosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/hosts,v 1.4 2002/03/08 04:54:52 luigi Exp $
 # This file contains ip <-> hostname mapping.
 # It is also used for autoconfiguration based on Ethernet address
 # and other things. The initial part is just a standard /etc/hosts
diff --git a/release/picobsd/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
index 30981ef29ee1f..71a7036d35114 100644
--- a/release/picobsd/floppy.tree/etc/ppp/ppp.conf
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/ppp/ppp.conf,v 1.2 2004/11/19 03:45:30 obrien Exp $
 #  	PPP  Sample Configuration File
 #	  Written by Toshiharu OHNO
 default:
diff --git a/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
index bfaab7681aa59..c8f98aab5df57 100644
--- a/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
@@ -12,7 +12,7 @@
 #  required for all server socket connections.  Refer to the ppp(8)
 #  and pppctl(8) man pages for further details.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample,v 1.2 1999/08/28 01:33:30 peter Exp $
 #
 ##################################################
 
diff --git a/release/picobsd/floppy.tree/etc/rc.conf.defaults b/release/picobsd/floppy.tree/etc/rc.conf.defaults
index 8b8bdf3f0e96e..8c8e08ae34d78 100644
--- a/release/picobsd/floppy.tree/etc/rc.conf.defaults
+++ b/release/picobsd/floppy.tree/etc/rc.conf.defaults
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.conf.defaults,v 1.2 2002/03/09 18:27:02 luigi Exp $
 #
 # rc.conf for picobsd. This is sourced from /etc/rc1, and is supposed to
 # contain only shell functions that are used later in /etc/rc1.
diff --git a/release/picobsd/floppy.tree/etc/rc.firewall b/release/picobsd/floppy.tree/etc/rc.firewall
index 408fe6087f026..00dcb85568e0f 100644
--- a/release/picobsd/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/floppy.tree/etc/rc.firewall
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc.firewall,v 1.3 2002/03/08 05:15:08 luigi Exp $
 
 # Setup system for firewall service, with some sample configurations.
 # Select one using ${firewall_type} which you can set in /etc/rc.conf.local.
diff --git a/release/picobsd/floppy.tree/etc/rc1 b/release/picobsd/floppy.tree/etc/rc1
index 780311d285ba0..2565c72c2ec65 100644
--- a/release/picobsd/floppy.tree/etc/rc1
+++ b/release/picobsd/floppy.tree/etc/rc1
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc1,v 1.5 2002/07/01 21:30:39 luigi Exp $
 ### rc1, next stage 'rc' for PicoBSD -- THIS IS NOT THE NORMAL /etc/rc 
 
 . /etc/rc.conf.defaults		# Load default procedures
diff --git a/release/picobsd/mfs_tree/etc/disktab b/release/picobsd/mfs_tree/etc/disktab
index f5b00975e20b3..a83ba852bafa1 100644
--- a/release/picobsd/mfs_tree/etc/disktab
+++ b/release/picobsd/mfs_tree/etc/disktab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/disktab,v 1.2 2001/04/24 07:46:27 joe Exp $
 # Floppy formats:
 #
 # To make a filesystem on a floppy:
diff --git a/release/picobsd/mfs_tree/etc/gettytab b/release/picobsd/mfs_tree/etc/gettytab
index 09173321819f2..84ea3033ad498 100644
--- a/release/picobsd/mfs_tree/etc/gettytab
+++ b/release/picobsd/mfs_tree/etc/gettytab
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/gettytab,v 1.2 2001/04/24 07:46:27 joe Exp $
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 default:\
diff --git a/release/picobsd/mfs_tree/etc/login.conf b/release/picobsd/mfs_tree/etc/login.conf
index 4337b1fb74816..ffd4a6e26dfa5 100644
--- a/release/picobsd/mfs_tree/etc/login.conf
+++ b/release/picobsd/mfs_tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/login.conf,v 1.2 2001/04/24 07:46:27 joe Exp $
 #
 
 
diff --git a/release/picobsd/mfs_tree/etc/protocols b/release/picobsd/mfs_tree/etc/protocols
index 0ef23af6cb38b..1d7bcb9d61a39 100644
--- a/release/picobsd/mfs_tree/etc/protocols
+++ b/release/picobsd/mfs_tree/etc/protocols
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/protocols,v 1.3 2002/03/24 21:13:53 luigi Exp $
 # Internet (IP) protocols
 ip	0	IP		# internet protocol, pseudo protocol number
 icmp	1	ICMP		# internet control message protocol
diff --git a/release/picobsd/mfs_tree/etc/rc b/release/picobsd/mfs_tree/etc/rc
index 30137187d5768..9e3fa06fcab36 100644
--- a/release/picobsd/mfs_tree/etc/rc
+++ b/release/picobsd/mfs_tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/rc,v 1.9 2002/11/17 20:19:34 luigi Exp $
 
 stty status '^T'
 trap : 2
diff --git a/release/picobsd/mfs_tree/etc/rc.network b/release/picobsd/mfs_tree/etc/rc.network
index 3cd6d5dcdb5b3..8a608846f9ab8 100644
--- a/release/picobsd/mfs_tree/etc/rc.network
+++ b/release/picobsd/mfs_tree/etc/rc.network
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/rc.network,v 1.5 2002/05/11 06:06:11 dd Exp $
 
 network_pass1() {
     echo -n 'Doing initial network setup:'
diff --git a/release/picobsd/mfs_tree/etc/rc.serial b/release/picobsd/mfs_tree/etc/rc.serial
index 40fbd8a334cc6..195f22dc94499 100644
--- a/release/picobsd/mfs_tree/etc/rc.serial
+++ b/release/picobsd/mfs_tree/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/rc.serial,v 1.2 2001/04/24 07:46:27 joe Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/release/picobsd/mfs_tree/etc/remote b/release/picobsd/mfs_tree/etc/remote
index f881f6b420a5c..bea0ddd1e6843 100644
--- a/release/picobsd/mfs_tree/etc/remote
+++ b/release/picobsd/mfs_tree/etc/remote
@@ -1,5 +1,5 @@
 #	@(#)remote	5.2 (Berkeley) 6/30/90
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/remote,v 1.3 2004/11/19 03:45:30 obrien Exp $
 # remote -- remote host description file
 # see tip(1), remote(5)
 #
diff --git a/release/picobsd/mfs_tree/etc/shells b/release/picobsd/mfs_tree/etc/shells
index cd386f6321c21..58e5aac9ff9f8 100644
--- a/release/picobsd/mfs_tree/etc/shells
+++ b/release/picobsd/mfs_tree/etc/shells
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/shells,v 1.2 2001/04/24 07:46:27 joe Exp $
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
 # one of these shells.
diff --git a/release/picobsd/mfs_tree/etc/termcap b/release/picobsd/mfs_tree/etc/termcap
index 5b8f9498cec45..58889c625f1b9 100644
--- a/release/picobsd/mfs_tree/etc/termcap
+++ b/release/picobsd/mfs_tree/etc/termcap
@@ -2,7 +2,7 @@
 # All rights reserved.
 #	@(#)termcap.src	5.88 (Berkeley) 4/30/91
 #
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/etc/termcap,v 1.6 2002/07/14 14:17:28 luigi Exp $
 #
 # for syscons
 # common entry without semigraphics
diff --git a/release/picobsd/mfs_tree/stand/update b/release/picobsd/mfs_tree/stand/update
index 072493a12f896..5577b15162cea 100755
--- a/release/picobsd/mfs_tree/stand/update
+++ b/release/picobsd/mfs_tree/stand/update
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/mfs_tree/stand/update,v 1.5 2002/03/11 05:15:44 luigi Exp $
 # script to edit and save some config file(s).
 # If called with no arguments, it edits 3 files in /etc
 thefiles=$*
diff --git a/release/picobsd/tinyware/aps/Makefile b/release/picobsd/tinyware/aps/Makefile
index f2b481a11f54a..0aa6b9daa56ad 100644
--- a/release/picobsd/tinyware/aps/Makefile
+++ b/release/picobsd/tinyware/aps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/aps/Makefile,v 1.4 2004/12/21 08:47:05 ru Exp $
 #
 PROG=ps
 SRCS+=main.c
diff --git a/release/picobsd/tinyware/aps/README b/release/picobsd/tinyware/aps/README
index f455c7bae3076..8f1c4f0e176ef 100644
--- a/release/picobsd/tinyware/aps/README
+++ b/release/picobsd/tinyware/aps/README
@@ -16,4 +16,4 @@ more general (and less complicated) sysctl(3).
 (As of 1998.07.31 this program is no longer used in PicoBSD. See sps(1) in
 TinyWare collection).
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/aps/README,v 1.3 1999/08/28 01:33:52 peter Exp $
diff --git a/release/picobsd/tinyware/aps/main.c b/release/picobsd/tinyware/aps/main.c
index eece247af3bd2..0132d6c69b551 100644
--- a/release/picobsd/tinyware/aps/main.c
+++ b/release/picobsd/tinyware/aps/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/aps/main.c,v 1.2 1999/08/28 01:33:52 peter Exp $
  *
  */
 
diff --git a/release/picobsd/tinyware/help/Makefile b/release/picobsd/tinyware/help/Makefile
index f7a90e8de4900..6fc1b22b7c008 100644
--- a/release/picobsd/tinyware/help/Makefile
+++ b/release/picobsd/tinyware/help/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/help/Makefile,v 1.4 2004/12/21 08:47:05 ru Exp $
 #
 PROG=help
 SRCS+=help.c
diff --git a/release/picobsd/tinyware/help/README b/release/picobsd/tinyware/help/README
index 9c9900feba3fd..1f2c2482cb669 100644
--- a/release/picobsd/tinyware/help/README
+++ b/release/picobsd/tinyware/help/README
@@ -5,4 +5,4 @@ and these files are just the beginning of it...
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/help/README,v 1.3 1999/08/28 01:33:53 peter Exp $
diff --git a/release/picobsd/tinyware/help/help.c b/release/picobsd/tinyware/help/help.c
index b57b4f6f15577..5b771cdf15ac1 100644
--- a/release/picobsd/tinyware/help/help.c
+++ b/release/picobsd/tinyware/help/help.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/help/help.c,v 1.5 1999/08/28 01:33:54 peter Exp $
  */
 
 
diff --git a/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile
index a86fff46a933d..f12bdfa6b7ca4 100644
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.5.2.1 2007/11/21 07:20:11 luigi Exp $
 
 .include <bsd.own.mk>
 
diff --git a/release/picobsd/tinyware/login/README b/release/picobsd/tinyware/login/README
index 4dba3344e6daf..ca2ee67c07f29 100644
--- a/release/picobsd/tinyware/login/README
+++ b/release/picobsd/tinyware/login/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/login/README,v 1.1 2001/10/01 16:58:28 luigi Exp $
 
 This is a modified login version for PicoBSD purposes, which does
 not demand PAM.
diff --git a/release/picobsd/tinyware/login/pathnames.h b/release/picobsd/tinyware/login/pathnames.h
index 333c2ca280fa3..cf21ed3ea031f 100644
--- a/release/picobsd/tinyware/login/pathnames.h
+++ b/release/picobsd/tinyware/login/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/9/93
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/login/pathnames.h,v 1.1 2001/10/01 16:58:28 luigi Exp $
  */
 
 #include <paths.h>
diff --git a/release/picobsd/tinyware/login/pico-login.c b/release/picobsd/tinyware/login/pico-login.c
index 2f333a439188f..e7cc197ec1211 100644
--- a/release/picobsd/tinyware/login/pico-login.c
+++ b/release/picobsd/tinyware/login/pico-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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/release/picobsd/tinyware/login/pico-login.c,v 1.6 2005/05/13 16:31:10 ume Exp $";
 #endif /* not lint */
 
 /*
diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile
index db07e7808b4c1..739fb099f0ba4 100644
--- a/release/picobsd/tinyware/msg/Makefile
+++ b/release/picobsd/tinyware/msg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/msg/Makefile,v 1.4 2004/12/21 08:47:05 ru Exp $
 #
 PROG=msg
 SRCS= 	msg.c
diff --git a/release/picobsd/tinyware/msg/README b/release/picobsd/tinyware/msg/README
index d26e38326a9e3..f8832f004c598 100644
--- a/release/picobsd/tinyware/msg/README
+++ b/release/picobsd/tinyware/msg/README
@@ -12,4 +12,4 @@ kernel tree, contact me directly - the patches are very small and simple.
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/msg/README,v 1.3 1999/08/28 01:33:55 peter Exp $
diff --git a/release/picobsd/tinyware/msg/msg.c b/release/picobsd/tinyware/msg/msg.c
index c9f87efbbb6a7..11d8148c894c6 100644
--- a/release/picobsd/tinyware/msg/msg.c
+++ b/release/picobsd/tinyware/msg/msg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/msg/msg.c,v 1.3 2001/07/03 19:51:53 tmm Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/msh/Makefile b/release/picobsd/tinyware/msh/Makefile
index e1a1b541ca351..3589f736f34ed 100644
--- a/release/picobsd/tinyware/msh/Makefile
+++ b/release/picobsd/tinyware/msh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/msh/Makefile,v 1.3 2001/02/10 22:57:33 abial Exp $
 #
 PROG=msh
 SRCS= sh1.c sh2.c sh3.c sh4.c sh5.c sh6.c
diff --git a/release/picobsd/tinyware/ns/Makefile b/release/picobsd/tinyware/ns/Makefile
index 46f5e2413c6d7..710ae4bd6edfe 100644
--- a/release/picobsd/tinyware/ns/Makefile
+++ b/release/picobsd/tinyware/ns/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/ns/Makefile,v 1.10 2004/12/21 08:47:05 ru Exp $
 
 PROG=	ns
 SRCS=	ns.c
diff --git a/release/picobsd/tinyware/ns/README b/release/picobsd/tinyware/ns/README
index 8d5f50358415e..77bafe7ae3e66 100644
--- a/release/picobsd/tinyware/ns/README
+++ b/release/picobsd/tinyware/ns/README
@@ -40,4 +40,4 @@ Bugs
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/ns/README,v 1.5 2001/07/23 12:05:23 kris Exp $
diff --git a/release/picobsd/tinyware/ns/ns.c b/release/picobsd/tinyware/ns/ns.c
index c6e58e24e7473..61eeba2a4423e 100644
--- a/release/picobsd/tinyware/ns/ns.c
+++ b/release/picobsd/tinyware/ns/ns.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/ns/ns.c,v 1.17 2005/09/27 18:10:43 mlaier Exp $
  */
 
 
diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile
index c5fc1f3f0e613..5b527f6a61278 100644
--- a/release/picobsd/tinyware/oinit/Makefile
+++ b/release/picobsd/tinyware/oinit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/oinit/Makefile,v 1.5 2004/12/21 08:47:06 ru Exp $
 #
 PROG=		oinit
 
diff --git a/release/picobsd/tinyware/oinit/README b/release/picobsd/tinyware/oinit/README
index e34c404f4a8d3..ff7e891861419 100644
--- a/release/picobsd/tinyware/oinit/README
+++ b/release/picobsd/tinyware/oinit/README
@@ -120,4 +120,4 @@ The overall framework was taken from FreeBSD /sbin/init.
 Andrzej Bialecki
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/oinit/README,v 1.3 1999/08/28 01:33:58 peter Exp $
diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c
index b02434a7132b8..5e4b68bdb425e 100644
--- a/release/picobsd/tinyware/oinit/oinit.c
+++ b/release/picobsd/tinyware/oinit/oinit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/oinit/oinit.c,v 1.7 2002/10/10 00:25:33 alfred Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/passwd/Makefile b/release/picobsd/tinyware/passwd/Makefile
index 5f6b8c45bd154..214282c99e22d 100644
--- a/release/picobsd/tinyware/passwd/Makefile
+++ b/release/picobsd/tinyware/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/passwd/Makefile,v 1.4 2004/12/21 12:49:24 ru Exp $
 
 # Only NO_PAM is used by PicoBSD and supported here
 
diff --git a/release/picobsd/tinyware/passwd/extern.h b/release/picobsd/tinyware/passwd/extern.h
index eae768c6e82a9..4dda6a5b887f4 100644
--- a/release/picobsd/tinyware/passwd/extern.h
+++ b/release/picobsd/tinyware/passwd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/passwd/extern.h,v 1.1 2002/06/20 21:17:33 luigi Exp $
  */
 
 int	krb_passwd(char *, char *, char *, char *);
diff --git a/release/picobsd/tinyware/passwd/local_passwd.c b/release/picobsd/tinyware/passwd/local_passwd.c
index 6bbf24d3c47b8..6154e9c06b5cd 100644
--- a/release/picobsd/tinyware/passwd/local_passwd.c
+++ b/release/picobsd/tinyware/passwd/local_passwd.c
@@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)local_passwd.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/release/picobsd/tinyware/passwd/local_passwd.c,v 1.1 2002/06/20 21:17:33 luigi Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/release/picobsd/tinyware/passwd/passwd.c b/release/picobsd/tinyware/passwd/passwd.c
index d24165037a5a4..a1690467f54b8 100644
--- a/release/picobsd/tinyware/passwd/passwd.c
+++ b/release/picobsd/tinyware/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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/release/picobsd/tinyware/passwd/passwd.c,v 1.1 2002/05/05 20:43:27 luigi Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/passwd/pw_copy.c b/release/picobsd/tinyware/passwd/pw_copy.c
index ba3c8865dde7c..fe9d4f1a855af 100644
--- a/release/picobsd/tinyware/passwd/pw_copy.c
+++ b/release/picobsd/tinyware/passwd/pw_copy.c
@@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pw_copy.c	8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/release/picobsd/tinyware/passwd/pw_copy.c,v 1.3 2004/02/10 20:42:33 cperciva Exp $");
 
 /*
  * This module is used to copy the master password file, replacing a single
diff --git a/release/picobsd/tinyware/passwd/pw_util.c b/release/picobsd/tinyware/passwd/pw_util.c
index 1c163d2d57ed7..5d71bd2811556 100644
--- a/release/picobsd/tinyware/passwd/pw_util.c
+++ b/release/picobsd/tinyware/passwd/pw_util.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/release/picobsd/tinyware/passwd/pw_util.c,v 1.1 2002/06/20 21:17:33 luigi Exp $";
 #endif /* not lint */
 
 /*
diff --git a/release/picobsd/tinyware/passwd/pw_util.h b/release/picobsd/tinyware/passwd/pw_util.h
index 1000a9abdc7fd..622f7270ac816 100644
--- a/release/picobsd/tinyware/passwd/pw_util.h
+++ b/release/picobsd/tinyware/passwd/pw_util.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pw_util.h	8.2 (Berkeley) 4/1/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/passwd/pw_util.h,v 1.1 2002/06/20 21:17:33 luigi Exp $
  */
 
 void	pw_edit(int);
diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile
index cb4b149e54704..5595020a94924 100644
--- a/release/picobsd/tinyware/simple_httpd/Makefile
+++ b/release/picobsd/tinyware/simple_httpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/simple_httpd/Makefile,v 1.8 2004/12/21 08:47:06 ru Exp $
 #
 PROG=simple_httpd
 SRCS= 	simple_httpd.c
diff --git a/release/picobsd/tinyware/simple_httpd/README b/release/picobsd/tinyware/simple_httpd/README
index 6961954615d44..6b7fc1d85e332 100644
--- a/release/picobsd/tinyware/simple_httpd/README
+++ b/release/picobsd/tinyware/simple_httpd/README
@@ -164,4 +164,4 @@ This program was originally contributed by Marc Nicholas <marc@netstor.com>
 
 Major rewrite by William Lloyd <wlloyd@slap.net>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/simple_httpd/README,v 1.6 1999/08/28 01:33:59 peter Exp $
diff --git a/release/picobsd/tinyware/simple_httpd/simple_httpd.c b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
index ab35b55ae04c7..fa5492953a475 100644
--- a/release/picobsd/tinyware/simple_httpd/simple_httpd.c
+++ b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/simple_httpd/simple_httpd.c,v 1.16 2004/08/16 09:38:34 dwmalone Exp $
  */
 
 #include <sys/stat.h>
diff --git a/release/picobsd/tinyware/sps/Makefile b/release/picobsd/tinyware/sps/Makefile
index 348ea32b5140f..551c2234e065f 100644
--- a/release/picobsd/tinyware/sps/Makefile
+++ b/release/picobsd/tinyware/sps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/sps/Makefile,v 1.4 2004/12/21 08:47:06 ru Exp $
 #
 PROG=sps
 SRCS= 	sps.c
diff --git a/release/picobsd/tinyware/sps/README b/release/picobsd/tinyware/sps/README
index 2357113bf2cad..b227dd0b10afc 100644
--- a/release/picobsd/tinyware/sps/README
+++ b/release/picobsd/tinyware/sps/README
@@ -8,4 +8,4 @@ When I have some time, I'll add usual switches and other functions that normal
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/sps/README,v 1.4 2000/11/11 16:12:38 abial Exp $
diff --git a/release/picobsd/tinyware/sps/sps.c b/release/picobsd/tinyware/sps/sps.c
index f79d01983b9f3..7abaef212aed6 100644
--- a/release/picobsd/tinyware/sps/sps.c
+++ b/release/picobsd/tinyware/sps/sps.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/sps/sps.c,v 1.6 2002/03/11 08:03:50 luigi Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/view/Makefile b/release/picobsd/tinyware/view/Makefile
index e49baa191adc8..553a2b3e5b29d 100644
--- a/release/picobsd/tinyware/view/Makefile
+++ b/release/picobsd/tinyware/view/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/view/Makefile,v 1.5 2004/12/21 08:47:06 ru Exp $
 
 PROG=view
 SRCS=view.c
diff --git a/release/picobsd/tinyware/view/README b/release/picobsd/tinyware/view/README
index df5f774a95f6f..20add44d15f96 100644
--- a/release/picobsd/tinyware/view/README
+++ b/release/picobsd/tinyware/view/README
@@ -83,4 +83,4 @@ Andrzej Bialecki
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/view/README,v 1.3 1999/08/28 01:34:02 peter Exp $
diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c
index 2727ebe244260..29f39a6aa051e 100644
--- a/release/picobsd/tinyware/view/view.c
+++ b/release/picobsd/tinyware/view/view.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/view/view.c,v 1.7 2002/10/10 00:25:33 alfred Exp $
  */
 
 /*
diff --git a/release/picobsd/tinyware/vm/Makefile b/release/picobsd/tinyware/vm/Makefile
index b1d662913d412..28867a8bf0e0b 100644
--- a/release/picobsd/tinyware/vm/Makefile
+++ b/release/picobsd/tinyware/vm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/picobsd/tinyware/vm/Makefile,v 1.4 2004/12/21 08:47:06 ru Exp $
 #
 PROG=vm
 #CFLAGS+=
diff --git a/release/picobsd/tinyware/vm/README b/release/picobsd/tinyware/vm/README
index c4a940c629e87..ef4a18eb73ccc 100644
--- a/release/picobsd/tinyware/vm/README
+++ b/release/picobsd/tinyware/vm/README
@@ -7,4 +7,4 @@ consequently it is not displayed in stock version of sysctl(8).
 
 <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/release/picobsd/tinyware/vm/README,v 1.3 1999/08/28 01:34:03 peter Exp $
diff --git a/release/picobsd/tinyware/vm/vm.c b/release/picobsd/tinyware/vm/vm.c
index 90bb8ddd388df..5b41de3437f2d 100644
--- a/release/picobsd/tinyware/vm/vm.c
+++ b/release/picobsd/tinyware/vm/vm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/release/picobsd/tinyware/vm/vm.c,v 1.10 2006/11/28 12:46:02 ru Exp $
  */
 
 #include <stdio.h>
diff --git a/release/powerpc/boot.tbxi b/release/powerpc/boot.tbxi
index 70897866bec86..59613d34ec5f7 100644
--- a/release/powerpc/boot.tbxi
+++ b/release/powerpc/boot.tbxi
@@ -1,6 +1,6 @@
 <CHRP-BOOT>
 <LICENSE>
-$FreeBSD$
+$FreeBSD: src/release/powerpc/boot.tbxi,v 1.1 2004/08/18 11:08:18 grehan Exp $
 </LICENSE>
 <COMPATIBLE>
 MacRISC MacRISC3 MacRISC4
diff --git a/release/powerpc/boot_crunch.conf b/release/powerpc/boot_crunch.conf
index cfc40fe836753..f11226f5bb027 100644
--- a/release/powerpc/boot_crunch.conf
+++ b/release/powerpc/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.4.4.1 2008/01/23 20:22:48 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/powerpc/hfs.map b/release/powerpc/hfs.map
index 7048d0a991d41..5396b8b603805 100644
--- a/release/powerpc/hfs.map
+++ b/release/powerpc/hfs.map
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/release/powerpc/hfs.map,v 1.1 2004/08/18 11:08:19 grehan Exp $
 .tbxi   -     'chrp'  'tbxi'  "bootstrap"
 *       -     'fbsd'  'TEXT'  "FreeBSD file"
diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh
index 31e69971f3a53..61281a308c826 100644
--- a/release/powerpc/mkisoimages.sh
+++ b/release/powerpc/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/powerpc/mkisoimages.sh,v 1.1 2004/08/18 11:08:19 grehan Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/scripts/base-install.sh b/release/scripts/base-install.sh
index c87a38bf86a96..c7e31ad38afad 100755
--- a/release/scripts/base-install.sh
+++ b/release/scripts/base-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/base-install.sh,v 1.6 2002/04/30 09:57:21 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/catpages-install.sh b/release/scripts/catpages-install.sh
index 2e618ca76eeb9..bd41425c166c7 100755
--- a/release/scripts/catpages-install.sh
+++ b/release/scripts/catpages-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/catpages-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/catpages-make.sh b/release/scripts/catpages-make.sh
index 755057d40ccb8..d9d3c3048160e 100755
--- a/release/scripts/catpages-make.sh
+++ b/release/scripts/catpages-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/catpages-make.sh,v 1.7 2002/05/25 17:31:27 ru Exp $
 #
 
 # Move all the catpages out to their own dist, using the base dist as a
diff --git a/release/scripts/checkindex.pl b/release/scripts/checkindex.pl
index 44612dcbee5c6..55a837fbda21b 100644
--- a/release/scripts/checkindex.pl
+++ b/release/scripts/checkindex.pl
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------
 # 08 Apr 2000
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/checkindex.pl,v 1.1 2003/03/03 09:42:47 murray Exp $
 #
 
 use Getopt::Long;
diff --git a/release/scripts/chkINDEX b/release/scripts/chkINDEX
index d2b9e0eed8b75..4db2b4cba2cae 100755
--- a/release/scripts/chkINDEX
+++ b/release/scripts/chkINDEX
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/chkINDEX,v 1.3 2002/12/08 18:31:03 murray Exp $
 
 usage()
 {
diff --git a/release/scripts/commerce-install.sh b/release/scripts/commerce-install.sh
index 9bf67a338b446..9089a4e4400e3 100755
--- a/release/scripts/commerce-install.sh
+++ b/release/scripts/commerce-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/commerce-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/dict-install.sh b/release/scripts/dict-install.sh
index 4f57aaa11ec99..5a4c5a152a017 100755
--- a/release/scripts/dict-install.sh
+++ b/release/scripts/dict-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/dict-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/dict-make.sh b/release/scripts/dict-make.sh
index c0ca6a5880ed9..4ff2f47db970a 100755
--- a/release/scripts/dict-make.sh
+++ b/release/scripts/dict-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/dict-make.sh,v 1.10 2002/04/26 07:40:08 ru Exp $
 #
 
 # Move the dict stuff out to its own dist
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index cb8cb92931933..7f72a85d32b17 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.60 2004/08/25 01:39:52 kensmith Exp $
 #
 
 set -ex
diff --git a/release/scripts/doc-install.sh b/release/scripts/doc-install.sh
index 5609720ada37b..dfbff0eaffe76 100755
--- a/release/scripts/doc-install.sh
+++ b/release/scripts/doc-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/doc-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/doc-make.sh b/release/scripts/doc-make.sh
index 033554007abec..0f3d773bb9200 100755
--- a/release/scripts/doc-make.sh
+++ b/release/scripts/doc-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/doc-make.sh,v 1.3 2002/04/23 22:16:40 obrien Exp $
 #
 
 # Create the doc dist.
diff --git a/release/scripts/games-install.sh b/release/scripts/games-install.sh
index 6c940776b55e8..cf8564d651a23 100755
--- a/release/scripts/games-install.sh
+++ b/release/scripts/games-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/games-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/games-make.sh b/release/scripts/games-make.sh
index 6e83d14747373..29eb462c8c545 100755
--- a/release/scripts/games-make.sh
+++ b/release/scripts/games-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/games-make.sh,v 1.5 2002/04/23 22:16:40 obrien Exp $
 #
 
 # Move all the games out to their own dist
diff --git a/release/scripts/info-install.sh b/release/scripts/info-install.sh
index 30c12bf23850c..e5ba91ea53b65 100755
--- a/release/scripts/info-install.sh
+++ b/release/scripts/info-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/info-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/info-make.sh b/release/scripts/info-make.sh
index 12fd29d938731..ac1284e0c71e8 100755
--- a/release/scripts/info-make.sh
+++ b/release/scripts/info-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/info-make.sh,v 1.4 2002/04/23 22:16:40 obrien Exp $
 #
 
 # Move the info files out to their own dist
diff --git a/release/scripts/info.sh b/release/scripts/info.sh
index e25ceb73dbe98..8ba12b603adad 100644
--- a/release/scripts/info.sh
+++ b/release/scripts/info.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $ANA: info.sh,v 1.3 1996/06/04 16:25:30 wollman Exp $
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/info.sh,v 1.5 2001/04/08 23:09:21 obrien Exp $
 #
 
 ls $1.[a-z][a-z] | wc | awk '{ print "Pieces = ",$1 }'
diff --git a/release/scripts/kernels-install.sh b/release/scripts/kernels-install.sh
index 0bf9619b95879..a617cf80fe42b 100644
--- a/release/scripts/kernels-install.sh
+++ b/release/scripts/kernels-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/kernels-install.sh,v 1.4 2006/09/08 19:54:37 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/lib32-install.sh b/release/scripts/lib32-install.sh
index c6f732d0138b0..e170ae3e88777 100644
--- a/release/scripts/lib32-install.sh
+++ b/release/scripts/lib32-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/lib32-install.sh,v 1.1 2006/08/28 08:13:56 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/lib32-make.sh b/release/scripts/lib32-make.sh
index 37e16d4c719af..ffbcbfac0c12b 100644
--- a/release/scripts/lib32-make.sh
+++ b/release/scripts/lib32-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/lib32-make.sh,v 1.1 2005/06/16 18:16:13 ru Exp $
 #
 
 # Clean the dust.
diff --git a/release/scripts/manpages-install.sh b/release/scripts/manpages-install.sh
index 35eb4b7a17ca8..0ef9cbd6271ad 100755
--- a/release/scripts/manpages-install.sh
+++ b/release/scripts/manpages-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/manpages-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/manpages-make.sh b/release/scripts/manpages-make.sh
index bb1326f3d506b..bc3b018d39de3 100755
--- a/release/scripts/manpages-make.sh
+++ b/release/scripts/manpages-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/manpages-make.sh,v 1.5 2002/05/25 17:31:27 ru Exp $
 #
 
 # Move all the manpages out to their own dist, using the base dist as a
diff --git a/release/scripts/mkpkghier b/release/scripts/mkpkghier
index c14b628680181..60507ee74c8c2 100755
--- a/release/scripts/mkpkghier
+++ b/release/scripts/mkpkghier
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/mkpkghier,v 1.2 2002/12/08 18:31:03 murray Exp $
 
 usage()
 {
diff --git a/release/scripts/mkpkgindex.sh b/release/scripts/mkpkgindex.sh
index b70a258257df9..fb6b36c083e26 100644
--- a/release/scripts/mkpkgindex.sh
+++ b/release/scripts/mkpkgindex.sh
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/mkpkgindex.sh,v 1.2 2004/01/02 22:58:29 obrien Exp $
 
 # Creates an INDEX file suitable for an ISO distribution image from a master
 # INDEX file.  The generated INDEX file contains only the packages in the
diff --git a/release/scripts/package-split.py b/release/scripts/package-split.py
index fd24a08c52dd9..35d446a4ab845 100644
--- a/release/scripts/package-split.py
+++ b/release/scripts/package-split.py
@@ -7,7 +7,7 @@
 #
 # Usage: package-split.py <INDEX> <master INDEX>
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/package-split.py,v 1.16.2.2.2.1 2008/01/14 17:31:35 kensmith Exp $
 
 import os
 import sys
diff --git a/release/scripts/package-trees.sh b/release/scripts/package-trees.sh
index f054a5ea7ddf9..f701986164111 100644
--- a/release/scripts/package-trees.sh
+++ b/release/scripts/package-trees.sh
@@ -7,7 +7,7 @@
 #
 # Usage: package-tress.sh <copy method> <INDEX> <package tree> <destination>
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/package-trees.sh,v 1.2 2005/05/03 04:19:07 marcel Exp $
 
 # Verify the command line
 if [ $# -ne 4 ]; then
diff --git a/release/scripts/ports-install.sh b/release/scripts/ports-install.sh
index 81c4023c77eeb..57ddaac34ac75 100755
--- a/release/scripts/ports-install.sh
+++ b/release/scripts/ports-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/proflibs-install.sh b/release/scripts/proflibs-install.sh
index 8e35ae3fd3a27..b0572fae8ca30 100755
--- a/release/scripts/proflibs-install.sh
+++ b/release/scripts/proflibs-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/proflibs-install.sh,v 1.6 2006/08/28 08:12:49 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/proflibs-make.sh b/release/scripts/proflibs-make.sh
index 5ff447ac9068d..a7c47671b21fd 100755
--- a/release/scripts/proflibs-make.sh
+++ b/release/scripts/proflibs-make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/proflibs-make.sh,v 1.8 2004/01/18 09:06:40 ru Exp $
 #
 
 # Move the profiled libraries out to their own dist
diff --git a/release/scripts/split-file.sh b/release/scripts/split-file.sh
index 40b8eaa044e41..27308058121ce 100755
--- a/release/scripts/split-file.sh
+++ b/release/scripts/split-file.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/split-file.sh,v 1.2 2004/08/26 19:15:20 ru Exp $
 #
 
 # Bail if things fail and be verbose about what we are doing
diff --git a/release/scripts/src-install.sh b/release/scripts/src-install.sh
index 75ec5a5659305..194ee2aaf9d8a 100755
--- a/release/scripts/src-install.sh
+++ b/release/scripts/src-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/src-install.sh,v 1.11.2.1 2007/11/09 16:16:59 ru Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/scripts/tar.sh b/release/scripts/tar.sh
index e0933f29d7783..9e3310782b756 100644
--- a/release/scripts/tar.sh
+++ b/release/scripts/tar.sh
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/tar.sh,v 1.7 2001/04/08 23:09:21 obrien Exp $
 #
 
 #
diff --git a/release/scripts/xperimnt-install.sh b/release/scripts/xperimnt-install.sh
index 394265892f2c8..f153c4fd57ba7 100755
--- a/release/scripts/xperimnt-install.sh
+++ b/release/scripts/xperimnt-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/release/scripts/xperimnt-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
 #
 
 if [ "`id -u`" != "0" ]; then
diff --git a/release/sparc64/boot_crunch.conf b/release/sparc64/boot_crunch.conf
index 14f59d307f6f9..06743c62a718c 100644
--- a/release/sparc64/boot_crunch.conf
+++ b/release/sparc64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.8.4.1 2008/01/23 20:22:48 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/release/sparc64/mkisoimages.sh b/release/sparc64/mkisoimages.sh
index b101306d9a926..abf05e4bd38b8 100644
--- a/release/sparc64/mkisoimages.sh
+++ b/release/sparc64/mkisoimages.sh
@@ -4,7 +4,7 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
+# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.9 2005/01/30 21:10:52 kensmith Exp $
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
diff --git a/release/sun4v/boot_crunch.conf b/release/sun4v/boot_crunch.conf
index 14f59d307f6f9..02e2cd579dbe1 100644
--- a/release/sun4v/boot_crunch.conf
+++ b/release/sun4v/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.1.4.1 2008/01/23 20:22:48 kensmith Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
diff --git a/rescue/Makefile b/rescue/Makefile
index 0945ed35a6abb..302ff938b3b6d 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/rescue/Makefile,v 1.1 2003/06/29 18:35:36 gordon Exp $
 
 SUBDIR=	librescue \
 	rescue
diff --git a/rescue/README b/rescue/README
index 3a8cb463fe5ec..be420b6b1c738 100644
--- a/rescue/README
+++ b/rescue/README
@@ -41,4 +41,4 @@ To compile:
 Note that rebuilds don't always work correctly; if you run into
 trouble, try 'make clean' before recompiling.
 
-$FreeBSD$
+$FreeBSD: src/rescue/README,v 1.1 2003/06/29 18:35:36 gordon Exp $
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index 03ffec57139f4..baa84ce73264c 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/rescue/librescue/Makefile,v 1.9 2006/07/27 12:28:05 yar Exp $
 #
 
 .include <bsd.own.mk>
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index e0c05be2c4f6c..b02c43649d6ba 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.56 2007/07/14 21:49:22 rwatson Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 NO_MAN=
diff --git a/sbin/Makefile b/sbin/Makefile
index 7c78a99f197f9..746516dbad9f7 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile,v 1.168 2007/07/24 15:35:00 scottl Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 70d658416ea92..0f4ee57c5c5d1 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/Makefile.inc,v 1.15 2006/03/17 18:54:30 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9bb..cd38438b55d63 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/adjkerntz/Makefile,v 1.6 2001/12/04 02:19:43 obrien Exp $
 
 PROG=   adjkerntz
 MAN=	adjkerntz.8
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 5591f2e10b760..3dcfcaa7929e0 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.29 2005/02/13 22:25:15 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 35d8da9d6c518..bb5e4072e255f 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,7 @@ static const char copyright[] =
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.32 2006/10/23 10:48:19 ru Exp $");
 
 /*
  * Andrey A. Chernov   <ache@astral.msk.su>    Dec 20 1993
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 73b916080d42d..6cf21e7317ba9 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sbin/atacontrol/Makefile,v 1.8 2003/11/05 19:20:41 johan Exp $
 
 PROG=	atacontrol
 MAN=	atacontrol.8
diff --git a/sbin/atacontrol/atacontrol.8 b/sbin/atacontrol/atacontrol.8
index dd25f570023a4..8cf8800de748c 100644
--- a/sbin/atacontrol/atacontrol.8
+++ b/sbin/atacontrol/atacontrol.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.28.2.1 2007/12/02 08:49:23 remko Exp $
 .\"
 .Dd November 28, 2007
 .Dt ATACONTROL 8
diff --git a/sbin/atacontrol/atacontrol.c b/sbin/atacontrol/atacontrol.c
index 451ae75f4157f..7edb1901e524b 100644
--- a/sbin/atacontrol/atacontrol.c
+++ b/sbin/atacontrol/atacontrol.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.43 2007/08/13 18:46:31 jhb Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index 79fc6a3664e55..203acf0b4abea 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/Makefile,v 1.6 2007/07/14 21:49:22 rwatson Exp $
 
 SUBDIR=	atmconfig
 
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 3d5738afdbc4d..29cdbeba00cbc 100644
--- a/sbin/atm/Makefile.inc
+++ b/sbin/atm/Makefile.inc
@@ -21,6 +21,6 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile.inc,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/Makefile.inc,v 1.5 2003/08/18 15:32:16 obrien Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index 973e5cce4cd4e..592ae9bc27d0b 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atm/Makefile,v 1.12 2004/05/14 13:31:20 cognet Exp $
 
 PROG=	atm
 SRCS=	atm.c atm_fore200.c atm_inet.c atm_print.c \
diff --git a/sbin/atm/atm/atm.8 b/sbin/atm/atm/atm.8
index 7cd6493ba4401..bdb96f3f244c3 100644
--- a/sbin/atm/atm/atm.8
+++ b/sbin/atm/atm/atm.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD$
+.\" @(#) $FreeBSD: src/sbin/atm/atm/atm.8,v 1.7 2007/01/02 21:00:45 rse Exp $
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/atm/atm.c b/sbin/atm/atm/atm.c
index 94cde38582d75..f6999274a520c 100644
--- a/sbin/atm/atm/atm.c
+++ b/sbin/atm/atm/atm.c
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.10 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index 09f5c87987cbd..9213fa06dcbf2 100644
--- a/sbin/atm/atm/atm.h
+++ b/sbin/atm/atm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.9 2005/05/02 10:31:27 delphij Exp $
  *
  */
 
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index d6da017903927..39bf0f58570f1 100644
--- a/sbin/atm/atm/atm_fore200.c
+++ b/sbin/atm/atm/atm_fore200.c
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_inet.c b/sbin/atm/atm/atm_inet.c
index 2f916a091bdc1..eba21d30d6f31 100644
--- a/sbin/atm/atm/atm_inet.c
+++ b/sbin/atm/atm/atm_inet.c
@@ -53,7 +53,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_inet.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_print.c b/sbin/atm/atm/atm_print.c
index a3f0ce3bfd0e1..edae60588913e 100644
--- a/sbin/atm/atm/atm_print.c
+++ b/sbin/atm/atm/atm_print.c
@@ -60,7 +60,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_print.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index 790bfc1799192..78d1368f90b1f 100644
--- a/sbin/atm/atm/atm_set.c
+++ b/sbin/atm/atm/atm_set.c
@@ -54,7 +54,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_set.c,v 1.8 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c
index e744c755fd419..413f13694911f 100644
--- a/sbin/atm/atm/atm_show.c
+++ b/sbin/atm/atm/atm_show.c
@@ -53,7 +53,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.10 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_subr.c b/sbin/atm/atm/atm_subr.c
index a612beef20662..2ed18f07f2bc6 100644
--- a/sbin/atm/atm/atm_subr.c
+++ b/sbin/atm/atm/atm_subr.c
@@ -53,7 +53,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm_subr.c,v 1.9 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 1db0fa46dc00e..a300aa82321f7 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -3,7 +3,7 @@
 #	All rights reserved.
 # Author: Harti Brandt <brandt@fokus.gmd.de>
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.8 2005/03/15 07:38:15 harti Exp $
 
 PROG=	atmconfig
 .ifndef RESCUE
diff --git a/sbin/atm/atmconfig/atm_oid.list b/sbin/atm/atmconfig/atm_oid.list
index ca64afa44267d..e1f4efcf3cba9 100644
--- a/sbin/atm/atmconfig/atm_oid.list
+++ b/sbin/atm/atmconfig/atm_oid.list
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atm_oid.list,v 1.1 2004/08/12 12:31:43 harti Exp $
 begemotAtmIfTable
 begemotAtmIfName
 begemotAtmIfNodeId
diff --git a/sbin/atm/atmconfig/atmconfig.8 b/sbin/atm/atmconfig/atmconfig.8
index 1ff76a100cd8a..c17cc8589a700 100644
--- a/sbin/atm/atmconfig/atmconfig.8
+++ b/sbin/atm/atmconfig/atmconfig.8
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/atmconfig/atmconfig.8,v 1.2 2004/05/17 20:45:21 ru Exp $
 .\"
 .Dd August 11, 2003
 .Dt ATMCONFIG 8
diff --git a/sbin/atm/atmconfig/atmconfig.h b/sbin/atm/atmconfig/atmconfig.h
index 5e5b04172cb08..3d781b7a55317 100644
--- a/sbin/atm/atmconfig/atmconfig.h
+++ b/sbin/atm/atmconfig/atmconfig.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/atmconfig.h,v 1.2 2004/08/12 12:31:43 harti Exp $
  */
 #ifndef _ATMCONFIG_H
 #define	_ATMCONFIG_H
diff --git a/sbin/atm/atmconfig/atmconfig.help b/sbin/atm/atmconfig/atmconfig.help
index 8c6e7cec7f2fc..30b79f5cdbfc7 100644
--- a/sbin/atm/atmconfig/atmconfig.help
+++ b/sbin/atm/atmconfig/atmconfig.help
@@ -31,7 +31,7 @@
 #
 # Help file for the atmconfig utility
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atmconfig.help,v 1.5 2004/08/12 12:31:43 harti Exp $
 #
 ^0 intro
 ATM configuration utility.
diff --git a/sbin/atm/atmconfig/atmconfig_device.c b/sbin/atm/atmconfig/atmconfig_device.c
index 082494df95a50..c2e2e6630c7d2 100644
--- a/sbin/atm/atmconfig/atmconfig_device.c
+++ b/sbin/atm/atmconfig/atmconfig_device.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.c,v 1.1 2004/08/12 12:31:43 harti Exp $");
 
 #include "atmconfig.h"
 #include "atmconfig_device.h"
diff --git a/sbin/atm/atmconfig/atmconfig_device.h b/sbin/atm/atmconfig/atmconfig_device.h
index 1c099fcdc79af..b2a50da675124 100644
--- a/sbin/atm/atmconfig/atmconfig_device.h
+++ b/sbin/atm/atmconfig/atmconfig_device.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.h,v 1.2 2005/05/02 10:31:27 delphij Exp $
  */
 #ifndef ATMCONFIG_DEVICE_H_
 #define ATMCONFIG_DEVICE_H_
diff --git a/sbin/atm/atmconfig/atmconfig_device.help b/sbin/atm/atmconfig/atmconfig_device.help
index 27237c8cb7b9a..020d0ee6be4c9 100644
--- a/sbin/atm/atmconfig/atmconfig_device.help
+++ b/sbin/atm/atmconfig/atmconfig_device.help
@@ -27,7 +27,7 @@
 #
 # Help file for the atmconfig utility
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/atmconfig/atmconfig_device.help,v 1.1 2004/08/12 12:31:43 harti Exp $
 #
 ^0 device
 ^^  device	show information about ATM hardware interfaces
diff --git a/sbin/atm/atmconfig/diag.c b/sbin/atm/atmconfig/diag.c
index 699d5ccf2f6b2..656cc02c08acb 100644
--- a/sbin/atm/atmconfig/diag.c
+++ b/sbin/atm/atmconfig/diag.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/diag.c,v 1.8 2007/04/14 16:09:23 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/atm/atmconfig/diag.h b/sbin/atm/atmconfig/diag.h
index 8b36cd44e1f5d..1f3c1cb5e0514 100644
--- a/sbin/atm/atmconfig/diag.h
+++ b/sbin/atm/atmconfig/diag.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/diag.h,v 1.2 2004/01/26 12:17:49 harti Exp $
  */
 
 struct diagif {
diff --git a/sbin/atm/atmconfig/main.c b/sbin/atm/atmconfig/main.c
index d2543f7d1f36e..c59108f9f0a7f 100644
--- a/sbin/atm/atmconfig/main.c
+++ b/sbin/atm/atmconfig/main.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/main.c,v 1.4 2004/08/12 12:31:43 harti Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/atm/atmconfig/natm.c b/sbin/atm/atmconfig/natm.c
index 29f5ce231e0a9..b250a9e9f491d 100644
--- a/sbin/atm/atmconfig/natm.c
+++ b/sbin/atm/atmconfig/natm.c
@@ -27,7 +27,7 @@
  * Author: Hartmut Brandt <harti@freebsd.org>
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/atm/atmconfig/natm.c,v 1.2 2004/07/28 16:32:17 harti Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/atm/atmconfig/private.h b/sbin/atm/atmconfig/private.h
index 9dcf53979517a..9243bb8908500 100644
--- a/sbin/atm/atmconfig/private.h
+++ b/sbin/atm/atmconfig/private.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/atmconfig/private.h,v 1.3 2004/08/12 12:31:43 harti Exp $
  */
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/atm/fore_dnld/COPYRIGHT b/sbin/atm/fore_dnld/COPYRIGHT
index f934d42937246..771e38e69db8e 100644
--- a/sbin/atm/fore_dnld/COPYRIGHT
+++ b/sbin/atm/fore_dnld/COPYRIGHT
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/atm/fore_dnld/COPYRIGHT,v 1.1 2000/02/15 13:20:57 phk Exp $
 
 This copyright applies to the microcode image in the file pca200e.c.
 
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index abcec31b23631..f7484775d2ddc 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.11 2003/08/18 15:32:16 obrien Exp $
 
 PROG=	fore_dnld
 MAN=	fore_dnld.8
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index c7afb78b9fb7e..3f7c6fe7ce8a2 100644
--- a/sbin/atm/fore_dnld/fore_dnld.8
+++ b/sbin/atm/fore_dnld/fore_dnld.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.10 2005/02/09 18:03:37 ru Exp $
 .\"
 .Dd December 3, 1996
 .Dt FORE_DNLD 8
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index dc52effc97026..d7bfe024a63d8 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.c
@@ -62,7 +62,7 @@
 #include <unistd.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.17 2004/02/10 20:48:08 cperciva Exp $");
 #endif
 
 extern u_char pca200e_microcode_3[];
diff --git a/sbin/atm/fore_dnld/pca200e.c b/sbin/atm/fore_dnld/pca200e.c
index c208a4ddf3a1b..4b7b87bca8642 100644
--- a/sbin/atm/fore_dnld/pca200e.c
+++ b/sbin/atm/fore_dnld/pca200e.c
@@ -36,7 +36,7 @@
  * This are binary copies of the PCA200E firmware versions 3.0.1 and
  * 4.1.12
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/atm/fore_dnld/pca200e.c,v 1.2 2003/07/31 14:26:07 harti Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index 67d9bab32b9c8..3f31368c3ca84 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -21,7 +21,7 @@
 # notice must be reproduced on all copies.
 #
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/atm/ilmid/Makefile,v 1.12 2004/05/14 13:31:20 cognet Exp $
 
 PROG=	ilmid
 MAN=	ilmid.8
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index 8ffa9fe12563b..e1dbe4063dcdd 100644
--- a/sbin/atm/ilmid/ilmid.8
+++ b/sbin/atm/ilmid/ilmid.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.8 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd September 14, 1998
 .Dt ILMID 8
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 4a1e5eca101f4..f48a7d5452680 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -71,7 +71,7 @@
 #include <ctype.h>
 
 #ifndef	lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.34 2005/05/02 10:31:27 delphij Exp $");
 #endif
 
 
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index a39227716b77a..57bdd837b4f5e 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/badsect/Makefile,v 1.8 2003/02/22 21:33:42 johan Exp $
 
 PROG=	badsect
 DPADD=	${LIBUFS}
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 293e9589a2810..133895c6653ef 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.23 2005/02/13 22:25:15 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 93891714c1933..f95af2766eeec 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -39,7 +39,7 @@ static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/badsect/badsect.c,v 1.21 2005/01/03 19:03:40 rwatson Exp $");
 
 /*
  * badsect
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index a412493bb4efa..fb302f1cbccc7 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.20 2006/08/22 07:51:09 ru Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index a0bb82ee4e542..f4982d5f9d147 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.17 2004/04/09 19:58:25 markm Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index fbcf75b233cce..fa0b386fe0841 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.68.4.1 2008/02/14 21:46:19 remko Exp $
 .\"
 .Dd December 8, 2007
 .Dt BSDLABEL 8
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index bcba1253751d2..27fcd312754e1 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.112 2006/10/20 13:10:27 maxim Exp $");
 
 #include <sys/param.h>
 #include <stdint.h>
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index c8a9ef362e54e..51887855dee96 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/bsdlabel/pathnames.h,v 1.5 2004/04/09 19:58:25 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/bsdlabel/runtest.sh b/sbin/bsdlabel/runtest.sh
index 9d561f39ab82f..7513dce3512ce 100644
--- a/sbin/bsdlabel/runtest.sh
+++ b/sbin/bsdlabel/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/bsdlabel/runtest.sh,v 1.5 2003/06/07 09:09:39 phk Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index 7a3d4213cbace..58d3ef0957673 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/camcontrol/Makefile,v 1.17 2007/09/08 20:24:12 ken Exp $
 
 PROG=	camcontrol
 SRCS=	camcontrol.c util.c
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 7925e947f92ed..1a1eed49c1941 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.44 2007/09/08 20:24:12 ken Exp $
 .\"
 .Dd August 21, 2006
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 9eab41c61d10b..a5b6f4c39b997 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.58 2007/09/08 20:24:12 ken Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index eebbe8553ed50..55b757870fa6b 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/camcontrol/camcontrol.h,v 1.4 2000/08/08 06:24:15 kbyanc Exp $
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 3fb9587e206a4..b93ce2094398e 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.17 2004/01/22 07:23:35 grehan Exp $");
 
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 67f4e4f0cd157..57a9b195c5309 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -44,7 +44,7 @@
  * from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/util.c,v 1.10 2003/08/05 09:19:07 johan Exp $");
 
 #include <sys/stdint.h>
 #include <sys/types.h>
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index ac7558409ed61..66bbcb0ef7e77 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.10 2003/08/07 19:10:35 johan Exp $
 
 PROG=	ccdconfig
 WARNS?=	6
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index f5f4224b5e302..869bf74a495aa 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.37 2006/04/14 09:20:25 ru Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 928aba5cb73a3..4a256324f041f 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.37 2006/04/13 20:35:31 cracauer Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 538cfeda096dd..b762105f87884 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ccdconfig/pathnames.h,v 1.2 2003/01/17 14:53:53 phk Exp $
  */
 
 #define _PATH_CCDCONF		"/etc/ccd.conf"
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index c68c312f269b2..e89723640f7fe 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/clri/Makefile,v 1.6 2001/12/04 02:19:44 obrien Exp $
 
 PROG=	clri
 MAN=	clri.8
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index c3c37960cbb24..60c57d61f36cc 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/clri/clri.8,v 1.14 2004/04/09 19:58:26 markm Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index dc77a41c66d5b..73342692f9400 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/clri/clri.c,v 1.15 2005/05/29 16:07:10 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index a7720d81b41e9..ca636f9d70ce5 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.4 (Berkeley) 6/5/91
-# $FreeBSD$
+# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.7 2003/08/08 19:51:01 johan Exp $
 
 PROG=	comcontrol
 MAN=	comcontrol.8
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 87a7630582e36..2b89167cbe158 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/comcontrol/comcontrol.8,v 1.29 2005/01/18 10:09:31 ru Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 753ded36d1a9f..a974a064003d1 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.14 2003/08/08 19:51:01 johan Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile
index ddd2434e6cc58..609206b5a594e 100644
--- a/sbin/conscontrol/Makefile
+++ b/sbin/conscontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/conscontrol/Makefile,v 1.5 2001/12/04 02:19:44 obrien Exp $
 
 PROG=	conscontrol
 MAN=	conscontrol.8
diff --git a/sbin/conscontrol/conscontrol.8 b/sbin/conscontrol/conscontrol.8
index 726041e4087b3..d2db6bd2b5c7e 100644
--- a/sbin/conscontrol/conscontrol.8
+++ b/sbin/conscontrol/conscontrol.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/conscontrol/conscontrol.8,v 1.9 2005/02/10 09:19:28 ru Exp $
 .\"
 .Dd October 23, 2001
 .Dt CONSCONTROL 8
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index d8e5bc52c11af..aef283cbc49c9 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/conscontrol/conscontrol.c,v 1.4 2004/06/18 06:33:44 green Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 8f52d902782c6..5186a15376259 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devd/Makefile,v 1.8 2006/01/30 22:50:13 pjd Exp $
 
 PROG_CXX=devd
 SRCS=	devd.cc token.l parse.y y.tab.h
diff --git a/sbin/devd/devd.8 b/sbin/devd/devd.8
index 7377e254759cf..50eac2cd9a246 100644
--- a/sbin/devd/devd.8
+++ b/sbin/devd/devd.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.17 2006/09/17 22:49:26 ru Exp $
 .\"
 .Dd November 24, 2005
 .Dt DEVD 8
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index c6ac80c65173a..d79f867d9b8c2 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -34,7 +34,7 @@
 //	  - devd.conf needs more details on the supported statements.
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.33 2006/09/17 22:49:26 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index c8de20f099440..92ce421ce2aea 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.11 2006/10/24 20:20:41 ru Exp $
 .\"
 .\" The section on comments was taken from named.conf.5, which has the
 .\" following copyright:
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index a8d113b03439c..44ac1c8059eb2 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/devd.h,v 1.5 2005/07/10 03:37:15 imp Exp $
  */
 
 #ifndef DEVD_H
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index a1ee9cd595d5a..9d2653e85565f 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/devd.hh,v 1.4 2006/01/30 22:50:13 pjd Exp $
  */
 
 #ifndef DEVD_HH
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 28b8a908adb19..dc72625c8a91b 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/parse.y,v 1.5 2005/07/10 03:37:15 imp Exp $
  */
 
 #include "devd.h"
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 0fa78da4ebc30..27806a4ca3c03 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devd/token.l,v 1.6 2005/07/10 03:37:15 imp Exp $
  */
 
 #include <ctype.h>
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 95d2540272e6b..a176a641d477c 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/devfs/Makefile,v 1.2 2002/07/28 06:52:47 dd Exp $
 
 PROG=	devfs
 SRCS=	devfs.c rule.c
diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index 631bf732a4fbf..2bc8cdc0b3738 100644
--- a/sbin/devfs/devfs.8
+++ b/sbin/devfs/devfs.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18 2006/12/29 22:45:12 danger Exp $
 .\"
 .Dd November 5, 2006
 .Dt DEVFS 8
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 0e7b66210121a..5e5f04711aa21 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devfs/devfs.c,v 1.7 2006/06/14 15:09:52 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index a9f8d224838de..64218809e00b3 100644
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/devfs/extern.h,v 1.3 2004/06/02 23:02:31 stefanf Exp $
  */
 
 #ifndef __DEVFS_H__
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index 25a7d289ad0fb..ad225e2415763 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/devfs/rule.c,v 1.8 2006/01/05 13:37:07 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 7e32326ff00aa..1fedf279fb1e1 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,5 +1,5 @@
 # $OpenBSD: Makefile,v 1.9 2004/05/04 12:52:05 henning Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/Makefile,v 1.24 2005/06/25 11:03:06 ru Exp $
 #
 # Copyright (c) 1996, 1997 The Internet Software Consortium.
 # All rights reserved.
diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index cd60ceca7d83c..ce4308c7f800c 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/alloc.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 43122fb8972b0..20a5d26ee4e72 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/bpf.c,v 1.7 2006/09/26 01:02:02 brooks Exp $");
 
 #include "dhcpd.h"
 #include <sys/ioctl.h>
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 5d7084e74c791..3117f0bd2e172 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/clparse.c,v 1.3 2007/02/09 17:50:26 emaste Exp $");
 
 #include "dhcpd.h"
 #include "dhctoken.h"
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 3c8932dbd5b2b..e6abe33539f9c 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/conflex.c,v 1.4 2005/08/26 01:25:59 brooks Exp $");
 
 #include <ctype.h>
 
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index adca0929a07cb..f7a58c29b6874 100644
--- a/sbin/dhclient/convert.c
+++ b/sbin/dhclient/convert.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/convert.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/dhclient-script b/sbin/dhclient/dhclient-script
index c6c9e8cc5657e..42440f8eabbcd 100644
--- a/sbin/dhclient/dhclient-script
+++ b/sbin/dhclient/dhclient-script
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.17 2007/07/03 17:49:32 thompsa Exp $
 #
 # Copyright (c) 2003 Kenneth R Westerback <krw@openbsd.org>
 #
diff --git a/sbin/dhclient/dhclient-script.8 b/sbin/dhclient/dhclient-script.8
index b04974bc16176..cab4adf4501ba 100644
--- a/sbin/dhclient/dhclient-script.8
+++ b/sbin/dhclient/dhclient-script.8
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient-script.8,v 1.2 2005/06/22 14:55:59 ru Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT-SCRIPT 8
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index 58f5ddd3ea05f..ed9c6b35af6cb 100644
--- a/sbin/dhclient/dhclient.8
+++ b/sbin/dhclient/dhclient.8
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient.8,v 1.9 2007/09/20 10:46:25 gabor Exp $
 .\"
 .Dd August 13, 2007
 .Dt DHCLIENT 8
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index c2d3635b492c5..aba1692c7aea4 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.21 2007/02/09 17:50:26 emaste Exp $");
 
 #include "dhcpd.h"
 #include "privsep.h"
diff --git a/sbin/dhclient/dhclient.conf b/sbin/dhclient/dhclient.conf
index 7eaeeb8eb40a7..b7592d4bf829f 100644
--- a/sbin/dhclient/dhclient.conf
+++ b/sbin/dhclient/dhclient.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dhclient/dhclient.conf,v 1.3 2007/02/09 17:50:26 emaste Exp $
 
 send host-name "andare.fugue.com";
 send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 167239ef63c3e..51c22b453cb0d 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient.conf.5,v 1.2 2005/06/22 14:55:59 ru Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT.CONF 5
diff --git a/sbin/dhclient/dhclient.leases.5 b/sbin/dhclient/dhclient.leases.5
index b1f0f3d8bd53a..5aa07ea979b72 100644
--- a/sbin/dhclient/dhclient.leases.5
+++ b/sbin/dhclient/dhclient.leases.5
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhclient.leases.5,v 1.2 2005/06/22 14:55:59 ru Exp $
 .\"
 .Dd January 1, 1997
 .Dt DHCLIENT.LEASES 5
diff --git a/sbin/dhclient/dhcp-options.5 b/sbin/dhclient/dhcp-options.5
index 37356062ccacc..2b1e692ec1ebc 100644
--- a/sbin/dhclient/dhcp-options.5
+++ b/sbin/dhclient/dhcp-options.5
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dhclient/dhcp-options.5,v 1.3 2006/02/06 19:22:34 jcamou Exp $
 .\"
 .Dd January 1, 1995
 .Dt DHCP-OPTIONS 5
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index 3f0eb81bb65cf..aa699307d49b4 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: dhcp.h,v 1.5 2004/05/04 15:49:49 deraadt Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/dhclient/dhcp.h,v 1.3 2007/02/09 17:50:26 emaste Exp $	*/
 
 /* Protocol structures... */
 
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 02766e0280ea1..8693eaa3d80a7 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/dispatch.c,v 1.2.2.1 2007/12/10 17:49:16 jkim Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index de3458322fda3..d8b662fbe8ebf 100644
--- a/sbin/dhclient/errwarn.c
+++ b/sbin/dhclient/errwarn.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/errwarn.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include <errno.h>
 
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 040236ab735b5..a461609b1325c 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/hash.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index 4b7b1cef1bad2..543424319f1c2 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/inet.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index 09aa4d8ffb649..7e7052ac4467d 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/options.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include <ctype.h>
 
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 484953ca2d985..20858508147f0 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/packet.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 6a54fd0a4c88d..b5a35892c1a85 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/parse.c,v 1.3 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 #include "dhctoken.h"
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index b42572f2895b1..647ef5558c861 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/privsep.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 #include "privsep.h"
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index f7ee057bf797a..beac8f0e5baca 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/tables.c,v 1.4 2007/02/09 17:50:26 emaste Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 0ed2919bb3145..dca8f980ba7d2 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dhclient/tree.c,v 1.2 2005/08/23 23:59:55 brooks Exp $");
 
 #include "dhcpd.h"
 
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 8472f56c461ff..e7b68377b1710 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dmesg/Makefile,v 1.8 2005/01/17 13:56:46 delphij Exp $
 
 PROG=	dmesg
 MAN=	dmesg.8
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 9d05e6c70b755..0dd7f8a74b9a2 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dmesg/dmesg.8,v 1.19 2004/04/09 19:58:26 markm Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index f2e513f6106ce..f89bbe1f55cce 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -39,7 +39,7 @@ static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.28 2006/02/27 19:13:47 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 608162aa570ef..e8eaa5705790f 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dump/Makefile,v 1.24 2003/11/14 13:07:38 johan Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/cache.c b/sbin/dump/cache.c
index 906ac27169598..2a6ac95ab71df 100644
--- a/sbin/dump/cache.c
+++ b/sbin/dump/cache.c
@@ -3,7 +3,7 @@
  *
  *	Block cache for dump
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/cache.c,v 1.2 2003/01/25 19:06:30 dillon Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 6759bdaabdd47..cb2b345c3e524 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.75 2006/09/18 11:55:09 ru Exp $
 .\"
 .Dd February 24, 2006
 .Dt DUMP 8
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index d467668b7e829..bf7c1c822595c 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -28,7 +28,7 @@
  *
  *	@(#)dump.h	8.2 (Berkeley) 4/28/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/dump.h,v 1.28 2007/02/26 08:15:56 mckusick Exp $
  */
 
 /*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index dd02642bdbf63..cea9351357180 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.22 2004/04/10 02:22:35 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index de880bbc030cf..f8ae316a510f0 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/itime.c,v 1.16 2004/12/02 13:56:53 maxim Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 827ffcc129f37..4656567ba2579 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/main.c,v 1.65 2006/10/12 20:22:31 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 8fc255ae73c59..dcb8667b2d56c 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/optr.c,v 1.35 2006/08/06 14:23:50 marck Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index eb3ce3977af23..035f7f15ac373 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/dump/pathnames.h,v 1.9 2004/04/09 19:58:27 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 913409fb7b01d..f30045a071d9b 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/tape.c,v 1.27 2005/03/02 02:30:08 iedowse Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 211cfa6370b98..0239a2a698787 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/traverse.c,v 1.40 2007/04/05 20:31:23 thomas Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 3720ebf550fd2..538ca4af80de1 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dump/unctime.c,v 1.6 2004/04/09 19:58:27 markm Exp $";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 99faa77ad725a..ee8b003fa3c71 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9 2003/11/14 13:13:23 johan Exp $
 
 PROG=	dumpfs
 DPADD=	${LIBUFS}
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 8879f783e3cb3..9a78357830efe 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.16 2007/05/12 22:35:22 pav Exp $
 .\"
 .Dd January 19, 2003
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index e0b809e1b5e0e..62b50cf76c967 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.44 2006/10/31 22:02:24 pjd Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index c273f93470a2f..e4ba142de8104 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/dumpon/Makefile,v 1.10 2004/10/03 23:39:14 des Exp $
 
 PROG=	dumpon
 WARNS?=	6
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index ff47bcb194795..9424d69e80b87 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.35 2006/02/27 00:15:53 kris Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 73d46b00eb3c0..8c8a18483afa1 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -39,7 +39,7 @@ static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.24 2006/10/31 22:36:49 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 6899c47c83562..c4135bb4d0879 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/Makefile,v 1.12 2005/07/15 08:02:51 phk Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_mbr_enc.c
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 562adbbbaea27..1a1a1c3a56b52 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.39 2007/04/30 18:29:36 maxim Exp $
 .\"
 .Dd April 30, 2007
 .Dt FDISK 8
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 5b5f174ab99b4..65663ad6b8c0c 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.84 2007/05/06 18:48:30 andre Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fdisk/runtest.sh b/sbin/fdisk/runtest.sh
index f25f4272bb0fe..3acca05045f20 100644
--- a/sbin/fdisk/runtest.sh
+++ b/sbin/fdisk/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk/runtest.sh,v 1.2 2003/04/13 21:57:08 phk Exp $
 
 set -e
 MD=`mdconfig -a -t malloc -s 4m -x 63 -y 16`
diff --git a/sbin/fdisk_pc98/Makefile b/sbin/fdisk_pc98/Makefile
index e5932f8a2d366..ec7dc74d05440 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fdisk_pc98/Makefile,v 1.8 2005/07/15 15:31:19 nyan Exp $
 
 PROG=	fdisk
 SRCS=	fdisk.c geom_pc98_enc.c
diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8
index c33e78abfc3ea..52738180d2baf 100644
--- a/sbin/fdisk_pc98/fdisk.8
+++ b/sbin/fdisk_pc98/fdisk.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.22 2007/05/10 12:33:00 nyan Exp $
 .\"
 .Dd April 30, 2007
 .Dt FDISK 8
diff --git a/sbin/fdisk_pc98/fdisk.c b/sbin/fdisk_pc98/fdisk.c
index 161c1f55a981f..c127d76da830a 100644
--- a/sbin/fdisk_pc98/fdisk.c
+++ b/sbin/fdisk_pc98/fdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.21 2007/04/21 22:47:35 imp Exp $");
 
 #include <sys/disk.h>
 #include <sys/disklabel.h>
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index a1ffef7989a09..e6fc5a578cf03 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -1,7 +1,7 @@
 # @(#)Makefile    8.8 (Berkeley) 6/21/2000
 #
 # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.7 2004/04/01 20:31:48 johan Exp $
 #
 
 GROWFS= ${.CURDIR}/../growfs
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index aacf4280bf137..60364ef65eaa3 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.18 2006/06/11 15:53:36 maxim Exp $
 .\"
 .Dd September 8, 2000
 .Dt FFSINFO 8
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 0ef5e9e0e1d89..4b1e5e10465c2 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -48,7 +48,7 @@ All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.13 2007/02/14 23:22:33 brian Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index bc445fda26f7c..f27f719f04b7e 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.14 1996/09/27 22:38:37 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck/Makefile,v 1.11 2003/10/29 16:10:17 trhodes Exp $
 
 PROG=	fsck
 SRCS=	fsck.c fsutil.c preen.c
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index b7360d9bd8c09..c2a56e0f8f520 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck/fsck.8,v 1.37 2005/02/10 09:19:29 ru Exp $
 .\"
 .Dd April 25, 2001
 .Dt FSCK 8
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 490a29af919ad..8291356412e3f 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck/fsck.c,v 1.18 2005/02/10 09:19:29 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index a4578bd63eb60..229e656aa7cba 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -33,7 +33,7 @@
 #ifndef lint
 __RCSID("$NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $");
 #endif /* not lint */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck/fsutil.c,v 1.8 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 84e72909592db..60bb9a8f32ee1 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck/fsutil.h,v 1.8 2003/12/27 13:54:02 bde Exp $
  */
 
 void perror(const char *);
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 6204685833f4b..fb2ac196c180d 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck/preen.c,v 1.28 2004/04/09 19:58:28 markm Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index aaae685df1493..4106f3f66e636 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18 2007/09/19 01:24:19 rodrigc Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95
 
 PROG=	fsck_ffs
diff --git a/sbin/fsck_ffs/SMM.doc/0.t b/sbin/fsck_ffs/SMM.doc/0.t
index 5fe189dc471ac..a9503e5f7ee69 100644
--- a/sbin/fsck_ffs/SMM.doc/0.t
+++ b/sbin/fsck_ffs/SMM.doc/0.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/0.t,v 1.6 2004/04/09 19:58:29 markm Exp $
 .\"	@(#)0.t	8.1 (Berkeley) 6/8/93
 .\"
 .if n .ND
diff --git a/sbin/fsck_ffs/SMM.doc/1.t b/sbin/fsck_ffs/SMM.doc/1.t
index 3098b49f95763..9b67a6cfbf274 100644
--- a/sbin/fsck_ffs/SMM.doc/1.t
+++ b/sbin/fsck_ffs/SMM.doc/1.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/1.t,v 1.5 2004/04/09 19:58:29 markm Exp $
 .\"	@(#)1.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Introduction
diff --git a/sbin/fsck_ffs/SMM.doc/2.t b/sbin/fsck_ffs/SMM.doc/2.t
index b294a6af3becc..841085ad2d7c5 100644
--- a/sbin/fsck_ffs/SMM.doc/2.t
+++ b/sbin/fsck_ffs/SMM.doc/2.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/2.t,v 1.5 2004/04/09 19:58:29 markm Exp $
 .\"	@(#)2.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Overview of the file system
diff --git a/sbin/fsck_ffs/SMM.doc/3.t b/sbin/fsck_ffs/SMM.doc/3.t
index 522a222c3dc38..90aad68073b33 100644
--- a/sbin/fsck_ffs/SMM.doc/3.t
+++ b/sbin/fsck_ffs/SMM.doc/3.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/3.t,v 1.7 2004/04/09 19:58:29 markm Exp $
 .\"	@(#)3.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Fixing corrupted file systems
diff --git a/sbin/fsck_ffs/SMM.doc/4.t b/sbin/fsck_ffs/SMM.doc/4.t
index 353fab3378fa7..4ecd2dc301903 100644
--- a/sbin/fsck_ffs/SMM.doc/4.t
+++ b/sbin/fsck_ffs/SMM.doc/4.t
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/sbin/fsck_ffs/SMM.doc/4.t,v 1.5 2004/04/09 19:58:29 markm Exp $
 .\"	@(#)4.t	8.1 (Berkeley) 6/5/93
 .\"
 .ds RH Appendix A \- Fsck_ffs Error Conditions
diff --git a/sbin/fsck_ffs/SMM.doc/Makefile b/sbin/fsck_ffs/SMM.doc/Makefile
index 9ddc06f097ae9..18b9ffd004774 100644
--- a/sbin/fsck_ffs/SMM.doc/Makefile
+++ b/sbin/fsck_ffs/SMM.doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_ffs/SMM.doc/Makefile,v 1.2 2000/10/09 08:26:35 adrian Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 DIR=	smm/03.fsck_ffs
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index da838b05c36a9..f7ee2cb72d435 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/dir.c,v 1.30 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 2cdf71e3ebeb9..02e69064e0ca0 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/ea.c,v 1.2 2003/05/03 18:41:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index f9b38e0c27b84..cf23eeddf7949 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $
  */
 
 #include <unistd.h>
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index a64c7ce8b5e76..2e838a2577433 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $
 .\"
 .Dd April 24, 2001
 .Dt FSCK_FFS 8
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 65f996c1ced8c..c29d107de2784 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26 2006/10/31 22:06:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index 8785e41d82a19..753acc8821f34 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2 2006/11/01 10:56:33 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index b41d8430e81b2..955f9077d10ee 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 578716f0e8675..8612c236a1db7 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.47 2007/09/19 01:24:19 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index f72887755ec2f..0cf2aab5258ba 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index e635935fca000..f54d4ae00c90d 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1b.c,v 1.15 2004/10/10 06:37:56 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index c4fdd2a8a5781..993543d3c888c 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 22309cbbde572..2558784e74416 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass3.c,v 1.15 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 8a426eaa081eb..606a7de4d6138 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass4.c,v 1.15 2004/10/08 20:44:47 truckman Exp $");
 
 #include <sys/param.h>
 
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 3275894de173b..4f4aade8c04b0 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.43 2006/10/31 22:06:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index bdf88b4b0dfde..b683ee14d608b 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 8e66820342149..f7d145a3ea874 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/utilities.c,v 1.23 2004/04/09 19:58:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/fsck_msdosfs/Makefile b/sbin/fsck_msdosfs/Makefile
index fd539b94f9d79..ed85989721749 100644
--- a/sbin/fsck_msdosfs/Makefile
+++ b/sbin/fsck_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsck_msdosfs/Makefile,v 1.5 2004/02/23 20:13:51 johan Exp $
 
 FSCK=	${.CURDIR}/../fsck
 .PATH: ${FSCK}
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 32ed8633e037a..8582596759c3f 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: boot.c,v 1.9 2003/07/24 19:25:46 ws Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/boot.c,v 1.4 2004/04/20 11:41:57 tjr Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 48ae5ca20eb17..324a8b9cca676 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: check.c,v 1.10 2000/04/25 23:02:51 jdolecek Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/check.c,v 1.10 2004/02/05 15:47:46 bde Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index b87a916c17ff0..0cb317fa8c5f6 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -37,7 +37,7 @@
 #ifndef lint
 __RCSID("$NetBSD: dir.c,v 1.14 1998/08/25 19:18:15 ross Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/dir.c,v 1.3 2003/12/26 17:24:37 trhodes Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 3a5d4394c5067..5420e2580c6ce 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.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.
  *	$NetBSD: dosfs.h,v 1.4 1997/01/03 14:32:48 ws Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_msdosfs/dosfs.h,v 1.3 2003/12/26 17:24:37 trhodes Exp $
  */
 
 #ifndef DOSFS_H
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 53127cf44ab4b..2987870a072c7 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -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.
  *	$NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsck_msdosfs/ext.h,v 1.10 2005/03/09 10:10:51 stefanf Exp $
  */
 
 #ifndef EXT_H
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index 0b0bd9e11e899..6d7845c08c091 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/fat.c,v 1.7 2004/02/05 15:18:18 bde Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/fsck_msdosfs.8 b/sbin/fsck_msdosfs/fsck_msdosfs.8
index 8631210cb4e60..21f1b5033327f 100644
--- a/sbin/fsck_msdosfs/fsck_msdosfs.8
+++ b/sbin/fsck_msdosfs/fsck_msdosfs.8
@@ -30,7 +30,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsck_msdosfs/fsck_msdosfs.8,v 1.15 2005/02/10 09:39:51 ru Exp $
 .\"
 .Dd August 13, 1995
 .Dt FSCK_MSDOSFS 8
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index eacc792d0323e..a807dbb21328b 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -35,7 +35,7 @@
 #ifndef lint
 __RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $");
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsck_msdosfs/main.c,v 1.15 2005/02/10 09:39:51 ru Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 65333ef07252d..cf2f513dee985 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsdb/Makefile,v 1.19 2004/10/09 15:56:34 le Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 5fc6f2414b4cb..66aae42f9b326 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.32 2006/09/18 11:55:09 ru Exp $
 .\"
 .Dd August 24, 2006
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index f7354e86d9cc2..f7f842f19271d 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdb.c,v 1.35 2006/10/31 22:07:29 pjd Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index ddd15153f5cb9..e5d8a1aef7aa6 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/fsdb/fsdb.h,v 1.12 2006/10/31 22:07:29 pjd Exp $
  */
 
 extern int blread(int fd, char *buf, ufs2_daddr_t blk, long size);
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index d50c6c00d3319..84992ecf0fd36 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.20 2006/08/23 22:44:00 ceri Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 7e2da62408e34..56118b111b4ed 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/fsirand/Makefile,v 1.6 2004/02/23 20:13:51 johan Exp $
 
 PROG=	fsirand
 WARNS?=	0
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 00f0eeee4c99b..f45c3dd362686 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -27,7 +27,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: fsirand.8,v 1.6 1997/02/23 03:58:26 millert Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/fsirand/fsirand.8,v 1.17 2004/07/02 21:45:02 ru Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index defdf5250d33d..f6d5acbc8bb3f 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/fsirand/fsirand.c,v 1.13 2004/07/28 05:59:22 kan Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index 87058028533ec..3c26f5b9542a8 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/Makefile,v 1.11 2003/10/17 19:52:07 phk Exp $
 
 PROG=	gbde
 SRCS=	gbde.c template.c
diff --git a/sbin/gbde/gbde.8 b/sbin/gbde/gbde.8
index 96bbb607d0028..f82f0df5f1e60 100644
--- a/sbin/gbde/gbde.8
+++ b/sbin/gbde/gbde.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gbde/gbde.8,v 1.15 2006/09/18 11:55:09 ru Exp $
 .\"
 .Dd February 8, 2006
 .Dt GBDE 8
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 0a1e740c40412..609cd02765903 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gbde/gbde.c,v 1.31 2006/02/08 06:52:15 cperciva Exp $
  *
  * XXX: Future stuff
  *
diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu
index 82e6f2e474891..1868464e5d868 100644
--- a/sbin/gbde/image.uu
+++ b/sbin/gbde/image.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sbin/gbde/image.uu,v 1.1 2003/10/07 09:31:51 phk Exp $
 
 begin 644 gbde.image.bz2
 M0EIH.3%!629364"&9H\`Y1=_____________________________________
diff --git a/sbin/gbde/template.txt b/sbin/gbde/template.txt
index 3d22007befd9b..6bd638fa3a418 100644
--- a/sbin/gbde/template.txt
+++ b/sbin/gbde/template.txt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/template.txt,v 1.1 2002/10/20 11:16:13 phk Exp $
 #
 # Sector size is the smallest unit of data which can be read or written.
 # Making it too small decreases performance and decreases available space.
diff --git a/sbin/gbde/test.sh b/sbin/gbde/test.sh
index 0aeb05c907c88..87e54cbebd1da 100644
--- a/sbin/gbde/test.sh
+++ b/sbin/gbde/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/gbde/test.sh,v 1.5 2007/04/06 11:16:11 pjd Exp $
 
 set -e
 
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 95f00d914756b..6967e80d1b21a 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/Makefile,v 1.1 2004/05/20 10:09:55 pjd Exp $
 
 SUBDIR=	core class
 
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index 94ca09f3889c2..153d99c883d31 100644
--- a/sbin/geom/Makefile.inc
+++ b/sbin/geom/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/Makefile.inc,v 1.5 2004/08/02 09:05:29 pjd Exp $
 
 WARNS?=	6
 CLASS_DIR?=/lib/geom
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index 7b556a8f2d33b..9a9f80d9f2a81 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/Makefile,v 1.16 2007/09/23 07:34:22 pjd Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 63109c29df6a3..7901d72109cf3 100644
--- a/sbin/geom/class/Makefile.inc
+++ b/sbin/geom/class/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/Makefile.inc,v 1.7 2005/04/07 15:57:38 pjd Exp $
 
 SHLIBDIR?=${CLASS_DIR}
 SHLIB_NAME?=geom_${CLASS}.so
diff --git a/sbin/geom/class/cache/Makefile b/sbin/geom/class/cache/Makefile
index 6ca37e6c05e8e..9b205cd6a2b63 100644
--- a/sbin/geom/class/cache/Makefile
+++ b/sbin/geom/class/cache/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/cache/Makefile,v 1.1 2006/10/06 08:27:06 ru Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/cache/geom_cache.c b/sbin/geom/class/cache/geom_cache.c
index 636c54119ce15..8acad01914196 100644
--- a/sbin/geom/class/cache/geom_cache.c
+++ b/sbin/geom/class/cache/geom_cache.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/cache/geom_cache.c,v 1.3 2007/05/15 20:25:15 marcel Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile
index b3a3e23c449df..70473f791d40b 100644
--- a/sbin/geom/class/concat/Makefile
+++ b/sbin/geom/class/concat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/concat/Makefile,v 1.3 2004/05/21 22:12:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index 2e1b79dadd1a2..fa3ea0695d918 100644
--- a/sbin/geom/class/concat/gconcat.8
+++ b/sbin/geom/class/concat/gconcat.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.18 2006/01/30 22:47:07 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GCONCAT 8
diff --git a/sbin/geom/class/concat/geom_concat.c b/sbin/geom/class/concat/geom_concat.c
index e1b7342a03765..816bd86ec88f2 100644
--- a/sbin/geom/class/concat/geom_concat.c
+++ b/sbin/geom/class/concat/geom_concat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/concat/geom_concat.c,v 1.13 2007/05/15 20:25:16 marcel Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile
index 041e738465cfb..6f79c6e34cc6e 100644
--- a/sbin/geom/class/eli/Makefile
+++ b/sbin/geom/class/eli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/eli/Makefile,v 1.3 2005/07/29 10:06:57 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2
 
diff --git a/sbin/geom/class/eli/geli.8 b/sbin/geom/class/eli/geli.8
index d087e640eaea2..efa3e08b7589e 100644
--- a/sbin/geom/class/eli/geli.8
+++ b/sbin/geom/class/eli/geli.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.22 2007/09/01 06:33:01 pjd Exp $
 .\"
 .Dd September 16, 2006
 .Dt GELI 8
diff --git a/sbin/geom/class/eli/geom_eli.c b/sbin/geom/class/eli/geom_eli.c
index 46f1bce684a50..320fe5c4dacd9 100644
--- a/sbin/geom/class/eli/geom_eli.c
+++ b/sbin/geom/class/eli/geom_eli.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.24 2007/05/15 20:25:16 marcel Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/journal/Makefile b/sbin/geom/class/journal/Makefile
index 95f66de2085e3..222f424951847 100644
--- a/sbin/geom/class/journal/Makefile
+++ b/sbin/geom/class/journal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/journal/Makefile,v 1.2 2007/02/10 17:59:46 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/journal/geom_journal.c b/sbin/geom/class/journal/geom_journal.c
index 37169990ac4e2..93e6f2acf586d 100644
--- a/sbin/geom/class/journal/geom_journal.c
+++ b/sbin/geom/class/journal/geom_journal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/journal/geom_journal.c,v 1.4 2007/05/15 20:25:16 marcel Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/sbin/geom/class/journal/geom_journal.h b/sbin/geom/class/journal/geom_journal.h
index 63d35b487926f..673b61bb994de 100644
--- a/sbin/geom/class/journal/geom_journal.h
+++ b/sbin/geom/class/journal/geom_journal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/geom/class/journal/geom_journal.h,v 1.1 2006/10/31 21:32:54 pjd Exp $
  */
 
 #ifndef	_GEOM_JOURNAL_H_
diff --git a/sbin/geom/class/journal/geom_journal_ufs.c b/sbin/geom/class/journal/geom_journal_ufs.c
index c847a880d64b5..f610618abe721 100644
--- a/sbin/geom/class/journal/geom_journal_ufs.c
+++ b/sbin/geom/class/journal/geom_journal_ufs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/journal/geom_journal_ufs.c,v 1.1 2006/10/31 21:32:54 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sbin/geom/class/journal/gjournal.8 b/sbin/geom/class/journal/gjournal.8
index 248431e82d09b..b50eba5c92192 100644
--- a/sbin/geom/class/journal/gjournal.8
+++ b/sbin/geom/class/journal/gjournal.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.1.2.1 2007/11/20 07:32:54 ru Exp $
 .\"
 .Dd November 14, 2007
 .Dt GJOURNAL 8
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index cba7ac6b44830..c6dee337c35e8 100644
--- a/sbin/geom/class/label/Makefile
+++ b/sbin/geom/class/label/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/label/Makefile,v 1.1 2004/07/02 19:40:34 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c
index 9e27eec376e80..ffea296109071 100644
--- a/sbin/geom/class/label/geom_label.c
+++ b/sbin/geom/class/label/geom_label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/label/geom_label.c,v 1.10 2007/05/15 20:25:16 marcel Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8
index cbff2b467ef2a..1f78424f88bf2 100644
--- a/sbin/geom/class/label/glabel.8
+++ b/sbin/geom/class/label/glabel.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.14 2005/08/26 11:39:38 takawata Exp $
 .\"
 .Dd July 2, 2004
 .Dt GLABEL 8
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index f07a790539b63..451002f63c27e 100644
--- a/sbin/geom/class/mirror/Makefile
+++ b/sbin/geom/class/mirror/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/mirror/Makefile,v 1.2 2004/08/18 15:48:18 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index 38912a34958b6..3e94c02773fb6 100644
--- a/sbin/geom/class/mirror/geom_mirror.c
+++ b/sbin/geom/class/mirror/geom_mirror.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.17 2007/05/15 20:25:16 marcel Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index 185b3d3838c1e..41138af14658d 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.23 2006/12/21 18:30:23 ceri Exp $
 .\"
 .Dd November 1, 2006
 .Dt GMIRROR 8
diff --git a/sbin/geom/class/multipath/Makefile b/sbin/geom/class/multipath/Makefile
index b4eb7837e8eb1..63fd216fd42f8 100644
--- a/sbin/geom/class/multipath/Makefile
+++ b/sbin/geom/class/multipath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/multipath/Makefile,v 1.2 2007/02/27 07:29:15 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../misc
 CLASS=	multipath
diff --git a/sbin/geom/class/multipath/geom_multipath.c b/sbin/geom/class/multipath/geom_multipath.c
index 1bb3f32239a29..4fd6b1173255b 100644
--- a/sbin/geom/class/multipath/geom_multipath.c
+++ b/sbin/geom/class/multipath/geom_multipath.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/multipath/geom_multipath.c,v 1.2 2007/05/15 20:25:17 marcel Exp $");
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/sbin/geom/class/multipath/gmultipath.8 b/sbin/geom/class/multipath/gmultipath.8
index 13978c5e20be8..cfac608ee57a5 100644
--- a/sbin/geom/class/multipath/gmultipath.8
+++ b/sbin/geom/class/multipath/gmultipath.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/multipath/gmultipath.8,v 1.4 2007/05/06 00:31:38 pjd Exp $
 .\"
 .Dd February 26, 2007
 .Dt GMULTIPATH 8
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index 75a20376ff452..b7867a1c6fad8 100644
--- a/sbin/geom/class/nop/Makefile
+++ b/sbin/geom/class/nop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/nop/Makefile,v 1.3 2004/05/21 22:12:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/nop/geom_nop.c b/sbin/geom/class/nop/geom_nop.c
index 7306add3674ba..97a9ba8a53d05 100644
--- a/sbin/geom/class/nop/geom_nop.c
+++ b/sbin/geom/class/nop/geom_nop.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/nop/geom_nop.c,v 1.11 2007/05/15 20:25:17 marcel Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/nop/gnop.8 b/sbin/geom/class/nop/gnop.8
index 83c33232647b3..f7d7a76202ea3 100644
--- a/sbin/geom/class/nop/gnop.8
+++ b/sbin/geom/class/nop/gnop.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.21.2.1 2007/12/18 20:13:43 brueffer Exp $
 .\"
 .Dd September 8, 2006
 .Dt GNOP 8
diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile
index 0588646f09b71..b266a43e64938 100644
--- a/sbin/geom/class/part/Makefile
+++ b/sbin/geom/class/part/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/part/Makefile,v 1.1 2007/05/15 20:25:17 marcel Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index f70b4879260d7..ebc8be7727e24 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.1.2.1 2007/10/29 06:18:03 marcel Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/sbin/geom/class/part/gpart.8 b/sbin/geom/class/part/gpart.8
index 1f664ca5ec24a..444fe1cd9e0e1 100644
--- a/sbin/geom/class/part/gpart.8
+++ b/sbin/geom/class/part/gpart.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/part/gpart.8,v 1.1.2.1 2007/10/29 06:18:03 marcel Exp $
 .\"
 .Dd Oct 20, 2007
 .Dt GPART 8
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index 1791669dec92f..4640a7488be18 100644
--- a/sbin/geom/class/raid3/Makefile
+++ b/sbin/geom/class/raid3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/raid3/Makefile,v 1.2 2004/08/18 16:41:29 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/raid3/geom_raid3.c b/sbin/geom/class/raid3/geom_raid3.c
index 4a2dbe201ef2b..27b49b173be94 100644
--- a/sbin/geom/class/raid3/geom_raid3.c
+++ b/sbin/geom/class/raid3/geom_raid3.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.20 2007/05/15 20:25:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/raid3/graid3.8 b/sbin/geom/class/raid3/graid3.8
index 21c6f181e773f..fc4db0565972f 100644
--- a/sbin/geom/class/raid3/graid3.8
+++ b/sbin/geom/class/raid3/graid3.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.18 2006/11/02 10:44:02 ceri Exp $
 .\"
 .Dd November 1, 2006
 .Dt GRAID3 8
diff --git a/sbin/geom/class/shsec/Makefile b/sbin/geom/class/shsec/Makefile
index ea38f159241a3..634a704d97a7a 100644
--- a/sbin/geom/class/shsec/Makefile
+++ b/sbin/geom/class/shsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/shsec/Makefile,v 1.1 2005/01/11 18:06:44 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/shsec/geom_shsec.c b/sbin/geom/class/shsec/geom_shsec.c
index 8af47ee62d1f6..9959b9f14871a 100644
--- a/sbin/geom/class/shsec/geom_shsec.c
+++ b/sbin/geom/class/shsec/geom_shsec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/shsec/geom_shsec.c,v 1.10 2007/05/15 20:25:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/shsec/gshsec.8 b/sbin/geom/class/shsec/gshsec.8
index 67dff5d596169..8806c75332db6 100644
--- a/sbin/geom/class/shsec/gshsec.8
+++ b/sbin/geom/class/shsec/gshsec.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/shsec/gshsec.8,v 1.8 2005/03/14 13:14:03 pjd Exp $
 .\"
 .Dd January 8, 2005
 .Dt GSHSEC 8
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index 53a35fff46bf8..9024ebd44ce05 100644
--- a/sbin/geom/class/stripe/Makefile
+++ b/sbin/geom/class/stripe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/stripe/Makefile,v 1.3 2004/05/21 22:12:24 pjd Exp $
 
 .PATH: ${.CURDIR}/../../misc
 
diff --git a/sbin/geom/class/stripe/geom_stripe.c b/sbin/geom/class/stripe/geom_stripe.c
index 13243c7505a56..60e2381f41de6 100644
--- a/sbin/geom/class/stripe/geom_stripe.c
+++ b/sbin/geom/class/stripe/geom_stripe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/stripe/geom_stripe.c,v 1.16 2007/05/24 09:21:20 ru Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8
index ee70184bdb3a5..7097d31d54308 100644
--- a/sbin/geom/class/stripe/gstripe.8
+++ b/sbin/geom/class/stripe/gstripe.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.25 2005/04/26 09:23:21 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GSTRIPE 8
diff --git a/sbin/geom/class/virstor/Makefile b/sbin/geom/class/virstor/Makefile
index 0b4d5cdda31b5..fca21be289359 100644
--- a/sbin/geom/class/virstor/Makefile
+++ b/sbin/geom/class/virstor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/class/virstor/Makefile,v 1.1 2007/09/23 07:34:22 pjd Exp $
 
 .PATH:	${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
 
diff --git a/sbin/geom/class/virstor/geom_virstor.c b/sbin/geom/class/virstor/geom_virstor.c
index 6b29bbe16fc5b..43ef4b43f315a 100644
--- a/sbin/geom/class/virstor/geom_virstor.c
+++ b/sbin/geom/class/virstor/geom_virstor.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.1 2007/09/23 07:34:22 pjd Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/sbin/geom/class/virstor/gvirstor.8 b/sbin/geom/class/virstor/gvirstor.8
index 5807af9259332..1c8725add07f1 100644
--- a/sbin/geom/class/virstor/gvirstor.8
+++ b/sbin/geom/class/virstor/gvirstor.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/class/virstor/gvirstor.8,v 1.1 2007/09/23 07:34:22 pjd Exp $
 .\"
 .Dd July 8, 2006
 .Dt GVIRSTOR 8
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index d76c35b0512dc..0209bcb5819ae 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/geom/core/Makefile,v 1.10 2004/12/21 09:59:42 ru Exp $
 
 .PATH: ${.CURDIR}/../misc
 
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index bb79f785f1fe0..40c84f535c77a 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/geom/core/geom.8,v 1.19 2007/09/23 07:34:22 pjd Exp $
 .\"
 .Dd May 21, 2004
 .Dt GEOM 8
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index cfa1e6074ad44..fadbcade1e82a 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.32 2007/09/21 10:00:05 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/geom/core/geom.h b/sbin/geom/core/geom.h
index e79e8559cf03a..940876b4a237a 100644
--- a/sbin/geom/core/geom.h
+++ b/sbin/geom/core/geom.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/geom/core/geom.h,v 1.6 2007/05/16 23:32:40 marcel Exp $
  */
 
 #ifndef _GEOM_H_
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index 745d91955d3d7..4be3716b5a423 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.7 2007/01/25 11:35:27 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/geom/misc/subr.h b/sbin/geom/misc/subr.h
index 4c54142891bc0..baf95cec815a8 100644
--- a/sbin/geom/misc/subr.h
+++ b/sbin/geom/misc/subr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/geom/misc/subr.h,v 1.8 2007/01/25 11:35:27 pjd Exp $
  */
 
 #ifndef _SUBR_H_
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 38ca2f2d09799..3d1c87bbf7d6b 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.10 2007/10/09 23:31:10 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc
index e55271f7ddc5c..c46de58199357 100644
--- a/sbin/ggate/Makefile.inc
+++ b/sbin/ggate/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/Makefile.inc,v 1.1 2004/05/20 20:05:05 pjd Exp $
 
 WARNS?=	6
 
diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile
index 4d8917f3164c2..99a5e3da3da66 100644
--- a/sbin/ggate/ggatec/Makefile
+++ b/sbin/ggate/ggatec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.7 2007/04/06 11:19:48 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 09f0444fa6a5f..b96534d447008 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ggate/ggatec/ggatec.8,v 1.9 2006/09/18 11:55:10 ru Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEC 8
diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index e421614dc6a34..543a62a0c54b1 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/ggatec/ggatec.c,v 1.7 2006/03/12 09:27:51 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index 4e7708ebffa32..4c734cc0699f9 100644
--- a/sbin/ggate/ggated/Makefile
+++ b/sbin/ggate/ggated/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.5 2005/07/10 21:10:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index 3024a04230d75..dd34771f84421 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ggate/ggated/ggated.8,v 1.4 2005/01/18 10:09:34 ru Exp $
 .\"
 .Dd April 29, 2004
 .Dt GGATED 8
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index b211ccc8592cd..40ee38250c0ee 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/ggated/ggated.c,v 1.9 2006/12/18 11:12:00 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile
index 604a75480313a..72be0b5542b4f 100644
--- a/sbin/ggate/ggatel/Makefile
+++ b/sbin/ggate/ggatel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ggate/ggatel/Makefile,v 1.4 2004/06/21 09:20:06 pjd Exp $
 
 .PATH: ${.CURDIR}/../shared
 
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index 01b964a947e65..e37686e7536e2 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.5 2005/01/18 10:09:34 ru Exp $
 .\"
 .Dd April 26, 2004
 .Dt GGATEL 8
diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c
index 03979c3f9f722..2e7b2d72d21b6 100644
--- a/sbin/ggate/ggatel/ggatel.c
+++ b/sbin/ggate/ggatel/ggatel.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/ggatel/ggatel.c,v 1.6 2005/07/10 21:10:20 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index dd40790120d1e..f4a6e0f052c72 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/shared/ggate.c,v 1.9 2007/04/06 11:19:48 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index 3e26253c360c6..ce09eea4170e7 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ggate/shared/ggate.h,v 1.5 2006/12/18 11:12:00 pjd Exp $
  */
 
 #ifndef _GGATE_H_
diff --git a/sbin/gpt/Makefile b/sbin/gpt/Makefile
index cfae78d03cf26..cc577689dbea4 100644
--- a/sbin/gpt/Makefile
+++ b/sbin/gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
 
 PROG=	gpt
 SRCS=	add.c create.c destroy.c gpt.c label.c map.c migrate.c recover.c \
diff --git a/sbin/gpt/add.c b/sbin/gpt/add.c
index 348989fb7e2ad..73b8a1a1205bc 100644
--- a/sbin/gpt/add.c
+++ b/sbin/gpt/add.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/create.c b/sbin/gpt/create.c
index 24a6a6d014fbf..2593cb25d8490 100644
--- a/sbin/gpt/create.c
+++ b/sbin/gpt/create.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/destroy.c b/sbin/gpt/destroy.c
index 7c2c198608bc5..aa03cb9cd36ab 100644
--- a/sbin/gpt/destroy.c
+++ b/sbin/gpt/destroy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/destroy.c,v 1.6 2005/08/31 01:47:19 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/gpt.8 b/sbin/gpt/gpt.8
index 13f9223257f12..a23b1ed9afeb8 100644
--- a/sbin/gpt/gpt.8
+++ b/sbin/gpt/gpt.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
 .\"
 .Dd June 22, 2006
 .Os
diff --git a/sbin/gpt/gpt.c b/sbin/gpt/gpt.c
index 2aa1015378cc3..3995c6a7c4460 100644
--- a/sbin/gpt/gpt.c
+++ b/sbin/gpt/gpt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16.2.1 2007/11/09 02:29:43 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/gpt/gpt.h b/sbin/gpt/gpt.h
index 6b1b1a2874400..fc9d543e3a19b 100644
--- a/sbin/gpt/gpt.h
+++ b/sbin/gpt/gpt.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/gpt.h,v 1.11 2006/06/22 22:05:28 marcel Exp $
  */
 
 #ifndef _GPT_H_
diff --git a/sbin/gpt/label.c b/sbin/gpt/label.c
index 4a793cd1cc123..7d40090e3814b 100644
--- a/sbin/gpt/label.c
+++ b/sbin/gpt/label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/map.c b/sbin/gpt/map.c
index 91b56850b9c47..705336262b4b9 100644
--- a/sbin/gpt/map.c
+++ b/sbin/gpt/map.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/map.c,v 1.6 2005/08/31 01:47:19 marcel Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/sbin/gpt/map.h b/sbin/gpt/map.h
index 4c3f0992d59ab..89fed274c1993 100644
--- a/sbin/gpt/map.h
+++ b/sbin/gpt/map.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gpt/map.h,v 1.6 2005/08/31 01:47:19 marcel Exp $
  */
 
 #ifndef _MAP_H_
diff --git a/sbin/gpt/migrate.c b/sbin/gpt/migrate.c
index 8f3b4ecff32ca..07db7230ffbd2 100644
--- a/sbin/gpt/migrate.c
+++ b/sbin/gpt/migrate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
diff --git a/sbin/gpt/recover.c b/sbin/gpt/recover.c
index dd13a64951edc..644d9b74cfd17 100644
--- a/sbin/gpt/recover.c
+++ b/sbin/gpt/recover.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/remove.c b/sbin/gpt/remove.c
index 381ff0b8217fd..fec54c031f6b5 100644
--- a/sbin/gpt/remove.c
+++ b/sbin/gpt/remove.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/gpt/show.c b/sbin/gpt/show.c
index 43fd6eae3ee3e..a4c6eedb66679 100644
--- a/sbin/gpt/show.c
+++ b/sbin/gpt/show.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index a5e9937e8f166..32f848ca7c9fb 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.8 (Berkeley) 6/21/2000
 #
 # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/growfs/Makefile,v 1.13 2005/03/31 04:10:31 rwatson Exp $
 #
 
 #GFSDBG=
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 15effec81587e..108a325e52123 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/growfs/debug.c,v 1.10 2006/10/31 22:02:24 pjd Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 3cad9d97874c5..4d80bd053a59f 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  * $TSHeader: src/sbin/growfs/debug.h,v 1.2 2000/11/16 18:43:50 tom Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/growfs/debug.h,v 1.3 2004/07/06 17:48:34 stefanf Exp $
  *
  */
 
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 387e5114bdc0e..34be0929ea900 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/growfs/growfs.8,v 1.24 2005/01/18 10:09:34 ru Exp $
 .\"
 .Dd September 8, 2000
 .Dt GROWFS 8
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index dab9ba76a8878..888b77bd45f69 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -47,7 +47,7 @@ All rights reserved.\n";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/growfs/growfs.c,v 1.25 2006/07/17 20:48:36 stefanf Exp $");
 
 /* ********************************************************** INCLUDES ***** */
 #include <sys/param.h>
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 6d414974dba19..9eb0cf729993f 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/gvinum/Makefile,v 1.4 2005/11/19 20:26:52 le Exp $
 
 PROG=	gvinum
 SRCS=	gvinum.c gvinum.h geom_vinum_share.c
diff --git a/sbin/gvinum/gvinum.8 b/sbin/gvinum/gvinum.8
index 83b6876df36d5..13f4bf57dea68 100644
--- a/sbin/gvinum/gvinum.8
+++ b/sbin/gvinum/gvinum.8
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/gvinum/gvinum.8,v 1.4 2006/09/30 11:02:17 ru Exp $
 .\"
 .Dd March 23, 2006
 .Dt GVINUM 8
diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c
index ea33b75e1adca..f8d7d3763dfa7 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/gvinum/gvinum.c,v 1.8 2006/03/23 19:58:43 le Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index d1b45a07749b0..f59801df88c7c 100644
--- a/sbin/gvinum/gvinum.h
+++ b/sbin/gvinum/gvinum.h
@@ -34,6 +34,6 @@
  * advised of the possibility of such damage.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/gvinum/gvinum.h,v 1.1 2004/06/12 21:22:47 le Exp $ */
 
 #define GVINUMMOD	"geom_vinum"
diff --git a/sbin/idmapd/Makefile b/sbin/idmapd/Makefile
index 8206e0d9bb810..90b60f7920864 100644
--- a/sbin/idmapd/Makefile
+++ b/sbin/idmapd/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/idmapd/Makefile,v 1.4 2006/10/15 13:51:49 ceri Exp $
 
 PROG=	idmapd
 MAN=	idmapd.8
diff --git a/sbin/idmapd/idmapd.8 b/sbin/idmapd/idmapd.8
index 1fb62168c6eb0..6e57ef6f86ab6 100644
--- a/sbin/idmapd/idmapd.8
+++ b/sbin/idmapd/idmapd.8
@@ -20,7 +20,7 @@
 .\" connection with the use of the software, even if it has been or is hereafter
 .\" advised of the possibility of such damages.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/idmapd/idmapd.8,v 1.5 2006/10/15 13:50:16 ceri Exp $
 .\"
 .Dd October 15, 2006
 .Dt IDMAPD 8
diff --git a/sbin/idmapd/idmapd.c b/sbin/idmapd/idmapd.c
index fa3a082d3ddb5..4abd5cfbc47dc 100644
--- a/sbin/idmapd/idmapd.c
+++ b/sbin/idmapd/idmapd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/idmapd/idmapd.c,v 1.6 2005/04/14 20:27:30 rees Exp $ */
 /* $Id: idmapd.c,v 1.5 2003/11/05 14:58:58 rees Exp $ */
 
 /*
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 09592ad99db5f..04fbff8347018 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.33 2007/04/17 00:35:09 thompsa Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ifconfig/af_atalk.c b/sbin/ifconfig/af_atalk.c
index 9accc75fdc196..bddd03e3f2c59 100644
--- a/sbin/ifconfig/af_atalk.c
+++ b/sbin/ifconfig/af_atalk.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_atalk.c,v 1.2 2007/02/24 23:55:46 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index 1720b1981d876..66ea08eb6011b 100644
--- a/sbin/ifconfig/af_inet.c
+++ b/sbin/ifconfig/af_inet.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_inet.c,v 1.3 2007/02/24 23:55:46 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index f1871fb4996ce..d3fb4fc89a739 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_inet6.c,v 1.6 2007/02/24 23:55:46 sam Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/af_ipx.c b/sbin/ifconfig/af_ipx.c
index bc5d500dac761..e49c0f79ee37f 100644
--- a/sbin/ifconfig/af_ipx.c
+++ b/sbin/ifconfig/af_ipx.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_ipx.c,v 1.4 2007/06/13 18:07:59 rwatson Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c
index f77515e5115ef..5b5a60d3388a9 100644
--- a/sbin/ifconfig/af_link.c
+++ b/sbin/ifconfig/af_link.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/af_link.c,v 1.4 2007/02/24 23:55:46 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index d8176a857b853..2f0d9c5ae70a7 100644
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -35,7 +35,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.11 2007/08/01 00:33:52 thompsa Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifcarp.c b/sbin/ifconfig/ifcarp.c
index 36f1bb6a47b74..9c961b71c500a 100644
--- a/sbin/ifconfig/ifcarp.c
+++ b/sbin/ifconfig/ifcarp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sbin/ifconfig/ifcarp.c,v 1.2 2005/02/22 14:07:47 glebius Exp $ */
 /*	from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */
 
 /*
diff --git a/sbin/ifconfig/ifclone.c b/sbin/ifconfig/ifclone.c
index 3fda062e99dcb..651fb5c1d5f1f 100644
--- a/sbin/ifconfig/ifclone.c
+++ b/sbin/ifconfig/ifclone.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifclone.c,v 1.3 2006/08/12 18:07:17 yar Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 9d3cc6a2db8f0..f07823a44c670 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.142.2.1 2007/11/11 17:45:56 sam Exp $
 .\"
 .Dd October 31, 2007
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 3ea1b31fdf4d9..b7ab6710c9bb6 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.134 2007/10/04 09:45:41 thompsa Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index 5ef36c9930ec2..076a2cd0558fb 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -31,7 +31,7 @@
  *
  * so there!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.21 2007/06/13 18:07:59 rwatson Exp $
  */
 
 #define	__constructor	__attribute__((constructor))
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index 88774a6ae4858..d775f7289c9f9 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifgroup.c,v 1.2 2007/02/17 18:22:20 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 97eed75232b10..b904a11c8651b 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.47.2.1.2.2 2008/02/05 18:17:29 sam Exp $
  */
 
 /*-
diff --git a/sbin/ifconfig/iflagg.c b/sbin/ifconfig/iflagg.c
index 5eaea98b34e12..2e5776ed912bc 100644
--- a/sbin/ifconfig/iflagg.c
+++ b/sbin/ifconfig/iflagg.c
@@ -3,7 +3,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/iflagg.c,v 1.3 2007/07/05 09:18:56 thompsa Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c
index bb021060ea441..3c9a2d171cdf0 100644
--- a/sbin/ifconfig/ifmac.c
+++ b/sbin/ifconfig/ifmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.4 2004/12/31 19:46:27 sam Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 947b961303420..84697835e503a 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.25 2007/06/11 03:56:33 sam Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index 2a388a17e1c85..feafd6e85dbfd 100644
--- a/sbin/ifconfig/ifpfsync.c
+++ b/sbin/ifconfig/ifpfsync.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifpfsync.c,v 1.4 2006/06/06 11:21:08 glebius Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 205ed21c28cb4..ba2556de70062 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.12 2006/07/09 06:10:23 sam Exp $";
 #endif
 
 #define	NOTAG	((u_short) -1)
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 58a9e0ad0d2eb..d7fdbb7770768 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/init/Makefile,v 1.34 2007/06/01 21:48:06 remko Exp $
 
 PROG=	init
 MAN=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index bd21b48d2144a..0a1843fbd889d 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/init/init.8,v 1.50 2007/01/02 09:12:37 rse Exp $
 .\"
 .Dd September 15, 2005
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 46bc1013ddb33..8dcde289d4245 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 7/15/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/init/init.c,v 1.63 2007/02/04 06:33:13 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 335445bb06347..563376e3307be 100644
--- a/sbin/init/pathnames.h
+++ b/sbin/init/pathnames.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/sbin/init/pathnames.h,v 1.3 2004/04/09 19:58:30 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index df57c807a02ba..323934428ffac 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/Makefile,v 1.16 2005/04/25 18:55:50 darrenr Exp $
 
 #.WAIT
 SUBDIR=		libipf
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc
index 3373b557bd8ca..55951553f72b3 100644
--- a/sbin/ipf/Makefile.inc
+++ b/sbin/ipf/Makefile.inc
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/Makefile.inc,v 1.2 2005/05/17 14:29:06 ru Exp $
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib/ipfilter
 CFLAGS+=	-I${.CURDIR}/../../../contrib/ipfilter/tools
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 0a5f4a82c3a2a..e2a538ace7928 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipf/ipf/Makefile,v 1.6 2006/09/10 08:58:46 obrien Exp $
 
 PROG=		ipf
 SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
diff --git a/sbin/ipf/ipfs/Makefile b/sbin/ipf/ipfs/Makefile
index a64f805b2ab3d..e4c3b5e1d43ac 100644
--- a/sbin/ipf/ipfs/Makefile
+++ b/sbin/ipf/ipfs/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipfs/Makefile,v 1.1 2005/04/25 18:55:50 darrenr Exp $
 
 PROG=	ipfs
 MAN=	ipfs.8
diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile
index a33c5df38d8f6..8e1b529c613fa 100644
--- a/sbin/ipf/ipfstat/Makefile
+++ b/sbin/ipf/ipfstat/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipfstat/Makefile,v 1.1 2005/04/25 18:55:50 darrenr Exp $
 
 NOGCCERROR=	# defined
 
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 64ea1cfced23e..aae1548296e37 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.4 2006/09/10 08:58:46 obrien Exp $
 
 PROG=		ipftest
 SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 3639f8733c1e3..bff9e28a863c5 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipmon/Makefile,v 1.3 2006/09/10 08:58:47 obrien Exp $
 
 PROG=		ipmon
 SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index 1c017e182cb1a..afee14ae9115d 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipnat/Makefile,v 1.3 2006/09/10 08:58:47 obrien Exp $
 
 PROG=		ipnat
 SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index 6e3f85da847d4..5e7c523934c2c 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ippool/Makefile,v 1.3 2006/09/10 08:58:47 obrien Exp $
 
 PROG=		ippool
 SRCS=		${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile
index 5e0ac15cbb1f9..272fb8252dab7 100644
--- a/sbin/ipf/ipresend/Makefile
+++ b/sbin/ipf/ipresend/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipresend/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
 
 PROG=		ipresend
 SRCS=		ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
diff --git a/sbin/ipf/ipsend/Makefile b/sbin/ipf/ipsend/Makefile
index 4ae4c3441bbbf..3eec653f9cee7 100644
--- a/sbin/ipf/ipsend/Makefile
+++ b/sbin/ipf/ipsend/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/ipsend/Makefile,v 1.2 2005/04/28 16:26:35 darrenr Exp $
 
 NOGCCERROR=	# defined
 
diff --git a/sbin/ipf/iptest/Makefile b/sbin/ipf/iptest/Makefile
index 647471cf4cef2..96a3b593a236c 100644
--- a/sbin/ipf/iptest/Makefile
+++ b/sbin/ipf/iptest/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/iptest/Makefile,v 1.1 2005/04/25 18:55:52 darrenr Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile
index 43428cc68f4e0..57e1e36e4bd68 100644
--- a/sbin/ipf/libipf/Makefile
+++ b/sbin/ipf/libipf/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/libipf/Makefile,v 1.7 2007/06/11 19:38:38 cognet Exp $
 
 LIB=		ipf
 INTERNALLIB=
diff --git a/sbin/ipf/rules/Makefile b/sbin/ipf/rules/Makefile
index a90907fc98532..111eb54cbc205 100644
--- a/sbin/ipf/rules/Makefile
+++ b/sbin/ipf/rules/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/ipf/rules/Makefile,v 1.1 2005/04/25 18:55:52 darrenr Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 023f682b25f51..8cdfd53ca485b 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ipfw/Makefile,v 1.14 2004/10/03 06:32:37 green Exp $
 
 PROG=	ipfw
 SRCS=	ipfw2.c
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 683deb3c953e5..d3de06ba76ca2 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.203.2.1 2007/11/29 18:42:15 maxim Exp $
 .\"
 .Dd August 5, 2007
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index d1ca41ca56a95..b942516815a12 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.108.4.1 2008/01/28 17:44:30 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 2b09fa9aa3715..5680a58478d32 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/iscontrol/Makefile,v 1.1 2007/07/24 15:35:01 scottl Exp $
 
 SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
 PROG= iscontrol
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index 8381687fca512..4933291756bf9 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/auth_subr.c,v 1.1 2007/07/24 15:35:01 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index 409ed2c5680d2..9fcca9d17a9e7 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/config.c,v 1.1 2007/07/24 15:35:01 scottl Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index 6a1c529a2432f..41a4363bbe1c5 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/fsm.c,v 1.1 2007/07/24 15:35:01 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/iscontrol.8 b/sbin/iscontrol/iscontrol.8
index 4ae0d3f1d8f2b..f363a918e2462 100644
--- a/sbin/iscontrol/iscontrol.8
+++ b/sbin/iscontrol/iscontrol.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/iscontrol/iscontrol.8,v 1.2 2007/07/24 18:08:15 brueffer Exp $
 .\"
 .Dd February 22, 2007
 .Dt ISCONTROL 8
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index d5d5929188bd4..89b8ee950cddb 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/iscontrol.c,v 1.1 2007/07/24 15:35:01 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index c93c35af80495..d5a0d104bbed9 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/iscontrol/iscontrol.h,v 1.1 2007/07/24 15:35:01 scottl Exp $
  */
 /*
  | $Id: iscontrol.h,v 2.3 2007/04/27 08:36:49 danny Exp danny $
diff --git a/sbin/iscontrol/iscsi.conf.5 b/sbin/iscontrol/iscsi.conf.5
index 3388746822c51..cb3aaaa9afae3 100644
--- a/sbin/iscontrol/iscsi.conf.5
+++ b/sbin/iscontrol/iscsi.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/iscontrol/iscsi.conf.5,v 1.2 2007/07/24 18:08:15 brueffer Exp $
 .\"
 .Dd June 5, 2007
 .Os
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index 44ea889a329ea..b9022148df9cd 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/login.c,v 1.1 2007/07/24 15:35:01 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index 4ac3f0a349f70..dd3b18cc1a507 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/misc.c,v 1.1.4.1 2008/02/07 00:08:57 pb Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index 18dfdfc03b56c..f3b3c6047b340 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/iscontrol/pdu.c,v 1.1 2007/07/24 15:35:01 scottl Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/iscontrol/pdu.h b/sbin/iscontrol/pdu.h
index 0154f9e601711..6355fc8cf459a 100644
--- a/sbin/iscontrol/pdu.h
+++ b/sbin/iscontrol/pdu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/iscontrol/pdu.h,v 1.1 2007/07/24 15:35:01 scottl Exp $
  */
 /*
  | $Id: pdu.h,v 2.1 2006/11/12 08:06:51 danny Exp $
diff --git a/sbin/kldconfig/Makefile b/sbin/kldconfig/Makefile
index e92daf6c6f7c2..d0fa74b7246fd 100644
--- a/sbin/kldconfig/Makefile
+++ b/sbin/kldconfig/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldconfig/Makefile,v 1.3 2003/04/23 20:22:32 johan Exp $
 #
 
 PROG=		kldconfig
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 18fbaf609ac49..8b9a23fd347bf 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldconfig/kldconfig.8,v 1.7 2005/02/10 09:19:29 ru Exp $
 .\"
 .Dd June 15, 2001
 .Dt KLDCONFIG 8
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 403251d2a18f1..486e2a00f0e05 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.8 2005/11/07 19:22:20 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index da597d4594f9e..0c442b4e5e370 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldload/Makefile,v 1.10 2003/04/23 20:22:33 johan Exp $
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 474404fe12623..7feca3f5f15d9 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.27 2007/02/13 17:06:14 brueffer Exp $
 .\"
 .Dd October 13, 2006
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 9e841bccf9080..1822307eb9f4e 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldload/kldload.c,v 1.10 2003/05/03 18:41:57 obrien Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index b602a3edfb1fa..fcea3e08bb9a2 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldstat/Makefile,v 1.9 2003/04/23 20:24:13 johan Exp $
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index 6f040e2419259..8523b13b2f38c 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldstat/kldstat.8,v 1.17 2007/02/13 17:06:15 brueffer Exp $
 .\"
 .Dd September 23, 2005
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 74f375e0ec6c9..80126eea45520 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldstat/kldstat.c,v 1.19 2005/09/24 08:20:45 pjd Exp $");
 
 #include <err.h>
 #include <stdint.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 48e5c035ccdcb..92a3caaede2c5 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/kldunload/Makefile,v 1.10 2006/02/27 22:20:57 wkoszek Exp $
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 0a7937c5ebc42..52c58008f2cfc 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/kldunload/kldunload.8,v 1.20 2007/02/13 17:06:15 brueffer Exp $
 .\"
 .Dd February 27, 2006
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 8a3ea6176f66f..cec74a33bf36e 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/kldunload/kldunload.c,v 1.17 2006/02/27 22:20:57 wkoszek Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 442ae6350713b..715af866598a1 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ldconfig/Makefile,v 1.20 2005/01/14 12:22:57 delphij Exp $
 
 PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 9bdf56e4271e4..62ab6b0db883a 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/elfhints.c,v 1.8 2001/05/02 23:56:18 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 882459010b309..379b4e238eb04 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.36 2005/12/09 03:12:25 obrien Exp $
 .\"
 .Dd November 11, 2005
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 6364653880c4b..f3a3a8df492a7 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.47 2007/01/25 22:38:58 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 859bcbd204bc0..23265ff334a77 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ldconfig/ldconfig.h,v 1.5 2002/03/21 13:14:19 imp Exp $
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/mca/Makefile b/sbin/mca/Makefile
index e025a23e42396..62f0d4f30fbbb 100644
--- a/sbin/mca/Makefile
+++ b/sbin/mca/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mca/Makefile,v 1.5 2006/02/11 23:09:58 marcel Exp $
 PROG=	mca
 WARNS?=	4
 MAN=	mca.8
diff --git a/sbin/mca/mca.8 b/sbin/mca/mca.8
index e654d3676173c..be4abeb1138d3 100644
--- a/sbin/mca/mca.8
+++ b/sbin/mca/mca.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mca/mca.8,v 1.3 2006/09/30 11:12:36 ru Exp $
 .\"
 .Dd February 11, 2006
 .Dt MCA 8
diff --git a/sbin/mca/mca.c b/sbin/mca/mca.c
index 0c4e1a0c5a804..1d761ae634fe0 100644
--- a/sbin/mca/mca.c
+++ b/sbin/mca/mca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mca/mca.c,v 1.3 2002/11/01 06:34:35 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 07c4109e0d797..84e861af1e71f 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/md5/Makefile,v 1.10 2005/03/09 19:23:04 cperciva Exp $
 
 PROG=	md5
 
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index a771fb76132cf..1bfadda46dcff 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/md5/md5.1,v 1.24 2005/03/10 09:56:39 cperciva Exp $
 .Dd June 6, 2004
 .Dt MD5 1
 .Os
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index fa853fbcbc12b..f724539ef7ed2 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/md5/md5.c,v 1.35 2006/01/17 15:35:57 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index f4d8adcfde8d4..186e7fd508624 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdconfig/Makefile,v 1.10 2006/04/01 16:34:45 phk Exp $
 
 PROG=		mdconfig
 MAN=		mdconfig.8
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index fca9bb86d6fa4..732c4a00c42b6 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -39,7 +39,7 @@
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.1 2007/12/02 08:47:28 remko Exp $
 .\"
 .Dd November 28, 2007
 .Dt MDCONFIG 8
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 9142b477d5050..5d58bc121717f 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.1 2007/12/06 11:54:36 flz Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 1ef7084542675..b55f32f8165f3 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.6 2005/01/25 14:28:31 ssouhlal Exp $
 
 PROG=		mdmfs
 LINKS=		${BINDIR}/${PROG} ${BINDIR}/mount_mfs
diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8
index ef8e596420d9e..c98b8cd1469ee 100644
--- a/sbin/mdmfs/mdmfs.8
+++ b/sbin/mdmfs/mdmfs.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.29 2007/02/15 21:49:32 ceri Exp $
 .\"
 .Dd February 15, 2007
 .Dt MDMFS 8
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index bdd880b285420..6526867caa36f 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.33 2007/05/14 19:23:13 remko Exp $");
 
 #include <sys/param.h>
 #include <sys/mdioctl.h>
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index d28d3a5953777..7e263caf8920a 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/mknod/Makefile,v 1.6 2004/02/23 20:13:53 johan Exp $
 
 PROG=	mknod
 WARNS?=	0
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 54b544153c979..d0cc38097014f 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.31 2005/02/10 09:19:30 ru Exp $
 .\"
 .Dd December 15, 2004
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 4c6c399d3fd40..f570df62b569f 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mknod/mknod.c,v 1.16 2007/06/14 03:16:16 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index 3c08f565225d1..bc4271f8047f2 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.1 2003/03/02 01:50:33 mckusick Exp $
 
 PROG=	mksnap_ffs
 MAN=	mksnap_ffs.8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8
index 2465f557f2ff4..dad6de648e940 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.8
+++ b/sbin/mksnap_ffs/mksnap_ffs.8
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.3 2003/09/07 14:11:02 charnier Exp $
 .\"
 .Dd January 19, 2003
 .Dt MKSNAP_FFS 8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.c b/sbin/mksnap_ffs/mksnap_ffs.c
index a7ff9572572b7..5893cddb4e7c4 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.c
+++ b/sbin/mksnap_ffs/mksnap_ffs.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.8 2004/12/08 11:54:50 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 4186f00f6fd13..b824daf99a1af 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount/Makefile,v 1.19 2007/02/02 23:58:10 pjd Exp $
 
 PROG=	mount
 SRCS=	mount.c mount_fs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 91e2ec480b2e3..71504800f7247 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/extern.h,v 1.7 2005/11/23 23:22:56 rodrigc Exp $
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index b9022d9d3fb32..0e48663c11eaf 100644
--- a/sbin/mount/getmntopts.3
+++ b/sbin/mount/getmntopts.3
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.14 2005/11/24 14:27:53 ru Exp $
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 0c0e0fed807a7..7bed5c7c91ab1 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.18 2005/11/14 17:39:00 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 2fcbbddbbc112..43564243c6d61 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount/mntopts.h,v 1.29 2005/12/02 03:55:02 rodrigc Exp $
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index cda90df66b731..09ebab82c267c 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.82.2.1 2007/12/06 08:08:04 jhb Exp $
 .\"
 .Dd July 12, 2006
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 99cab2301f9e1..942d8b2fd2676 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount/mount.c,v 1.96 2007/06/25 05:06:54 rafan Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index 6ab15a3b364f7..06bd0556f9fd4 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_fs.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$FreeBSD: src/sbin/mount/mount_fs.c,v 1.3 2006/12/07 03:24:43 rodrigc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index aaa0a2c10e1ee..a49945ec1305a 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 3/27/94
- *	$FreeBSD$
+ *	$FreeBSD: src/sbin/mount/pathnames.h,v 1.3 2004/04/09 19:58:31 markm Exp $
  */
 
 #define	_PATH_MOUNTDPID	"/var/run/mountd.pid"
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index f95a76efdb241..6e6e1b41c60be 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount/vfslist.c,v 1.6 2004/04/09 19:58:31 markm Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile
index e7d040d4d08c6..09a881f1e4d04 100644
--- a/sbin/mount_autofs/Makefile
+++ b/sbin/mount_autofs/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2004/09/08 08:27:12 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_autofs/Makefile,v 1.2 2004/09/08 08:44:14 alfred Exp $
 
 PROG=mount_autofs
 MAN=mount_autofs.8
diff --git a/sbin/mount_autofs/mount_autofs.8 b/sbin/mount_autofs/mount_autofs.8
index 5f10ea72e188c..42f7f4158c83e 100644
--- a/sbin/mount_autofs/mount_autofs.8
+++ b/sbin/mount_autofs/mount_autofs.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: mount_autofs.8,v 1.3 2004/09/08 08:12:21 bright Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_autofs/mount_autofs.8,v 1.3 2005/01/24 20:03:04 charnier Exp $
 .Dd August 30, 2004
 .Dt MOUNT_AUTOFS 8
 .Os
diff --git a/sbin/mount_autofs/mount_autofs.c b/sbin/mount_autofs/mount_autofs.c
index 17fbb5b5b6fe9..af31b33c4c384 100644
--- a/sbin/mount_autofs/mount_autofs.c
+++ b/sbin/mount_autofs/mount_autofs.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $Id: mount_autofs.c,v 1.5 2004/09/08 08:12:21 bright Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_autofs/mount_autofs.c,v 1.4 2004/09/12 07:06:48 alfred Exp $
  */
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 0602d9bbd29c1..fbb44149dbf0b 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_cd9660/Makefile,v 1.11 2005/11/13 01:40:36 rodrigc Exp $
 
 PROG=	mount_cd9660
 SRCS=	mount_cd9660.c getmntopts.c
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 909af4019cdfc..7c0fa972e0c00 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.30 2005/11/18 10:32:11 ru Exp $
 .\"
 .Dd October 3, 2005
 .Dt MOUNT_CD9660 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 9a9bd9d045544..6a42954aca8fe 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.33 2005/12/19 05:52:37 avatar Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 3eefb92eb8c05..9f623e68b19a8 100644
--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ext2fs/Makefile,v 1.7 2003/11/13 19:18:43 johan Exp $
 
 PROG=	mount_ext2fs
 SRCS=	mount_ext2fs.c getmntopts.c
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 91a315e8bd399..a112f2f94be2f 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.8,v 1.15 2004/04/09 19:58:31 markm Exp $
 .\"
 .Dd January 31, 1996
 .Dt MOUNT_EXT2FS 8
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 04d2ea08c86ee..d6cad9d3d8c6d 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.22 2007/01/28 00:51:01 rodrigc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index 084377407787f..65750e9aad6df 100644
--- a/sbin/mount_hpfs/Makefile
+++ b/sbin/mount_hpfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_hpfs/Makefile,v 1.6 2004/02/23 20:13:53 johan Exp $
 #
 
 PROG=	mount_hpfs
diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8
index 0cdcb20e2e152..a75604c095347 100644
--- a/sbin/mount_hpfs/mount_hpfs.8
+++ b/sbin/mount_hpfs/mount_hpfs.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.8,v 1.11 2002/12/27 12:15:32 schweikh Exp $
 .\"
 .Dd May 20, 1999
 .Dt MOUNT_HPFS 8
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index a9a87e238881b..385d9be0088e3 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.c,v 1.6 2005/06/10 09:51:41 delphij Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 8752f0d848a88..d2950ff47eafc 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_msdosfs/Makefile,v 1.28 2005/11/13 03:25:39 rodrigc Exp $
 #
 
 PROG=	mount_msdosfs
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 6147aa42b137d..8c9da3875f6a0 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.8,v 1.32 2005/09/14 16:36:19 joel Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOSFS 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 8947644d152c1..3b4b0d822e1e2 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.c,v 1.43 2007/01/29 01:49:08 rodrigc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 4f7efeadd2b1b..30493f2a21402 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.16 2007/01/23 09:14:33 rodrigc Exp $
 
 PROG=	mount_nfs
 SRCS=	mount_nfs.c getmntopts.c mounttab.c
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 93ea3c2caa623..d16caeaf8835c 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.47 2007/03/05 14:47:54 thomas Exp $
 .\"
 .Dd December 25, 2005
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 44d45e85760ee..264c469f4a633 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -66,7 +66,7 @@ static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.72 2007/03/05 14:47:54 thomas Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 5938b0dd52a6d..ae09f3f55e179 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_ntfs/Makefile,v 1.10 2004/12/21 09:59:43 ru Exp $
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 15f49dffc2a07..52acabb94856e 100644
--- a/sbin/mount_ntfs/mount_ntfs.8
+++ b/sbin/mount_ntfs/mount_ntfs.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.21 2005/02/10 09:19:31 ru Exp $
 .\"
 .Dd January 3, 1999
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 4bd118f2b5277..defd98d9b1409 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.c,v 1.14 2005/06/10 09:51:42 delphij Exp $
  *
  */
 
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 5e92c5b5c2640..92230f91ff889 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_nullfs/Makefile,v 1.12 2005/11/21 22:51:16 rodrigc Exp $
 
 PROG=	mount_nullfs
 SRCS=	mount_nullfs.c getmntopts.c
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 177ecdd2cf84a..ff92abc3d50c6 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_nullfs/mount_nullfs.8,v 1.32 2006/04/19 19:21:42 brueffer Exp $
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULLFS 8
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index a0ad5f6819088..1382205452811 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_nullfs/mount_nullfs.c,v 1.26 2005/11/21 22:51:16 rodrigc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_reiserfs/Makefile b/sbin/mount_reiserfs/Makefile
index bd11a4b8ac648..066bb51f11c60 100644
--- a/sbin/mount_reiserfs/Makefile
+++ b/sbin/mount_reiserfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_reiserfs/Makefile,v 1.2 2005/11/13 01:47:04 rodrigc Exp $
 
 PROG = mount_reiserfs
 SRCS = mount_reiserfs.c getmntopts.c
diff --git a/sbin/mount_reiserfs/mount_reiserfs.8 b/sbin/mount_reiserfs/mount_reiserfs.8
index 7306182667d29..45d63512cf770 100644
--- a/sbin/mount_reiserfs/mount_reiserfs.8
+++ b/sbin/mount_reiserfs/mount_reiserfs.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_reiserfs/mount_reiserfs.8,v 1.2 2005/06/24 10:57:53 ru Exp $
 .\"
 .Dd February 3, 2005
 .Dt MOUNT_REISERFS 8
diff --git a/sbin/mount_reiserfs/mount_reiserfs.c b/sbin/mount_reiserfs/mount_reiserfs.c
index 5c4e6fcff628b..d354608819f3b 100644
--- a/sbin/mount_reiserfs/mount_reiserfs.c
+++ b/sbin/mount_reiserfs/mount_reiserfs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_reiserfs/mount_reiserfs.c,v 1.4 2005/11/13 01:45:32 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile
index 110a5256cf22b..236ff0c4d0766 100644
--- a/sbin/mount_std/Makefile
+++ b/sbin/mount_std/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-#	$FreeBSD$
+#	$FreeBSD: src/sbin/mount_std/Makefile,v 1.14 2005/12/02 04:25:54 davidxu Exp $
 
 PROG=	mount_std
 SRCS=	mount_std.c getmntopts.c
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 7575cee0b186b..b46c2d6ee276d 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.24 2006/05/18 15:26:27 ceri Exp $
 .\"
 .Dd November 26, 2004
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 3f292b4a9a1d2..91df8be33c0a2 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.22 2006/09/13 04:50:44 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index c5351fdc87822..635bb4283526a 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_udf/Makefile,v 1.6 2006/07/17 20:53:25 stefanf Exp $
 
 PROG=	mount_udf
 SRCS=	mount_udf.c getmntopts.c
diff --git a/sbin/mount_udf/mount_udf.8 b/sbin/mount_udf/mount_udf.8
index fb39419aea48c..0a9a94c851ab9 100644
--- a/sbin/mount_udf/mount_udf.8
+++ b/sbin/mount_udf/mount_udf.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_udf/mount_udf.8,v 1.6 2005/02/10 09:19:31 ru Exp $
 .\"
 .Dd March 23, 2002
 .Dt MOUNT_UDF 8
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 0175f20f24fd2..410449549c4df 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/mount_udf/mount_udf.c,v 1.13 2005/06/10 09:51:43 delphij Exp $
  */
 
 /*
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 35158ab923788..107f07b4fcea1 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/mount_unionfs/Makefile,v 1.14 2007/02/13 05:39:38 rodrigc Exp $
 
 PROG=	mount_unionfs
 SRCS=	mount_unionfs.c getmntopts.c
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 4f661b8bdd1bd..2b0c75bd41b83 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.22.2.1 2007/10/22 05:41:54 daichi Exp $
 .\"
 .Dd November 30, 2006
 .Dt MOUNT_UNIONFS 8
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index edb0fff075965..71b6f3b1d1333 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -44,7 +44,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/mount_unionfs/mount_unionfs.c,v 1.28 2007/02/13 05:39:38 rodrigc Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index c6bf3267a7cfe..2c2367228f3e8 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/Makefile,v 1.9 2004/02/23 20:13:55 johan Exp $
 
 PROG		= natd
 SRCS		= natd.c icmp.c
diff --git a/sbin/natd/README b/sbin/natd/README
index d2e8a9ae67097..f55a7ffe92d36 100644
--- a/sbin/natd/README
+++ b/sbin/natd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/README,v 1.3 2003/01/23 08:35:21 ru Exp $
 
 	A Network Address Translation Daemon for FreeBSD
 
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 1509b965f4b81..4fb0f150c5e45 100644
--- a/sbin/natd/icmp.c
+++ b/sbin/natd/icmp.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/icmp.c,v 1.7 2004/07/04 12:53:54 phk Exp $
  */
 
 #include <stdlib.h>
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 254948a02abc1..c4ae50376ddf1 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.62 2005/01/15 12:28:00 ru Exp $
 .Dd February 28, 2003
 .Dt NATD 8
 .Os
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index c0fb05facc9cf..b0f05c56e4438 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/natd/natd.c,v 1.50 2006/09/26 23:26:51 piso Exp $");
 
 #define SYSLOG_NAMES
 
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index a05d1f7e4dcad..38a7d95f468c3 100644
--- a/sbin/natd/natd.h
+++ b/sbin/natd/natd.h
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/natd/natd.h,v 1.5 2004/07/04 12:53:54 phk Exp $
  */
 
 #define PIDFILE	"/var/run/natd.pid"
diff --git a/sbin/natd/samples/natd.cf.sample b/sbin/natd/samples/natd.cf.sample
index d4dcd714bd92f..db33c28aa2c91 100644
--- a/sbin/natd/samples/natd.cf.sample
+++ b/sbin/natd/samples/natd.cf.sample
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/natd/samples/natd.cf.sample,v 1.5 1999/09/13 18:18:33 ru Exp $
 #
 #
 # Configuration file for natd.
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index efbe7abfe492e..c67ce2675f57e 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/Makefile,v 1.22 2003/02/11 03:06:45 jmallett Exp $
 
 PROG=	newfs
 DPADD=	${LIBUFS}
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index fe862b58f1649..d7e54018f7e0f 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.92 2006/10/31 21:52:27 pjd Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 8be6d3521485c..3440b54f16123 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.70 2006/10/31 21:52:27 pjd Exp $
 .\"
 .Dd January 21, 2005
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 41823cb42e9d8..7445ed8c83aa5 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.82 2007/03/02 20:07:59 pjd Exp $");
 
 /*
  * newfs: friendly front end to mkfs
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 55f920f02925b..d6afa36a35336 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/newfs/newfs.h,v 1.18 2006/10/31 21:52:27 pjd Exp $
  */
 
 #include <libufs.h>
diff --git a/sbin/newfs/ref.test b/sbin/newfs/ref.test
index 1967e247d4e55..eee6b632255bd 100644
--- a/sbin/newfs/ref.test
+++ b/sbin/newfs/ref.test
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/ref.test,v 1.3 2003/02/22 23:26:11 mckusick Exp $
 00c08266df6b0c79d2673515c182216a
 c00458f223a9119190591e8b8679bf97
 7d5b3c75244898dbb07a4cd20860c8a1
diff --git a/sbin/newfs/runtest00.sh b/sbin/newfs/runtest00.sh
index a95dbcc83b250..1ef96f34bc93f 100644
--- a/sbin/newfs/runtest00.sh
+++ b/sbin/newfs/runtest00.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/runtest00.sh,v 1.1 2002/03/19 21:05:29 phk Exp $
 
 set -e
 
diff --git a/sbin/newfs/runtest01.sh b/sbin/newfs/runtest01.sh
index 47128326ed243..f87aec93904ca 100644
--- a/sbin/newfs/runtest01.sh
+++ b/sbin/newfs/runtest01.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs/runtest01.sh,v 1.1 2002/03/19 21:05:29 phk Exp $
 
 set -e
 
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index 5ee8277d42a91..ba09f7025abb7 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.11 2005/01/24 01:56:06 cognet Exp $
 
 PROG=	newfs_msdos
 MAN=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 024ed1c188c6e..93e284feeec77 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.20 2005/02/13 22:25:16 ru Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 1c23b241e6387..94b5c2aa4e431 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.22 2007/05/31 20:06:46 trhodes Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 22717c576f42b..d36527836fe24 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/nfsiod/Makefile,v 1.9 2002/08/10 20:19:04 mux Exp $
 
 PROG=	nfsiod
 WARNS?=	6
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 44bf1af28ad2f..61f7cc926ff60 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nfsiod/nfsiod.8,v 1.19 2005/01/17 07:44:10 ru Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 31559cc61bd76..689af584f473e 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.18 2005/04/07 20:37:04 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index e128b62160f77..a42140407d608 100644
--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/nos-tun/Makefile,v 1.5 2004/02/23 20:13:55 johan Exp $
 
 PROG=	nos-tun
 WARNS?=	0
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 405d43007b62d..548e36dc8ea97 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.18 2005/02/13 22:25:16 ru Exp $
 .\"
 .Dd April 11, 1998
 .Dt NOS-TUN 8
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index 9966840038f74..f11b7447b059a 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -57,7 +57,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/nos-tun/nos-tun.c,v 1.14 2005/02/10 09:19:32 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index ee5705197e56d..8d916a760dbc2 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pfctl/Makefile,v 1.7 2007/07/03 12:46:05 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pfctl
 .PATH:	${.CURDIR}/../../sys/contrib/pf/net
diff --git a/sbin/pfctl/missing/altq/altq.h b/sbin/pfctl/missing/altq/altq.h
index c740ed359ad16..154b298ccf811 100644
--- a/sbin/pfctl/missing/altq/altq.h
+++ b/sbin/pfctl/missing/altq/altq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_cbq.h b/sbin/pfctl/missing/altq/altq_cbq.h
index 3c41c6bd836f5..1c1b68a7d7cbb 100644
--- a/sbin/pfctl/missing/altq/altq_cbq.h
+++ b/sbin/pfctl/missing/altq/altq_cbq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_cbq.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_cbq.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_classq.h b/sbin/pfctl/missing/altq/altq_classq.h
index 43045b25a6303..ab5dcc2f4bd62 100644
--- a/sbin/pfctl/missing/altq/altq_classq.h
+++ b/sbin/pfctl/missing/altq/altq_classq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_classq.h,v 1.2 2004/04/09 19:58:34 markm Exp $	*/
 /*	$KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_hfsc.h b/sbin/pfctl/missing/altq/altq_hfsc.h
index ac242114c084c..19f0610e784cd 100644
--- a/sbin/pfctl/missing/altq/altq_hfsc.h
+++ b/sbin/pfctl/missing/altq/altq_hfsc.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_hfsc.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_hfsc.h,v 1.10 2003/07/10 12:07:48 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_priq.h b/sbin/pfctl/missing/altq/altq_priq.h
index 526b09235e397..8e73bbd264883 100644
--- a/sbin/pfctl/missing/altq/altq_priq.h
+++ b/sbin/pfctl/missing/altq/altq_priq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_priq.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_priq.h,v 1.5 2003/07/10 12:07:48 kjc Exp $	*/
 /*
  * Copyright (C) 2000-2003
diff --git a/sbin/pfctl/missing/altq/altq_red.h b/sbin/pfctl/missing/altq/altq_red.h
index 96e3fae94fc6a..7b25d3ee08aca 100644
--- a/sbin/pfctl/missing/altq/altq_red.h
+++ b/sbin/pfctl/missing/altq/altq_red.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_red.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_red.h,v 1.8 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_rio.h b/sbin/pfctl/missing/altq/altq_rio.h
index eda338ae2f1dc..a00bf58d26819 100644
--- a/sbin/pfctl/missing/altq/altq_rio.h
+++ b/sbin/pfctl/missing/altq/altq_rio.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_rio.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_rio.h,v 1.9 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_rmclass.h b/sbin/pfctl/missing/altq/altq_rmclass.h
index 87e3e630bb8a1..c48ddf97c2c18 100644
--- a/sbin/pfctl/missing/altq/altq_rmclass.h
+++ b/sbin/pfctl/missing/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_rmclass.h,v 1.2 2004/04/09 19:58:34 markm Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_rmclass_debug.h b/sbin/pfctl/missing/altq/altq_rmclass_debug.h
index 7fcc86ba129be..5131f55ede971 100644
--- a/sbin/pfctl/missing/altq/altq_rmclass_debug.h
+++ b/sbin/pfctl/missing/altq/altq_rmclass_debug.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_rmclass_debug.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_var.h b/sbin/pfctl/missing/altq/altq_var.h
index 165b5afe32045..3c0ab7eb325e4 100644
--- a/sbin/pfctl/missing/altq/altq_var.h
+++ b/sbin/pfctl/missing/altq/altq_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_var.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_var.h,v 1.15 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pfctl/missing/altq/altq_wfq.h b/sbin/pfctl/missing/altq/altq_wfq.h
index ca163cf3652dc..f455417b6d54e 100644
--- a/sbin/pfctl/missing/altq/altq_wfq.h
+++ b/sbin/pfctl/missing/altq/altq_wfq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/pfctl/missing/altq/altq_wfq.h,v 1.1 2004/02/28 21:50:49 mlaier Exp $	*/
 /*	$KAME: altq_wfq.h,v 1.8 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
index 01c41d0723f1a..8eca296eb3e5f 100644
--- a/sbin/pflogd/Makefile
+++ b/sbin/pflogd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/pflogd/Makefile,v 1.3 2004/10/24 14:25:53 ru Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/pflogd
 
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 838e1ea7245bc..1e263d4b6c15e 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping/Makefile,v 1.20 2006/08/22 07:51:09 ru Exp $
 
 PROG=	ping
 MAN=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index b710991cb6eec..1fbc92ebb8f28 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ping/ping.8,v 1.54 2006/04/05 12:30:42 glebius Exp $
 .\"
 .Dd April 4, 2006
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 9280bef1e8efb..cd29996367e5f 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.112 2007/07/01 12:08:06 gnn Exp $");
 
 /*
  *			P I N G . C
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 89e7fbe2c6aee..a7dc771fec6f0 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/ping6/Makefile,v 1.15 2007/07/05 08:56:45 bz Exp $
 
 PROG=	ping6
 MAN=	ping6.8
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 89a81684cf552..460d87d1b271f 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/ping6/ping6.8,v 1.23 2005/02/10 09:19:32 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index a7ab9a1f3e8a6..4aee090e64016 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -78,7 +78,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/ping6/ping6.c,v 1.31 2007/07/01 12:08:06 gnn Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index b54eda3128801..71174f3ef946d 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/quotacheck/Makefile,v 1.8 2004/02/23 20:13:55 johan Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	quotacheck
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index 7856091ded3b4..66461c4c17162 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/preen.c,v 1.26 2007/09/16 02:59:32 mpp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 11952907e4066..24aba38dcfc3c 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.19 2007/01/25 19:54:03 mpp Exp $
 .\"
 .Dd January 25, 2007
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 1956184f91cf0..0aa1940a89160 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.33 2007/09/14 03:12:19 mpp Exp $");
 
 /*
  * Fix up / report on disk quotas & usage
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 2ca64cc90b5f3..3c90fa37b7539 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -1,5 +1,5 @@
 #       $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/rcorder/Makefile,v 1.6 2006/01/25 16:34:33 dougb Exp $
 
 PROG=   rcorder
 SRCS=   ealloc.c hash.c rcorder.c
diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8
index 6a0c570c4e0df..c856d95fad473 100644
--- a/sbin/rcorder/rcorder.8
+++ b/sbin/rcorder/rcorder.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/rcorder/rcorder.8,v 1.4 2004/07/02 18:37:52 ru Exp $
 .\"
 .Dd July 17, 2000
 .Dt RCORDER 8
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 5bf60cb174bcb..dbe9e07bf7db6 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/types.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/rcorder/rcorder.c,v 1.3 2006/05/20 05:47:18 delphij Exp $");
 
 #include <sys/stat.h>
 
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 42f086887eb7e..d832650eec36e 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/reboot/Makefile,v 1.15 2005/11/17 09:39:36 ru Exp $
 
 PROG=	reboot
 WARNS?=	6
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 4b15ccf3f54c9..cd26399cc69c5 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.61 2007/08/18 07:58:36 danger Exp $
 .\"
 .Dd August 18, 2005
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index 765fa796fe040..d33b9fe3627be 100644
--- a/sbin/reboot/nextboot.8
+++ b/sbin/reboot/nextboot.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/nextboot.8,v 1.4 2002/12/12 17:25:56 ru Exp $
 .\"
 .Dd November 4, 2002
 .Dt NEXTBOOT 8
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index 56e53f60a1a97..585cd78967414 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -3,7 +3,7 @@
 # Copyright 2002. Gordon Tetlow.
 # gordon@FreeBSD.org
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/reboot/nextboot.sh,v 1.3 2006/01/18 04:48:45 wes Exp $
 
 delete="NO"
 force="NO"
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index b9baf344d79d4..18ab9758077a8 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/reboot/reboot.8,v 1.24 2006/11/22 13:12:34 jkoshy Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index de4030771d6c9..57ac93b42c238 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/reboot/reboot.c,v 1.26 2006/08/02 13:05:38 bms Exp $");
 
 #include <sys/reboot.h>
 #include <sys/types.h>
diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
index 6733a4f8fa200..1004ce59abdf6 100644
--- a/sbin/recoverdisk/Makefile
+++ b/sbin/recoverdisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/recoverdisk/Makefile,v 1.5 2006/05/30 19:10:18 matteo Exp $
 
 PROG=	recoverdisk
 WARNS?=	6
diff --git a/sbin/recoverdisk/recoverdisk.1 b/sbin/recoverdisk/recoverdisk.1
index c5526b36f62b2..878d8535f35d5 100644
--- a/sbin/recoverdisk/recoverdisk.1
+++ b/sbin/recoverdisk/recoverdisk.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/recoverdisk/recoverdisk.1,v 1.3 2007/06/17 16:53:45 phk Exp $
 .\"
 .Dd May 6, 2006
 .Dt RECOVERDISK 1
diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c
index 0dc5d7ccf0d7a..eb42f764513ca 100644
--- a/sbin/recoverdisk/recoverdisk.c
+++ b/sbin/recoverdisk/recoverdisk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/recoverdisk/recoverdisk.c,v 1.9 2007/06/17 16:53:45 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index c06a3db9116c7..07d29803bf6cf 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/restore/Makefile,v 1.24 2005/03/25 17:30:20 imp Exp $
 
 .PATH: ${.CURDIR}/../dump
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 406a0f04afe7a..a84519466815d 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/dirs.c,v 1.31 2007/02/26 08:15:56 mckusick Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index cbecc86bd4766..0844878c38bfb 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/extern.h,v 1.11 2007/02/26 08:15:56 mckusick Exp $
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index e3391d0eb77cd..7177e8d8eac13 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/interactive.c,v 1.18 2005/07/21 16:12:35 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 91f4a83c72962..228166cd4c0d6 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/main.c,v 1.27 2006/12/05 11:18:51 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index cf6a364693b00..fa98e415ee779 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.53 2006/12/05 11:18:51 dwmalone Exp $
 .\"
 .Dd October 12, 2006
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index e494cdb69a7d5..0b7f80b8b88fd 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/restore.c,v 1.19 2006/12/05 11:18:51 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 8c6a87b8b2f75..3dbe497b3c1dd 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)restore.h	8.3 (Berkeley) 9/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sbin/restore/restore.h,v 1.12 2007/02/26 08:15:56 mckusick Exp $
  */
 
 /*
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index b7eff268e653d..fb1d5cec68fa8 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/symtab.c,v 1.14 2004/04/09 19:58:36 markm Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 6afa591081bfb..2a35bbe20f747 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.49 2007/03/06 08:13:20 mckusick Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 6b984e4097495..ba8840bd605bd 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/restore/utilities.c,v 1.14 2004/04/09 19:58:36 markm Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index ef56dfd9286a9..1b7b0a4d68ef0 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/Makefile,v 1.21 2006/07/27 13:26:29 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/route/keywords b/sbin/route/keywords
index 130fcd195b2f9..b963111a9238f 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -1,5 +1,5 @@
 #	@(#)keywords	8.2 (Berkeley) 3/19/94
-# $FreeBSD$
+# $FreeBSD: src/sbin/route/keywords,v 1.6 2005/09/28 12:12:15 tobez Exp $
 
 add
 atalk
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index ff751895d5367..916316c595125 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/route/route.8,v 1.46 2005/10/02 12:55:34 ru Exp $
 .\"
 .Dd October 2, 2005
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 2edea134350f3..644575a9a098c 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/route/route.c,v 1.81 2005/09/28 12:12:15 tobez Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 1ac16c41e32cb..75e0cedd1e3e1 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,5 +1,5 @@
 # Make `routed` for FreeBSD
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile,v 1.16 2004/08/13 14:18:24 ru Exp $
 
 PROG=   routed
 SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc
index 265f86d1ed55a..5789693e70bc4 100644
--- a/sbin/routed/Makefile.inc
+++ b/sbin/routed/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/Makefile.inc,v 1.4 2001/10/25 08:37:12 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 9860e4d77b7f9..07f7915ccb968 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -28,11 +28,11 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/defs.h,v 1.18 2004/06/16 05:08:57 bms Exp $
  */
 
 #ifdef  sgi
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sbin/routed/defs.h,v 1.18 2004/06/16 05:08:57 bms Exp $"
 #endif
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index f8038f6a47255..9dc59f96cb814 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/if.c,v 1.16 2005/12/20 18:18:37 maxim Exp $
  */
 
 #include "defs.h"
@@ -35,7 +35,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/if.c,v 1.16 2005/12/20 18:18:37 maxim Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index f655346bfcad4..bc974f7f61c57 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/input.c,v 1.14 2005/08/05 09:58:49 stefanf Exp $
  */
 
 #include "defs.h"
@@ -34,7 +34,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/input.c,v 1.14 2005/08/05 09:58:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 7c3c5acc8697e..36c83bb489797 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $
  */
 
 #include "defs.h"
@@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n"
 __RCSID("$NetBSD$");
 #include <util.h>
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $");
 #else
 __RCSID("$Revision: 2.31 $");
 #ident "$Revision: 2.31 $"
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index c9db470b9b467..0d6913effd124 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/output.c,v 1.12 2005/05/31 20:28:48 stefanf Exp $
  */
 
 #include "defs.h"
@@ -34,7 +34,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/output.c,v 1.12 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 356ac8e9da36b..2c43dbb44015f 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/parms.c,v 1.14 2005/05/31 20:28:48 stefanf Exp $
  */
 
 #include "defs.h"
@@ -36,7 +36,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/parms.c,v 1.14 2005/05/31 20:28:48 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index c45405ed9e559..7908351043d6a 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -28,7 +28,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/pathnames.h,v 1.8 2004/04/09 19:58:37 markm Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 7f3768853abc4..64dea2b166049 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -28,7 +28,7 @@
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.c,v 1.9 2005/05/31 20:28:49 stefanf Exp $
  */
 
 /*
@@ -40,7 +40,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/radix.c,v 1.9 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.23 $");
 #ident "$Revision: 2.23 $"
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index 6cf196fa4da6d..21c95d61c346f 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -28,7 +28,7 @@
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/radix.h,v 1.7 2004/04/09 19:58:37 markm Exp $
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 047b3d1230476..3fc01a9e1f8f8 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/rdisc.c,v 1.11 2005/05/31 20:28:49 stefanf Exp $
  */
 
 #include "defs.h"
@@ -37,7 +37,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/rdisc.c,v 1.11 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 25998c9bd83cc..5d121b8348be7 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/routed.8,v 1.34 2005/01/18 10:09:37 ru Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 7076158727f67..979a0cc683afd 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` tools for BSD/OS
 # $Revision: 1.6 $
-# $FreeBSD$
+# $FreeBSD: src/sbin/routed/rtquery/Makefile,v 1.14 2004/08/13 14:18:24 ru Exp $
 
 PROG=	rtquery
 MAN=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 4f16e88d5c095..775dfc6cfa359 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,5 +1,5 @@
 .\" $Revision: 2.27 $
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.20 2004/02/25 23:45:57 bms Exp $
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 1b3a47bef5dad..1fb65dde0df84 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/rtquery/rtquery.c,v 1.17 2004/04/09 19:58:38 markm Exp $
  */
 
 #include <sys/cdefs.h>
@@ -62,7 +62,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n"
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/rtquery/rtquery.c,v 1.17 2004/04/09 19:58:38 markm Exp $");
 #else
 __RCSID("$Revision: 2.26 $");
 #ident "$Revision: 2.26 $"
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 491c5cfa0ab15..7baea54ff10c3 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/table.c,v 1.21 2005/05/31 20:28:49 stefanf Exp $
  */
 
 #include "defs.h"
@@ -34,7 +34,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/table.c,v 1.21 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 320056f76c8f7..faff945a1513a 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/routed/trace.c,v 1.12 2005/05/31 20:28:49 stefanf Exp $
  */
 
 #define	RIPCMDS
@@ -39,7 +39,7 @@
 #ifdef __NetBSD__
 __RCSID("$NetBSD$");
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/sbin/routed/trace.c,v 1.12 2005/05/31 20:28:49 stefanf Exp $");
 #else
 __RCSID("$Revision: 2.27 $");
 #ident "$Revision: 2.27 $"
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index 2086c68d5f295..8d8258aea3e14 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/rtsol/Makefile,v 1.14 2006/07/27 18:28:14 yar Exp $
 
 SRCDIR=	${.CURDIR}/../../usr.sbin/rtsold
 
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 525f281b598c9..b8aa446918178 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/savecore/Makefile,v 1.13 2005/01/10 10:44:56 delphij Exp $
 
 PROG=	savecore
 WARNS?=	6
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 447e008d67dc0..a69d072fc0634 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.25 2005/06/14 11:24:56 ru Exp $
 .\"
 .Dd February 24, 2005
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 88a6301f1cfab..3927ce55c3a26 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.78 2007/05/28 09:48:25 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/disk.h>
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 5923692aad472..220d58ae6b896 100644
--- a/sbin/sconfig/Makefile
+++ b/sbin/sconfig/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sbin.sconfig.Makefile,v 1.1.4.1 2003/02/17 12:51:24 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sbin/sconfig/Makefile,v 1.3 2004/01/21 13:22:08 ru Exp $
 
 PROG=	sconfig
 MAN=	sconfig.8
diff --git a/sbin/sconfig/sconfig.8 b/sbin/sconfig/sconfig.8
index 3fe7abcff6866..0fbd396b2cd80 100644
--- a/sbin/sconfig/sconfig.8
+++ b/sbin/sconfig/sconfig.8
@@ -10,7 +10,7 @@
 .\" as long as this message is kept with the software, all derivative
 .\" works or modified versions.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.7 2004/12/30 01:48:12 brueffer Exp $
 .Dd May 19, 2004
 .Dt SCONFIG 8 i386
 .Os
diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c
index 4274fbf87a290..7c6c09d7232ab 100644
--- a/sbin/sconfig/sconfig.c
+++ b/sbin/sconfig/sconfig.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/sconfig/sconfig.c,v 1.4 2006/09/12 17:54:35 charnier Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 03c2ea2655dc8..40e1240249498 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/setkey/Makefile,v 1.14 2007/07/01 12:08:06 gnn Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y
index 85f4fabcda6e9..35e886a9c430c 100644
--- a/sbin/setkey/parse.y
+++ b/sbin/setkey/parse.y
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/parse.y,v 1.9 2007/07/01 12:08:06 gnn Exp $	*/
 /*	$KAME: parse.y,v 1.83 2004/05/18 08:48:23 sakane Exp $	*/
 
 /*
diff --git a/sbin/setkey/sample.cf b/sbin/setkey/sample.cf
index c534fa10f1c49..0189a014d2fc7 100644
--- a/sbin/setkey/sample.cf
+++ b/sbin/setkey/sample.cf
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/setkey/sample.cf,v 1.4 2003/11/05 09:47:54 ume Exp $
 
 # There are sample scripts for IPsec configuration by manual keying.
 # A security association is uniquely identified by a triple consisting
diff --git a/sbin/setkey/scriptdump.pl b/sbin/setkey/scriptdump.pl
index a1d8adb207bc6..4edc914858596 100644
--- a/sbin/setkey/scriptdump.pl
+++ b/sbin/setkey/scriptdump.pl
@@ -1,5 +1,5 @@
 #! @LOCALPREFIX@/bin/perl
-# $FreeBSD$
+# $FreeBSD: src/sbin/setkey/scriptdump.pl,v 1.4 2001/08/06 19:40:01 ume Exp $
 
 if ($< != 0) {
 	print STDERR "must be root to invoke this\n";
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 12ef325c985ae..4e8c606c7e394 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/setkey/setkey.8,v 1.38 2007/05/09 19:37:00 gnn Exp $
 .\"
 .Dd May 13, 2006
 .Dt SETKEY 8
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index 9bb9a88e02bae..e5f52a55df246 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/setkey.c,v 1.7 2007/07/01 12:08:06 gnn Exp $	*/
 /*	$KAME: setkey.c,v 1.28 2003/06/27 07:15:45 itojun Exp $	*/
 
 /*
diff --git a/sbin/setkey/test-pfkey.c b/sbin/setkey/test-pfkey.c
index 672f03c8512cc..72ad776aac342 100644
--- a/sbin/setkey/test-pfkey.c
+++ b/sbin/setkey/test-pfkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/test-pfkey.c,v 1.3 2007/07/01 12:08:06 gnn Exp $	*/
 /*	$KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/sbin/setkey/test-policy.c b/sbin/setkey/test-policy.c
index 9e9b723e77730..30097431b87f8 100644
--- a/sbin/setkey/test-policy.c
+++ b/sbin/setkey/test-policy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/setkey/test-policy.c,v 1.2 2007/07/01 12:08:06 gnn Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index fe45770407354..546458a47e1b7 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/token.l,v 1.13 2007/07/01 12:08:06 gnn Exp $	*/
 /*	$KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $	*/
 
 /*
diff --git a/sbin/setkey/vchar.h b/sbin/setkey/vchar.h
index f3251c7bfed32..f6a1c34c73073 100644
--- a/sbin/setkey/vchar.h
+++ b/sbin/setkey/vchar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sbin/setkey/vchar.h,v 1.2 2000/07/04 16:22:05 itojun Exp $	*/
 /*	$KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $	*/
 
 /*
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index b7f232d090b52..21f62d4a4f1a2 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/shutdown/Makefile,v 1.9 2005/01/25 08:37:04 delphij Exp $
 
 PROG=	shutdown
 MAN=	shutdown.8
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index e68687f20b96c..14c7abc700ca0 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/shutdown/shutdown.8,v 1.24 2005/01/18 20:36:37 ru Exp $
 .\"
 .Dd December 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index c4f3f41e6c51e..818627c174521 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/shutdown/shutdown.c,v 1.28 2005/01/25 08:40:51 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 84b0c1282865f..bd499b0aebaa9 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/11/90
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/slattach/Makefile,v 1.13 2004/02/23 20:13:56 johan Exp $
 
 PROG=	slattach
 WARNS?=	0
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index a359dd25605da..200f143a0712d 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -27,7 +27,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/slattach/slattach.8,v 1.29 2005/02/10 09:19:33 ru Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index afdfce8a2e712..cc247d96fb3da 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/slattach/slattach.c,v 1.41 2005/02/10 09:19:33 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index b394c39a4e83e..05c5387811824 100644
--- a/sbin/spppcontrol/Makefile
+++ b/sbin/spppcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/spppcontrol/Makefile,v 1.6 2001/12/04 02:19:57 obrien Exp $
 
 PROG=	spppcontrol
 MAN=	spppcontrol.8
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index 4389c8f66ec13..01ecd31b19bfa 100644
--- a/sbin/spppcontrol/spppcontrol.8
+++ b/sbin/spppcontrol/spppcontrol.8
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.16 2005/02/13 23:45:48 ru Exp $
 .\"
 .Dd December 30, 2001
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index a1df0f49942b3..c708aa7944cd4 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.13 2003/05/03 18:41:59 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/sbin/startslip/Makefile b/sbin/startslip/Makefile
index 1bf91dd821697..69171e25e194f 100644
--- a/sbin/startslip/Makefile
+++ b/sbin/startslip/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/startslip/Makefile,v 1.10 2004/08/02 08:10:28 stefanf Exp $
 
 PROG=	startslip
 WARNS?=	3
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 2d6f43b3c52e4..e24cdd0107bf7 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.24 2005/07/14 20:29:05 brueffer Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index 2d4d3bfb124a9..1d422ed7d092f 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/startslip/startslip.c,v 1.38 2005/02/10 09:19:34 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 143b6c72bb0f4..c5e5e5bc3167e 100644
--- a/sbin/sunlabel/Makefile
+++ b/sbin/sunlabel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.12 2004/02/01 13:09:26 ceri Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom
 
diff --git a/sbin/sunlabel/runtest.sh b/sbin/sunlabel/runtest.sh
index 73833e0b7fee4..fe784b8bae18f 100644
--- a/sbin/sunlabel/runtest.sh
+++ b/sbin/sunlabel/runtest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sbin/sunlabel/runtest.sh,v 1.3 2003/04/23 08:25:44 phk Exp $
 
 TMP=/tmp/$$.
 set -e
diff --git a/sbin/sunlabel/sunlabel.8 b/sbin/sunlabel/sunlabel.8
index 60096048dafac..f405406614884 100644
--- a/sbin/sunlabel/sunlabel.8
+++ b/sbin/sunlabel/sunlabel.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sunlabel/sunlabel.8,v 1.6 2005/03/30 18:54:41 joerg Exp $
 .\"
 .Dd March 30, 2005
 .Dt SUNLABEL 8
diff --git a/sbin/sunlabel/sunlabel.c b/sbin/sunlabel/sunlabel.c
index 7bf051ef47864..de020bcb2ab2f 100644
--- a/sbin/sunlabel/sunlabel.c
+++ b/sbin/sunlabel/sunlabel.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.13 2005/03/30 09:33:09 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 85b0f0ab60bb6..bb0e1788a0171 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/swapon/Makefile,v 1.8 2002/12/28 23:39:47 dillon Exp $
 
 PROG=	swapon
 MAN=	swapon.8
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index f4ecd14145f78..edda603940a8f 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.29 2005/02/10 09:19:34 ru Exp $
 .\"
 .Dd December 28, 2002
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 13297f9178dc0..60e5235b0d0c5 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.22 2005/02/10 09:19:34 ru Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 381f19918be3d..69d85ab7b9cee 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/sysctl/Makefile,v 1.9 2004/02/23 20:13:56 johan Exp $
 
 PROG=	sysctl
 WARNS?=	0
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 4084290284e17..f71a003774e7a 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.61.2.1 2007/12/02 08:48:30 remko Exp $
 .\"
 .Dd November 28, 2007
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 9dcfcb06bfd92..1548ea9e28775 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.86 2007/06/11 13:02:15 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index d501d104b4b79..682fcdc9c7ee5 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/sbin/tunefs/Makefile,v 1.8 2003/01/23 08:15:05 ru Exp $
 
 PROG=	tunefs
 DPADD=	${LIBUFS}
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 245aa361f2574..9122b251db3fa 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.39 2007/09/23 16:06:37 maxim Exp $
 .\"
 .Dd August 13, 2007
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 2b263bb343c8c..2bd9854418df5 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.43 2006/10/31 21:52:28 pjd Exp $");
 
 /*
  * tunefs: change layout parameters to an existing file system.
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 70ccc5a066247..370e748525eee 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
 #
-# $FreeBSD$
+# $FreeBSD: src/sbin/umount/Makefile,v 1.11 2004/02/23 20:13:57 johan Exp $
 
 PROG=	umount
 SRCS=	umount.c vfslist.c mounttab.c
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index d19ea9ae7a49d..c732e449c6ecc 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.20 2004/04/09 19:58:40 markm Exp $
 .\"
 .Dd July 18, 2003
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index c00a09d8da225..e273cb06d9747 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sbin/umount/umount.c,v 1.45 2005/02/10 09:19:34 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/secure/Makefile b/secure/Makefile
index 7a78d947c5569..256170a5f749c 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/Makefile,v 1.27 2006/03/17 18:54:31 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 7b9cb987e7192..375130df97346 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/Makefile.inc,v 1.25 2006/03/17 18:54:31 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index e27bcc39dd49c..de47d119e7128 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/Makefile,v 1.34 2006/03/17 18:54:31 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc
index 002a3f70ef335..84e4673e7dc7f 100644
--- a/secure/lib/Makefile.inc
+++ b/secure/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/Makefile.inc,v 1.9 2003/04/30 07:54:38 ru Exp $
 
 .include "../Makefile.inc"
 .if exists(${.CURDIR}/../../../lib/Makefile.inc)
diff --git a/secure/lib/libcrypt/blowfish.c b/secure/lib/libcrypt/blowfish.c
index 5b33f025fdfdd..c830cdafbd486 100644
--- a/secure/lib/libcrypt/blowfish.c
+++ b/secure/lib/libcrypt/blowfish.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/lib/libcrypt/blowfish.c,v 1.4 2003/06/02 19:17:24 markm Exp $");
 
 /*
  * This code is derived from section 14.3 and the given source
diff --git a/secure/lib/libcrypt/blowfish.h b/secure/lib/libcrypt/blowfish.h
index 2ea64749b9f1c..902befcc8b358 100644
--- a/secure/lib/libcrypt/blowfish.h
+++ b/secure/lib/libcrypt/blowfish.h
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/secure/lib/libcrypt/blowfish.h,v 1.3 2003/06/02 19:17:24 markm Exp $
  */
 
 /*
diff --git a/secure/lib/libcrypt/crypt-blowfish.c b/secure/lib/libcrypt/crypt-blowfish.c
index 649d07cb30fdb..10dd7f5f76431 100644
--- a/secure/lib/libcrypt/crypt-blowfish.c
+++ b/secure/lib/libcrypt/crypt-blowfish.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/lib/libcrypt/crypt-blowfish.c,v 1.4 2003/06/02 19:17:24 markm Exp $");
 
 /* This password hashing algorithm was designed by David Mazieres
  * <dm@lcs.mit.edu> and works as follows:
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index 9adff936f3adf..72ce1d63e9066 100644
--- a/secure/lib/libcrypt/crypt-des.c
+++ b/secure/lib/libcrypt/crypt-des.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/lib/libcrypt/crypt-des.c,v 1.16 2002/03/06 17:18:09 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 9a0c7f7280b9a..3b18609e7b534 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.81 2007/05/09 19:37:00 gnn Exp $
 
 SHLIBDIR?=	/lib
 SUBDIR=		engines
diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm
index 50584ee03ed6e..f321a2105ff1c 100644
--- a/secure/lib/libcrypto/Makefile.asm
+++ b/secure/lib/libcrypto/Makefile.asm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile.asm,v 1.5 2005/02/25 06:04:09 nectar Exp $
 # Use this to help generate the asm *.s files after an import.  It is not
 # perfect by any means, but does what is needed.
 # Do a 'make -f Makefile.asm all' and it will generate *.s.  Move them
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index ad17d85237f58..0b2220b468fb5 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile.inc,v 1.47 2007/05/09 19:37:00 gnn Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/lib/libcrypto/Makefile.man b/secure/lib/libcrypto/Makefile.man
index e6cc9b876629a..68c436659fc10 100644
--- a/secure/lib/libcrypto/Makefile.man
+++ b/secure/lib/libcrypto/Makefile.man
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/Makefile.man,v 1.6 2007/03/15 20:15:07 simon Exp $
 # DO NOT EDIT: generated from man-makefile-update target
 MAN+= ASN1_OBJECT_new.3
 MAN+= ASN1_STRING_length.3
diff --git a/secure/lib/libcrypto/engines/Makefile b/secure/lib/libcrypto/engines/Makefile
index 6250527e6e9a5..0782f69189011 100644
--- a/secure/lib/libcrypto/engines/Makefile
+++ b/secure/lib/libcrypto/engines/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/Makefile,v 1.1 2006/07/29 19:41:32 simon Exp $
 
 SUBDIR=	lib4758cca libaep libatalla libcswift libchil libnuron \
 	libsureware libubsec
diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc
index a71820f442a0b..84324b71924c4 100644
--- a/secure/lib/libcrypto/engines/Makefile.inc
+++ b/secure/lib/libcrypto/engines/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/Makefile.inc,v 1.1 2006/07/29 19:41:32 simon Exp $
 
 LCRYPTO_SRC=	${.CURDIR}/../../../../../crypto/openssl
 .PATH: ${LCRYPTO_SRC}/engines
diff --git a/secure/lib/libcrypto/engines/lib4758cca/Makefile b/secure/lib/libcrypto/engines/lib4758cca/Makefile
index 4144034cc0243..221f938966925 100644
--- a/secure/lib/libcrypto/engines/lib4758cca/Makefile
+++ b/secure/lib/libcrypto/engines/lib4758cca/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/lib4758cca/Makefile,v 1.1 2006/07/29 19:41:32 simon Exp $
 
 SHLIB_NAME?= lib4758cca.so
 SRCS=	e_4758cca.c
diff --git a/secure/lib/libcrypto/engines/libaep/Makefile b/secure/lib/libcrypto/engines/libaep/Makefile
index 66997dffffea8..683fa97f5bbbc 100644
--- a/secure/lib/libcrypto/engines/libaep/Makefile
+++ b/secure/lib/libcrypto/engines/libaep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libaep/Makefile,v 1.1 2006/07/29 19:41:32 simon Exp $
 
 SHLIB_NAME?= libaep.so
 SRCS=	e_aep.c
diff --git a/secure/lib/libcrypto/engines/libatalla/Makefile b/secure/lib/libcrypto/engines/libatalla/Makefile
index 6223dea79d078..c12d95baf9fce 100644
--- a/secure/lib/libcrypto/engines/libatalla/Makefile
+++ b/secure/lib/libcrypto/engines/libatalla/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libatalla/Makefile,v 1.1 2006/07/29 19:41:33 simon Exp $
 
 SHLIB_NAME?= libatalla.so
 SRCS=	e_atalla.c
diff --git a/secure/lib/libcrypto/engines/libchil/Makefile b/secure/lib/libcrypto/engines/libchil/Makefile
index 14972c9f77638..fb429c502e772 100644
--- a/secure/lib/libcrypto/engines/libchil/Makefile
+++ b/secure/lib/libcrypto/engines/libchil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libchil/Makefile,v 1.1 2006/07/29 19:41:33 simon Exp $
 
 SHLIB_NAME?= libchil.so
 SRCS=	e_chil.c
diff --git a/secure/lib/libcrypto/engines/libcswift/Makefile b/secure/lib/libcrypto/engines/libcswift/Makefile
index 38b00455cb789..80c21bfea38c5 100644
--- a/secure/lib/libcrypto/engines/libcswift/Makefile
+++ b/secure/lib/libcrypto/engines/libcswift/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libcswift/Makefile,v 1.1 2006/07/29 19:41:33 simon Exp $
 
 SHLIB_NAME?= libcswift.so
 SRCS=	e_cswift.c
diff --git a/secure/lib/libcrypto/engines/libnuron/Makefile b/secure/lib/libcrypto/engines/libnuron/Makefile
index 82aab9b3a58b2..ee77ef9875f95 100644
--- a/secure/lib/libcrypto/engines/libnuron/Makefile
+++ b/secure/lib/libcrypto/engines/libnuron/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libnuron/Makefile,v 1.1 2006/07/29 19:41:33 simon Exp $
 
 SHLIB_NAME?= libnuron.so
 SRCS=	e_nuron.c
diff --git a/secure/lib/libcrypto/engines/libsureware/Makefile b/secure/lib/libcrypto/engines/libsureware/Makefile
index 4d176ee50ca87..61e524ce7b0d5 100644
--- a/secure/lib/libcrypto/engines/libsureware/Makefile
+++ b/secure/lib/libcrypto/engines/libsureware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libsureware/Makefile,v 1.1 2006/07/29 19:41:33 simon Exp $
 
 SHLIB_NAME?= libsureware.so
 SRCS=	e_sureware.c
diff --git a/secure/lib/libcrypto/engines/libubsec/Makefile b/secure/lib/libcrypto/engines/libubsec/Makefile
index e02efaba64fce..4bb44161470bc 100644
--- a/secure/lib/libcrypto/engines/libubsec/Makefile
+++ b/secure/lib/libcrypto/engines/libubsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libcrypto/engines/libubsec/Makefile,v 1.1 2006/07/29 19:41:33 simon Exp $
 
 SHLIB_NAME?= libubsec.so
 SRCS=	e_ubsec.c
diff --git a/secure/lib/libcrypto/i386/bf-586.s b/secure/lib/libcrypto/i386/bf-586.s
index 73e0042430ce7..aa97f39d3017e 100644
--- a/secure/lib/libcrypto/i386/bf-586.s
+++ b/secure/lib/libcrypto/i386/bf-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/bf-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/bf-686.s b/secure/lib/libcrypto/i386/bf-686.s
index d3b4cb8955864..ab47c92f8dcdb 100644
--- a/secure/lib/libcrypto/i386/bf-686.s
+++ b/secure/lib/libcrypto/i386/bf-686.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/bf-686.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/bn-586.s b/secure/lib/libcrypto/i386/bn-586.s
index 88c73fa3c9f91..684c4aab6eba2 100644
--- a/secure/lib/libcrypto/i386/bn-586.s
+++ b/secure/lib/libcrypto/i386/bn-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/bn-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/cast-586.s b/secure/lib/libcrypto/i386/cast-586.s
index bb31376b57474..40b48f1b9a8a1 100644
--- a/secure/lib/libcrypto/i386/cast-586.s
+++ b/secure/lib/libcrypto/i386/cast-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/cast-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/co-586.s b/secure/lib/libcrypto/i386/co-586.s
index 4e554b0387ed1..efe5582bc6b70 100644
--- a/secure/lib/libcrypto/i386/co-586.s
+++ b/secure/lib/libcrypto/i386/co-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/co-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/crypt586.s b/secure/lib/libcrypto/i386/crypt586.s
index dc594e4809e36..7391e0b8588df 100644
--- a/secure/lib/libcrypto/i386/crypt586.s
+++ b/secure/lib/libcrypto/i386/crypt586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/crypt586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/des-586.s b/secure/lib/libcrypto/i386/des-586.s
index b7612905cf20c..5a8f6cdbe98fd 100644
--- a/secure/lib/libcrypto/i386/des-586.s
+++ b/secure/lib/libcrypto/i386/des-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/des-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/md5-586.s b/secure/lib/libcrypto/i386/md5-586.s
index b97c357411695..b04275ecf3558 100644
--- a/secure/lib/libcrypto/i386/md5-586.s
+++ b/secure/lib/libcrypto/i386/md5-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/md5-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/rc4-586.s b/secure/lib/libcrypto/i386/rc4-586.s
index ad274986ac25b..88b07be6dc327 100644
--- a/secure/lib/libcrypto/i386/rc4-586.s
+++ b/secure/lib/libcrypto/i386/rc4-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/rc4-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/rc5-586.s b/secure/lib/libcrypto/i386/rc5-586.s
index a33eff94806e7..266d5c9f34de7 100644
--- a/secure/lib/libcrypto/i386/rc5-586.s
+++ b/secure/lib/libcrypto/i386/rc5-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/rc5-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/rmd-586.s b/secure/lib/libcrypto/i386/rmd-586.s
index fb541db16e7a5..bf11cddd3354f 100644
--- a/secure/lib/libcrypto/i386/rmd-586.s
+++ b/secure/lib/libcrypto/i386/rmd-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/rmd-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/i386/sha1-586.s b/secure/lib/libcrypto/i386/sha1-586.s
index 4a35f9ddb9629..05966e9f26cb5 100644
--- a/secure/lib/libcrypto/i386/sha1-586.s
+++ b/secure/lib/libcrypto/i386/sha1-586.s
@@ -1,4 +1,4 @@
-	# $FreeBSD$
+	# $FreeBSD: src/secure/lib/libcrypto/i386/sha1-586.s,v 1.2 2004/03/23 08:32:29 markm Exp $
 
 
 
diff --git a/secure/lib/libcrypto/opensslconf-amd64.h b/secure/lib/libcrypto/opensslconf-amd64.h
index cc0dde1690a39..7e0258f4833b5 100644
--- a/secure/lib/libcrypto/opensslconf-amd64.h
+++ b/secure/lib/libcrypto/opensslconf-amd64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-amd64.h,v 1.8 2007/05/09 19:37:01 gnn Exp $ */
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
diff --git a/secure/lib/libcrypto/opensslconf-arm.h b/secure/lib/libcrypto/opensslconf-arm.h
index ff53f1cc77248..a55dd64696353 100644
--- a/secure/lib/libcrypto/opensslconf-arm.h
+++ b/secure/lib/libcrypto/opensslconf-arm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-arm.h,v 1.3 2006/10/01 07:56:43 simon Exp $ */
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
diff --git a/secure/lib/libcrypto/opensslconf-i386.h b/secure/lib/libcrypto/opensslconf-i386.h
index f8ecc656b28e2..104f503c46af6 100644
--- a/secure/lib/libcrypto/opensslconf-i386.h
+++ b/secure/lib/libcrypto/opensslconf-i386.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-i386.h,v 1.8 2007/05/09 19:37:01 gnn Exp $ */
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
diff --git a/secure/lib/libcrypto/opensslconf-ia64.h b/secure/lib/libcrypto/opensslconf-ia64.h
index 6728bdc4688e4..bee2fadfb3dc2 100644
--- a/secure/lib/libcrypto/opensslconf-ia64.h
+++ b/secure/lib/libcrypto/opensslconf-ia64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-ia64.h,v 1.6 2006/10/01 07:56:43 simon Exp $ */
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
diff --git a/secure/lib/libcrypto/opensslconf-powerpc.h b/secure/lib/libcrypto/opensslconf-powerpc.h
index ff53f1cc77248..1da9712960467 100644
--- a/secure/lib/libcrypto/opensslconf-powerpc.h
+++ b/secure/lib/libcrypto/opensslconf-powerpc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-powerpc.h,v 1.5 2006/10/01 07:56:43 simon Exp $ */
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
diff --git a/secure/lib/libcrypto/opensslconf-sparc64.h b/secure/lib/libcrypto/opensslconf-sparc64.h
index 6728bdc4688e4..fb564c13da254 100644
--- a/secure/lib/libcrypto/opensslconf-sparc64.h
+++ b/secure/lib/libcrypto/opensslconf-sparc64.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-sparc64.h,v 1.6 2006/10/01 07:56:44 simon Exp $ */
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index ec65f68361c48..51c52b05248e3 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.43 2007/06/18 18:47:54 rafan Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 5550b9b545980..cb09c15297b91 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.25 2006/07/29 19:41:38 simon Exp $
 
 LIB=		ssl
 SHLIB_MAJOR=	5
diff --git a/secure/lib/libssl/Makefile.man b/secure/lib/libssl/Makefile.man
index 77d1aed0b725a..881830d21231d 100644
--- a/secure/lib/libssl/Makefile.man
+++ b/secure/lib/libssl/Makefile.man
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/lib/libssl/Makefile.man,v 1.4 2007/03/15 20:15:11 simon Exp $
 # DO NOT EDIT: generated from man-makefile-update target
 MAN+= SSL_CIPHER_get_name.3
 MAN+= SSL_COMP_add_compression_method.3
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 1c3ee015a5e7e..eecb66d7466ca 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/Makefile,v 1.16 2006/03/17 18:54:32 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc
index 6d620e245bffc..e721456742780 100644
--- a/secure/libexec/Makefile.inc
+++ b/secure/libexec/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/Makefile.inc,v 1.8 2003/04/30 07:54:38 ru Exp $
 
 BINDIR?=	/usr/libexec
 
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 9323bb742831f..0771f8c89466b 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/sftp-server/Makefile,v 1.15 2006/05/13 21:38:15 des Exp $
 
 PROG=   sftp-server
 SRCS=   sftp-server.c sftp-common.c
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 6018b948265b8..8664afc5da44e 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/libexec/ssh-keysign/Makefile,v 1.8 2006/05/13 21:38:15 des Exp $
 
 PROG=	ssh-keysign
 SRCS=	ssh-keysign.c readconf.c
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index b10a43b350d07..180aba28b2e91 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/Makefile,v 1.25 2006/03/17 18:54:32 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
index 4cec6fe01a452..355a54c9b4a5c 100644
--- a/secure/usr.bin/Makefile.inc
+++ b/secure/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/Makefile.inc,v 1.8 2003/04/30 07:54:38 ru Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
index 306fc2cfe0540..d60cff6be703e 100644
--- a/secure/usr.bin/bdes/Makefile
+++ b/secure/usr.bin/bdes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/bdes/Makefile,v 1.14 2004/02/23 20:25:27 johan Exp $
 
 PROG=	bdes
 
diff --git a/secure/usr.bin/bdes/bdes.1 b/secure/usr.bin/bdes/bdes.1
index 367d32d5065c2..d4dd9f4290100 100644
--- a/secure/usr.bin/bdes/bdes.1
+++ b/secure/usr.bin/bdes/bdes.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bdes.1	8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/secure/usr.bin/bdes/bdes.1,v 1.7 2003/06/02 19:10:59 markm Exp $
 .\"
 .Dd June 29, 1993
 .Dt BDES 1
diff --git a/secure/usr.bin/bdes/bdes.c b/secure/usr.bin/bdes/bdes.c
index 8e8125a857736..ddc3e7001934c 100644
--- a/secure/usr.bin/bdes/bdes.c
+++ b/secure/usr.bin/bdes/bdes.c
@@ -81,7 +81,7 @@ static char sccsid[] = "@(#)bdes.c	8.1 (Berkeley) 6/6/93";
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.9 2005/02/10 14:47:06 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 82e7e8d20b257..d023bf6ba252b 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.25 2006/07/29 19:41:40 simon Exp $
 
 PROG=	openssl
 
diff --git a/secure/usr.bin/openssl/Makefile.man b/secure/usr.bin/openssl/Makefile.man
index b87642fbf181d..c9ccaa91a9d3f 100644
--- a/secure/usr.bin/openssl/Makefile.man
+++ b/secure/usr.bin/openssl/Makefile.man
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/openssl/Makefile.man,v 1.5 2007/03/15 20:15:14 simon Exp $
 # DO NOT EDIT: generated from man-makefile-update target
 MAN+= CA.pl.1
 MAN+= asn1parse.1
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index ddb2b09301542..3fe0345e7aba2 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/scp/Makefile,v 1.16 2006/05/13 21:38:15 des Exp $
 
 PROG=	scp
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 29c435272094f..c3c75af1a60d5 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/sftp/Makefile,v 1.15 2006/10/07 17:32:05 ru Exp $
 
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 34d66a6a771a9..825708136d8d1 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-add/Makefile,v 1.16 2006/05/13 21:38:16 des Exp $
 
 PROG=	ssh-add
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index ed99a01ced3e0..b4007acc4ffcf 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-agent/Makefile,v 1.16 2006/05/13 21:38:16 des Exp $
 
 PROG=	ssh-agent
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 30adcf2147951..97ddc60dcf48d 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-keygen/Makefile,v 1.17 2006/05/13 21:38:16 des Exp $
 
 PROG=	ssh-keygen
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index f59542e55fb96..1e2db5318ea60 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh-keyscan/Makefile,v 1.11 2006/05/13 21:38:16 des Exp $
 
 PROG=	ssh-keyscan
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 1c666ab77170e..44dd8fb0f1b85 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.35 2006/05/13 21:38:15 des Exp $
 #
 
 .include <bsd.own.mk>
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
index e08025c8b81bf..78cecaeb661bd 100644
--- a/secure/usr.sbin/Makefile
+++ b/secure/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.sbin/Makefile,v 1.6 2006/03/17 18:54:32 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc
index 282198ea8d8c4..81e5a154c7753 100644
--- a/secure/usr.sbin/Makefile.inc
+++ b/secure/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.sbin/Makefile.inc,v 1.5 2003/04/30 07:54:39 ru Exp $
 
 BINDIR?=	/usr/sbin
 
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index ddafee008c0c1..c654e9201d6fe 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.50 2006/09/30 13:41:26 des Exp $
 #
 
 .include <bsd.own.mk>
diff --git a/share/Makefile b/share/Makefile
index bd3f4396651cc..876f29010038c 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/Makefile,v 1.37 2007/06/26 19:40:03 remko Exp $
 
 .include <bsd.own.mk>
 
diff --git a/share/Makefile.inc b/share/Makefile.inc
index dbe7ccfdebca6..78a5172019018 100644
--- a/share/Makefile.inc
+++ b/share/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/Makefile.inc,v 1.4 1999/08/28 00:17:58 peter Exp $
 
 BINDIR?=	${SHAREDIR}
 BINOWN=		${SHAREOWN}
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index d6efbe354bd8d..ff3b531820bd6 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/Makefile,v 1.71 2006/11/09 18:10:33 des Exp $
 
 LOCALES=	bg_BG.CP1251 \
 		be_BY.CP1131 \
diff --git a/share/colldef/README b/share/colldef/README
index b2fc9f2d650c7..c294cf37a4a51 100644
--- a/share/colldef/README
+++ b/share/colldef/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/colldef/README,v 1.2 2002/04/08 09:28:22 ache Exp $
 
 WARNING: For the compatibility sake try to keep collating table backward 
 compatible with ASCII, i.e.  add other symbols to the existent ASCII order.
diff --git a/share/colldef/be_BY.CP1131.src b/share/colldef/be_BY.CP1131.src
index ed9f3cb0bb419..dd4d23b22a530 100644
--- a/share/colldef/be_BY.CP1131.src
+++ b/share/colldef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 charmap map.CP1131
 order \
 # controls
diff --git a/share/colldef/be_BY.CP1251.src b/share/colldef/be_BY.CP1251.src
index aae4c7de78f6f..b9e89a58bd56f 100644
--- a/share/colldef/be_BY.CP1251.src
+++ b/share/colldef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 charmap map.CP1251
 order \
 # controls
diff --git a/share/colldef/be_BY.ISO8859-5.src b/share/colldef/be_BY.ISO8859-5.src
index bd1e08be2ae28..ae35705509fa7 100644
--- a/share/colldef/be_BY.ISO8859-5.src
+++ b/share/colldef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 charmap map.ISO8859-5
 order \
 # controls
diff --git a/share/colldef/bg_BG.CP1251.src b/share/colldef/bg_BG.CP1251.src
index 6c3ed8febac0f..587438e3778c0 100644
--- a/share/colldef/bg_BG.CP1251.src
+++ b/share/colldef/bg_BG.CP1251.src
@@ -1,6 +1,6 @@
 # CP1251 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/bg_BG.CP1251.src,v 1.2 2003/06/07 03:26:21 ache Exp $
 #
 charmap map.CP1251
 order \
diff --git a/share/colldef/ca_ES.ISO8859-1.src b/share/colldef/ca_ES.ISO8859-1.src
index 138ff848de270..eebbf5b5c3c3e 100644
--- a/share/colldef/ca_ES.ISO8859-1.src
+++ b/share/colldef/ca_ES.ISO8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:57 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/ca_ES.ISO8859-15.src b/share/colldef/ca_ES.ISO8859-15.src
index 7aa54f60f7deb..19ad5d1caff9f 100644
--- a/share/colldef/ca_ES.ISO8859-15.src
+++ b/share/colldef/ca_ES.ISO8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ca_ES.ISO8859-15.src,v 1.1 2002/12/30 09:09:57 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/cs_CZ.ISO8859-2.src b/share/colldef/cs_CZ.ISO8859-2.src
index 2a7c798641559..0f44e341606c4 100644
--- a/share/colldef/cs_CZ.ISO8859-2.src
+++ b/share/colldef/cs_CZ.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Latin2 (for Czech; partially according to CSN 97 6030)
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/cs_CZ.ISO8859-2.src,v 1.4 2002/04/08 09:40:52 ache Exp $
 #
 charmap map.ISO8859-2
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-1.src b/share/colldef/de_DE.ISO8859-1.src
index 888623f65383d..b4ceddec566fd 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/de_DE.ISO8859-1.src,v 1.8 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-15.src b/share/colldef/de_DE.ISO8859-15.src
index 4bb6bbc94b7ad..164c40a31bfac 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/de_DE.ISO8859-15.src,v 1.6 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/el_GR.ISO8859-7.src b/share/colldef/el_GR.ISO8859-7.src
index c345b81595e0b..8ee6d6c15f101 100644
--- a/share/colldef/el_GR.ISO8859-7.src
+++ b/share/colldef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/el_GR.ISO8859-7.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 # Greek/ISO 8859-7 (backward compatible with ASCII)
 #
diff --git a/share/colldef/es_ES.ISO8859-1.src b/share/colldef/es_ES.ISO8859-1.src
index 138ff848de270..cd841b1012157 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/es_ES.ISO8859-1.src,v 1.5 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/es_ES.ISO8859-15.src b/share/colldef/es_ES.ISO8859-15.src
index 7aa54f60f7deb..9528615e33886 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/es_ES.ISO8859-15.src,v 1.4 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/et_EE.ISO8859-15.src b/share/colldef/et_EE.ISO8859-15.src
index e05a90ac2956b..c0bee860fd08c 100644
--- a/share/colldef/et_EE.ISO8859-15.src
+++ b/share/colldef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/et_EE.ISO8859-15.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 # latin1 (backward compatible with ASCII)
 #
 #
diff --git a/share/colldef/hi_IN.ISCII-DEV.src b/share/colldef/hi_IN.ISCII-DEV.src
index fcd8b21b6f636..8119124f6faaf 100644
--- a/share/colldef/hi_IN.ISCII-DEV.src
+++ b/share/colldef/hi_IN.ISCII-DEV.src
@@ -1,6 +1,6 @@
 # ISCII-DEV
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:03 ache Exp $
 #
 
 charmap map.ISCII-DEV
diff --git a/share/colldef/hy_AM.ARMSCII-8.src b/share/colldef/hy_AM.ARMSCII-8.src
index 8fa1ed092985c..cbb51667a883b 100644
--- a/share/colldef/hy_AM.ARMSCII-8.src
+++ b/share/colldef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:16 ache Exp $
 #
 # LC_COLLATE source for Armenian/ARMSCII-8 (backward compatible with ASCII)
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/colldef/is_IS.ISO8859-1.src b/share/colldef/is_IS.ISO8859-1.src
index 68a96c7d26e96..85aa51aedeaf0 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/is_IS.ISO8859-1.src,v 1.6 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/is_IS.ISO8859-15.src b/share/colldef/is_IS.ISO8859-15.src
index 0fcbe63b5d47d..882e4846fc108 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/is_IS.ISO8859-15.src,v 1.4 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/kk_KZ.PT154.src b/share/colldef/kk_KZ.PT154.src
index a9cde3e51fbf0..df762a9b658b2 100644
--- a/share/colldef/kk_KZ.PT154.src
+++ b/share/colldef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:20 ache Exp $
 # PT154 (backward compatible with ASCII)
 #
 # Birsh T <birsh@mail.kz>, 2003-12-12
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 89e1abb171636..24961ae6d4876 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-1.src,v 1.10 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/la_LN.ISO8859-15.src b/share/colldef/la_LN.ISO8859-15.src
index 40d0bf4cca32b..55fe7c88246fe 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-15.src,v 1.4 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/la_LN.ISO8859-2.src b/share/colldef/la_LN.ISO8859-2.src
index 6672d87825762..e5ad30bb7ed9e 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-2.src,v 1.3 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-2
 order \
diff --git a/share/colldef/la_LN.ISO8859-4.src b/share/colldef/la_LN.ISO8859-4.src
index 5b8417dbca99b..0668af3b364d3 100644
--- a/share/colldef/la_LN.ISO8859-4.src
+++ b/share/colldef/la_LN.ISO8859-4.src
@@ -1,6 +1,6 @@
 # latin4 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.ISO8859-4.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-4
 order \
diff --git a/share/colldef/la_LN.US-ASCII.src b/share/colldef/la_LN.US-ASCII.src
index df3c340887648..b868b824685d7 100644
--- a/share/colldef/la_LN.US-ASCII.src
+++ b/share/colldef/la_LN.US-ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/la_LN.US-ASCII.src,v 1.2 1999/08/28 00:59:47 peter Exp $
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/lt_LT.ISO8859-13.src b/share/colldef/lt_LT.ISO8859-13.src
index 811db89f7c8bc..118b19e140565 100644
--- a/share/colldef/lt_LT.ISO8859-13.src
+++ b/share/colldef/lt_LT.ISO8859-13.src
@@ -1,6 +1,6 @@
 # Lithuanian (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
 #
 charmap map.ISO8859-13
 order \
diff --git a/share/colldef/lt_LT.ISO8859-4.src b/share/colldef/lt_LT.ISO8859-4.src
index 961ce6ea73882..8bc5f56efe9a1 100644
--- a/share/colldef/lt_LT.ISO8859-4.src
+++ b/share/colldef/lt_LT.ISO8859-4.src
@@ -1,6 +1,6 @@
 # Lithuanian (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/lt_LT.ISO8859-4.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-4
 order \
diff --git a/share/colldef/map.ARMSCII-8 b/share/colldef/map.ARMSCII-8
index b9dc826817a37..e85504fbcebdf 100644
--- a/share/colldef/map.ARMSCII-8
+++ b/share/colldef/map.ARMSCII-8
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ARMSCII-8,v 1.1 2003/07/05 12:03:16 ache Exp $
 #
 # map.ARMSCII-8 defined by Vahe Khachikyan <vahe@khachikyan.de>
 # 
diff --git a/share/colldef/map.CP1131 b/share/colldef/map.CP1131
index 1f49cdcc9bb0d..8c1d7bffb8ef4 100644
--- a/share/colldef/map.CP1131
+++ b/share/colldef/map.CP1131
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.CP1131,v 1.1 2003/12/20 11:20:05 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.CP1251 b/share/colldef/map.CP1251
index dac8eb7c7791c..af8f6000bb653 100644
--- a/share/colldef/map.CP1251
+++ b/share/colldef/map.CP1251
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.CP1251,v 1.1 2001/11/05 06:58:02 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.CP866 b/share/colldef/map.CP866
index 16f09b4143706..452fbbad8d1b2 100644
--- a/share/colldef/map.CP866
+++ b/share/colldef/map.CP866
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.CP866,v 1.2 2003/06/07 02:51:52 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISCII-DEV b/share/colldef/map.ISCII-DEV
index 93ef1564b7df0..62995fbbe0db9 100644
--- a/share/colldef/map.ISCII-DEV
+++ b/share/colldef/map.ISCII-DEV
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISCII-DEV,v 1.1 2001/11/28 07:23:03 ache Exp $
 NU 							 \x00
 SH 							 \x01
 SX 							 \x02
diff --git a/share/colldef/map.ISO8859-13 b/share/colldef/map.ISO8859-13
index 8cb2afe0f2cdf..3907ef0bbb3c3 100644
--- a/share/colldef/map.ISO8859-13
+++ b/share/colldef/map.ISO8859-13
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-13,v 1.1 2002/10/25 22:02:09 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISO8859-4 b/share/colldef/map.ISO8859-4
index 8bbeb57ea1dc2..f9681096f6fdd 100644
--- a/share/colldef/map.ISO8859-4
+++ b/share/colldef/map.ISO8859-4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-4,v 1.1 1999/12/24 05:47:10 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISO8859-5 b/share/colldef/map.ISO8859-5
index 230b559c659bb..37fe88bccc4d0 100644
--- a/share/colldef/map.ISO8859-5
+++ b/share/colldef/map.ISO8859-5
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-5,v 1.1 1999/10/03 01:22:22 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.ISO8859-7 b/share/colldef/map.ISO8859-7
index b45066a32b731..46b528a5cccec 100644
--- a/share/colldef/map.ISO8859-7
+++ b/share/colldef/map.ISO8859-7
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.ISO8859-7,v 1.1 2001/01/17 16:47:28 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.KOI8-R b/share/colldef/map.KOI8-R
index 62dd2f45dbdd4..3fef2915565bc 100644
--- a/share/colldef/map.KOI8-R
+++ b/share/colldef/map.KOI8-R
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.KOI8-R,v 1.2 2003/06/07 02:51:52 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.KOI8-U b/share/colldef/map.KOI8-U
index fd6a6e302c806..46ca161a6d59a 100644
--- a/share/colldef/map.KOI8-U
+++ b/share/colldef/map.KOI8-U
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.KOI8-U,v 1.3 2003/06/07 02:59:28 ache Exp $
 NU \x00
 SH \x01
 SX \x02
diff --git a/share/colldef/map.PT154 b/share/colldef/map.PT154
index 79b2fb31fe3cf..ac780af9bddb1 100644
--- a/share/colldef/map.PT154
+++ b/share/colldef/map.PT154
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/map.PT154,v 1.1 2004/01/29 16:28:20 ache Exp $
 # Birsh T <birsh@mail.kz>, 2003-12-12
 NU \x00
 SH \x01
diff --git a/share/colldef/pl_PL.ISO8859-2.src b/share/colldef/pl_PL.ISO8859-2.src
index 6518d7200bc69..23760580b8857 100644
--- a/share/colldef/pl_PL.ISO8859-2.src
+++ b/share/colldef/pl_PL.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Latin2 (for Polish) by Michal Pasternak <michal@pasternak.w.lub.pl> 
 # with much help from Adam Liberacki and Jan Srzednicki
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/pl_PL.ISO8859-2.src,v 1.1 2002/07/14 13:17:12 ache Exp $
 #
 charmap map.ISO8859-2
 order \
diff --git a/share/colldef/ru_RU.CP1251.src b/share/colldef/ru_RU.CP1251.src
index 06e064197a0e0..9cd8b3d9a0257 100644
--- a/share/colldef/ru_RU.CP1251.src
+++ b/share/colldef/ru_RU.CP1251.src
@@ -1,6 +1,6 @@
 # CP1251 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.CP1251.src,v 1.2 2003/06/07 00:46:20 ache Exp $
 #
 charmap map.CP1251
 order \
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 425cb30805c3e..066527ae76ce0 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.CP866.src,v 1.10 2003/06/07 02:51:52 ache Exp $
 #
 charmap map.CP866
 order \
diff --git a/share/colldef/ru_RU.ISO8859-5.src b/share/colldef/ru_RU.ISO8859-5.src
index 2fd9f5ac32236..e04601ba87869 100644
--- a/share/colldef/ru_RU.ISO8859-5.src
+++ b/share/colldef/ru_RU.ISO8859-5.src
@@ -1,6 +1,6 @@
 # Russian part of ISO8859-5 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.ISO8859-5.src,v 1.3 2003/06/07 00:46:20 ache Exp $
 #
 charmap map.ISO8859-5
 order \
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index f7c69d2fb6429..32e9332f314b0 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/ru_RU.KOI8-R.src,v 1.10 2003/06/07 02:51:52 ache Exp $
 #
 charmap map.KOI8-R
 order \
diff --git a/share/colldef/sl_SI.ISO8859-2.src b/share/colldef/sl_SI.ISO8859-2.src
index db5db89a981bf..22d1b55f19674 100644
--- a/share/colldef/sl_SI.ISO8859-2.src
+++ b/share/colldef/sl_SI.ISO8859-2.src
@@ -2,7 +2,7 @@
 # Slovenian collation sequence
 # 2003-03-20 simon.zekar@literal.si
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sl_SI.ISO8859-2.src,v 1.1 2003/10/09 00:55:33 ache Exp $
 #
 
 charmap map.ISO8859-2
diff --git a/share/colldef/sr_YU.ISO8859-5.src b/share/colldef/sr_YU.ISO8859-5.src
index ce2f4d28f850d..382e4d208a4b9 100644
--- a/share/colldef/sr_YU.ISO8859-5.src
+++ b/share/colldef/sr_YU.ISO8859-5.src
@@ -1,6 +1,6 @@
 # Serbian part of ISO8859-5 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 12:59:19 ache Exp $
 #
 charmap map.ISO8859-5
 order \
diff --git a/share/colldef/sv_SE.ISO8859-1.src b/share/colldef/sv_SE.ISO8859-1.src
index 567d7a0d8bed0..430f940679bae 100644
--- a/share/colldef/sv_SE.ISO8859-1.src
+++ b/share/colldef/sv_SE.ISO8859-1.src
@@ -2,7 +2,7 @@
 #
 # (Based on the German de_DE.ISO_8859-1)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sv_SE.ISO8859-1.src,v 1.2 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-1
 order \
diff --git a/share/colldef/sv_SE.ISO8859-15.src b/share/colldef/sv_SE.ISO8859-15.src
index e5946b3e8a593..098a5d80e429f 100644
--- a/share/colldef/sv_SE.ISO8859-15.src
+++ b/share/colldef/sv_SE.ISO8859-15.src
@@ -2,7 +2,7 @@
 #
 # (Based on the German de_DE.ISO_8859-15)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/sv_SE.ISO8859-15.src,v 1.3 2001/06/10 13:43:47 ache Exp $
 #
 charmap map.ISO8859-15
 order \
diff --git a/share/colldef/uk_UA.CP1251.src b/share/colldef/uk_UA.CP1251.src
index 6bf3454748cc7..8ac50457e44a5 100644
--- a/share/colldef/uk_UA.CP1251.src
+++ b/share/colldef/uk_UA.CP1251.src
@@ -1,6 +1,6 @@
 # CP1251 (for Ukrainian)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:29 ru Exp $
 #
 charmap map.CP1251
 order \
diff --git a/share/colldef/uk_UA.ISO8859-5.src b/share/colldef/uk_UA.ISO8859-5.src
index 4024e2d996991..1d90ea548933a 100644
--- a/share/colldef/uk_UA.ISO8859-5.src
+++ b/share/colldef/uk_UA.ISO8859-5.src
@@ -1,6 +1,6 @@
 # Ukrainian part of ISO8859-5 with russian letters (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/uk_UA.ISO8859-5.src,v 1.2 2001/12/21 03:31:12 ache Exp $
 #
 charmap map.ISO8859-5
 order \
diff --git a/share/colldef/uk_UA.KOI8-U.src b/share/colldef/uk_UA.KOI8-U.src
index bb31d239e01fc..f579e39b62101 100644
--- a/share/colldef/uk_UA.KOI8-U.src
+++ b/share/colldef/uk_UA.KOI8-U.src
@@ -1,6 +1,6 @@
 # koi8-u (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/colldef/uk_UA.KOI8-U.src,v 1.4 2003/06/07 03:37:16 ache Exp $
 #
 charmap map.KOI8-U
 order \
diff --git a/share/dict/Makefile b/share/dict/Makefile
index d9e455d6b54ce..bd34246b14af7 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/dict/Makefile,v 1.14 2004/12/21 08:46:52 ru Exp $
 
 NO_OBJ=
 
diff --git a/share/dict/README b/share/dict/README
index 1a51c20a95a12..767c561c87c7c 100644
--- a/share/dict/README
+++ b/share/dict/README
@@ -1,5 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/dict/README,v 1.13 2003/01/24 20:51:03 wollman Exp $
 
 WEB ---- (introduction provided by jaw@riacs) -------------------------
 
diff --git a/share/dict/freebsd b/share/dict/freebsd
index 66f57a5e91374..a698d99c7976c 100644
--- a/share/dict/freebsd
+++ b/share/dict/freebsd
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/dict/freebsd,v 1.13 2007/01/18 03:07:04 delphij Exp $
 ABI
 ACL
 ACPI
diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION
index 9b5d8ee7e0a3f..c2c3d0ae651d6 100644
--- a/share/doc/IPv6/IMPLEMENTATION
+++ b/share/doc/IPv6/IMPLEMENTATION
@@ -3,7 +3,7 @@
 	KAME Project
 	http://www.kame.net/
 	$KAME: IMPLEMENTATION,v 1.216 2001/05/25 07:43:01 jinmei Exp $
-	$FreeBSD$
+	$FreeBSD: src/share/doc/IPv6/IMPLEMENTATION,v 1.10 2006/11/12 18:38:07 bz Exp $
 
 NOTE: The document tries to describe behaviors/implementation choices
 of the latest KAME/*BSD stack.  The description here may not be
diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile
index 62e160cbfcf1f..d4523039cf920 100644
--- a/share/doc/IPv6/Makefile
+++ b/share/doc/IPv6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/IPv6/Makefile,v 1.4 2004/12/21 08:46:52 ru Exp $
 
 NO_OBJ=
 FILES=		IMPLEMENTATION
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 61b26d70dc973..b891749912912 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/Makefile,v 1.21 2007/03/02 11:42:53 flz Exp $
 
 .include <bsd.own.mk>
 
diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index 5d65fe6964910..abb6fb808539e 100644
--- a/share/doc/bind9/Makefile
+++ b/share/doc/bind9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/bind9/Makefile,v 1.5 2007/06/02 23:19:56 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 SRCDIR=		${BIND_DIR}/doc
diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index bc079ec4c3149..a299a8cac20a6 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/legal/Makefile,v 1.1.2.1 2007/12/08 12:44:58 benjsc Exp $
 
 SUBDIR=	intel_ipw \
 	intel_iwi \
diff --git a/share/doc/legal/intel_ipw/Makefile b/share/doc/legal/intel_ipw/Makefile
index 8f4f822fb4e02..ab141d005bc3b 100644
--- a/share/doc/legal/intel_ipw/Makefile
+++ b/share/doc/legal/intel_ipw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/legal/intel_ipw/Makefile,v 1.2 2007/03/02 18:10:55 flz Exp $
 
 NO_OBJ=
 FILES=		${.CURDIR}/../../../../sys/contrib/dev/ipw/LICENSE
diff --git a/share/doc/legal/intel_iwi/Makefile b/share/doc/legal/intel_iwi/Makefile
index 85962379a1a69..4c865e761dbaf 100644
--- a/share/doc/legal/intel_iwi/Makefile
+++ b/share/doc/legal/intel_iwi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/legal/intel_iwi/Makefile,v 1.2 2007/03/02 18:10:55 flz Exp $
 
 NO_OBJ=
 FILES=		${.CURDIR}/../../../../sys/contrib/dev/iwi/LICENSE
diff --git a/share/doc/legal/intel_wpi/Makefile b/share/doc/legal/intel_wpi/Makefile
index 81014bedc0a74..984a25ecc7553 100644
--- a/share/doc/legal/intel_wpi/Makefile
+++ b/share/doc/legal/intel_wpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/legal/intel_wpi/Makefile,v 1.1.2.1 2007/12/08 12:44:56 benjsc Exp $
 
 NO_OBJ=
 FILES=          ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index 866fe20cd9250..f9b75fdac139c 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/Makefile,v 1.17 2006/10/05 13:42:30 ru Exp $
 
 SUBDIR=	beyond4.3 \
 	bufbio \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 7d1fa492d9a57..bc08c6acd2299 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/beyond4.3/Makefile,v 1.9 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=	papers
 DOC=	beyond43
diff --git a/share/doc/papers/beyond4.3/beyond43.ms b/share/doc/papers/beyond4.3/beyond43.ms
index b682ffc0d836d..a59698fc3f3fd 100644
--- a/share/doc/papers/beyond4.3/beyond43.ms
+++ b/share/doc/papers/beyond4.3/beyond43.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)beyond43.ms	5.1 (Berkeley) 6/5/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/beyond4.3/beyond43.ms,v 1.3 2000/11/28 11:32:03 ru Exp $
 .\"
 .\" *troff -ms
 .rm CM
diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile
index 9bdd4874fb203..22e3e15509a46 100644
--- a/share/doc/papers/bufbio/Makefile
+++ b/share/doc/papers/bufbio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/bufbio/Makefile,v 1.5 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		bio
diff --git a/share/doc/papers/bufbio/bio.ms b/share/doc/papers/bufbio/bio.ms
index 123f8e7699b73..77795cc55a14f 100644
--- a/share/doc/papers/bufbio/bio.ms
+++ b/share/doc/papers/bufbio/bio.ms
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/bufbio/bio.ms,v 1.3 2000/11/29 08:51:24 ru Exp $
 .\"
 .if n .ftr C R
 .nr PI 2n
diff --git a/share/doc/papers/bufbio/bufsize.eps b/share/doc/papers/bufbio/bufsize.eps
index 2396ac62aa403..6dee88740fcb4 100644
--- a/share/doc/papers/bufbio/bufsize.eps
+++ b/share/doc/papers/bufbio/bufsize.eps
@@ -1,6 +1,6 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: a.ps
-%%Creator: $FreeBSD$
+%%Creator: $FreeBSD: src/share/doc/papers/bufbio/bufsize.eps,v 1.1 2000/07/30 08:57:03 phk Exp $
 %%CreationDate: Sat Apr  8 08:32:58 2000
 %%DocumentFonts: (atend)
 %%BoundingBox: 50 50 410 302
diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile
index d15ff9c3b4eab..b2051f0314d1f 100644
--- a/share/doc/papers/contents/Makefile
+++ b/share/doc/papers/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/contents/Makefile,v 1.6 2001/12/17 13:45:49 ru Exp $
 
 VOLUME=	papers
 DOC=	contents
diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms
index 12b287a919c3b..84e30f6f5cced 100644
--- a/share/doc/papers/contents/contents.ms
+++ b/share/doc/papers/contents/contents.ms
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/contents/contents.ms,v 1.8 2005/05/26 23:01:30 eivind Exp $
 .\"
 .OH '''Papers Contents'
 .EH 'Papers Contents'''
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 53a79fccab9a4..5fcd4d89d22a0 100644
--- a/share/doc/papers/devfs/Makefile
+++ b/share/doc/papers/devfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/devfs/Makefile,v 1.4 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		devfs
diff --git a/share/doc/papers/devfs/paper.me b/share/doc/papers/devfs/paper.me
index 9b775e938b925..a0940bbdb38cc 100644
--- a/share/doc/papers/devfs/paper.me
+++ b/share/doc/papers/devfs/paper.me
@@ -1,5 +1,5 @@
 .\" format with ditroff -me
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/devfs/paper.me,v 1.2 2002/02/18 16:22:23 sobomax Exp $
 .\" format made to look as a paper for the proceedings is to look
 .\" (as specified in the text)
 .if n \{ .po 0
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 7f7670c455337..b9eef9a8090ca 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/diskperf/Makefile,v 1.7 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		diskperf
diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms
index 9e20f1a647089..f01b51d013f61 100644
--- a/share/doc/papers/diskperf/conclusions.ms
+++ b/share/doc/papers/diskperf/conclusions.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)conclusions.ms	6.2 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/diskperf/conclusions.ms,v 1.6 1999/08/28 00:18:04 peter Exp $
 .\"
 .ds RH Conclusions
 .NH
diff --git a/share/doc/papers/diskperf/motivation.ms b/share/doc/papers/diskperf/motivation.ms
index d5fde9d1b933e..69f82f0c7bf12 100644
--- a/share/doc/papers/diskperf/motivation.ms
+++ b/share/doc/papers/diskperf/motivation.ms
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)motivation.ms	6.2 (Berkeley) 4/16/91
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/papers/diskperf/motivation.ms,v 1.2 2003/01/01 18:48:46 schweikh Exp $
 .\"
 .ds RH Motivation
 .NH
diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms
index e9379311301cd..0247b1cb80bbc 100644
--- a/share/doc/papers/diskperf/tests.ms
+++ b/share/doc/papers/diskperf/tests.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tests.ms	6.2 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/diskperf/tests.ms,v 1.6 2003/01/01 18:48:46 schweikh Exp $
 .\"
 .ds RH Tests
 .NH
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index f11021b0d27c1..32d185f6909e9 100644
--- a/share/doc/papers/fsinterface/Makefile
+++ b/share/doc/papers/fsinterface/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/fsinterface/Makefile,v 1.7 2002/10/25 08:10:40 ru Exp $
 
 VOLUME=	papers
 DOC=	fsinterface
diff --git a/share/doc/papers/fsinterface/fsinterface.ms b/share/doc/papers/fsinterface/fsinterface.ms
index 453cc7e9d594f..797ca41f761b7 100644
--- a/share/doc/papers/fsinterface/fsinterface.ms
+++ b/share/doc/papers/fsinterface/fsinterface.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsinterface.ms	1.4 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.9 2002/06/20 07:09:23 peter Exp $
 .\"
 .nr UX 0
 .de UX
diff --git a/share/doc/papers/hwpmc/Makefile b/share/doc/papers/hwpmc/Makefile
index d24fe06d9d2d5..6bc1fd08670de 100644
--- a/share/doc/papers/hwpmc/Makefile
+++ b/share/doc/papers/hwpmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/hwpmc/Makefile,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
 
 VOLUME=	papers
 DOC=	hwpmc
diff --git a/share/doc/papers/hwpmc/hwpmc.ms b/share/doc/papers/hwpmc/hwpmc.ms
index 9061bb7a69a34..bfeda9d1df0f0 100644
--- a/share/doc/papers/hwpmc/hwpmc.ms
+++ b/share/doc/papers/hwpmc/hwpmc.ms
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/hwpmc/hwpmc.ms,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
 .\"
 .OH '''Using Hardware Performance Monitoring Counters'
 .EH 'HWPMC'''
diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile
index 5d493542ea980..c0be903c5e5da 100644
--- a/share/doc/papers/jail/Makefile
+++ b/share/doc/papers/jail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/jail/Makefile,v 1.6 2004/10/24 15:32:39 ru Exp $
 
 VOLUME=		papers
 DOC=		jail
diff --git a/share/doc/papers/jail/future.ms b/share/doc/papers/jail/future.ms
index 01c325d4d19ca..d1e0097789792 100644
--- a/share/doc/papers/jail/future.ms
+++ b/share/doc/papers/jail/future.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/future.ms,v 1.1 2000/05/29 18:18:07 phk Exp $
 .\"
 .NH
 Future Directions
diff --git a/share/doc/papers/jail/implementation.ms b/share/doc/papers/jail/implementation.ms
index eafc8f25c9c7c..edff4ddc19fa7 100644
--- a/share/doc/papers/jail/implementation.ms
+++ b/share/doc/papers/jail/implementation.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/implementation.ms,v 1.1 2000/05/29 18:18:07 phk Exp $
 .\"
 .NH
 Implementation jail in the FreeBSD kernel.
diff --git a/share/doc/papers/jail/jail01.eps b/share/doc/papers/jail/jail01.eps
index ffcfa30386f17..56289171a205e 100644
--- a/share/doc/papers/jail/jail01.eps
+++ b/share/doc/papers/jail/jail01.eps
@@ -2,7 +2,7 @@
 %%Title: jail01.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 1
 %%CreationDate: Fri Mar 24 20:37:59 2000
-%%For: $FreeBSD$
+%%For: $FreeBSD: src/share/doc/papers/jail/jail01.eps,v 1.1 2000/05/29 18:18:07 phk Exp $
 %%Orientation: Portrait
 %%BoundingBox: 0 0 425 250
 %%Pages: 0
diff --git a/share/doc/papers/jail/jail01.fig b/share/doc/papers/jail/jail01.fig
index d4ef1655e195d..5486df0894853 100644
--- a/share/doc/papers/jail/jail01.fig
+++ b/share/doc/papers/jail/jail01.fig
@@ -1,5 +1,5 @@
 #FIG 3.2
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/jail/jail01.fig,v 1.1 2000/05/29 18:18:07 phk Exp $
 Landscape
 Center
 Inches
diff --git a/share/doc/papers/jail/mgt.ms b/share/doc/papers/jail/mgt.ms
index e2835d7f4947e..ec39c5ecfffeb 100644
--- a/share/doc/papers/jail/mgt.ms
+++ b/share/doc/papers/jail/mgt.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/mgt.ms,v 1.3 2002/01/16 06:55:29 arr Exp $
 .\"
 .NH
 Managing Jails and the Jail File System Environment
diff --git a/share/doc/papers/jail/paper.ms b/share/doc/papers/jail/paper.ms
index 60be9f2748bd6..0024a56b398ae 100644
--- a/share/doc/papers/jail/paper.ms
+++ b/share/doc/papers/jail/paper.ms
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/jail/paper.ms,v 1.7 2000/12/06 11:56:34 ru Exp $
 .\"
 .if n .ftr C R
 .ig TL
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index e706f0a389627..d3707aa139e54 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/kernmalloc/Makefile,v 1.7 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		kernmalloc
diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t
index d074c9ed48d45..65fcf35c8fc46 100644
--- a/share/doc/papers/kernmalloc/kernmalloc.t
+++ b/share/doc/papers/kernmalloc/kernmalloc.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kernmalloc.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/kernmalloc/kernmalloc.t,v 1.6 2000/11/28 19:26:53 ru Exp $
 .\"
 .\" reference a system routine name
 .de RN
diff --git a/share/doc/papers/kerntune/1.t b/share/doc/papers/kerntune/1.t
index 49b653f501f80..f5ebcd55ee61e 100644
--- a/share/doc/papers/kerntune/1.t
+++ b/share/doc/papers/kerntune/1.t
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	1.2 (Berkeley) 11/8/90
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/kerntune/1.t,v 1.5 1999/08/28 00:18:07 peter Exp $
 .\"
 .ds RH Introduction
 .NH 1
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 33416d6e3c1bf..914a7cc537be9 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.5 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/kerntune/Makefile,v 1.8 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		kerntune
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 00e1e3d87a3ed..b95e3f5636b0e 100644
--- a/share/doc/papers/malloc/Makefile
+++ b/share/doc/papers/malloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/malloc/Makefile,v 1.5 2002/10/29 15:01:55 ru Exp $
 
 VOLUME=	papers
 DOC=	malloc
diff --git a/share/doc/papers/malloc/abs.ms b/share/doc/papers/malloc/abs.ms
index f58d719f4c28d..28ff9782175fd 100644
--- a/share/doc/papers/malloc/abs.ms
+++ b/share/doc/papers/malloc/abs.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/abs.ms,v 1.6 2002/03/25 14:11:34 phk Exp $
 .\"
 .if n .ND
 .TL
diff --git a/share/doc/papers/malloc/alternatives.ms b/share/doc/papers/malloc/alternatives.ms
index 5a46f9520984a..7d4e147ef5a6c 100644
--- a/share/doc/papers/malloc/alternatives.ms
+++ b/share/doc/papers/malloc/alternatives.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/alternatives.ms,v 1.7 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Alternative implementations
 .NH
diff --git a/share/doc/papers/malloc/conclusion.ms b/share/doc/papers/malloc/conclusion.ms
index da7d7e98bdb59..10fa994163908 100644
--- a/share/doc/papers/malloc/conclusion.ms
+++ b/share/doc/papers/malloc/conclusion.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/conclusion.ms,v 1.7 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Conclusion and experience.
 .NH
diff --git a/share/doc/papers/malloc/implementation.ms b/share/doc/papers/malloc/implementation.ms
index 2507e4cb1b770..24713e1305506 100644
--- a/share/doc/papers/malloc/implementation.ms
+++ b/share/doc/papers/malloc/implementation.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/implementation.ms,v 1.10 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Implementation
 .NH
diff --git a/share/doc/papers/malloc/intro.ms b/share/doc/papers/malloc/intro.ms
index 0ee87c959a2b4..f147b283a3cee 100644
--- a/share/doc/papers/malloc/intro.ms
+++ b/share/doc/papers/malloc/intro.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/intro.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Introduction
 .NH
diff --git a/share/doc/papers/malloc/kernel.ms b/share/doc/papers/malloc/kernel.ms
index 952e95ccd9629..65000418638fe 100644
--- a/share/doc/papers/malloc/kernel.ms
+++ b/share/doc/papers/malloc/kernel.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/kernel.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH The kernel and memory
 .NH
diff --git a/share/doc/papers/malloc/malloc.ms b/share/doc/papers/malloc/malloc.ms
index 4f3cf7d80def3..7f18ccea33074 100644
--- a/share/doc/papers/malloc/malloc.ms
+++ b/share/doc/papers/malloc/malloc.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/malloc.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Malloc and free
 .NH
diff --git a/share/doc/papers/malloc/performance.ms b/share/doc/papers/malloc/performance.ms
index 773f92ab7832d..5a67f36805ec7 100644
--- a/share/doc/papers/malloc/performance.ms
+++ b/share/doc/papers/malloc/performance.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/performance.ms,v 1.8 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH Performance
 .NH
diff --git a/share/doc/papers/malloc/problems.ms b/share/doc/papers/malloc/problems.ms
index 980f2e97ddba8..e638145846db1 100644
--- a/share/doc/papers/malloc/problems.ms
+++ b/share/doc/papers/malloc/problems.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/malloc/problems.ms,v 1.6 2002/03/25 14:11:34 phk Exp $
 .\"
 .ds RH The problems
 .NH
diff --git a/share/doc/papers/newvm/1.t b/share/doc/papers/newvm/1.t
index 02ac8be22d1ab..c3cbf983deb94 100644
--- a/share/doc/papers/newvm/1.t
+++ b/share/doc/papers/newvm/1.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/newvm/1.t,v 1.6 1999/08/28 00:18:13 peter Exp $
 .\"
 .NH
 Motivations for a New Virtual Memory System
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 6b1a9e32bc039..92b64cff9e992 100644
--- a/share/doc/papers/newvm/Makefile
+++ b/share/doc/papers/newvm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.4 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/newvm/Makefile,v 1.6 2002/10/25 08:40:24 ru Exp $
 
 VOLUME=	papers
 DOC=	newvm
diff --git a/share/doc/papers/newvm/a.t b/share/doc/papers/newvm/a.t
index bb20df115a558..86b845bc2c794 100644
--- a/share/doc/papers/newvm/a.t
+++ b/share/doc/papers/newvm/a.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.t	5.1 (Berkeley) 4/16/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/newvm/a.t,v 1.6 1999/08/28 00:18:14 peter Exp $
 .\"
 .sp 2
 .ne 2i
diff --git a/share/doc/papers/relengr/0.t b/share/doc/papers/relengr/0.t
index 569be698d4fd2..1703d32e0a9ff 100644
--- a/share/doc/papers/relengr/0.t
+++ b/share/doc/papers/relengr/0.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)0.t	5.1 (Berkeley) 4/17/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/relengr/0.t,v 1.3 2002/10/30 13:07:33 ru Exp $
 .\"
 .rm CM
 .nr PO 1.25i
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index 88ab5afcc2878..75368a2b32abb 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/relengr/Makefile,v 1.10 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		releng
diff --git a/share/doc/papers/sysperf/4.t b/share/doc/papers/sysperf/4.t
index 373a0d0ce14a2..2d407c3c226f9 100644
--- a/share/doc/papers/sysperf/4.t
+++ b/share/doc/papers/sysperf/4.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)4.t	5.1 (Berkeley) 4/17/91
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/papers/sysperf/4.t,v 1.3 2003/01/01 18:48:46 schweikh Exp $
 .\"
 .ds RH Performance Improvements
 .NH
diff --git a/share/doc/papers/sysperf/5.t b/share/doc/papers/sysperf/5.t
index ff008c336c34a..821e57a6dc73a 100644
--- a/share/doc/papers/sysperf/5.t
+++ b/share/doc/papers/sysperf/5.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)5.t	5.1 (Berkeley) 4/17/91
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/sysperf/5.t,v 1.2 2002/12/30 21:18:05 schweikh Exp $
 .\"
 .ds RH Functional Extensions
 .NH
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index 9ddbc9df5474e..10b0a92a2d42e 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/sysperf/Makefile,v 1.9 2004/10/24 15:32:40 ru Exp $
 
 VOLUME=		papers
 DOC=		sysperf
diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile
index f6d158ba4034b..97932a64f631a 100644
--- a/share/doc/papers/timecounter/Makefile
+++ b/share/doc/papers/timecounter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/papers/timecounter/Makefile,v 1.3 2004/10/24 15:32:41 ru Exp $
 
 # You really want:
 # PRINTERDEVICE=ps
diff --git a/share/doc/papers/timecounter/fig1.eps b/share/doc/papers/timecounter/fig1.eps
index 012fed28d80fa..998350473996c 100644
--- a/share/doc/papers/timecounter/fig1.eps
+++ b/share/doc/papers/timecounter/fig1.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig1.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig1.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 191 194
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig2.eps b/share/doc/papers/timecounter/fig2.eps
index 67714356dccdd..002f7df1db85b 100644
--- a/share/doc/papers/timecounter/fig2.eps
+++ b/share/doc/papers/timecounter/fig2.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig2.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig2.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 191 194
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig3.eps b/share/doc/papers/timecounter/fig3.eps
index 997282374dcfb..45a5e531c5cd6 100644
--- a/share/doc/papers/timecounter/fig3.eps
+++ b/share/doc/papers/timecounter/fig3.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig3.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig3.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 181 56
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig4.eps b/share/doc/papers/timecounter/fig4.eps
index 7a5684f26a715..b19321dffdc3a 100644
--- a/share/doc/papers/timecounter/fig4.eps
+++ b/share/doc/papers/timecounter/fig4.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig4.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig4.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 119 203
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/fig5.eps b/share/doc/papers/timecounter/fig5.eps
index b6274c1f6d405..ab7224adbeb95 100644
--- a/share/doc/papers/timecounter/fig5.eps
+++ b/share/doc/papers/timecounter/fig5.eps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: fig5.eps
 %%Creator: fig2dev Version 3.2 Patchlevel 3d
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/fig5.eps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%For: phk@critter.freebsd.dk (Poul-Henning Kamp)
 %%BoundingBox: 0 0 140 225
 %%Magnification: 1.0000
diff --git a/share/doc/papers/timecounter/gps.ps b/share/doc/papers/timecounter/gps.ps
index aaaae8173f7f9..f1971ba4eea7b 100644
--- a/share/doc/papers/timecounter/gps.ps
+++ b/share/doc/papers/timecounter/gps.ps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: _.ps
 %%Creator: gnuplot 3.7 patchlevel 1
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/gps.ps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%DocumentFonts: (atend)
 %%BoundingBox: 50 50 266 201
 %%Orientation: Portrait
diff --git a/share/doc/papers/timecounter/intr.ps b/share/doc/papers/timecounter/intr.ps
index a6bb7ce078a2e..8fce26705ba36 100644
--- a/share/doc/papers/timecounter/intr.ps
+++ b/share/doc/papers/timecounter/intr.ps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: _.ps
 %%Creator: gnuplot 3.7 patchlevel 1
-%%CreationDate: $FreeBSD$
+%%CreationDate: $FreeBSD: src/share/doc/papers/timecounter/intr.ps,v 1.1 2003/06/15 18:49:46 phk Exp $
 %%DocumentFonts: (atend)
 %%BoundingBox: 50 50 266 201
 %%Orientation: Portrait
diff --git a/share/doc/papers/timecounter/timecounter.ms b/share/doc/papers/timecounter/timecounter.ms
index 097ab65451095..5e476fe953930 100644
--- a/share/doc/papers/timecounter/timecounter.ms
+++ b/share/doc/papers/timecounter/timecounter.ms
@@ -9,7 +9,7 @@ delim øø
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/timecounter/timecounter.ms,v 1.4 2006/08/04 07:56:32 yar Exp $
 .\"
 .if n .ND
 .TI
diff --git a/share/doc/papers/timecounter/tmac.usenix b/share/doc/papers/timecounter/tmac.usenix
index c0c13c20cd086..9efc48c9e1431 100644
--- a/share/doc/papers/timecounter/tmac.usenix
+++ b/share/doc/papers/timecounter/tmac.usenix
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/papers/timecounter/tmac.usenix,v 1.1 2003/06/15 18:49:46 phk Exp $
 .ds CC "
 .nr PS 10
 .nr FU 0.0i	\" priniter prints this much too low
diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 14a2f703e5b94..39fda88471ff9 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/01.cacm/Makefile,v 1.8 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/01.cacm
 SRCS=		stubs p.mac p1 p2 p3 p4 p5 p6
diff --git a/share/doc/psd/01.cacm/p.mac b/share/doc/psd/01.cacm/p.mac
index 5450b5dc96f76..d75be7584d245 100644
--- a/share/doc/psd/01.cacm/p.mac
+++ b/share/doc/psd/01.cacm/p.mac
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p.mac	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p.mac,v 1.1 2002/05/19 05:31:37 grog Exp $
 .de P1
 .DS
 ..
diff --git a/share/doc/psd/01.cacm/p1 b/share/doc/psd/01.cacm/p1
index 88987e02bb068..5a4ccfd5ca2b7 100644
--- a/share/doc/psd/01.cacm/p1
+++ b/share/doc/psd/01.cacm/p1
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p1	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p1,v 1.3 2002/10/30 13:07:34 ru Exp $
 .OH 'The UNIX Time-Sharing System''PSD:1-%'
 .EH 'PSD:1-%''The UNIX Time-Sharing System'
 .ds n \s+2
diff --git a/share/doc/psd/01.cacm/p2 b/share/doc/psd/01.cacm/p2
index 8373c0ed9d583..4e711715e2a5b 100644
--- a/share/doc/psd/01.cacm/p2
+++ b/share/doc/psd/01.cacm/p2
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p2	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p2,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 3.6 I/O calls
 .PP
diff --git a/share/doc/psd/01.cacm/p3 b/share/doc/psd/01.cacm/p3
index 2dc86d28e7553..d63414d9c161b 100644
--- a/share/doc/psd/01.cacm/p3
+++ b/share/doc/psd/01.cacm/p3
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p3	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p3,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 V. PROCESSES AND IMAGES
 .PP
diff --git a/share/doc/psd/01.cacm/p4 b/share/doc/psd/01.cacm/p4
index 09adb2bb6e8b7..de0a2f5678da6 100644
--- a/share/doc/psd/01.cacm/p4
+++ b/share/doc/psd/01.cacm/p4
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p4	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p4,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 VI. THE SHELL
 .PP
diff --git a/share/doc/psd/01.cacm/p5 b/share/doc/psd/01.cacm/p5
index cf40f2d6b0168..bdab82a85eecb 100644
--- a/share/doc/psd/01.cacm/p5
+++ b/share/doc/psd/01.cacm/p5
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p5	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p5,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 VII. TRAPS
 .PP
diff --git a/share/doc/psd/01.cacm/p6 b/share/doc/psd/01.cacm/p6
index 77af7e7622929..52b649e06dc85 100644
--- a/share/doc/psd/01.cacm/p6
+++ b/share/doc/psd/01.cacm/p6
@@ -4,7 +4,7 @@
 .\"
 .\"	@(#)p6	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/01.cacm/p6,v 1.1 2002/05/19 05:31:37 grog Exp $
 .SH
 IX. STATISTICS
 .PP
diff --git a/share/doc/psd/01.cacm/ref.bib b/share/doc/psd/01.cacm/ref.bib
index c4283b5806c3a..679ab97205fd3 100644
--- a/share/doc/psd/01.cacm/ref.bib
+++ b/share/doc/psd/01.cacm/ref.bib
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/01.cacm/ref.bib,v 1.1 2002/10/24 12:56:20 ru Exp $
 
 %A L. P. Deutsch
 %A B. W. Lampson
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index 89d0dc3c3b952..2f7704e0bc80e 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/02.implement/Makefile,v 1.8 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/02.implement
 SRCS=		stubs implement
diff --git a/share/doc/psd/02.implement/fig1.pic b/share/doc/psd/02.implement/fig1.pic
index 2d4b3d3c22313..43bc9035e4f36 100644
--- a/share/doc/psd/02.implement/fig1.pic
+++ b/share/doc/psd/02.implement/fig1.pic
@@ -39,7 +39,7 @@
 .\" 
 .\"	@(#)fig1.pic	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/02.implement/fig1.pic,v 1.2 2002/05/19 05:52:57 grog Exp $
 .PS
 .ps 9
 [
diff --git a/share/doc/psd/02.implement/fig2.pic b/share/doc/psd/02.implement/fig2.pic
index 2dc291556d022..370ddff5adedc 100644
--- a/share/doc/psd/02.implement/fig2.pic
+++ b/share/doc/psd/02.implement/fig2.pic
@@ -39,7 +39,7 @@
 .\" 
 .\"	@(#)fig2.pic	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/02.implement/fig2.pic,v 1.2 2002/05/19 05:52:57 grog Exp $
 .PS
 .ps 9
 [
diff --git a/share/doc/psd/02.implement/implement b/share/doc/psd/02.implement/implement
index f6ad7d7591912..0f9f21b0e72d7 100644
--- a/share/doc/psd/02.implement/implement
+++ b/share/doc/psd/02.implement/implement
@@ -39,7 +39,7 @@
 .\" 
 .\"	@(#)implement	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/02.implement/implement,v 1.4 2002/10/30 13:07:34 ru Exp $
 .EH 'PSD:2-%''UNIX Implementation'
 .OH 'UNIX Implementation''PSD:2-%'
 .de P1
diff --git a/share/doc/psd/02.implement/ref.bib b/share/doc/psd/02.implement/ref.bib
index 34140640e8bc3..84e5b140e10b6 100644
--- a/share/doc/psd/02.implement/ref.bib
+++ b/share/doc/psd/02.implement/ref.bib
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/02.implement/ref.bib,v 1.1 2002/10/24 12:56:20 ru Exp $
 
 %T U\s-2NIX\s0 Time-Sharing System: The U\s-2NIX\s0 Shell
 %A S. R. Bourne
diff --git a/share/doc/psd/03.iosys/Makefile b/share/doc/psd/03.iosys/Makefile
index 113bf90fd4fec..cbb9211ddf817 100644
--- a/share/doc/psd/03.iosys/Makefile
+++ b/share/doc/psd/03.iosys/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/03.iosys/Makefile,v 1.3 2002/05/22 10:41:09 ru Exp $
 
 VOLUME=	psd/03.iosys
 SRCS=	iosys
diff --git a/share/doc/psd/03.iosys/iosys b/share/doc/psd/03.iosys/iosys
index ce63bc25319a6..0c1a41d2fb017 100644
--- a/share/doc/psd/03.iosys/iosys
+++ b/share/doc/psd/03.iosys/iosys
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)iosys	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/03.iosys/iosys,v 1.2 2002/05/19 06:03:05 grog Exp $
 .EH 'PSD:3-%''The UNIX I/O System'
 .OH 'The UNIX I/O System''PSD:3-%'
 .TL
diff --git a/share/doc/psd/04.uprog/Makefile b/share/doc/psd/04.uprog/Makefile
index f149dcf274230..e6efff7e9b233 100644
--- a/share/doc/psd/04.uprog/Makefile
+++ b/share/doc/psd/04.uprog/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/04.uprog/Makefile,v 1.3 2002/05/20 00:45:20 grog Exp $
 
 VOLUME=	psd/04.uprog
 SRCS=	p.mac p0 p1 p2 p3 p4 p5 p6 p8 p9
diff --git a/share/doc/psd/04.uprog/p.mac b/share/doc/psd/04.uprog/p.mac
index 7f9295c729ac8..22e3d63c28122 100644
--- a/share/doc/psd/04.uprog/p.mac
+++ b/share/doc/psd/04.uprog/p.mac
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p.mac,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p.mac	8.1 (Berkeley) 6/8/93
 .de UC
diff --git a/share/doc/psd/04.uprog/p0 b/share/doc/psd/04.uprog/p0
index 5aaf32555f91d..9a86f5c1832a6 100644
--- a/share/doc/psd/04.uprog/p0
+++ b/share/doc/psd/04.uprog/p0
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p0,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p0	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p1 b/share/doc/psd/04.uprog/p1
index 848862ec7942f..6248cef20a97a 100644
--- a/share/doc/psd/04.uprog/p1
+++ b/share/doc/psd/04.uprog/p1
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p1,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p1	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p2 b/share/doc/psd/04.uprog/p2
index 280f65cd51cdc..95e8b2edebafd 100644
--- a/share/doc/psd/04.uprog/p2
+++ b/share/doc/psd/04.uprog/p2
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p2,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p2	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p3 b/share/doc/psd/04.uprog/p3
index 201c4a904af25..fb69fd41f2df6 100644
--- a/share/doc/psd/04.uprog/p3
+++ b/share/doc/psd/04.uprog/p3
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p3,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p3	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p4 b/share/doc/psd/04.uprog/p4
index fe23ac31d5400..68ded4c62d2cb 100644
--- a/share/doc/psd/04.uprog/p4
+++ b/share/doc/psd/04.uprog/p4
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p4,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p4	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p5 b/share/doc/psd/04.uprog/p5
index 652641fbfe7db..713589bd0b0c0 100644
--- a/share/doc/psd/04.uprog/p5
+++ b/share/doc/psd/04.uprog/p5
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p5,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p5	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p6 b/share/doc/psd/04.uprog/p6
index c323d94b64e4d..c6dec5f7a079e 100644
--- a/share/doc/psd/04.uprog/p6
+++ b/share/doc/psd/04.uprog/p6
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p6,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p6	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p8 b/share/doc/psd/04.uprog/p8
index 3c7c7b4c20842..36a8345aa3d99 100644
--- a/share/doc/psd/04.uprog/p8
+++ b/share/doc/psd/04.uprog/p8
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p8,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p8	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/04.uprog/p9 b/share/doc/psd/04.uprog/p9
index 2366444ea52e5..5bb5b92e7623e 100644
--- a/share/doc/psd/04.uprog/p9
+++ b/share/doc/psd/04.uprog/p9
@@ -34,7 +34,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/04.uprog/p9,v 1.2 2002/05/19 06:13:52 grog Exp $
 .\"
 .\"	@(#)p9	8.1 (Berkeley) 6/8/93
 .\"
diff --git a/share/doc/psd/05.sysman/1.1.t b/share/doc/psd/05.sysman/1.1.t
index 223cf831e556f..fa7682ac5ec18 100644
--- a/share/doc/psd/05.sysman/1.1.t
+++ b/share/doc/psd/05.sysman/1.1.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.1.t	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/psd/05.sysman/1.1.t,v 1.2 2000/11/26 22:20:17 kris Exp $
 .\"
 .sh "Processes and protection
 .NH 3
diff --git a/share/doc/psd/05.sysman/1.2.t b/share/doc/psd/05.sysman/1.2.t
index 8527a75f8f3e5..999ea68cfdacf 100644
--- a/share/doc/psd/05.sysman/1.2.t
+++ b/share/doc/psd/05.sysman/1.2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.2.t	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/05.sysman/1.2.t,v 1.5 1999/08/28 00:18:18 peter Exp $
 .\"
 .sh "Memory management\(dg
 .NH 3
diff --git a/share/doc/psd/05.sysman/2.3.t b/share/doc/psd/05.sysman/2.3.t
index edf3e10fb52ed..f0262358cf4b6 100644
--- a/share/doc/psd/05.sysman/2.3.t
+++ b/share/doc/psd/05.sysman/2.3.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.3.t	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/05.sysman/2.3.t,v 1.5 1999/08/28 00:18:19 peter Exp $
 .\"
 .sh "Interprocess communications
 .NH 3
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index 2c0ec7b8c9d38..7530c5c0ff11d 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/05.sysman/Makefile,v 1.7 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/05.sysman
 SRCS=		0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
diff --git a/share/doc/psd/06.Clang/Clang.ms b/share/doc/psd/06.Clang/Clang.ms
index 639591349e82c..ba17d6550b19e 100644
--- a/share/doc/psd/06.Clang/Clang.ms
+++ b/share/doc/psd/06.Clang/Clang.ms
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)Clang.ms	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/06.Clang/Clang.ms,v 1.3 2002/10/12 14:50:50 schweikh Exp $
 .nr Cl 2
 .TL
 The C Programming Language - Reference Manual
diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile
index 877a97cd70739..275ee939fb893 100644
--- a/share/doc/psd/06.Clang/Makefile
+++ b/share/doc/psd/06.Clang/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/06.Clang/Makefile,v 1.7 2004/10/24 15:32:41 ru Exp $
 
 VOLUME=		psd/06.Clang
 SRCS=		Clang.ms
diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index fdc38a78aecff..8c7a710bdbebb 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/12.make/Makefile,v 1.7 2002/10/29 14:56:07 ru Exp $
 
 VOLUME=	psd/12.make
 SRCS=	stubs tutorial.ms
diff --git a/share/doc/psd/13.rcs/Makefile b/share/doc/psd/13.rcs/Makefile
index ed497da4d8db0..093121983f1e0 100644
--- a/share/doc/psd/13.rcs/Makefile
+++ b/share/doc/psd/13.rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/Makefile,v 1.2 1999/08/28 00:18:21 peter Exp $
 
 SUBDIR=	rcs rcs_func
 
diff --git a/share/doc/psd/13.rcs/Makefile.inc b/share/doc/psd/13.rcs/Makefile.inc
index 666dbd862ff25..06329a502192e 100644
--- a/share/doc/psd/13.rcs/Makefile.inc
+++ b/share/doc/psd/13.rcs/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/Makefile.inc,v 1.2 1999/08/28 00:18:21 peter Exp $
 
 VOLUME=	psd/13.rcs
 MACROS=	-ms
diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile
index 6d94aed2bb445..7539c3ef258ad 100644
--- a/share/doc/psd/13.rcs/rcs/Makefile
+++ b/share/doc/psd/13.rcs/rcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/rcs/Makefile,v 1.6 2004/10/24 15:32:41 ru Exp $
 
 SRCS=		rcs.ms
 USE_PIC=
diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile
index 09e5a9b226c2b..214722a9df27c 100644
--- a/share/doc/psd/13.rcs/rcs_func/Makefile
+++ b/share/doc/psd/13.rcs/rcs_func/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/13.rcs/rcs_func/Makefile,v 1.4 2002/10/29 15:01:56 ru Exp $
 
 DOC=	rcs_func
 SRCS=	rcs_func.ms
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 4381c98d7f866..06d3a8bd83039 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/15.yacc/Makefile,v 1.8 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/15.yacc
 SRCS=		stubs ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
diff --git a/share/doc/psd/15.yacc/ref.bib b/share/doc/psd/15.yacc/ref.bib
index a1364f608f519..e5d36f23459b6 100644
--- a/share/doc/psd/15.yacc/ref.bib
+++ b/share/doc/psd/15.yacc/ref.bib
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/15.yacc/ref.bib,v 1.1 2002/10/24 12:56:20 ru Exp $
 
 %T The C Programming Language
 %A B. W. Kernighan
diff --git a/share/doc/psd/15.yacc/ss.. b/share/doc/psd/15.yacc/ss..
index 7dd9ea84cdf9c..b265b4c8b7ea8 100644
--- a/share/doc/psd/15.yacc/ss..
+++ b/share/doc/psd/15.yacc/ss..
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss..	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss..,v 1.4 2002/10/30 13:07:34 ru Exp $
 .EH 'PSD:15-%''Yacc: Yet Another Compiler-Compiler'
 .OH 'Yacc: Yet Another Compiler-Compiler''PSD:15-%'
 .\".RP
diff --git a/share/doc/psd/15.yacc/ss0 b/share/doc/psd/15.yacc/ss0
index 223e90fbac54e..33558614f539d 100644
--- a/share/doc/psd/15.yacc/ss0
+++ b/share/doc/psd/15.yacc/ss0
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss0	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss0,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 0: Introduction
 .PP
diff --git a/share/doc/psd/15.yacc/ss1 b/share/doc/psd/15.yacc/ss1
index f9369fb4bf5de..b4b4f04758554 100644
--- a/share/doc/psd/15.yacc/ss1
+++ b/share/doc/psd/15.yacc/ss1
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss1	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss1,v 1.2 2002/05/19 05:14:02 grog Exp $
 .tr *\(**
 .tr |\(or
 .SH
diff --git a/share/doc/psd/15.yacc/ss2 b/share/doc/psd/15.yacc/ss2
index f1fdb44075815..341f582d556ce 100644
--- a/share/doc/psd/15.yacc/ss2
+++ b/share/doc/psd/15.yacc/ss2
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss2	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss2,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 2: Actions
 .PP
diff --git a/share/doc/psd/15.yacc/ss3 b/share/doc/psd/15.yacc/ss3
index fa06acb75b097..fe60a16ce9cda 100644
--- a/share/doc/psd/15.yacc/ss3
+++ b/share/doc/psd/15.yacc/ss3
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss3	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss3,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 3: Lexical Analysis
 .PP
diff --git a/share/doc/psd/15.yacc/ss4 b/share/doc/psd/15.yacc/ss4
index e548d53cfc7d6..b5dc99573f48a 100644
--- a/share/doc/psd/15.yacc/ss4
+++ b/share/doc/psd/15.yacc/ss4
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss4	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss4,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 4: How the Parser Works
 .PP
diff --git a/share/doc/psd/15.yacc/ss5 b/share/doc/psd/15.yacc/ss5
index e2c34626f3333..5a43cb080f09c 100644
--- a/share/doc/psd/15.yacc/ss5
+++ b/share/doc/psd/15.yacc/ss5
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss5	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss5,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 5: Ambiguity and Conflicts
 .PP
diff --git a/share/doc/psd/15.yacc/ss6 b/share/doc/psd/15.yacc/ss6
index 513d042a82031..64b424c26b4fc 100644
--- a/share/doc/psd/15.yacc/ss6
+++ b/share/doc/psd/15.yacc/ss6
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss6	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss6,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 6: Precedence
 .PP
diff --git a/share/doc/psd/15.yacc/ss7 b/share/doc/psd/15.yacc/ss7
index b6440c793857d..adb02e765dd0d 100644
--- a/share/doc/psd/15.yacc/ss7
+++ b/share/doc/psd/15.yacc/ss7
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss7	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss7,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 7: Error Handling
 .PP
diff --git a/share/doc/psd/15.yacc/ss8 b/share/doc/psd/15.yacc/ss8
index 75c66ab383a5a..da9b489da58fe 100644
--- a/share/doc/psd/15.yacc/ss8
+++ b/share/doc/psd/15.yacc/ss8
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss8	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss8,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 8: The Yacc Environment
 .PP
diff --git a/share/doc/psd/15.yacc/ss9 b/share/doc/psd/15.yacc/ss9
index 9d05fecd4abde..9ee7b426e20c5 100644
--- a/share/doc/psd/15.yacc/ss9
+++ b/share/doc/psd/15.yacc/ss9
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ss9	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ss9,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 9: Hints for Preparing Specifications
 .PP
diff --git a/share/doc/psd/15.yacc/ssA b/share/doc/psd/15.yacc/ssA
index f6f1702de803e..6dbe760b8c149 100644
--- a/share/doc/psd/15.yacc/ssA
+++ b/share/doc/psd/15.yacc/ssA
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssA	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssA,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 10: Advanced Topics
 .PP
diff --git a/share/doc/psd/15.yacc/ssB b/share/doc/psd/15.yacc/ssB
index c16bb52b94220..8e37ae2b7c1f4 100644
--- a/share/doc/psd/15.yacc/ssB
+++ b/share/doc/psd/15.yacc/ssB
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssB	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssB,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 11: Acknowledgements
 .PP
diff --git a/share/doc/psd/15.yacc/ssa b/share/doc/psd/15.yacc/ssa
index 17e815edfcb16..318099c48d0f1 100644
--- a/share/doc/psd/15.yacc/ssa
+++ b/share/doc/psd/15.yacc/ssa
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssa	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssa,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix A:  A Simple Example
 .PP
diff --git a/share/doc/psd/15.yacc/ssb b/share/doc/psd/15.yacc/ssb
index 2dba020cd0151..5389fe7dd12ed 100644
--- a/share/doc/psd/15.yacc/ssb
+++ b/share/doc/psd/15.yacc/ssb
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)ssb	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssb,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix B: Yacc Input Syntax
 .PP
diff --git a/share/doc/psd/15.yacc/ssc b/share/doc/psd/15.yacc/ssc
index 95fca5c516b0a..eda188ee9896d 100644
--- a/share/doc/psd/15.yacc/ssc
+++ b/share/doc/psd/15.yacc/ssc
@@ -35,7 +35,7 @@
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"	@(#)ssc	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssc,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix C: An Advanced Example
 .PP
diff --git a/share/doc/psd/15.yacc/ssd b/share/doc/psd/15.yacc/ssd
index 988e0a0da09e6..b0757caac10d2 100644
--- a/share/doc/psd/15.yacc/ssd
+++ b/share/doc/psd/15.yacc/ssd
@@ -35,7 +35,7 @@
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"	@(#)ssd	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/15.yacc/ssd,v 1.2 2002/05/19 05:14:02 grog Exp $
 .SH
 Appendix D: Old Features Supported but not Encouraged
 .PP
diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile
index 6dea7c0289916..326c396771c7b 100644
--- a/share/doc/psd/16.lex/Makefile
+++ b/share/doc/psd/16.lex/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/16.lex/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/16.lex
 SRCS=		lex.ms
diff --git a/share/doc/psd/16.lex/lex.ms b/share/doc/psd/16.lex/lex.ms
index 8b3c82ee23b3a..3772c5674c82c 100644
--- a/share/doc/psd/16.lex/lex.ms
+++ b/share/doc/psd/16.lex/lex.ms
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)lex.ms	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/16.lex/lex.ms,v 1.4 2002/10/24 13:21:29 ru Exp $
 .nr tm 0
 .de MH
 Bell Laboratories, Murray Hill, NJ 07974.
diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile
index c48921f09a154..58c3df8840934 100644
--- a/share/doc/psd/17.m4/Makefile
+++ b/share/doc/psd/17.m4/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/17.m4/Makefile,v 1.4 2002/05/22 10:41:12 ru Exp $
 
 VOLUME=	psd/17.m4
 SRCS=	m4.ms
diff --git a/share/doc/psd/17.m4/m4.ms b/share/doc/psd/17.m4/m4.ms
index c7a2fd941a86c..8f127cf4c417b 100644
--- a/share/doc/psd/17.m4/m4.ms
+++ b/share/doc/psd/17.m4/m4.ms
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)m4.ms	6.3 (Berkeley) 6/5/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/17.m4/m4.ms,v 1.3 2002/10/24 13:31:34 ru Exp $
 .de MH
 Bell Laboratories, Murray Hill, NJ 07974.
 ..
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 1097072fe0eba..b1db26009d589 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/18.gprof/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/18.gprof
 SRCS=		header.me abstract.me intro.me profiling.me gathering.me \
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index 934cdeaf5eb63..fe04190f935ca 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/20.ipctut/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/20.ipctut
 SRCS=		tutor.me
diff --git a/share/doc/psd/21.ipc/3.t b/share/doc/psd/21.ipc/3.t
index 6e7eb06223644..d792087583c73 100644
--- a/share/doc/psd/21.ipc/3.t
+++ b/share/doc/psd/21.ipc/3.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)3.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/psd/21.ipc/3.t,v 1.3 2003/07/06 10:37:00 charnier Exp $
 .\"
 .\".ds RH "Network Library Routines
 .bp
diff --git a/share/doc/psd/21.ipc/4.t b/share/doc/psd/21.ipc/4.t
index 22e6836d28a40..85c7e38deb159 100644
--- a/share/doc/psd/21.ipc/4.t
+++ b/share/doc/psd/21.ipc/4.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)4.t	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/psd/21.ipc/4.t,v 1.2 2003/07/06 10:37:00 charnier Exp $
 .\"
 .\".ds RH "Client/Server Model
 .bp
diff --git a/share/doc/psd/21.ipc/5.t b/share/doc/psd/21.ipc/5.t
index 8ce44b2018c1b..6bcddcb7b3af1 100644
--- a/share/doc/psd/21.ipc/5.t
+++ b/share/doc/psd/21.ipc/5.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)5.t	8.1 (Berkeley) 8/14/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/21.ipc/5.t,v 1.5 1999/08/28 00:18:26 peter Exp $
 .\"
 .\".ds RH "Advanced Topics
 .bp
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index 67c3d6c40a176..63108733b92d5 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/21.ipc/Makefile,v 1.7 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/21.ipc
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index 4c38add5ba8c9..949e1fe58ab50 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/22.rpcgen/Makefile,v 1.6 2004/10/24 15:32:42 ru Exp $
 
 VOLUME=		psd/22.rpcgen
 SRCS=		stubs rpcgen.ms
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 77849b657aa91..faefd665b843a 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/23.rpc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/23.rpc
 SRCS=		stubs rpc.prog.ms
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index 878dca1c280ef..759d916849857 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/24.xdr/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/24.xdr
 SRCS=		stubs xdr.nts.ms
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index 105135e217bc4..390a989ebff88 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/25.xdrrfc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/25.xdrrfc
 SRCS=		stubs xdr.rfc.ms
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index 79214f1c59711..0864796832a99 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/26.rpcrfc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/26.rpcrfc
 SRCS=		stubs rpc.rfc.ms
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index 590478780cef4..5a241612f85bd 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/27.nfsrpc/Makefile,v 1.6 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/27.nfsrfc
 SRCS=		stubs nfs.rfc.ms
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
index a62473284e36e..51be2da484fdf 100644
--- a/share/doc/psd/28.cvs/Makefile
+++ b/share/doc/psd/28.cvs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/28.cvs/Makefile,v 1.4 2004/10/24 15:32:43 ru Exp $
 
 VOLUME=		psd/28.cvs
 SRCS=		cvs-paper.ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index d50f05b1b2c64..2c1031c2ee493 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/Makefile,v 1.21 2004/01/20 13:08:33 ru Exp $
 
 # The following modules do not build/install:
 # 10.gdb
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index 38864e96a4fe0..920983fc95760 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/contents/Makefile,v 1.6 2002/10/29 15:01:57 ru Exp $
 
 VOLUME=	psd
 DOC=	contents
diff --git a/share/doc/psd/contents/contents.ms b/share/doc/psd/contents/contents.ms
index 9f374dc47cdda..158e228d91d6b 100644
--- a/share/doc/psd/contents/contents.ms
+++ b/share/doc/psd/contents/contents.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)00.contents	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/contents/contents.ms,v 1.6 2002/05/22 11:58:34 ru Exp $
 .\"
 .OH '''PSD Contents'
 .EH 'PSD Contents'''
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index d073730b322c0..cc169548664ab 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/psd/title/Makefile,v 1.9 2002/10/29 16:13:20 ru Exp $
 
 VOLUME=	psd
 DOC=	Title
diff --git a/share/doc/psd/title/Title b/share/doc/psd/title/Title
index 014b3d54dcdbe..2cfd2c4be2d91 100644
--- a/share/doc/psd/title/Title
+++ b/share/doc/psd/title/Title
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/psd/title/Title,v 1.2 2000/11/23 11:08:17 ru Exp $
 .\"
 .ps 18
 .vs 22
diff --git a/share/doc/smm/01.setup/0.t b/share/doc/smm/01.setup/0.t
index 1951cd024d88e..e4a1c8d56e483 100644
--- a/share/doc/smm/01.setup/0.t
+++ b/share/doc/smm/01.setup/0.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)0.t	8.1 (Berkeley) 7/27/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/0.t,v 1.2 2000/11/27 18:00:51 ru Exp $
 .\"
 .ds Ux \s-1UNIX\s0
 .ds Bs \s-1BSD\s0
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index 4220a6d9b8114..1837329bb8c33 100644
--- a/share/doc/smm/01.setup/2.t
+++ b/share/doc/smm/01.setup/2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 7/27/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/2.t,v 1.7 1999/08/28 00:18:35 peter Exp $
 .\"
 .ds lq ``
 .ds rq ''
diff --git a/share/doc/smm/01.setup/3.t b/share/doc/smm/01.setup/3.t
index 5b0afd4775ca8..5601eb4f5629a 100644
--- a/share/doc/smm/01.setup/3.t
+++ b/share/doc/smm/01.setup/3.t
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/3.t,v 1.4 2003/04/30 17:01:42 markm Exp $
 .\"	@(#)3.t	8.1 (Berkeley) 7/27/93
 .\"
 .ds lq ``
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index b2d9c301b16b4..c08c2daa339b8 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 7/27/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/01.setup/Makefile,v 1.9 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/01.setup
 SRCS=		stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/01.setup/stubs b/share/doc/smm/01.setup/stubs
index b26f4d5fcbbe6..d557360f1f112 100644
--- a/share/doc/smm/01.setup/stubs
+++ b/share/doc/smm/01.setup/stubs
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/01.setup/stubs,v 1.1 2000/11/27 18:00:51 ru Exp $
 .\"
 .if n \{\
 .	ftr CW R
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index 26ed70a097798..4c56b2900c87b 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/02.config/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/02.config
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile
index fbdc0091f8efe..48a3fbe47daba 100644
--- a/share/doc/smm/03.fsck/Makefile
+++ b/share/doc/smm/03.fsck/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/03.fsck/Makefile,v 1.5 2000/10/09 10:23:31 adrian Exp $
 
 VOLUME=	smm/03.fsck
 SRCS=	0.t 1.t 2.t 3.t 4.t
diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile
index e3c68ff48c566..13f5b353131d5 100644
--- a/share/doc/smm/04.quotas/Makefile
+++ b/share/doc/smm/04.quotas/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/04.quotas/Makefile,v 1.5 1999/08/28 00:18:37 peter Exp $
 
 VOLUME=	smm/04.quotas
 SRCS=	quotas.ms
diff --git a/share/doc/smm/05.fastfs/3.t b/share/doc/smm/05.fastfs/3.t
index 23db86aead859..eebc05ba499d8 100644
--- a/share/doc/smm/05.fastfs/3.t
+++ b/share/doc/smm/05.fastfs/3.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)3.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/smm/05.fastfs/3.t,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .ds RH New file system
 .NH
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index d63aae2d877de..e00c4c4b6c423 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/05.fastfs/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/05.fastfs
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/06.nfs/1.t b/share/doc/smm/06.nfs/1.t
index 96415dabec0ec..a8ecc22246c73 100644
--- a/share/doc/smm/06.nfs/1.t
+++ b/share/doc/smm/06.nfs/1.t
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)1.t	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/06.nfs/1.t,v 1.5 2003/04/30 17:01:43 markm Exp $
 .\"
 .sh 1 "NFS Implementation"
 .pp
diff --git a/share/doc/smm/06.nfs/2.t b/share/doc/smm/06.nfs/2.t
index 85e28963fd3f8..a547252393681 100644
--- a/share/doc/smm/06.nfs/2.t
+++ b/share/doc/smm/06.nfs/2.t
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/smm/06.nfs/2.t,v 1.2 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .sh 1 "Not Quite NFS, Crash Tolerant Cache Consistency for NFS"
 .pp
diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile
index 99f0762ac6ef8..7f38cea52460e 100644
--- a/share/doc/smm/06.nfs/Makefile
+++ b/share/doc/smm/06.nfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/06.nfs/Makefile,v 1.5 1999/08/28 00:18:39 peter Exp $
 
 VOLUME=	smm/06.nfs
 SRCS=	0.t 1.t 2.t ref.t
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index 482ed798a95e2..6ddd1a011ef4a 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/08.sendmailop/Makefile,v 1.9 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/08.sendmailop
 SRCS=		op.me
diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile
index ad09e787076ac..f998f67aaff05 100644
--- a/share/doc/smm/11.timedop/Makefile
+++ b/share/doc/smm/11.timedop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/11.timedop/Makefile,v 1.4 1999/08/28 00:18:42 peter Exp $
 
 VOLUME=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index 1d9ed5c2eab5e..63e1a9f2e1ec3 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/12.timed/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		smm/12.timed
 SRCS=		timed.ms
diff --git a/share/doc/smm/18.net/7.t b/share/doc/smm/18.net/7.t
index e165de0e8f4a4..3936367c857bd 100644
--- a/share/doc/smm/18.net/7.t
+++ b/share/doc/smm/18.net/7.t
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)7.t	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/smm/18.net/7.t,v 1.2 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .nr H2 1
 .br
diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile
index 47e7e11bd201e..7518c6d0a434c 100644
--- a/share/doc/smm/18.net/Makefile
+++ b/share/doc/smm/18.net/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/18.net/Makefile,v 1.7 2002/10/25 09:05:10 ru Exp $
 
 VOLUME=	smm/18.net
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index e6ceda142e871..f4950d4431235 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/Makefile,v 1.20 2006/03/17 18:54:33 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index aa73faaf4e95d..16a2e53795dbd 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/contents/Makefile,v 1.6 2002/10/29 15:01:58 ru Exp $
 
 VOLUME=	smm
 DOC=	contents
diff --git a/share/doc/smm/contents/contents.ms b/share/doc/smm/contents/contents.ms
index 1b8038a22d44f..5b38a8481ec48 100644
--- a/share/doc/smm/contents/contents.ms
+++ b/share/doc/smm/contents/contents.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)00.contents	8.1 (Berkeley) 7/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/contents/contents.ms,v 1.5 2002/10/25 09:03:09 ru Exp $
 .\"
 .OH '''SMM Contents'
 .EH 'SMM Contents'''
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index c1f1c9b64419c..e30e02692389d 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/smm/title/Makefile,v 1.9 2002/10/29 16:13:21 ru Exp $
 
 VOLUME=	smm
 DOC=	Title
diff --git a/share/doc/smm/title/Title b/share/doc/smm/title/Title
index 5faa11f6960c8..b447d146cf39e 100644
--- a/share/doc/smm/title/Title
+++ b/share/doc/smm/title/Title
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/smm/title/Title,v 1.5 2000/11/27 07:19:05 ru Exp $
 .\"
 .ps 18
 .vs 22
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index d22a7b928970f..603c66b8aca25 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/04.csh/Makefile,v 1.7 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		usd/04.csh
 SRCS=		tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index d5a6d3c0b5543..aeb8cfd0ef923 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/07.mail/Makefile,v 1.6 2004/10/24 15:32:44 ru Exp $
 
 VOLUME=		usd/07.mail
 SRCS=		mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile
index 8df4f72087267..5c9bf9fd5a603 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/Makefile,v 1.10 1999/08/28 00:18:49 peter Exp $
 
 SUBDIR=	exref summary 
 
diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc
index c5c2f55a2d1f1..bf02d9e2d053d 100644
--- a/share/doc/usd/10.exref/Makefile.inc
+++ b/share/doc/usd/10.exref/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/Makefile.inc,v 1.3 2002/10/25 09:14:09 ru Exp $
 
 VOLUME=	usd/10.exref
 MACROS=	-ms
diff --git a/share/doc/usd/10.exref/exref/Makefile b/share/doc/usd/10.exref/exref/Makefile
index 7af18f93ef38b..fcef84d588381 100644
--- a/share/doc/usd/10.exref/exref/Makefile
+++ b/share/doc/usd/10.exref/exref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/exref/Makefile,v 1.4 1999/08/28 00:18:50 peter Exp $
 
 SRCS=	ex.rm
 
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 143333f6ea2c3..4cc91215ac6cd 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/10.exref/summary/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 DOC=		summary
 SRCS=		ex.summary
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index f412b627fa926..2a8ff7a890da5 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/11.vitut/Makefile,v 1.7 2004/10/24 15:32:45 ru Exp $
 
 VOLUME=		usd/11.edit
 SRCS=		edittut.ms
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index 7b2c080434cf0..bb3da501c5fb4 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/Makefile,v 1.10 2002/10/29 15:01:58 ru Exp $
 
 SUBDIR=	vi viapwh summary
 
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
index 42d417f046bf2..34e60e7256214 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/Makefile.inc,v 1.4 2002/10/29 15:01:58 ru Exp $
 
 VOLUME=		usd/12.vi
 MACROS=		-ms
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index 425536dce4d61..ff7ba12703424 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/summary/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 DOC=		summary
 SRCS=		vi.summary
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index 6021b092e236f..91f03b5e52041 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/vi/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 SRCS=		vi.in vi.chars
 USE_TBL=
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index f20582dda5aa4..cc95be49b5dc9 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/12.vi/viapwh/Makefile,v 1.4 2002/10/29 15:01:59 ru Exp $
 
 DOC=	viapwh
 SRCS=	vi.apwh.ms
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index d7bb392ef8448..3e0290e7dd588 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.16 (Berkeley) 8/15/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/13.viref/Makefile,v 1.15 2004/10/24 15:32:45 ru Exp $
 
 VOLUME=		usd/13.viref
 SRCS=		vi.ref-patched
diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile
index faf76bbb64f39..e1043e5c32b2f 100644
--- a/share/doc/usd/18.msdiffs/Makefile
+++ b/share/doc/usd/18.msdiffs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/18.msdiffs/Makefile,v 1.5 1999/08/28 00:18:57 peter Exp $
 
 VOLUME=	usd/18.msdiffs
 SRCS=	ms.diffs
diff --git a/share/doc/usd/18.msdiffs/ms.diffs b/share/doc/usd/18.msdiffs/ms.diffs
index be6883f15b7a5..529174fad089d 100644
--- a/share/doc/usd/18.msdiffs/ms.diffs
+++ b/share/doc/usd/18.msdiffs/ms.diffs
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)ms.diffs	8.1 (Berkeley) 6/8/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/usd/18.msdiffs/ms.diffs,v 1.3 2005/08/01 12:10:14 phk Exp $
 .\"
 .nr LL 6.5i
 .nr FL 6.0i
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index 4966e36f611f9..81fe800f35add 100644
--- a/share/doc/usd/19.memacros/Makefile
+++ b/share/doc/usd/19.memacros/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/19.memacros/Makefile,v 1.8 2002/10/29 14:56:08 ru Exp $
 
 VOLUME=		usd/19.memacros
 SRCS=		meintro.me-sed
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index af30e9b64fa56..366ccd55611ac 100644
--- a/share/doc/usd/20.meref/Makefile
+++ b/share/doc/usd/20.meref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/20.meref/Makefile,v 1.8 2002/10/29 14:56:09 ru Exp $
 
 VOLUME=		usd/20.meref
 SRCS=		meref.me-sed
diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile
index 92ed42959bf4c..4a6534858c98b 100644
--- a/share/doc/usd/21.troff/Makefile
+++ b/share/doc/usd/21.troff/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/21.troff/Makefile,v 1.6 2004/10/24 15:32:45 ru Exp $
 
 VOLUME=		usd/21.troff
 SRCS=		m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2
diff --git a/share/doc/usd/21.troff/m.mac b/share/doc/usd/21.troff/m.mac
index 6e68c4ee7983c..694c564e6f880 100644
--- a/share/doc/usd/21.troff/m.mac
+++ b/share/doc/usd/21.troff/m.mac
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m.mac	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m.mac,v 1.3 2002/05/20 13:52:35 ru Exp $
 .if \n(mo=1 .ds mo January
 .if \n(mo=2 .ds mo February
 .if \n(mo=3 .ds mo March
diff --git a/share/doc/usd/21.troff/m0 b/share/doc/usd/21.troff/m0
index d91c08f6313a2..8c26f793290b6 100644
--- a/share/doc/usd/21.troff/m0
+++ b/share/doc/usd/21.troff/m0
@@ -37,7 +37,7 @@
 .\"
 .\"	@(#)m0	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m0,v 1.2 2002/05/19 04:01:02 grog Exp $
 .br
 .rs
 .sp |1.0i
diff --git a/share/doc/usd/21.troff/m0a b/share/doc/usd/21.troff/m0a
index 1a0be6c58f545..23f3a6bc9bd82 100644
--- a/share/doc/usd/21.troff/m0a
+++ b/share/doc/usd/21.troff/m0a
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)m0a	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m0a,v 1.3 2002/05/20 13:52:35 ru Exp $
 .br
 .tr |
 .ce
diff --git a/share/doc/usd/21.troff/m1 b/share/doc/usd/21.troff/m1
index 0df1d52ac56ca..3d329324bb716 100644
--- a/share/doc/usd/21.troff/m1
+++ b/share/doc/usd/21.troff/m1
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m1	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m1,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .nr p 0 1
 .tr |
 .tr ~|
diff --git a/share/doc/usd/21.troff/m2 b/share/doc/usd/21.troff/m2
index b94f4788164fb..4f8daa215d942 100644
--- a/share/doc/usd/21.troff/m2
+++ b/share/doc/usd/21.troff/m2
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m2	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m2,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .tr |
 .rm mx
 .br
diff --git a/share/doc/usd/21.troff/m3 b/share/doc/usd/21.troff/m3
index 01e0023d03a40..e822622f96f8e 100644
--- a/share/doc/usd/21.troff/m3
+++ b/share/doc/usd/21.troff/m3
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)m3	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m3,v 1.2 2002/05/19 04:02:29 grog Exp $
 .tr |
 .rm mx
 .mh
diff --git a/share/doc/usd/21.troff/m4 b/share/doc/usd/21.troff/m4
index 931ac480a2e0c..0d712f69206d9 100644
--- a/share/doc/usd/21.troff/m4
+++ b/share/doc/usd/21.troff/m4
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m4	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m4,v 1.2 2002/05/19 04:02:29 grog Exp $
 .tr |
 .mh
 Hyphenation.
diff --git a/share/doc/usd/21.troff/m5 b/share/doc/usd/21.troff/m5
index 692db286d85c8..47b30429274ba 100644
--- a/share/doc/usd/21.troff/m5
+++ b/share/doc/usd/21.troff/m5
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)m5	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/m5,v 1.3 2002/05/20 13:52:35 ru Exp $
 .ds H T
 .tr |
 .tr ~|
diff --git a/share/doc/usd/21.troff/table1 b/share/doc/usd/21.troff/table1
index d0fad8f31ecd1..c9fb8cfa07e8f 100644
--- a/share/doc/usd/21.troff/table1
+++ b/share/doc/usd/21.troff/table1
@@ -36,7 +36,7 @@
 .\"
 .\"	@(#)table1	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/table1,v 1.2 2002/05/19 04:02:29 grog Exp $
 .pn 30
 .rm mx
 .br
diff --git a/share/doc/usd/21.troff/table2 b/share/doc/usd/21.troff/table2
index 7d212c0e6a246..fff039c961f1e 100644
--- a/share/doc/usd/21.troff/table2
+++ b/share/doc/usd/21.troff/table2
@@ -36,7 +36,7 @@
 .\" 
 .\"	@(#)table2	8.1 (Berkeley) 8/14/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/21.troff/table2,v 1.3 2002/05/20 13:52:35 ru Exp $
 .sp 100
 .br
 .de mx
diff --git a/share/doc/usd/22.trofftut/Makefile b/share/doc/usd/22.trofftut/Makefile
index a3f32fd27d075..396670c8c3dce 100644
--- a/share/doc/usd/22.trofftut/Makefile
+++ b/share/doc/usd/22.trofftut/Makefile
@@ -35,7 +35,7 @@
 # OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/22.trofftut/Makefile,v 1.3 2002/10/29 14:56:09 ru Exp $
 
 VOLUME=	usd/22.trofftut
 SRCS=	tt.mac tt00 tt01 tt02 tt03 tt04 tt05 tt06 tt07 tt08 tt09 tt10 \
diff --git a/share/doc/usd/22.trofftut/tt.mac b/share/doc/usd/22.trofftut/tt.mac
index 4bc3bb7d9f569..0466774b96402 100644
--- a/share/doc/usd/22.trofftut/tt.mac
+++ b/share/doc/usd/22.trofftut/tt.mac
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt.mac,v 1.3 2002/10/24 12:59:10 ru Exp $
 .\"
 .tr _\(em
 .tr *\(**
diff --git a/share/doc/usd/22.trofftut/tt00 b/share/doc/usd/22.trofftut/tt00
index f8c5ea7cf4b87..dafebb1c213fa 100644
--- a/share/doc/usd/22.trofftut/tt00
+++ b/share/doc/usd/22.trofftut/tt00
@@ -40,7 +40,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt00,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .EH 'USD:22-%''A TROFF Tutorial'
 .OH 'A TROFF Tutorial''USD:22-%'
diff --git a/share/doc/usd/22.trofftut/tt01 b/share/doc/usd/22.trofftut/tt01
index ff6fb83e4f2d1..6ff83bafa72b5 100644
--- a/share/doc/usd/22.trofftut/tt01
+++ b/share/doc/usd/22.trofftut/tt01
@@ -40,7 +40,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt01,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Introduction
diff --git a/share/doc/usd/22.trofftut/tt02 b/share/doc/usd/22.trofftut/tt02
index 4d14a5297e2f3..ba8b978f35647 100644
--- a/share/doc/usd/22.trofftut/tt02
+++ b/share/doc/usd/22.trofftut/tt02
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt02,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Point Sizes; Line Spacing
diff --git a/share/doc/usd/22.trofftut/tt03 b/share/doc/usd/22.trofftut/tt03
index e475d45c8265a..a95177fbc45cd 100644
--- a/share/doc/usd/22.trofftut/tt03
+++ b/share/doc/usd/22.trofftut/tt03
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt03,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Fonts and Special Characters
diff --git a/share/doc/usd/22.trofftut/tt04 b/share/doc/usd/22.trofftut/tt04
index c44c94baa51f4..3be9f4349e0f2 100644
--- a/share/doc/usd/22.trofftut/tt04
+++ b/share/doc/usd/22.trofftut/tt04
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt04,v 1.3 2003/01/01 18:48:47 schweikh Exp $
 .\"
 .NH
 Indents and Line Lengths
diff --git a/share/doc/usd/22.trofftut/tt05 b/share/doc/usd/22.trofftut/tt05
index b7bff82a3ee11..2383cdaf67fa0 100644
--- a/share/doc/usd/22.trofftut/tt05
+++ b/share/doc/usd/22.trofftut/tt05
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt05,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Tabs
diff --git a/share/doc/usd/22.trofftut/tt06 b/share/doc/usd/22.trofftut/tt06
index 3f739582c4e98..8a0f3fa08a036 100644
--- a/share/doc/usd/22.trofftut/tt06
+++ b/share/doc/usd/22.trofftut/tt06
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt06,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Local Motions: Drawing lines and characters
diff --git a/share/doc/usd/22.trofftut/tt07 b/share/doc/usd/22.trofftut/tt07
index 3a8cf5748e216..1be9bde54c744 100644
--- a/share/doc/usd/22.trofftut/tt07
+++ b/share/doc/usd/22.trofftut/tt07
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt07,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Strings
diff --git a/share/doc/usd/22.trofftut/tt08 b/share/doc/usd/22.trofftut/tt08
index 8f5075d97b2bb..19096ba90e3c0 100644
--- a/share/doc/usd/22.trofftut/tt08
+++ b/share/doc/usd/22.trofftut/tt08
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt08,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Introduction to Macros
diff --git a/share/doc/usd/22.trofftut/tt09 b/share/doc/usd/22.trofftut/tt09
index 4a44d34bbd6a7..80911d7467bf3 100644
--- a/share/doc/usd/22.trofftut/tt09
+++ b/share/doc/usd/22.trofftut/tt09
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt09,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Titles, Pages and Numbering
diff --git a/share/doc/usd/22.trofftut/tt10 b/share/doc/usd/22.trofftut/tt10
index a63bebdfd43fe..c42308b8b5ccf 100644
--- a/share/doc/usd/22.trofftut/tt10
+++ b/share/doc/usd/22.trofftut/tt10
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt10,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Number Registers and Arithmetic
diff --git a/share/doc/usd/22.trofftut/tt11 b/share/doc/usd/22.trofftut/tt11
index 538fac77920d2..cb0266f1397ae 100644
--- a/share/doc/usd/22.trofftut/tt11
+++ b/share/doc/usd/22.trofftut/tt11
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt11,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Macros with arguments
diff --git a/share/doc/usd/22.trofftut/tt12 b/share/doc/usd/22.trofftut/tt12
index 8cb389365e5d8..d18f1e19e2c9a 100644
--- a/share/doc/usd/22.trofftut/tt12
+++ b/share/doc/usd/22.trofftut/tt12
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt12,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Conditionals
diff --git a/share/doc/usd/22.trofftut/tt13 b/share/doc/usd/22.trofftut/tt13
index 67c97e285a017..0ac1326f53773 100644
--- a/share/doc/usd/22.trofftut/tt13
+++ b/share/doc/usd/22.trofftut/tt13
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt13,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Environments
diff --git a/share/doc/usd/22.trofftut/tt14 b/share/doc/usd/22.trofftut/tt14
index 6a83f5129ade7..88d62edc4afa0 100644
--- a/share/doc/usd/22.trofftut/tt14
+++ b/share/doc/usd/22.trofftut/tt14
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/tt14,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .NH
 Diversions
diff --git a/share/doc/usd/22.trofftut/ttack b/share/doc/usd/22.trofftut/ttack
index ee633f7294831..ac5d41ebeadc5 100644
--- a/share/doc/usd/22.trofftut/ttack
+++ b/share/doc/usd/22.trofftut/ttack
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/ttack,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .SH
 Acknowledgements
diff --git a/share/doc/usd/22.trofftut/ttcharset b/share/doc/usd/22.trofftut/ttcharset
index 551e79d8d570c..a076afb9bab68 100644
--- a/share/doc/usd/22.trofftut/ttcharset
+++ b/share/doc/usd/22.trofftut/ttcharset
@@ -40,7 +40,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/ttcharset,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .bp
 .tr __
diff --git a/share/doc/usd/22.trofftut/ttindex b/share/doc/usd/22.trofftut/ttindex
index ca032e829145f..3ed5154e1c85d 100644
--- a/share/doc/usd/22.trofftut/ttindex
+++ b/share/doc/usd/22.trofftut/ttindex
@@ -39,7 +39,7 @@
 .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/22.trofftut/ttindex,v 1.2 2002/05/19 03:37:41 grog Exp $
 .\"
 .bp
 .2C
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index e7939feb6630f..ed0afd25e76e6 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/Makefile,v 1.16 2004/01/20 13:08:33 ru Exp $
 
 # The following modules are not provided:
 # 14.jove
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index ec0c508f39ba2..49a18d078e6b2 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/contents/Makefile,v 1.6 2002/10/29 15:01:59 ru Exp $
 
 VOLUME=	usd
 DOC=	contents
diff --git a/share/doc/usd/contents/contents.ms b/share/doc/usd/contents/contents.ms
index 15bc07a6467af..507ccf8b9022e 100644
--- a/share/doc/usd/contents/contents.ms
+++ b/share/doc/usd/contents/contents.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)00.contents	8.2 (Berkeley) 4/20/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/doc/usd/contents/contents.ms,v 1.3 2000/11/29 08:36:36 ru Exp $
 .\"
 .de ND
 .KE
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index b773fc3c13587..b30dc073c00a2 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/doc/usd/title/Makefile,v 1.8 2002/10/29 16:13:21 ru Exp $
 
 VOLUME=	usd
 DOC=	Title
diff --git a/share/doc/usd/title/Title b/share/doc/usd/title/Title
index 1de72972dd67c..664198737649f 100644
--- a/share/doc/usd/title/Title
+++ b/share/doc/usd/title/Title
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/doc/usd/title/Title,v 1.2 2000/11/27 07:19:06 ru Exp $
 .\"
 .ps 18
 .vs 22
diff --git a/share/examples/BSD_daemon/FreeBSD.pfa b/share/examples/BSD_daemon/FreeBSD.pfa
index bcd7c70aff634..8da55dcaa3d9d 100644
--- a/share/examples/BSD_daemon/FreeBSD.pfa
+++ b/share/examples/BSD_daemon/FreeBSD.pfa
@@ -1,5 +1,5 @@
 %!PS-AdobeFont-1.0: (FreeBSD)  001.003
-%$FreeBSD$
+%$FreeBSD: src/share/examples/BSD_daemon/FreeBSD.pfa,v 1.1 2001/02/17 19:14:42 phk Exp $
 %Created by NRB Systems
 10 dict begin
 /FontInfo 9 dict dup begin
diff --git a/share/examples/BSD_daemon/README b/share/examples/BSD_daemon/README
index 9aa1173836a9e..ef05d4903d253 100644
--- a/share/examples/BSD_daemon/README
+++ b/share/examples/BSD_daemon/README
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/README,v 1.2 2001/03/04 09:13:17 phk Exp $
 #
 
 This directory contains various stuff relating to the FreeBSD daemon
diff --git a/share/examples/BSD_daemon/beastie.eps b/share/examples/BSD_daemon/beastie.eps
index 587fe508c36bb..d2bedd88620d2 100644
--- a/share/examples/BSD_daemon/beastie.eps
+++ b/share/examples/BSD_daemon/beastie.eps
@@ -2,7 +2,7 @@
 %%Title: beastie.eps
 %%Creator: fig2dev Version 3.2.3 Patchlevel 
 %%CreationDate: Sat Mar  3 15:57:53 2001
-%%For: $FreeBSD$
+%%For: $FreeBSD: src/share/examples/BSD_daemon/beastie.eps,v 1.2 2001/03/04 09:13:17 phk Exp $
 %%BoundingBox: 0 0 384 417
 %%Magnification: 1.0000
 %%EndComments
diff --git a/share/examples/BSD_daemon/beastie.fig b/share/examples/BSD_daemon/beastie.fig
index 1c156ca5ecedb..98fc89cda61e5 100644
--- a/share/examples/BSD_daemon/beastie.fig
+++ b/share/examples/BSD_daemon/beastie.fig
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/beastie.fig,v 1.2 2001/03/04 09:13:17 phk Exp $
 #
 Landscape
 Center
diff --git a/share/examples/BSD_daemon/eps.patch b/share/examples/BSD_daemon/eps.patch
index 984921449a1ce..38b4132f1cde0 100644
--- a/share/examples/BSD_daemon/eps.patch
+++ b/share/examples/BSD_daemon/eps.patch
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/eps.patch,v 1.2 2001/03/04 09:13:17 phk Exp $
 --- beastie.eps.ref	Sun Feb 11 22:46:59 2001
 +++ beastie.eps	Sun Feb 11 23:01:43 2001
 @@ -19,6 +19,23 @@
diff --git a/share/examples/BSD_daemon/poster.sh b/share/examples/BSD_daemon/poster.sh
index 1407701029f0a..2ffe89ae67a0a 100644
--- a/share/examples/BSD_daemon/poster.sh
+++ b/share/examples/BSD_daemon/poster.sh
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/BSD_daemon/poster.sh,v 1.2 2001/08/07 22:09:47 phk Exp $
 #
 
 echo '%!'
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index fcfc6b314506e..17f056e8f21de 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/FreeBSD_version/Makefile,v 1.5 2004/12/21 08:47:08 ru Exp $
 
 PROG=	FreeBSD_version
 NO_MAN=
diff --git a/share/examples/IPv6/USAGE b/share/examples/IPv6/USAGE
index 7e40f76bcb536..cf99e45fda7e4 100644
--- a/share/examples/IPv6/USAGE
+++ b/share/examples/IPv6/USAGE
@@ -1,7 +1,7 @@
 	USAGE
 	KAME Project
 	$KAME: USAGE,v 1.33 2000/11/22 10:22:57 itojun Exp $
-	$FreeBSD$
+	$FreeBSD: src/share/examples/IPv6/USAGE,v 1.5 2002/12/19 22:56:20 trhodes Exp $
 
 This is an introduction of how to use the commands provided in the KAME
 kit.  For more information, please refer to each man page.
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 072f6c81739a7..ba4c0edb4480f 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/Makefile,v 1.51 2007/07/14 21:49:22 rwatson Exp $
 #
 # Doing a make install builds /usr/share/examples
 
diff --git a/share/examples/atm/NOTES b/share/examples/atm/NOTES
index aad41906178e7..d2acda0fcf683 100644
--- a/share/examples/atm/NOTES
+++ b/share/examples/atm/NOTES
@@ -50,5 +50,5 @@ without halting on systems which can't support the larger sizes.
 
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/NOTES,v 1.2 1999/08/28 00:19:06 peter Exp $
 
diff --git a/share/examples/atm/README b/share/examples/atm/README
index a2e23f28bbbfc..bdbae0ac4ce0d 100644
--- a/share/examples/atm/README
+++ b/share/examples/atm/README
@@ -136,5 +136,5 @@ copyright notices are reproduced in the files where the material appears.
 
 --------------------------------------------------------------------------------
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/README,v 1.2 1999/08/28 00:19:06 peter Exp $
 
diff --git a/share/examples/atm/Startup b/share/examples/atm/Startup
index 8898e45c88211..9be739794fd41 100644
--- a/share/examples/atm/Startup
+++ b/share/examples/atm/Startup
@@ -123,5 +123,5 @@ See the file atm-config.sh for an example ATM startup script.
 
     See the man pages scspd(8) and atmarpd(8) for further information.
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/Startup,v 1.2 1999/08/28 00:19:07 peter Exp $
 
diff --git a/share/examples/atm/atm-config.sh b/share/examples/atm/atm-config.sh
index b15060e837145..d39843e0b4c33 100755
--- a/share/examples/atm/atm-config.sh
+++ b/share/examples/atm/atm-config.sh
@@ -24,7 +24,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/share/examples/atm/atm-config.sh,v 1.2 1999/08/28 00:19:07 peter Exp $
 #
 #
 
diff --git a/share/examples/atm/atm-sockets.txt b/share/examples/atm/atm-sockets.txt
index b4cc8e9d00d17..f1a0d49291c3f 100644
--- a/share/examples/atm/atm-sockets.txt
+++ b/share/examples/atm/atm-sockets.txt
@@ -568,5 +568,5 @@ main(argc, argv)
 	exit(0);
 }
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/atm-sockets.txt,v 1.3 1999/08/28 00:19:07 peter Exp $
 
diff --git a/share/examples/atm/cpcs-design.txt b/share/examples/atm/cpcs-design.txt
index 94901f23998eb..d589ecefbf319 100644
--- a/share/examples/atm/cpcs-design.txt
+++ b/share/examples/atm/cpcs-design.txt
@@ -80,5 +80,5 @@ o The Streaming Mode service is not supported.
 o The Abort service is not supported.
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/cpcs-design.txt,v 1.2 1999/08/28 00:19:07 peter Exp $
 
diff --git a/share/examples/atm/fore-microcode.txt b/share/examples/atm/fore-microcode.txt
index 8abcaf23e4de0..2c542e725c742 100644
--- a/share/examples/atm/fore-microcode.txt
+++ b/share/examples/atm/fore-microcode.txt
@@ -90,4 +90,4 @@ file. The command syntax is:
 Move the resulting <out-file> in binary mode back to the HARP machine as
 /etc/pca200e.bin and try to initialize the ATM system again.
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/fore-microcode.txt,v 1.2 2004/06/20 13:07:25 mpp Exp $
diff --git a/share/examples/atm/sscf-design.txt b/share/examples/atm/sscf-design.txt
index 5334d74bdbacb..814a487738e77 100644
--- a/share/examples/atm/sscf-design.txt
+++ b/share/examples/atm/sscf-design.txt
@@ -125,5 +125,5 @@ o The Parameter Data parameter is not supported for the following primitives:
 	AAL-RELEASE indication
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/sscf-design.txt,v 1.2 1999/08/28 00:19:08 peter Exp $
 
diff --git a/share/examples/atm/sscop-design.txt b/share/examples/atm/sscop-design.txt
index 2b546bd6aeac8..b1b01d9969353 100644
--- a/share/examples/atm/sscop-design.txt
+++ b/share/examples/atm/sscop-design.txt
@@ -216,5 +216,5 @@ o For the AA-ESTABLISH request and response signals, only BR=YES is supported
 o For the AA-DATA request signal, only PR=NO is supported (Q.SAAL1 only)
 
 
-	@(#) $FreeBSD$
+	@(#) $FreeBSD: src/share/examples/atm/sscop-design.txt,v 1.2 1999/08/28 00:19:08 peter Exp $
 
diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile
index 7a0f159cc5d39..bedc948ba11a4 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2004/09/08 08:27:12 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/autofs/driver/Makefile,v 1.5 2004/12/21 08:47:08 ru Exp $
 
 PROG=autodriver
 
diff --git a/share/examples/autofs/driver/autodriver.c b/share/examples/autofs/driver/autodriver.c
index 69af0c557eff8..b7f8c1021c806 100644
--- a/share/examples/autofs/driver/autodriver.c
+++ b/share/examples/autofs/driver/autodriver.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $Id: autodriver.c,v 1.9 2004/09/08 08:12:21 bright Exp $
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/autofs/driver/autodriver.c,v 1.3 2004/09/09 01:26:11 alfred Exp $
  */
 #include <ctype.h>
 #include <err.h>
diff --git a/share/examples/autofs/driver/autotab b/share/examples/autofs/driver/autotab
index c56e0721926da..52bb7900620a2 100644
--- a/share/examples/autofs/driver/autotab
+++ b/share/examples/autofs/driver/autotab
@@ -1,5 +1,5 @@
 # $Id: autotab,v 1.8 2004/09/08 08:12:21 bright Exp $
-# $FreeBSD$
+# $FreeBSD: src/share/examples/autofs/driver/autotab,v 1.2 2004/09/08 08:44:14 alfred Exp $
 # autofs, directory, fstype, opts, path
 /auto	share	nfs	ro,-R=1	big:/vol/share direct
 #/auto	src	nfs	ro,-R=1	big:/vol/share/src indirect
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index b8eb8a0f3a169..887d3f8374138 100644
--- a/share/examples/bootforth/README
+++ b/share/examples/bootforth/README
@@ -32,4 +32,4 @@ configuration to distinguish one from the other.
 Daniel C. Sobral
 <dcs@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/share/examples/bootforth/README,v 1.3 1999/08/28 00:19:09 peter Exp $
diff --git a/share/examples/bootforth/boot.4th b/share/examples/bootforth/boot.4th
index 8f26e0d0a38dc..1a4809a2f5e0b 100644
--- a/share/examples/bootforth/boot.4th
+++ b/share/examples/bootforth/boot.4th
@@ -1,6 +1,6 @@
 \ Example of the file which is automatically loaded by /boot/loader
 \ on startup.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/boot.4th,v 1.3 2001/12/11 00:49:33 jhb Exp $
 
 \ Load the screen manipulation words
 
diff --git a/share/examples/bootforth/frames.4th b/share/examples/bootforth/frames.4th
index 3b1f4046891fe..9ff2c81785eb4 100644
--- a/share/examples/bootforth/frames.4th
+++ b/share/examples/bootforth/frames.4th
@@ -1,6 +1,6 @@
 \ Words implementing frame drawing
 \ XXX Filled boxes are left as an exercise for the reader... ;-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/frames.4th,v 1.3 2004/01/18 15:16:12 nyan Exp $
 
 marker task-frames.4th
 
diff --git a/share/examples/bootforth/loader.rc b/share/examples/bootforth/loader.rc
index 617bc3db41046..ecdfdff3f9ee8 100644
--- a/share/examples/bootforth/loader.rc
+++ b/share/examples/bootforth/loader.rc
@@ -1,6 +1,6 @@
 \ Example of the file which is automatically loaded by /boot/loader
 \ on startup.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/loader.rc,v 1.4 2001/12/11 00:49:33 jhb Exp $
 
 cr .( Loading Forth extensions:)
 
diff --git a/share/examples/bootforth/menu.4th b/share/examples/bootforth/menu.4th
index 5c5c3e98c74e8..e0c83afad3263 100644
--- a/share/examples/bootforth/menu.4th
+++ b/share/examples/bootforth/menu.4th
@@ -1,7 +1,7 @@
 \ Simple greeting screen, presenting basic options.
 \ XXX This is far too trivial - I don't have time now to think
 \ XXX about something more fancy... :-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/menu.4th,v 1.4 1999/08/28 00:19:10 peter Exp $
 
 : title
 	f_single
diff --git a/share/examples/bootforth/menuconf.4th b/share/examples/bootforth/menuconf.4th
index a769f77e35433..0db589ed0a771 100644
--- a/share/examples/bootforth/menuconf.4th
+++ b/share/examples/bootforth/menuconf.4th
@@ -1,7 +1,7 @@
 \ Simple greeting screen, presenting basic options.
 \ XXX This is far too trivial - I don't have time now to think
 \ XXX about something more fancy... :-/
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/menuconf.4th,v 1.5 2000/09/05 16:30:09 dcs Exp $
 
 : title
 	f_single
diff --git a/share/examples/bootforth/screen.4th b/share/examples/bootforth/screen.4th
index 3ea79e453d800..b0cea0b6be978 100644
--- a/share/examples/bootforth/screen.4th
+++ b/share/examples/bootforth/screen.4th
@@ -1,5 +1,5 @@
 \ Screen manipulation related words.
-\ $FreeBSD$
+\ $FreeBSD: src/share/examples/bootforth/screen.4th,v 1.2 1999/08/28 00:19:10 peter Exp $
 
 marker task-screen.4th
 
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index e025e8fefb146..a6e8a72d882fa 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/README,v 1.18 2002/07/30 14:08:16 blackend Exp $
 
 This directory contains sample "supfiles" for obtaining and updating
 the FreeBSD sources via the Internet.  These supfiles will work
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 682024eb14ed5..b429dd91894e8 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.47 2007/09/07 22:01:19 gabor Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # CVS development tree of the FreeBSD system.
diff --git a/share/examples/cvsup/doc-supfile b/share/examples/cvsup/doc-supfile
index 2d6c2a96f92c4..881d6df70f56c 100644
--- a/share/examples/cvsup/doc-supfile
+++ b/share/examples/cvsup/doc-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/doc-supfile,v 1.10 2007/09/07 22:01:19 gabor Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source of the FreeBSD doc tree
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
index 429a8990ec863..b8aa7091d2502 100644
--- a/share/examples/cvsup/gnats-supfile
+++ b/share/examples/cvsup/gnats-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.8 2007/09/07 22:01:19 gabor Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD GNATS bug report database.
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index 879e58ad105d4..137cb1a7502d8 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.38 2007/09/07 22:01:19 gabor Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current ports collection.
diff --git a/share/examples/cvsup/refuse.README b/share/examples/cvsup/refuse.README
index 0b9bbacd33a8f..50fa1b8505ad0 100644
--- a/share/examples/cvsup/refuse.README
+++ b/share/examples/cvsup/refuse.README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.12.10.1 2007/12/10 18:42:05 gabor Exp $
 
 This describes the "refuse" file found in this directory.  The
 explanation cannot be put inside the file itself because:
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 3b0c8e968924e..afa30a1392b3f 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.32.2.1 2007/10/11 06:26:19 kensmith Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-stable source tree.
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index ee91ca965c78c..7929ae6b8f2bc 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.25.2.1.2.1 2007/12/22 13:39:03 kensmith Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/cvsup/www-supfile b/share/examples/cvsup/www-supfile
index a15ece5f01ecc..7a34c2545a129 100644
--- a/share/examples/cvsup/www-supfile
+++ b/share/examples/cvsup/www-supfile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/cvsup/www-supfile,v 1.7 2007/09/07 22:01:19 gabor Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # source of the FreeBSD www tree
diff --git a/share/examples/diskless/ME b/share/examples/diskless/ME
index ff06be2c53932..563a45164d9b2 100644
--- a/share/examples/diskless/ME
+++ b/share/examples/diskless/ME
@@ -11,7 +11,7 @@ actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2,
 and the /usr/share/examples/diskless/clone_root script which can
 be useful to set up clients and server for diskless boot.
 
---- $FreeBSD$ ---
+--- $FreeBSD: src/share/examples/diskless/ME,v 1.4 2002/03/15 06:47:37 luigi Exp $ ---
 ------------------------------------------------------------------------
 
 When templating, /conf/ME is typically a softlink to
diff --git a/share/examples/diskless/README.BOOTP b/share/examples/diskless/README.BOOTP
index 5ee53437a6f6a..466fdfeba071a 100644
--- a/share/examples/diskless/README.BOOTP
+++ b/share/examples/diskless/README.BOOTP
@@ -11,7 +11,7 @@ actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2,
 and the /usr/share/examples/diskless/clone_root script which can
 be useful to set up clients and server for diskless boot.
 
---- $FreeBSD$ ---
+--- $FreeBSD: src/share/examples/diskless/README.BOOTP,v 1.4 2004/06/20 13:17:37 mpp Exp $ ---
 ------------------------------------------------------------------------
 
 		        BOOTP configuration mechanism
diff --git a/share/examples/diskless/README.TEMPLATING b/share/examples/diskless/README.TEMPLATING
index b094267ceb267..886d7c4ebc2be 100644
--- a/share/examples/diskless/README.TEMPLATING
+++ b/share/examples/diskless/README.TEMPLATING
@@ -11,7 +11,7 @@ actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2,
 and the /usr/share/examples/diskless/clone_root script which can
 be useful to set up clients and server for diskless boot.
 
---- $FreeBSD$ ---
+--- $FreeBSD: src/share/examples/diskless/README.TEMPLATING,v 1.5 2004/06/20 13:17:37 mpp Exp $ ---
 ------------------------------------------------------------------------
 
 		      TEMPLATING machine configurations
diff --git a/share/examples/diskless/clone_root b/share/examples/diskless/clone_root
index 22bd70c997965..9855d94039142 100755
--- a/share/examples/diskless/clone_root
+++ b/share/examples/diskless/clone_root
@@ -4,7 +4,7 @@
 #	<Standard BSD copyright>
 # Revised 2001.04.16
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/diskless/clone_root,v 1.4 2006/06/02 15:01:11 motoyuki Exp $
 #
 # clone root filesystem for diskless root stuff
 #
diff --git a/share/examples/drivers/README b/share/examples/drivers/README
index d74089b9feabe..fa2a3e499037a 100644
--- a/share/examples/drivers/README
+++ b/share/examples/drivers/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/drivers/README,v 1.3 2001/03/10 05:28:46 billf Exp $
 
 Author: Julian Elischer
 
diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh
index 2acea33d57b77..f7ddd32ac3e02 100755
--- a/share/examples/drivers/make_device_driver.sh
+++ b/share/examples/drivers/make_device_driver.sh
@@ -20,7 +20,7 @@
 #   o generate foo_isa.c, foo_pci.c, foo_pccard.c, foo_cardbus.c, and foovar.h
 #   o Put pccard stuff in here.
 #
-# $FreeBSD$"
+# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.24 2006/08/09 10:53:26 rik Exp $"
 #
 #
 if [ "X${1}" = "X" ]; then
diff --git a/share/examples/drivers/make_pseudo_driver.sh b/share/examples/drivers/make_pseudo_driver.sh
index a7d49ac1df8ac..cf20a30358ec5 100644
--- a/share/examples/drivers/make_pseudo_driver.sh
+++ b/share/examples/drivers/make_pseudo_driver.sh
@@ -6,7 +6,7 @@
 #
 # Trust me, RUN THIS SCRIPT :)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.13 2006/08/23 23:51:29 rik Exp $
 #
 #-------cut here------------------
 
diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples
index 7ba696f33673e..c1e61355e068a 100644
--- a/share/examples/etc/README.examples
+++ b/share/examples/etc/README.examples
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/etc/README.examples,v 1.17 2006/10/19 05:19:00 imp Exp $
 
 The /usr/share/examples/etc directory contains the original
 distribution versions of the files which are shipped in /etc.  This is
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 1e08f79c8a9f2..878abe415c7e8 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/etc/make.conf,v 1.279 2007/01/17 12:43:06 des Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile
index ac6de9cf7f054..23889c7b12574 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/find_interface/Makefile,v 1.5 2004/12/21 08:47:09 ru Exp $
 
 PROG=	find_interface
 NO_MAN=
diff --git a/share/examples/find_interface/find_interface.c b/share/examples/find_interface/find_interface.c
index 73a7fe839d79f..f793f86af82e0 100644
--- a/share/examples/find_interface/find_interface.c
+++ b/share/examples/find_interface/find_interface.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/find_interface/find_interface.c,v 1.5 1999/08/28 00:19:18 peter Exp $
  */
 
 /*
diff --git a/share/examples/hwpmc/README b/share/examples/hwpmc/README
index 035e68d225753..b6d162229d744 100644
--- a/share/examples/hwpmc/README
+++ b/share/examples/hwpmc/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/hwpmc/README,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
 
 Examples illustrating the use of the hwpmc(4) driver and pmc(3)
 library interface.
diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile
index 1175897280774..ef197a67a8eb2 100644
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/Makefile,v 1.8 2006/03/01 22:59:00 ru Exp $
 
 FILES=	README
 
diff --git a/share/examples/ipfilter/README b/share/examples/ipfilter/README
index aefd2cd5ec8f4..0c298df37030b 100644
--- a/share/examples/ipfilter/README
+++ b/share/examples/ipfilter/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/README,v 1.1 2001/10/20 04:17:06 darrenr Exp $
 
 This directory contains various files related to ipfilter.
 
diff --git a/share/examples/ipfilter/example.14 b/share/examples/ipfilter/example.14
index f1f2be450fb8e..dcb476c9f8810 100644
--- a/share/examples/ipfilter/example.14
+++ b/share/examples/ipfilter/example.14
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/example.14,v 1.1 2001/10/20 04:17:06 darrenr Exp $
 #
 # log all inbound packet on le0 which has IP options present
 #
diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt
index a323a8457752b..ecb829b649a4d 100644
--- a/share/examples/ipfilter/examples.txt
+++ b/share/examples/ipfilter/examples.txt
@@ -512,4 +512,4 @@ pass in quick proto tcp from any to any port = WWW keep state group 100
 
   ------------------------------------------------------------------------
 Return to the IP Filter home page
-$FreeBSD$
+$FreeBSD: src/share/examples/ipfilter/examples.txt,v 1.2 2003/01/01 18:48:48 schweikh Exp $
diff --git a/share/examples/ipfilter/firewall.1 b/share/examples/ipfilter/firewall.1
index 47acb5cd3a223..c1db27ddde15c 100644
--- a/share/examples/ipfilter/firewall.1
+++ b/share/examples/ipfilter/firewall.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/firewall.1,v 1.2 2002/12/27 12:15:33 schweikh Exp $
 #
 #  This is an example of a very light firewall used to guard against
 #  some of the most easily exploited common security holes.
diff --git a/share/examples/ipfilter/firewall.2 b/share/examples/ipfilter/firewall.2
index ba00504a37c80..fa324b145ca29 100644
--- a/share/examples/ipfilter/firewall.2
+++ b/share/examples/ipfilter/firewall.2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/firewall.2,v 1.2 2002/12/27 12:15:33 schweikh Exp $
 #
 #  This is an example of a fairly heavy firewall used to keep everyone
 #  out of a particular network while still allowing people within that
diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt
index 54187ae1f4eda..f9505a54b19e9 100644
--- a/share/examples/ipfilter/ipf-howto.txt
+++ b/share/examples/ipfilter/ipf-howto.txt
@@ -8,7 +8,7 @@
 
               Brendan Conoboy <synk@swcp.com>
             Erik Fichtner <emf@obfuscation.org>
-            $FreeBSD$
+            $FreeBSD: src/share/examples/ipfilter/ipf-howto.txt,v 1.3 2005/10/26 17:39:35 jhb Exp $
 
                 Fri Apr 20 09:31:14 EDT 2001
 
diff --git a/share/examples/ipfilter/ipf.conf.permissive b/share/examples/ipfilter/ipf.conf.permissive
index 714d7d99bc696..5393203454f9f 100644
--- a/share/examples/ipfilter/ipf.conf.permissive
+++ b/share/examples/ipfilter/ipf.conf.permissive
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipf.conf.permissive,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 # augmented rules generated by mkfilters
 block in log quick from any with ipopts
 block in log quick proto tcp from any to any with short
diff --git a/share/examples/ipfilter/ipf.conf.restrictive b/share/examples/ipfilter/ipf.conf.restrictive
index ad3de82f58c8d..2e233717761ea 100644
--- a/share/examples/ipfilter/ipf.conf.restrictive
+++ b/share/examples/ipfilter/ipf.conf.restrictive
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipf.conf.restrictive,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 #--------------------------------------------------------------------------
 # ed1 - external interface
 # fxp0 - internal interface
diff --git a/share/examples/ipfilter/ipf.conf.sample b/share/examples/ipfilter/ipf.conf.sample
index c5d47bc1c9f90..7ec4dc1acb46b 100644
--- a/share/examples/ipfilter/ipf.conf.sample
+++ b/share/examples/ipfilter/ipf.conf.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipf.conf.sample,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 block in log quick from any with ipopts
 block in log quick proto tcp from any to any with short
 pass out on ed1 all head 150
diff --git a/share/examples/ipfilter/ipnat.conf.sample b/share/examples/ipfilter/ipnat.conf.sample
index 67956bceae064..ce995b5b85c65 100644
--- a/share/examples/ipfilter/ipnat.conf.sample
+++ b/share/examples/ipfilter/ipnat.conf.sample
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/ipnat.conf.sample,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 map ed1 192.168.0.0/24 -> 192.168.1.110/32 portmap tcp/udp 40000:65000
 map ed1 192.168.0.0/24 -> 192.168.1.110/32
diff --git a/share/examples/ipfilter/rules.txt b/share/examples/ipfilter/rules.txt
index 26a51d02b0649..44fd082755435 100644
--- a/share/examples/ipfilter/rules.txt
+++ b/share/examples/ipfilter/rules.txt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfilter/rules.txt,v 1.1 2001/10/20 04:17:07 darrenr Exp $
 #
 # block all incoming TCP packets on le0 from host "foo" to any destination.
 #
diff --git a/share/examples/ipfw/change_rules.sh b/share/examples/ipfw/change_rules.sh
index be7f7644064e5..73c16ca2b27b2 100755
--- a/share/examples/ipfw/change_rules.sh
+++ b/share/examples/ipfw/change_rules.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ipfw/change_rules.sh,v 1.6 2003/09/07 07:52:56 jmg Exp $
 
 # Change ipfw(8) rules with safety guarantees for remote operation
 #
diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ
index f3a4fda52d6ff..d66d66d19a1bc 100644
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@@ -5,7 +5,7 @@
 
                 last edit-date: [Wed Nov  1 15:08:03 2000]
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/FAQ,v 1.15 2007/07/06 07:21:55 bz Exp $
 
 --------------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/KERNEL b/share/examples/isdn/KERNEL
index a80dcce47f5d0..6d188c5688b22 100644
--- a/share/examples/isdn/KERNEL
+++ b/share/examples/isdn/KERNEL
@@ -7,7 +7,7 @@
 #
 #	last edit-date: [Sun Oct 21 11:03:37 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/KERNEL,v 1.3 2001/12/22 09:59:56 gj Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview
index 76043954c3ca5..f299392544070 100644
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@@ -4,7 +4,7 @@
 
 	Copyright (c) 1998 Hellmuth Michaelis. All rights reserved.
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/Overview,v 1.5 2007/07/06 07:21:55 bz Exp $
 
 	Last edit-date: [Tue Oct 27 11:26:03 1998]
 
diff --git a/share/examples/isdn/README b/share/examples/isdn/README
index 0a817f1235824..cdae585f33eeb 100644
--- a/share/examples/isdn/README
+++ b/share/examples/isdn/README
@@ -1,5 +1,5 @@
 
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/README,v 1.15 2002/08/12 07:53:55 hm Exp $
 
 --------------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/ROADMAP b/share/examples/isdn/ROADMAP
index 33cc055b5125b..2f58c83c41b3b 100644
--- a/share/examples/isdn/ROADMAP
+++ b/share/examples/isdn/ROADMAP
@@ -2,7 +2,7 @@
 	Roadmap of isdn4bsd as integrated into FreeBSD
 	==============================================
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/ROADMAP,v 1.5 2002/08/12 07:53:55 hm Exp $
 
 	last edit-date: [Mon Aug 12 09:42:53 2002]
 
diff --git a/share/examples/isdn/ReleaseNotes b/share/examples/isdn/ReleaseNotes
index cf93e6559113e..9a3cff0ae0b2f 100644
--- a/share/examples/isdn/ReleaseNotes
+++ b/share/examples/isdn/ReleaseNotes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/ReleaseNotes,v 1.9 2002/08/12 07:53:55 hm Exp $
 
 ReleaseNotes for isdn4bsd             last edit-date: [Mon Aug 12 09:47:59 2002]
 ================================================================================
diff --git a/share/examples/isdn/Resources b/share/examples/isdn/Resources
index c26aec0927fcb..83ec7c6172562 100644
--- a/share/examples/isdn/Resources
+++ b/share/examples/isdn/Resources
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/Resources,v 1.9 2002/03/26 15:14:58 hm Exp $
 
 
 Bugfixes, improvements and patches for i4b
diff --git a/share/examples/isdn/SupportedCards b/share/examples/isdn/SupportedCards
index 1c470021c0279..eed5309f515f8 100644
--- a/share/examples/isdn/SupportedCards
+++ b/share/examples/isdn/SupportedCards
@@ -5,7 +5,7 @@
 
                  last edit-date: [Sun Oct 21 11:09:24 2001]
 
- $FreeBSD$
+ $FreeBSD: src/share/examples/isdn/SupportedCards,v 1.7 2002/04/28 11:51:14 gj Exp $
 
 --------------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/ThankYou b/share/examples/isdn/ThankYou
index 3ad4cb06c55d4..0dfcfef054a82 100644
--- a/share/examples/isdn/ThankYou
+++ b/share/examples/isdn/ThankYou
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/ThankYou,v 1.10 2002/08/12 07:53:55 hm Exp $
 
 Thanks a lot for postcards from:
 --------------------------------
diff --git a/share/examples/isdn/contrib/README b/share/examples/isdn/contrib/README
index ae5969f09e846..e9a9a4caa43af 100644
--- a/share/examples/isdn/contrib/README
+++ b/share/examples/isdn/contrib/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/contrib/README,v 1.1 2001/05/25 13:25:58 hm Exp $
 
 This directory contains various unsupported contributions to isdn4bsd
 ---------------------------------------------------------------------
diff --git a/share/examples/isdn/contrib/anleitung.ppp b/share/examples/isdn/contrib/anleitung.ppp
index 01466e2f48808..7853b392f9fc8 100644
--- a/share/examples/isdn/contrib/anleitung.ppp
+++ b/share/examples/isdn/contrib/anleitung.ppp
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/contrib/anleitung.ppp,v 1.1 2001/05/25 13:25:58 hm Exp $
 
 i4b Anleitung für syncPPP Internet-Zugang und Anrufbeantworter
 unter FreeBSD 2.2.x mit Teles.S0/16.3-Karte
diff --git a/share/examples/isdn/contrib/answer.c b/share/examples/isdn/contrib/answer.c
index aac431f17e014..218d2534b8804 100644
--- a/share/examples/isdn/contrib/answer.c
+++ b/share/examples/isdn/contrib/answer.c
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/share/examples/isdn/contrib/answer.c,v 1.2 2002/04/22 13:44:29 des Exp $
 // changed ".g711a" to ".al" (-hm)
 // Tue Mar  3 02:42:14 MET 1998 	dave@turbocat.de
 // started
diff --git a/share/examples/isdn/contrib/answer.sh b/share/examples/isdn/contrib/answer.sh
index 34073d359923b..6cd2ec1af9824 100644
--- a/share/examples/isdn/contrib/answer.sh
+++ b/share/examples/isdn/contrib/answer.sh
@@ -6,7 +6,7 @@
 #
 #	last edit-date: [Fri May 25 15:21:05 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/answer.sh,v 1.1 2001/05/25 13:25:58 hm Exp $
 #
 #---------------------------------------------------------------------------
 VARDIR=/var/isdn
diff --git a/share/examples/isdn/contrib/convert.sh b/share/examples/isdn/contrib/convert.sh
index b4a6e7d8d8522..49a067af07e06 100644
--- a/share/examples/isdn/contrib/convert.sh
+++ b/share/examples/isdn/contrib/convert.sh
@@ -5,7 +5,7 @@
 # by:		Stefan Herrmann <stefan@asterix.webaffairs.net>
 # Date:	Fr  22 Mai 1998 14:18:40 CEST
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/convert.sh,v 1.1 2001/05/25 13:25:58 hm Exp $
 
 CAT=/bin/cat
 RM=/bin/rm
diff --git a/share/examples/isdn/contrib/hplay.c b/share/examples/isdn/contrib/hplay.c
index 763e5a865dfa9..83f591849b6f1 100644
--- a/share/examples/isdn/contrib/hplay.c
+++ b/share/examples/isdn/contrib/hplay.c
@@ -12,7 +12,7 @@
  *
  *	last edit-date: [Fri May 25 15:21:33 2001]
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/contrib/hplay.c,v 1.2 2007/07/06 07:21:56 bz Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/share/examples/isdn/contrib/i4b-ppp-newbie.txt b/share/examples/isdn/contrib/i4b-ppp-newbie.txt
index 7d6c4b0870aea..b6889a6ef3143 100644
--- a/share/examples/isdn/contrib/i4b-ppp-newbie.txt
+++ b/share/examples/isdn/contrib/i4b-ppp-newbie.txt
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/contrib/i4b-ppp-newbie.txt,v 1.1 2001/05/25 13:25:59 hm Exp $
 
                               PPP mit isdn4bsd
      _________________________________________________________________
diff --git a/share/examples/isdn/contrib/isdnctl b/share/examples/isdn/contrib/isdnctl
index 57fab4561cc6a..ddec9ff274c4f 100644
--- a/share/examples/isdn/contrib/isdnctl
+++ b/share/examples/isdn/contrib/isdnctl
@@ -19,7 +19,7 @@
 # Alexander Langer
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/isdnctl,v 1.2 2002/04/22 13:44:29 des Exp $
 #
 
 
diff --git a/share/examples/isdn/contrib/isdnd_acct b/share/examples/isdn/contrib/isdnd_acct
index 21223b7cd0f4f..30a8acf77fc5d 100644
--- a/share/examples/isdn/contrib/isdnd_acct
+++ b/share/examples/isdn/contrib/isdnd_acct
@@ -31,7 +31,7 @@
 #
 #	last edit-date: [Fri May 25 15:28:20 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/isdnd_acct,v 1.1 2001/05/25 13:25:59 hm Exp $
 #
 #---------------------------------------------------------------------------
 
diff --git a/share/examples/isdn/contrib/isdnd_acct.pl b/share/examples/isdn/contrib/isdnd_acct.pl
index 03062160104d8..7db40c22ac722 100644
--- a/share/examples/isdn/contrib/isdnd_acct.pl
+++ b/share/examples/isdn/contrib/isdnd_acct.pl
@@ -18,7 +18,7 @@
 #           Tests und Zug?nge nachts durchzuf?hren... Aber die meisten
 #           Einheiten werden immer noch im 90s-Takt verbraucht :-(
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/isdnd_acct.pl,v 1.1 2001/05/25 13:25:59 hm Exp $
 #
 #---------------------------------------------------------------------------
 #
diff --git a/share/examples/isdn/contrib/isdntelmux.c b/share/examples/isdn/contrib/isdntelmux.c
index 1d517a7106a05..0b83921567cef 100644
--- a/share/examples/isdn/contrib/isdntelmux.c
+++ b/share/examples/isdn/contrib/isdntelmux.c
@@ -28,7 +28,7 @@
  *	i4btemux - record while playing
  *      ===============================
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/contrib/isdntelmux.c,v 1.2 2007/07/06 07:21:56 bz Exp $
  *
  *----------------------------------------------------------------------------*/
 
diff --git a/share/examples/isdn/contrib/mrtg-isp0.sh b/share/examples/isdn/contrib/mrtg-isp0.sh
index bdc9671883acf..dd02ee19873bc 100644
--- a/share/examples/isdn/contrib/mrtg-isp0.sh
+++ b/share/examples/isdn/contrib/mrtg-isp0.sh
@@ -8,7 +8,7 @@
 #
 #	last edit-date: [Fri May 25 15:22:45 2001]
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/contrib/mrtg-isp0.sh,v 1.1 2001/05/25 13:25:59 hm Exp $
 #
 #---------------------------------------------------------------------------
 #
diff --git a/share/examples/isdn/i4brunppp/Makefile b/share/examples/isdn/i4brunppp/Makefile
index e1eeceaa18c5a..4fe1bac4af097 100644
--- a/share/examples/isdn/i4brunppp/Makefile
+++ b/share/examples/isdn/i4brunppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/i4brunppp/Makefile,v 1.4 2004/09/26 09:25:03 ru Exp $
 
 PROG	 =	i4brunppp
 SRCS	 =	i4brunppp.c
diff --git a/share/examples/isdn/i4brunppp/README b/share/examples/isdn/i4brunppp/README
index 81ebe75cf30d0..65e586f4536aa 100644
--- a/share/examples/isdn/i4brunppp/README
+++ b/share/examples/isdn/i4brunppp/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/i4brunppp/README,v 1.2 2003/01/01 18:48:48 schweikh Exp $
 
 BEWARE: HIGHLY EXPERIMENTAL!
 ---------------------------
diff --git a/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc b/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
index 962022045cae5..f9a4c8e8cce46 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
+++ b/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
@@ -3,7 +3,7 @@
 #    sample isdnd.rc for taking incoming calls with userland ppp
 #    -----------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc,v 1.1 2001/07/21 11:49:28 hm Exp $
 #
 #    last edit-date: [Sat Jul 21 13:40:50 2001]
 #
diff --git a/share/examples/isdn/i4brunppp/i4brunppp.8 b/share/examples/isdn/i4brunppp/i4brunppp.8
index bc4799032ea2e..00c5595b21585 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp.8
+++ b/share/examples/isdn/i4brunppp/i4brunppp.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp.8,v 1.4 2002/12/11 15:55:29 ru Exp $
 .\"
 .\"	last edit-date: [Sat Jul 21 13:37:00 2001]
 .\"
diff --git a/share/examples/isdn/i4brunppp/i4brunppp.c b/share/examples/isdn/i4brunppp/i4brunppp.c
index 3c8b6e76e2437..e93155fc20ae1 100644
--- a/share/examples/isdn/i4brunppp/i4brunppp.c
+++ b/share/examples/isdn/i4brunppp/i4brunppp.c
@@ -27,7 +27,7 @@
  *	i4brunppp - run userland ppp for incoming call from rbch i/f
  *	------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp.c,v 1.4 2007/07/06 07:21:56 bz Exp $
  *
  *      last edit-date: [Sat Jul 21 13:38:10 2001]
  *
diff --git a/share/examples/isdn/v21/Makefile b/share/examples/isdn/v21/Makefile
index 261cec10441fc..0554ed5e3a543 100644
--- a/share/examples/isdn/v21/Makefile
+++ b/share/examples/isdn/v21/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/isdn/v21/Makefile,v 1.4 2004/12/21 08:47:09 ru Exp $
 
 PROG=		v21modem
 NO_MAN=
diff --git a/share/examples/isdn/v21/README b/share/examples/isdn/v21/README
index 52f553c313073..1acdb5f5c1e2f 100644
--- a/share/examples/isdn/v21/README
+++ b/share/examples/isdn/v21/README
@@ -47,4 +47,4 @@ entry
 Poul-Henning (phk@freebsd.org)
 19991212
 
-$FreeBSD$
+$FreeBSD: src/share/examples/isdn/v21/README,v 1.1 2001/05/25 13:04:58 hm Exp $
diff --git a/share/examples/isdn/v21/v21modem.c b/share/examples/isdn/v21/v21modem.c
index 2707cdb392b5c..db61f778c9da4 100644
--- a/share/examples/isdn/v21/v21modem.c
+++ b/share/examples/isdn/v21/v21modem.c
@@ -8,7 +8,7 @@
  *
  * This is a V.21 modem for ISDN4BSD.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/isdn/v21/v21modem.c,v 1.3 2007/07/06 07:21:56 bz Exp $
  */
 
 #include <string.h>
diff --git a/share/examples/kld/Makefile b/share/examples/kld/Makefile
index 908f68e37aa91..58be5510642ce 100644
--- a/share/examples/kld/Makefile
+++ b/share/examples/kld/Makefile
@@ -64,7 +64,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/Makefile,v 1.4 2006/01/29 02:52:39 mlaier Exp $
 #
 
 SUBDIR=	cdev dyn_sysctl firmware syscall
diff --git a/share/examples/kld/cdev/Makefile b/share/examples/kld/cdev/Makefile
index 5c8f8f608f385..83afe978ec949 100644
--- a/share/examples/kld/cdev/Makefile
+++ b/share/examples/kld/cdev/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/Makefile,v 1.2 2002/07/11 13:38:05 ru Exp $
 
 SUBDIR=	module test
 
diff --git a/share/examples/kld/cdev/README b/share/examples/kld/cdev/README
index dc650f111358c..a85d4f11a7fdf 100644
--- a/share/examples/kld/cdev/README
+++ b/share/examples/kld/cdev/README
@@ -58,7 +58,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/README,v 1.2 2000/10/02 14:14:04 sobomax Exp $
 #
 
 1.0	Overview
diff --git a/share/examples/kld/cdev/module/Makefile b/share/examples/kld/cdev/module/Makefile
index a35c5001395d9..6f44c34b66e82 100644
--- a/share/examples/kld/cdev/module/Makefile
+++ b/share/examples/kld/cdev/module/Makefile
@@ -1,5 +1,5 @@
 # Makefile for kld char device driver.
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/module/Makefile,v 1.6 2003/08/03 10:39:28 mbr Exp $
 
 KMOD=	cdev
 SRCS=	cdev.c cdevmod.c
diff --git a/share/examples/kld/cdev/module/cdev.c b/share/examples/kld/cdev/module/cdev.c
index dda63c4fa70ec..defd6567ec4e6 100644
--- a/share/examples/kld/cdev/module/cdev.c
+++ b/share/examples/kld/cdev/module/cdev.c
@@ -65,7 +65,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/module/cdev.c,v 1.8 2004/07/16 06:55:34 tjr Exp $
  */
 #include <sys/param.h>
 #include <sys/uio.h>
diff --git a/share/examples/kld/cdev/module/cdev.h b/share/examples/kld/cdev/module/cdev.h
index b09e53ae3dbaa..bc717db78d42f 100644
--- a/share/examples/kld/cdev/module/cdev.h
+++ b/share/examples/kld/cdev/module/cdev.h
@@ -66,7 +66,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/module/cdev.h,v 1.4 2000/10/02 14:14:06 sobomax Exp $
  */
 
 #ifndef __CDEV_H_
diff --git a/share/examples/kld/cdev/module/cdevmod.c b/share/examples/kld/cdev/module/cdevmod.c
index f21723f132f8a..579c4addf9a08 100644
--- a/share/examples/kld/cdev/module/cdevmod.c
+++ b/share/examples/kld/cdev/module/cdevmod.c
@@ -65,7 +65,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/module/cdevmod.c,v 1.8 2006/05/19 20:02:44 sobomax Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index 333cdcb8c42a7..5a8b6c4ac4b60 100644
--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@@ -64,7 +64,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/cdev/test/Makefile,v 1.5 2004/12/21 08:47:09 ru Exp $
 #
 PROG=	testcdev
 NO_MAN=
diff --git a/share/examples/kld/cdev/test/testcdev.c b/share/examples/kld/cdev/test/testcdev.c
index 0a6118103c039..915e02f7e9aff 100644
--- a/share/examples/kld/cdev/test/testcdev.c
+++ b/share/examples/kld/cdev/test/testcdev.c
@@ -68,7 +68,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/cdev/test/testcdev.c,v 1.5 2003/08/03 10:39:29 mbr Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/kld/dyn_sysctl/Makefile b/share/examples/kld/dyn_sysctl/Makefile
index 695320de6080d..fba809c111149 100644
--- a/share/examples/kld/dyn_sysctl/Makefile
+++ b/share/examples/kld/dyn_sysctl/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/dyn_sysctl/Makefile,v 1.2 2001/05/18 13:56:29 ru Exp $
 
 SRCS	= dyn_sysctl.c
 KMOD	= dyn_sysctl
diff --git a/share/examples/kld/dyn_sysctl/README b/share/examples/kld/dyn_sysctl/README
index 4dfa3c6bdfbdd..ee73d2a099e7f 100644
--- a/share/examples/kld/dyn_sysctl/README
+++ b/share/examples/kld/dyn_sysctl/README
@@ -5,4 +5,4 @@ The framework should deal with this case gracefully.
 
 Andrzej Bialecki <abial@freebsd.org>
 
-$FreeBSD$
+$FreeBSD: src/share/examples/kld/dyn_sysctl/README,v 1.1 2000/07/15 10:26:00 abial Exp $
diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
index bcef7d472c5e5..6724033c0a649 100644
--- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c
+++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $FreeBSD$
+ *     $FreeBSD: src/share/examples/kld/dyn_sysctl/dyn_sysctl.c,v 1.3 2004/08/30 09:49:58 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/firmware/Makefile b/share/examples/kld/firmware/Makefile
index b4b733faae986..c6c0e1d19f8e8 100644
--- a/share/examples/kld/firmware/Makefile
+++ b/share/examples/kld/firmware/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/firmware/Makefile,v 1.1 2006/01/29 02:52:39 mlaier Exp $
 
 SUBDIR= fwimage fwconsumer
 
diff --git a/share/examples/kld/firmware/README b/share/examples/kld/firmware/README
index 075c5e5723b5a..e18ec277562bd 100644
--- a/share/examples/kld/firmware/README
+++ b/share/examples/kld/firmware/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/kld/firmware/README,v 1.1 2006/01/29 02:52:39 mlaier Exp $
 
 This is a simple example of the firmware(9) system.  It consists of two
 parts:
diff --git a/share/examples/kld/firmware/fwconsumer/Makefile b/share/examples/kld/firmware/fwconsumer/Makefile
index 1dea0c7eab693..af3fec02f54c0 100644
--- a/share/examples/kld/firmware/fwconsumer/Makefile
+++ b/share/examples/kld/firmware/fwconsumer/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/firmware/fwconsumer/Makefile,v 1.1 2006/01/29 02:52:40 mlaier Exp $
 
 KMOD=	fw_consumer
 SRCS=	fw_consumer.c
diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c
index 97ab99aa0f7a9..92833a2abc9f2 100644
--- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c
+++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/examples/kld/firmware/fwconsumer/fw_consumer.c,v 1.1 2006/01/29 02:52:40 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/share/examples/kld/firmware/fwimage/Makefile b/share/examples/kld/firmware/fwimage/Makefile
index 5c0ad7a8b49b7..e07bfa7118853 100644
--- a/share/examples/kld/firmware/fwimage/Makefile
+++ b/share/examples/kld/firmware/fwimage/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/kld/firmware/fwimage/Makefile,v 1.1 2006/01/29 02:52:40 mlaier Exp $
 
 KMOD=	beastie
 FIRMWS=	firmware.img:beastie
diff --git a/share/examples/kld/firmware/fwimage/firmware.img b/share/examples/kld/firmware/fwimage/firmware.img
index afc3c23287e75..a9b6e0013d373 100644
--- a/share/examples/kld/firmware/fwimage/firmware.img
+++ b/share/examples/kld/firmware/fwimage/firmware.img
diff --git a/share/examples/kld/syscall/Makefile b/share/examples/kld/syscall/Makefile
index 5c8f8f608f385..3f2b3dcd052e9 100644
--- a/share/examples/kld/syscall/Makefile
+++ b/share/examples/kld/syscall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/syscall/Makefile,v 1.2 2002/07/11 13:38:05 ru Exp $
 
 SUBDIR=	module test
 
diff --git a/share/examples/kld/syscall/module/Makefile b/share/examples/kld/syscall/module/Makefile
index 17066d141fce6..6ff2e5837b675 100644
--- a/share/examples/kld/syscall/module/Makefile
+++ b/share/examples/kld/syscall/module/Makefile
@@ -1,5 +1,5 @@
 # Makefile for building the sample syscall module
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/syscall/module/Makefile,v 1.2 2001/09/18 12:03:42 ru Exp $
 
 KMOD=	syscall
 SRCS=	syscall.c
diff --git a/share/examples/kld/syscall/module/syscall.c b/share/examples/kld/syscall/module/syscall.c
index 3416f3ca10a00..3c079f994932b 100644
--- a/share/examples/kld/syscall/module/syscall.c
+++ b/share/examples/kld/syscall/module/syscall.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/syscall/module/syscall.c,v 1.5 2007/07/22 06:48:34 kevlo Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile
index 83ad954eb35b3..3c36cc6928fca 100644
--- a/share/examples/kld/syscall/test/Makefile
+++ b/share/examples/kld/syscall/test/Makefile
@@ -1,5 +1,5 @@
 # Makefile for simple caller of syscall
-# $FreeBSD$
+# $FreeBSD: src/share/examples/kld/syscall/test/Makefile,v 1.4 2006/03/15 10:40:01 ru Exp $
 
 PROG=	call
 NO_MAN=
diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c
index 9183997821cdf..23cfb338ccfd6 100644
--- a/share/examples/kld/syscall/test/call.c
+++ b/share/examples/kld/syscall/test/call.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/kld/syscall/test/call.c,v 1.3 1999/08/28 00:19:24 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile
index 6b4e916851daf..c70ad6aa202c4 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/libvgl/Makefile,v 1.5 2004/12/21 08:47:10 ru Exp $
 
 PROG=	demo
 NO_MAN=
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 781f6a1a063be..16f36a8a98e8e 100644
--- a/share/examples/libvgl/demo.c
+++ b/share/examples/libvgl/demo.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/libvgl/demo.c,v 1.6 2002/06/02 20:05:40 schweikh Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/mdoc/POSIX-copyright b/share/examples/mdoc/POSIX-copyright
index d1bea592679bf..8b0ca05871c15 100644
--- a/share/examples/mdoc/POSIX-copyright
+++ b/share/examples/mdoc/POSIX-copyright
@@ -32,5 +32,5 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/POSIX-copyright,v 1.1 2005/01/10 18:09:17 simon Exp $
 .\"
diff --git a/share/examples/mdoc/deshallify.sh b/share/examples/mdoc/deshallify.sh
index 361753f63efb7..464c1056a1c8e 100644
--- a/share/examples/mdoc/deshallify.sh
+++ b/share/examples/mdoc/deshallify.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script to remove shall clauses.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/mdoc/deshallify.sh,v 1.2 2005/01/10 18:54:55 ru Exp $
 #
 sed -e 's/s shall define/s define/g' \
     -e 's/shall define/defines/g' \
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index a578502fafbf7..e82c5d1f1b6bd 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.1,v 1.23 2005/01/16 22:22:28 ru Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index bbdd068e8ea06..6d9eacaedcae7 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.3,v 1.28 2005/01/12 20:56:15 keramida Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index a5fa1a67a996e..35ee7cd5cbc0c 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.27 2006/09/27 21:28:44 danger Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/mdoc/example.9 b/share/examples/mdoc/example.9
index 0fb5a1006f7b6..97f60e4a026a8 100644
--- a/share/examples/mdoc/example.9
+++ b/share/examples/mdoc/example.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/mdoc/example.9,v 1.4 2006/09/27 08:39:00 pjd Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/examples/netgraph/ether.bridge b/share/examples/netgraph/ether.bridge
index 754e7602a5f2b..c6129b494f158 100644
--- a/share/examples/netgraph/ether.bridge
+++ b/share/examples/netgraph/ether.bridge
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/ether.bridge,v 1.5 2006/03/05 15:53:07 schweikh Exp $
 # This script sets up an Ethernet bridging network across multiple
 # Ethernet interfaces using the ng_bridge(4) and ng_ether(4) netgraph
 # node types.
diff --git a/share/examples/netgraph/frame_relay b/share/examples/netgraph/frame_relay
index 0becb471c810b..78421e35a35f1 100644
--- a/share/examples/netgraph/frame_relay
+++ b/share/examples/netgraph/frame_relay
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script to set up a frame relay link on the sr card.
 # The dlci used is selected below. The default is 16
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/frame_relay,v 1.1 1999/11/19 06:56:34 julian Exp $
 
 CARD=sr0
 DLCI=16
diff --git a/share/examples/netgraph/ngctl b/share/examples/netgraph/ngctl
index 80a7f22d13fde..3a2096177053d 100644
--- a/share/examples/netgraph/ngctl
+++ b/share/examples/netgraph/ngctl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/ngctl,v 1.3 2003/11/15 15:26:35 harti Exp $
 
 #
 # This is an example that shows how to send ASCII formatted control
diff --git a/share/examples/netgraph/raw b/share/examples/netgraph/raw
index e0970f3c0b33d..4bcfc4ce1fc22 100644
--- a/share/examples/netgraph/raw
+++ b/share/examples/netgraph/raw
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script to connect a raw synchronous card to a system interface.
 # Assumes the file if_sr was compiled with options NETGRAPH.
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/raw,v 1.1 1999/11/19 07:04:36 julian Exp $
 
 CARD=sr0
 
diff --git a/share/examples/netgraph/udp.tunnel b/share/examples/netgraph/udp.tunnel
index fc5810b844368..dc92827e8b58e 100644
--- a/share/examples/netgraph/udp.tunnel
+++ b/share/examples/netgraph/udp.tunnel
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/share/examples/netgraph/udp.tunnel,v 1.2 2003/09/30 22:39:22 julian Exp $
 
 # This script sets up a virtual point-to-point WAN link between
 # two subnets, using UDP packets as the ``WAN connection.''
diff --git a/share/examples/nwclient/dot.nwfsrc b/share/examples/nwclient/dot.nwfsrc
index 03bc1d00f7e93..f188954b28b89 100644
--- a/share/examples/nwclient/dot.nwfsrc
+++ b/share/examples/nwclient/dot.nwfsrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/nwclient/dot.nwfsrc,v 1.2 2002/04/20 05:04:21 bp Exp $
 #
 # Example for .nwfsrc file
 #
diff --git a/share/examples/nwclient/nwfs.sh.sample b/share/examples/nwclient/nwfs.sh.sample
index cb8b631f0b7d9..55d39176cd93f 100644
--- a/share/examples/nwclient/nwfs.sh.sample
+++ b/share/examples/nwclient/nwfs.sh.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/nwclient/nwfs.sh.sample,v 1.1 1999/11/03 12:06:13 bp Exp $
 #
 # Location: /usr/local/etc/rc.d/nwfs.sh
 #
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index de59b9effcf0a..14c0a6393f720 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/perfmon/Makefile,v 1.5 2004/12/21 08:47:10 ru Exp $
 
 PROG=	perfmon
 NO_MAN=
diff --git a/share/examples/perfmon/README b/share/examples/perfmon/README
index ffa2cafa92c8a..e9f00acf27dfd 100644
--- a/share/examples/perfmon/README
+++ b/share/examples/perfmon/README
@@ -22,4 +22,4 @@ There is one mandatory argument, which is the event number to be
 monitored, defined in <machine/perfmon.h>.  All numbers can be
 specified in any format acceptable to strtol(3).
 
-$FreeBSD$
+$FreeBSD: src/share/examples/perfmon/README,v 1.5 2001/04/29 03:54:48 dd Exp $
diff --git a/share/examples/perfmon/perfmon.c b/share/examples/perfmon/perfmon.c
index 34e38849b22b1..57c40ff95ca85 100644
--- a/share/examples/perfmon/perfmon.c
+++ b/share/examples/perfmon/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/perfmon/perfmon.c,v 1.5 1999/08/28 00:19:26 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile
index a6c4470256425..a896c3c55c8a0 100644
--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/Makefile,v 1.3.10.1 2007/11/11 02:16:00 mlaier Exp $
 
 NO_OBJ=
 
diff --git a/share/examples/pf/ackpri b/share/examples/pf/ackpri
index 060b7619cfa37..b2032b5d3cd2f 100644
--- a/share/examples/pf/ackpri
+++ b/share/examples/pf/ackpri
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/ackpri,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: ackpri,v 1.3 2006/10/07 04:48:01 mcbride Exp $
 
 # Use a simple priority queue to prioritize empty (no payload) TCP ACKs,
diff --git a/share/examples/pf/faq-example1 b/share/examples/pf/faq-example1
index 91942f616d4fd..5b3a1f4210464 100644
--- a/share/examples/pf/faq-example1
+++ b/share/examples/pf/faq-example1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/faq-example1,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: faq-example1,v 1.5 2006/10/07 04:48:01 mcbride Exp $
 
 #
diff --git a/share/examples/pf/faq-example2 b/share/examples/pf/faq-example2
index eded1e83472db..62386fff68931 100644
--- a/share/examples/pf/faq-example2
+++ b/share/examples/pf/faq-example2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/faq-example2,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: faq-example2,v 1.4 2006/10/07 04:48:01 mcbride Exp $
 
 #
diff --git a/share/examples/pf/faq-example3 b/share/examples/pf/faq-example3
index 61e2c93af2bda..f21724807a953 100644
--- a/share/examples/pf/faq-example3
+++ b/share/examples/pf/faq-example3
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/faq-example3,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: faq-example3,v 1.4 2006/10/07 04:48:01 mcbride Exp $
 
 #
diff --git a/share/examples/pf/pf.conf b/share/examples/pf/pf.conf
index bd3091ba420a2..7684fe1e430cc 100644
--- a/share/examples/pf/pf.conf
+++ b/share/examples/pf/pf.conf
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/share/examples/pf/pf.conf,v 1.1.2.1 2007/11/11 02:16:00 mlaier Exp $
 #	$OpenBSD: pf.conf,v 1.34 2007/02/24 19:30:59 millert Exp $
 #
 # See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
diff --git a/share/examples/pf/queue1 b/share/examples/pf/queue1
index 5aad7c9c9f9f9..49d9b81d016b2 100644
--- a/share/examples/pf/queue1
+++ b/share/examples/pf/queue1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue1,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: queue1,v 1.4 2006/10/07 04:48:01 mcbride Exp $
 
 ext_if = "dc0"
diff --git a/share/examples/pf/queue2 b/share/examples/pf/queue2
index c60d1c3264063..0f21d8db87680 100644
--- a/share/examples/pf/queue2
+++ b/share/examples/pf/queue2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue2,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: queue2,v 1.4 2006/10/07 04:48:01 mcbride Exp $
 # advanced queue example.
 # give interactive ssh traffic priority over ssh bulk transfers (scp, sftp)
diff --git a/share/examples/pf/queue3 b/share/examples/pf/queue3
index 6db5eb472ffb8..5e275322908c3 100644
--- a/share/examples/pf/queue3
+++ b/share/examples/pf/queue3
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue3,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: queue3,v 1.3 2006/10/07 04:48:01 mcbride Exp $
 # simple PRIQ example
 
diff --git a/share/examples/pf/queue4 b/share/examples/pf/queue4
index 0a24a066f8961..79b2955d32ebc 100644
--- a/share/examples/pf/queue4
+++ b/share/examples/pf/queue4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/queue4,v 1.1 2004/09/14 01:07:18 mlaier Exp $
 # $OpenBSD: queue4,v 1.2 2003/08/22 21:50:34 david Exp $
 #
 # Hierarchical queueing for a university.
diff --git a/share/examples/pf/spamd b/share/examples/pf/spamd
index ad122687df606..a94ebe2c120e8 100644
--- a/share/examples/pf/spamd
+++ b/share/examples/pf/spamd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pf/spamd,v 1.1.12.1 2007/11/11 02:16:00 mlaier Exp $
 # $OpenBSD: spamd,v 1.2 2005/08/06 19:52:37 jmc Exp $
 
 # spamd-setup puts addresses to be redirected into table <spamd>.
diff --git a/share/examples/portal/README b/share/examples/portal/README
index d8dc1fc6aeea6..86f7f8d89ecc9 100644
--- a/share/examples/portal/README
+++ b/share/examples/portal/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/examples/portal/README,v 1.2 2001/05/24 13:15:49 ru Exp $
 
 This contains a couple of examples for using the portal filing system.
 
diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile
index 9b0d0d59c3d30..d9c16e67012ca 100644
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@@ -1,6 +1,6 @@
 # Makefile to build LCD control software for ppi(4) interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppi/Makefile,v 1.6 2004/12/21 08:47:11 ru Exp $
 
 PROG=	ppilcd
 NO_MAN=
diff --git a/share/examples/ppi/ppilcd.c b/share/examples/ppi/ppilcd.c
index fd2506d66cd5f..77539e77566a2 100644
--- a/share/examples/ppi/ppilcd.c
+++ b/share/examples/ppi/ppilcd.c
@@ -2,7 +2,7 @@
  * Control LCD module hung off parallel port using the
  * ppi 'geek port' interface.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/ppi/ppilcd.c,v 1.6 2005/04/17 21:55:00 iedowse Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/ppp/chap-auth b/share/examples/ppp/chap-auth
index 1e56b07575c07..cc1ce175016ba 100755
--- a/share/examples/ppp/chap-auth
+++ b/share/examples/ppp/chap-auth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/chap-auth,v 1.2 1999/08/28 00:19:28 peter Exp $
 
 #
 # Display a window to request a users CHAP secret, accepting the relevant
diff --git a/share/examples/ppp/isdnd.rc b/share/examples/ppp/isdnd.rc
index 0ceef6d2f8367..324d90e711d04 100644
--- a/share/examples/ppp/isdnd.rc
+++ b/share/examples/ppp/isdnd.rc
@@ -1,6 +1,6 @@
 #	example of a configuration file for the isdn daemon & user-ppp
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/isdnd.rc,v 1.4 2000/11/30 23:08:36 brian Exp $
 
 
 # SYSTEM section: isdnd global configuration parameters
diff --git a/share/examples/ppp/login-auth b/share/examples/ppp/login-auth
index e866e1d9c092d..1507c92e0ff80 100755
--- a/share/examples/ppp/login-auth
+++ b/share/examples/ppp/login-auth
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/login-auth,v 1.2 1999/08/28 00:19:29 peter Exp $
 
 #
 # Display a window to request a users password, expecting a login name
diff --git a/share/examples/ppp/ppp.conf.isdn b/share/examples/ppp/ppp.conf.isdn
index 8946b4bb30108..0217700115353 100644
--- a/share/examples/ppp/ppp.conf.isdn
+++ b/share/examples/ppp/ppp.conf.isdn
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.isdn,v 1.12 2004/12/13 17:54:30 brian Exp $
 
 # This is an example ppp profile for bringing up a multilink ppp connection
 # over ISDN.  It needs at least version 0.83.0 of the i4b code.  An example
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index f59d18dde874d..2bca55df7d3a6 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -4,7 +4,7 @@
 #
 #           Originally written by Toshiharu OHNO
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.35 2004/12/13 17:54:30 brian Exp $
 #
 #################################################################
 
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index 446cee373cfbe..aad6397438839 100644
--- a/share/examples/ppp/ppp.conf.span-isp
+++ b/share/examples/ppp/ppp.conf.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.7 2004/12/13 17:54:30 brian Exp $
 
 # This advanced ppp configuration file explains how to implement
 # the following:
diff --git a/share/examples/ppp/ppp.conf.span-isp.working b/share/examples/ppp/ppp.conf.span-isp.working
index 09893b6a87fd2..62ec8a9fad0cc 100644
--- a/share/examples/ppp/ppp.conf.span-isp.working
+++ b/share/examples/ppp/ppp.conf.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.7 2004/12/13 17:54:30 brian Exp $
 
 # This is a working example of ppp.conf.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.linkdown.sample b/share/examples/ppp/ppp.linkdown.sample
index c7da79ead8ebf..d1baa6789f103 100644
--- a/share/examples/ppp/ppp.linkdown.sample
+++ b/share/examples/ppp/ppp.linkdown.sample
@@ -12,7 +12,7 @@
 #  3) If no label has been found, use MYADDR if it exists.
 #
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.sample,v 1.3 1999/09/07 07:56:54 brian Exp $
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkdown.span-isp b/share/examples/ppp/ppp.linkdown.span-isp
index 795a55951b257..bbf557dd5fe47 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp
+++ b/share/examples/ppp/ppp.linkdown.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.span-isp,v 1.3 2001/12/17 22:05:23 cjc Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Gateway machine.
diff --git a/share/examples/ppp/ppp.linkdown.span-isp.working b/share/examples/ppp/ppp.linkdown.span-isp.working
index ba34d05dddd60..87f783019ee3a 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp.working
+++ b/share/examples/ppp/ppp.linkdown.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkdown.span-isp.working,v 1.3 2001/12/17 22:05:23 cjc Exp $
 
 # This is a working example of ppp.linkdown.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.linkup.sample b/share/examples/ppp/ppp.linkup.sample
index 18073cf712e72..ccdb16ac6898c 100644
--- a/share/examples/ppp/ppp.linkup.sample
+++ b/share/examples/ppp/ppp.linkup.sample
@@ -12,7 +12,7 @@
 #  3) If no label has been found, use MYADDR if it exists.
 #
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.sample,v 1.2 1999/08/28 00:19:31 peter Exp $
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkup.span-isp b/share/examples/ppp/ppp.linkup.span-isp
index 8768bea25b726..56b39412ea5b5 100644
--- a/share/examples/ppp/ppp.linkup.span-isp
+++ b/share/examples/ppp/ppp.linkup.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.span-isp,v 1.3 2001/11/01 23:44:09 cjc Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Gateway machine.
diff --git a/share/examples/ppp/ppp.linkup.span-isp.working b/share/examples/ppp/ppp.linkup.span-isp.working
index 274296e73dbd4..28584f99d6917 100644
--- a/share/examples/ppp/ppp.linkup.span-isp.working
+++ b/share/examples/ppp/ppp.linkup.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.linkup.span-isp.working,v 1.3 2001/11/01 23:44:09 cjc Exp $
 
 # This is a working example of ppp.linkup.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/ppp/ppp.secret.sample b/share/examples/ppp/ppp.secret.sample
index 57d2375fb6b06..fd979fd875a2b 100644
--- a/share/examples/ppp/ppp.secret.sample
+++ b/share/examples/ppp/ppp.secret.sample
@@ -27,7 +27,7 @@
 #  ``auth'' or ``cbcp'' callback is enabled (see ``set callback'').
 #  A ``*'' specifies that the client must specify the number.
 #  
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.sample,v 1.2 1999/08/28 00:19:32 peter Exp $
 #
 ##################################################
 
diff --git a/share/examples/ppp/ppp.secret.span-isp b/share/examples/ppp/ppp.secret.span-isp
index 8370f379717ed..8b05afc2032d6 100644
--- a/share/examples/ppp/ppp.secret.span-isp
+++ b/share/examples/ppp/ppp.secret.span-isp
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.span-isp,v 1.2 1999/08/28 00:19:32 peter Exp $
 
 # Refer to ppp.conf.span-isp for a description of what this file is for.
 # This file is only required on the Receiver machine.
diff --git a/share/examples/ppp/ppp.secret.span-isp.working b/share/examples/ppp/ppp.secret.span-isp.working
index cc8bc3d63dbeb..afffb5d047bfa 100644
--- a/share/examples/ppp/ppp.secret.span-isp.working
+++ b/share/examples/ppp/ppp.secret.span-isp.working
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ppp/ppp.secret.span-isp.working,v 1.2 1999/08/28 00:19:32 peter Exp $
 
 # This is a working example of ppp.secret.span-isp that uses ppp connections
 # to the same machine through 3 null-modem serial cables.
diff --git a/share/examples/pppd/auth-down.sample b/share/examples/pppd/auth-down.sample
index b2da150dc040d..b68c6cf92d291 100644
--- a/share/examples/pppd/auth-down.sample
+++ b/share/examples/pppd/auth-down.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/auth-down.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/auth-down file.
 
diff --git a/share/examples/pppd/auth-up.sample b/share/examples/pppd/auth-up.sample
index 3d9c07e803440..73b0a39fbc70c 100644
--- a/share/examples/pppd/auth-up.sample
+++ b/share/examples/pppd/auth-up.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/auth-up.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/auth-up file.
 
diff --git a/share/examples/pppd/chap-secrets.sample b/share/examples/pppd/chap-secrets.sample
index 40d5dfdc86e32..c01f018bece97 100644
--- a/share/examples/pppd/chap-secrets.sample
+++ b/share/examples/pppd/chap-secrets.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/chap-secrets.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/chap-secrets file.
 #
diff --git a/share/examples/pppd/chat.sh.sample b/share/examples/pppd/chat.sh.sample
index 6418ebfdf6a45..62016be361ae2 100644
--- a/share/examples/pppd/chat.sh.sample
+++ b/share/examples/pppd/chat.sh.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/chat.sh.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for chat.sh file.
 
diff --git a/share/examples/pppd/ip-down.sample b/share/examples/pppd/ip-down.sample
index 45b8eb45675d9..8999def213a04 100644
--- a/share/examples/pppd/ip-down.sample
+++ b/share/examples/pppd/ip-down.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ip-down.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/ip-down file.
 
diff --git a/share/examples/pppd/ip-up.sample b/share/examples/pppd/ip-up.sample
index a0fc1b02aaafe..3c6256389384a 100644
--- a/share/examples/pppd/ip-up.sample
+++ b/share/examples/pppd/ip-up.sample
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ip-up.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/ip-up file.
 
diff --git a/share/examples/pppd/options.sample b/share/examples/pppd/options.sample
index fd0a927c57c8c..75beefcdae85b 100644
--- a/share/examples/pppd/options.sample
+++ b/share/examples/pppd/options.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/options.sample,v 1.2 2004/11/19 17:31:31 obrien Exp $
 #
 # Example for /etc/ppp/options file.
 #
diff --git a/share/examples/pppd/pap-secrets.sample b/share/examples/pppd/pap-secrets.sample
index 8896bdd7a65f9..7e55283b793d9 100644
--- a/share/examples/pppd/pap-secrets.sample
+++ b/share/examples/pppd/pap-secrets.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/pap-secrets.sample,v 1.1 2002/01/29 00:23:33 cjc Exp $
 #
 # Example for /etc/ppp/pap-secrets file.
 #
diff --git a/share/examples/pppd/ppp.deny.sample b/share/examples/pppd/ppp.deny.sample
index 948e11527cd4b..c5ff1ed89d814 100644
--- a/share/examples/pppd/ppp.deny.sample
+++ b/share/examples/pppd/ppp.deny.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.13 2005/06/07 03:41:20 maxim Exp $
 #
 # list of users disallowed any pppd access via 'system
 # password login'.
diff --git a/share/examples/pppd/ppp.shells.sample b/share/examples/pppd/ppp.shells.sample
index 93b68406c2167..e211574c4f3ed 100644
--- a/share/examples/pppd/ppp.shells.sample
+++ b/share/examples/pppd/ppp.shells.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/pppd/ppp.shells.sample,v 1.5 2002/01/29 00:23:33 cjc Exp $
 #
 # List of acceptable shells for pppd(8).
 # Pppd will not accept a system password login
diff --git a/share/examples/printing/README b/share/examples/printing/README
index f83eaa9c236a7..cc598f82f91b5 100644
--- a/share/examples/printing/README
+++ b/share/examples/printing/README
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/share/examples/printing/README,v 1.6 1999/08/28 00:19:34 peter Exp $ 
 #
 # The files in this directory are generated automatically
 # from doc/handbook/printing.sgml, do not edit it here!
diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile
index bab70b2f5d036..31a8c3b50e35f 100644
--- a/share/examples/scsi_target/Makefile
+++ b/share/examples/scsi_target/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/scsi_target/Makefile,v 1.5 2004/02/04 10:15:26 ru Exp $
 
 PROG=	scsi_target
 SRCS=	scsi_target.h scsi_target.c scsi_cmds.c
diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c
index 8d5f14b5f5503..5dca7cc0e2c0a 100644
--- a/share/examples/scsi_target/scsi_cmds.c
+++ b/share/examples/scsi_target/scsi_cmds.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_cmds.c,v 1.10 2006/09/27 15:38:13 mjacob Exp $
  */
 
 #include <stdio.h>
diff --git a/share/examples/scsi_target/scsi_target.8 b/share/examples/scsi_target/scsi_target.8
index 677e2b4ae6fa6..48e870e293703 100644
--- a/share/examples/scsi_target/scsi_target.8
+++ b/share/examples/scsi_target/scsi_target.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/scsi_target/scsi_target.8,v 1.5 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd November 15, 2002
 .Dt SCSI_TARGET 8
diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c
index c9686f955db0d..5005984c7c5f8 100644
--- a/share/examples/scsi_target/scsi_target.c
+++ b/share/examples/scsi_target/scsi_target.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_target.c,v 1.18 2006/09/27 15:38:13 mjacob Exp $
  */
 
 #include <sys/types.h>
diff --git a/share/examples/scsi_target/scsi_target.h b/share/examples/scsi_target/scsi_target.h
index 3d94810d149cf..7f4ab9a0c4eed 100644
--- a/share/examples/scsi_target/scsi_target.h
+++ b/share/examples/scsi_target/scsi_target.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/examples/scsi_target/scsi_target.h,v 1.4 2006/09/27 15:38:13 mjacob Exp $
  */
 
 #ifndef _SCSI_TARGET_H
diff --git a/share/examples/ses/Makefile b/share/examples/ses/Makefile
index 53bd0cb8cf59e..32f32644b2a07 100644
--- a/share/examples/ses/Makefile
+++ b/share/examples/ses/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/Makefile,v 1.3 2005/10/14 15:45:38 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/Makefile.inc b/share/examples/ses/Makefile.inc
index 5ff1cd4304875..63dfe612358b4 100644
--- a/share/examples/ses/Makefile.inc
+++ b/share/examples/ses/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/Makefile.inc,v 1.3 2005/12/10 12:09:54 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/getencstat/Makefile b/share/examples/ses/getencstat/Makefile
index 79141b69657ce..aa8c4e3bd0212 100644
--- a/share/examples/ses/getencstat/Makefile
+++ b/share/examples/ses/getencstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/getencstat/Makefile,v 1.3 2005/12/10 12:09:54 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/getencstat/getencstat.0 b/share/examples/ses/getencstat/getencstat.0
index 45a949818d550..a2029b846d4f5 100644
--- a/share/examples/ses/getencstat/getencstat.0
+++ b/share/examples/ses/getencstat/getencstat.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/getencstat/getencstat.0,v 1.5 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt GETENCSTAT 8
diff --git a/share/examples/ses/sesd/Makefile b/share/examples/ses/sesd/Makefile
index 99a3b9274536c..c70724f5bdec8 100644
--- a/share/examples/ses/sesd/Makefile
+++ b/share/examples/ses/sesd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/sesd/Makefile,v 1.3 2005/12/10 12:09:54 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/sesd/sesd.0 b/share/examples/ses/sesd/sesd.0
index 29c0084daa26e..83ebfdc356065 100644
--- a/share/examples/ses/sesd/sesd.0
+++ b/share/examples/ses/sesd/sesd.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/sesd/sesd.0,v 1.5 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt SESD 8
diff --git a/share/examples/ses/setencstat/Makefile b/share/examples/ses/setencstat/Makefile
index bdf4e4df8c0ce..57dda12b735ba 100644
--- a/share/examples/ses/setencstat/Makefile
+++ b/share/examples/ses/setencstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/setencstat/Makefile,v 1.3 2005/12/10 12:09:54 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/setencstat/setencstat.0 b/share/examples/ses/setencstat/setencstat.0
index 5c51757432a3f..961af619d6700 100644
--- a/share/examples/ses/setencstat/setencstat.0
+++ b/share/examples/ses/setencstat/setencstat.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/setencstat/setencstat.0,v 1.4 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt SETENCSTAT 8
diff --git a/share/examples/ses/setobjstat/Makefile b/share/examples/ses/setobjstat/Makefile
index 4a223b455c295..9c464270dde8b 100644
--- a/share/examples/ses/setobjstat/Makefile
+++ b/share/examples/ses/setobjstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/ses/setobjstat/Makefile,v 1.3 2005/12/10 12:09:54 ru Exp $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
diff --git a/share/examples/ses/setobjstat/setobjstat.0 b/share/examples/ses/setobjstat/setobjstat.0
index f4e21d8d3f866..7e793ecd37d48 100644
--- a/share/examples/ses/setobjstat/setobjstat.0
+++ b/share/examples/ses/setobjstat/setobjstat.0
@@ -29,7 +29,7 @@
 .\" Feral Software
 .\" mjacob@feral.com
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/examples/ses/setobjstat/setobjstat.0,v 1.5 2005/02/09 18:07:15 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt SETOBJSTAT 8
diff --git a/share/examples/ses/srcs/chpmon.c b/share/examples/ses/srcs/chpmon.c
index 1b537c7ba11e4..25ff09040f5de 100644
--- a/share/examples/ses/srcs/chpmon.c
+++ b/share/examples/ses/srcs/chpmon.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.1 2000/02/29 05:44:16 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/eltsub.c b/share/examples/ses/srcs/eltsub.c
index 5fae6653d41f0..4532c60626e6e 100644
--- a/share/examples/ses/srcs/eltsub.c
+++ b/share/examples/ses/srcs/eltsub.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/eltsub.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getencstat.c b/share/examples/ses/srcs/getencstat.c
index bf45e576fb727..ed8b1c3ea80a2 100644
--- a/share/examples/ses/srcs/getencstat.c
+++ b/share/examples/ses/srcs/getencstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getencstat.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getnobj.c b/share/examples/ses/srcs/getnobj.c
index 680a6cdbc1731..73e5247bf0f4c 100644
--- a/share/examples/ses/srcs/getnobj.c
+++ b/share/examples/ses/srcs/getnobj.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getnobj.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getobjmap.c b/share/examples/ses/srcs/getobjmap.c
index 7f4d1b7837458..8e8025297962e 100644
--- a/share/examples/ses/srcs/getobjmap.c
+++ b/share/examples/ses/srcs/getobjmap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getobjmap.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/getobjstat.c b/share/examples/ses/srcs/getobjstat.c
index bf703cf47ff41..106247635a9ae 100644
--- a/share/examples/ses/srcs/getobjstat.c
+++ b/share/examples/ses/srcs/getobjstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/getobjstat.c,v 1.1 2000/02/29 05:44:18 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/inienc.c b/share/examples/ses/srcs/inienc.c
index d6fb262ef7ee2..130924f75e65b 100644
--- a/share/examples/ses/srcs/inienc.c
+++ b/share/examples/ses/srcs/inienc.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/inienc.c,v 1.1 2000/02/29 05:44:18 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/sesd.c b/share/examples/ses/srcs/sesd.c
index 5262b639bfd49..9b00a8c56311c 100644
--- a/share/examples/ses/srcs/sesd.c
+++ b/share/examples/ses/srcs/sesd.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/sesd.c,v 1.1 2000/02/29 05:44:18 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/setencstat.c b/share/examples/ses/srcs/setencstat.c
index 58e0dafc18797..c7b5cc7e612b6 100644
--- a/share/examples/ses/srcs/setencstat.c
+++ b/share/examples/ses/srcs/setencstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/setencstat.c,v 1.1 2000/02/29 05:44:19 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/ses/srcs/setobjstat.c b/share/examples/ses/srcs/setobjstat.c
index 34e8ea65d97a2..eb39b808a04de 100644
--- a/share/examples/ses/srcs/setobjstat.c
+++ b/share/examples/ses/srcs/setobjstat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/ses/srcs/setobjstat.c,v 1.1 2000/02/29 05:44:19 mjacob Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index 9e5b99ac56cfb..c4eb628892dea 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/smbfs/Makefile,v 1.5 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index eb66815488b9d..0bf7d04a23e66 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/examples/smbfs/print/Makefile,v 1.4 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs/print
diff --git a/share/examples/startslip/slip.sh b/share/examples/startslip/slip.sh
index 2b4254e88f607..1e3f298313017 100755
--- a/share/examples/startslip/slip.sh
+++ b/share/examples/startslip/slip.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/share/examples/startslip/slip.sh,v 1.3 2004/11/19 03:48:17 obrien Exp $
 startslip -b 57600 -U ./slup.sh -D ./sldown.sh \
 	-s atd<phone1> -s atd<phone2> -s atd<phone3> \
 	-h -t 60 -w 2 -W 20 /dev/cuad1 <login> <password>
diff --git a/share/examples/sunrpc/msg/msg_proc.c b/share/examples/sunrpc/msg/msg_proc.c
index ed088839e52a8..75d37bf82fcd6 100644
--- a/share/examples/sunrpc/msg/msg_proc.c
+++ b/share/examples/sunrpc/msg/msg_proc.c
@@ -1,5 +1,5 @@
 /* @(#)msg_proc.c	2.1 88/08/11 4.0 RPCSRC */
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/sunrpc/msg/msg_proc.c,v 1.3 2000/12/09 09:35:40 obrien Exp $ */
 /*
  * msg_proc.c: implementation of the remote procedure "printmessage"
  */
diff --git a/share/examples/sunrpc/msg/printmsg.c b/share/examples/sunrpc/msg/printmsg.c
index 681007c4b1fe0..debcd87078aa3 100644
--- a/share/examples/sunrpc/msg/printmsg.c
+++ b/share/examples/sunrpc/msg/printmsg.c
@@ -1,5 +1,5 @@
 /* @(#)printmsg.c	2.1 88/08/11 4.0 RPCSRC */
-/* $FreeBSD$ */
+/* $FreeBSD: src/share/examples/sunrpc/msg/printmsg.c,v 1.3 2000/12/09 09:35:40 obrien Exp $ */
 /*
  * printmsg.c: print a message on the console
  */
diff --git a/share/info/Makefile b/share/info/Makefile
index 0110e02ca1511..4442e049e0ea4 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/info/Makefile,v 1.14 2004/12/21 08:46:53 ru Exp $
 
 NO_OBJ=
 
diff --git a/share/isdn/0.al.uu b/share/isdn/0.al.uu
index 84ed15f65e0f9..c8289174b5cb1 100644
--- a/share/isdn/0.al.uu
+++ b/share/isdn/0.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/0.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 0.al
 M5=75U=?7UM?4U=;3U-37U55555545%15U=7555175U965U15U=34U-?7U];6
 MT=?555175%555575U=75U=55U=37U]?7U]37U]34U5555=55555455145516
diff --git a/share/isdn/1.al.uu b/share/isdn/1.al.uu
index 60e59ca0cdce6..188769a8b616c 100644
--- a/share/isdn/1.al.uu
+++ b/share/isdn/1.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/1.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 1.al
 M55=75%755=545U1455145575U-37UM'6U];6UM155%175U975U74U-35U-77
 MU]75U=75U=565=;5U-'1U]345%=75U15U=75U]?7U]545E975%75U]?55555
diff --git a/share/isdn/2.al.uu b/share/isdn/2.al.uu
index 2fdae7d241430..7f05ff19cf64e 100644
--- a/share/isdn/2.al.uu
+++ b/share/isdn/2.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/2.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 2.al
 MU]?455175U14U=375U;55U145%175U75U]'0T]/0T=?4U5545%175E%15U15
 MU=?6UM564U-045=75E34UM#2W=W=TM#6U-555=5555=65U15U=55U=555U%1
diff --git a/share/isdn/3.al.uu b/share/isdn/3.al.uu
index 5b8b56cfc39ef..670430c5fac24 100644
--- a/share/isdn/3.al.uu
+++ b/share/isdn/3.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/3.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 3.al
 MU=755537UE1555=75E=75%145%75U-?1UM;1UM;7U-555%=75U=75575U=?7
 MU]?7U]355%545%155%15U-?7UM;1T=?4U-5555175E965E=45=?0T]?4UM55
diff --git a/share/isdn/4.al.uu b/share/isdn/4.al.uu
index c08e17e1288af..fef11e4671dde 100644
--- a/share/isdn/4.al.uu
+++ b/share/isdn/4.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/4.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 4.al
 M5-77UM'0T]/0U]31UE975U=45U=45%165E=75%155575U-?7U-34U=?6UM35
 MU=37U55555175E=75%75U-?4U-;1T-;1T=34U=555%545555U]?4U]?45514
diff --git a/share/isdn/5.al.uu b/share/isdn/5.al.uu
index b818efdd94a09..4eb823e87e5be 100644
--- a/share/isdn/5.al.uu
+++ b/share/isdn/5.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/5.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 5.al
 MU];7U-35U=75U=75U=?4U];6UM355%=555=5U5145%145=37UM?7U-34U=55
 M55175%15U]?6T='6UM35U5145U=64594U=55U-?6U]34U5545%755=75U-?6
diff --git a/share/isdn/6.al.uu b/share/isdn/6.al.uu
index fad3d5cc54430..395e7ad9c2ed9 100644
--- a/share/isdn/6.al.uu
+++ b/share/isdn/6.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/6.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 6.al
 MU=74U-74U=755U965U=65U=45575U-?6T=;6U-34U-155=75U-1555545U=4
 M5%155555U=75U=37U%755=55U=56UM#2W=/0UM955=74U-36UM1555545U!3
diff --git a/share/isdn/7.al.uu b/share/isdn/7.al.uu
index 697ae296b52c0..58829a662fbbb 100644
--- a/share/isdn/7.al.uu
+++ b/share/isdn/7.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/7.al.uu,v 1.3 2000/08/15 09:14:03 kris Exp $
 begin 644 7.al
 MUU565E!05E=145=45=36T=;6U]3555755-74U];1T-/0UM155U9145%15E=4
 M5U14U=75U-74U-34U]?4U-34UM;555555U14U=?4U555U%565U55U-35U=37
diff --git a/share/isdn/8.al.uu b/share/isdn/8.al.uu
index d7c69bab185ae..2ca255e34cce9 100644
--- a/share/isdn/8.al.uu
+++ b/share/isdn/8.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/8.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 8.al
 MT]945E=14%975%145%145%15U=75U=555=74U];7U]'1T=?4U-545%=65E97
 M5U=45%155-75U-?6UM34U]34U-?7U]?1UM?7U-355%=145%375!14574U];0
diff --git a/share/isdn/9.al.uu b/share/isdn/9.al.uu
index fd206143eeb29..fbb98f5b54639 100644
--- a/share/isdn/9.al.uu
+++ b/share/isdn/9.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/9.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 9.al
 M5U145-75U=75U574U-145E=5U-?1T-35UU55U5=5U-;6U5165E75U]355U%6
 M5U15U5555U;6W]1<4U545=31W=[?W=#4T=#1U]545U=04U-15U1455545U14
diff --git a/share/isdn/Makefile b/share/isdn/Makefile
index 0999d77928074..56d414c632041 100644
--- a/share/isdn/Makefile
+++ b/share/isdn/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/Makefile,v 1.4 2001/12/17 13:59:30 ru Exp $
 
 FILES=	0.al 1.al 2.al 3.al 4.al 5.al 6.al 7.al 8.al 9.al beep.al msg.al
 
diff --git a/share/isdn/beep.al.uu b/share/isdn/beep.al.uu
index 57324004dbfdc..1e1839c335aba 100644
--- a/share/isdn/beep.al.uu
+++ b/share/isdn/beep.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/beep.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 beep.al
 MO)PU,P+EEA$*#)^YI;%F."<QX[>(XFZ5M+"!#"<F-H&[OHQK!%.:Z`\[.`>Q
 MI[N-`CPT>I_$`P[`LJ6]ZC(F/FFUMH5E48RQCATZ(3SCN;JTU@`3EY(9/3L+
diff --git a/share/isdn/msg.al.uu b/share/isdn/msg.al.uu
index 8375ab43a3e21..1dbc470155bab 100644
--- a/share/isdn/msg.al.uu
+++ b/share/isdn/msg.al.uu
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/isdn/msg.al.uu,v 1.3 2000/08/15 09:14:04 kris Exp $
 begin 644 msg.al
 MT]'0T-=7U==45=35551755555%1555545U145=37T-#3TM/0U]355=75U557
 M45%15U=75U=75-74U-75U-;3TM/0UM;7U-75U=34U%575E%15E905-'4U=35
diff --git a/share/man/Makefile b/share/man/Makefile
index f1929dccac151..f7efd7558a5a4 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/16/94
-# $FreeBSD$
+# $FreeBSD: src/share/man/Makefile,v 1.19 2006/03/17 18:54:33 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 43bf9442d0101..c213bab4a9a73 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man1/Makefile,v 1.19 2006/10/05 12:40:44 ru Exp $
 
 MAN=	builtin.1 intro.1
 
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index 0a93c21ecd754..6983eebfb2ecc 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.28 2006/12/26 22:25:58 ru Exp $
 .\"
 .Dd October 14, 2006
 .Dt BUILTIN 1
diff --git a/share/man/man1/intro.1 b/share/man/man1/intro.1
index c7bd089dfc0ec..21fa02bc0e297 100644
--- a/share/man/man1/intro.1
+++ b/share/man/man1/intro.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man1/intro.1,v 1.17 2006/12/24 10:25:23 ru Exp $
 .\"
 .Dd October 21, 2001
 .Dt INTRO 1
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index a3da4e62cfe48..0272b8b529947 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man3/Makefile,v 1.45 2007/10/09 23:31:10 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index 88805357b929a..0bf6cf74b8c32 100644
--- a/share/man/man3/assert.3
+++ b/share/man/man3/assert.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)assert.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/assert.3,v 1.15 2002/12/04 18:57:46 ru Exp $
 .\"
 .Dd January 26, 1999
 .Dt ASSERT 3
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index ed7b0f3dfd0c6..659cba9260872 100644
--- a/share/man/man3/bitstring.3
+++ b/share/man/man3/bitstring.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bitstring.3	8.1 (Berkeley) 7/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/bitstring.3,v 1.11 2001/10/01 16:09:20 ru Exp $
 .\"
 .Dd July 19, 1993
 .Dt BITSTRING 3
diff --git a/share/man/man3/end.3 b/share/man/man3/end.3
index 42e73fe586a4a..afe277bf9b8e2 100644
--- a/share/man/man3/end.3
+++ b/share/man/man3/end.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)end.3	6.4 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/end.3,v 1.7 2001/01/12 15:46:56 ru Exp $
 .\"
 .Dd August 28, 2000
 .Dt END 3
diff --git a/share/man/man3/fpgetround.3 b/share/man/man3/fpgetround.3
index 33c94b7eb638d..680906cca5c3f 100644
--- a/share/man/man3/fpgetround.3
+++ b/share/man/man3/fpgetround.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fpgetround.3	1.0 (Berkeley) 9/23/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.15 2005/07/15 17:35:25 hrs Exp $
 .\"
 .Dd August 23, 1993
 .Dt FPGETROUND 3
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 5645ad94f996c..4098d5c08b54f 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.3	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/intro.3,v 1.15 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt INTRO 3
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index dff388630cf3e..24cd45d3968ba 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread.3,v 1.30.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd October 19, 2007
 .Dt PTHREAD 3
diff --git a/share/man/man3/pthread_atfork.3 b/share/man/man3/pthread_atfork.3
index 125bb430316ef..04200f072d6a1 100644
--- a/share/man/man3/pthread_atfork.3
+++ b/share/man/man3/pthread_atfork.3
@@ -32,7 +32,7 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_atfork.3,v 1.3 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd June 21, 2004
 .Dt PTHREAD_ATFORK 3
diff --git a/share/man/man3/pthread_attr.3 b/share/man/man3/pthread_attr.3
index 3253b176cf0b7..16e1cd5799297 100644
--- a/share/man/man3/pthread_attr.3
+++ b/share/man/man3/pthread_attr.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_attr.3,v 1.17.2.1 2007/10/23 12:53:02 ru Exp $
 .Dd April 28, 2000
 .Dt PTHREAD_ATTR 3
 .Os
diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3
index 774be8f028758..64a8f3b1a3f44 100644
--- a/share/man/man3/pthread_attr_get_np.3
+++ b/share/man/man3/pthread_attr_get_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_attr_get_np.3,v 1.13.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd January 31, 2003
 .Dt PTHREAD_ATTR_GET_NP 3
diff --git a/share/man/man3/pthread_attr_setcreatesuspend_np.3 b/share/man/man3/pthread_attr_setcreatesuspend_np.3
index 92c2fe0a70594..d974c95623a71 100644
--- a/share/man/man3/pthread_attr_setcreatesuspend_np.3
+++ b/share/man/man3/pthread_attr_setcreatesuspend_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_attr_setcreatesuspend_np.3,v 1.6.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_ATTR_SETCREATESUSPEND_NP 3
diff --git a/share/man/man3/pthread_barrier_destroy.3 b/share/man/man3/pthread_barrier_destroy.3
index 34be9d0c793f8..93e64f82221af 100644
--- a/share/man/man3/pthread_barrier_destroy.3
+++ b/share/man/man3/pthread_barrier_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_barrier_destroy.3,v 1.5.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd February 19, 2004
 .Dt PTHREAD_BARRIER 3
diff --git a/share/man/man3/pthread_barrierattr.3 b/share/man/man3/pthread_barrierattr.3
index e314a0e6180e3..8f114c8763f06 100644
--- a/share/man/man3/pthread_barrierattr.3
+++ b/share/man/man3/pthread_barrierattr.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_barrierattr.3,v 1.2.18.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd February 19, 2004
 .Dt PTHREAD_BARRIERATTR 3
diff --git a/share/man/man3/pthread_cancel.3 b/share/man/man3/pthread_cancel.3
index 7ac5f9de2b0b3..f080aa25d2b10 100644
--- a/share/man/man3/pthread_cancel.3
+++ b/share/man/man3/pthread_cancel.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cancel.3,v 1.12.2.1 2007/10/23 12:53:02 ru Exp $
 .Dd January 17, 1999
 .Dt PTHREAD_CANCEL 3
 .Os
diff --git a/share/man/man3/pthread_cleanup_pop.3 b/share/man/man3/pthread_cleanup_pop.3
index 519e53f4ef47e..e84f5781e5d42 100644
--- a/share/man/man3/pthread_cleanup_pop.3
+++ b/share/man/man3/pthread_cleanup_pop.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cleanup_pop.3,v 1.13.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_POP 3
diff --git a/share/man/man3/pthread_cleanup_push.3 b/share/man/man3/pthread_cleanup_push.3
index 2790987745992..7c569a0521b0d 100644
--- a/share/man/man3/pthread_cleanup_push.3
+++ b/share/man/man3/pthread_cleanup_push.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cleanup_push.3,v 1.14.2.1 2007/10/23 12:53:02 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_PUSH 3
diff --git a/share/man/man3/pthread_cond_broadcast.3 b/share/man/man3/pthread_cond_broadcast.3
index bbd274103ac35..905ddeacf2f6f 100644
--- a/share/man/man3/pthread_cond_broadcast.3
+++ b/share/man/man3/pthread_cond_broadcast.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_broadcast.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_BROADCAST 3
diff --git a/share/man/man3/pthread_cond_destroy.3 b/share/man/man3/pthread_cond_destroy.3
index ca435ea76cf31..00e3ff8307b0a 100644
--- a/share/man/man3/pthread_cond_destroy.3
+++ b/share/man/man3/pthread_cond_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_destroy.3,v 1.15.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_DESTROY 3
diff --git a/share/man/man3/pthread_cond_init.3 b/share/man/man3/pthread_cond_init.3
index 38843a76fe709..e34eb7f1f11af 100644
--- a/share/man/man3/pthread_cond_init.3
+++ b/share/man/man3/pthread_cond_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.17.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd November 4, 2006
 .Dt PTHREAD_COND_INIT 3
diff --git a/share/man/man3/pthread_cond_signal.3 b/share/man/man3/pthread_cond_signal.3
index 8ab801f91997a..1c5c4d7a4aa82 100644
--- a/share/man/man3/pthread_cond_signal.3
+++ b/share/man/man3/pthread_cond_signal.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_signal.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_SIGNAL 3
diff --git a/share/man/man3/pthread_cond_timedwait.3 b/share/man/man3/pthread_cond_timedwait.3
index 01625696289d7..38221377fa486 100644
--- a/share/man/man3/pthread_cond_timedwait.3
+++ b/share/man/man3/pthread_cond_timedwait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_timedwait.3,v 1.20.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_TIMEDWAIT 3
diff --git a/share/man/man3/pthread_cond_wait.3 b/share/man/man3/pthread_cond_wait.3
index 07276037ed934..713b292ccc06f 100644
--- a/share/man/man3/pthread_cond_wait.3
+++ b/share/man/man3/pthread_cond_wait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_cond_wait.3,v 1.21.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 16, 2006
 .Dt PTHREAD_COND_WAIT 3
diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3
index bf28987c0aa4d..5639acfc32b5e 100644
--- a/share/man/man3/pthread_condattr.3
+++ b/share/man/man3/pthread_condattr.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_condattr.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .Dd April 28, 2000
 .Dt PTHREAD_CONDATTR 3
 .Os
diff --git a/share/man/man3/pthread_create.3 b/share/man/man3/pthread_create.3
index 277d157cfbfc7..6d44350e7f181 100644
--- a/share/man/man3/pthread_create.3
+++ b/share/man/man3/pthread_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.23.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd November 4, 2006
 .Dt PTHREAD_CREATE 3
diff --git a/share/man/man3/pthread_detach.3 b/share/man/man3/pthread_detach.3
index dba4aec433c10..2b0a0363d3ecf 100644
--- a/share/man/man3/pthread_detach.3
+++ b/share/man/man3/pthread_detach.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_detach.3,v 1.17.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_DETACH 3
diff --git a/share/man/man3/pthread_equal.3 b/share/man/man3/pthread_equal.3
index 1ed85319b961e..c075011b16db8 100644
--- a/share/man/man3/pthread_equal.3
+++ b/share/man/man3/pthread_equal.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_equal.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EQUAL 3
diff --git a/share/man/man3/pthread_exit.3 b/share/man/man3/pthread_exit.3
index d949f190ef11e..ce0b106e16acc 100644
--- a/share/man/man3/pthread_exit.3
+++ b/share/man/man3/pthread_exit.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_exit.3,v 1.20.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EXIT 3
diff --git a/share/man/man3/pthread_getconcurrency.3 b/share/man/man3/pthread_getconcurrency.3
index f442ea20b4080..ac1268ebd51be 100644
--- a/share/man/man3/pthread_getconcurrency.3
+++ b/share/man/man3/pthread_getconcurrency.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_getconcurrency.3,v 1.5.2.1 2007/10/23 12:53:03 ru Exp $
 .Dd April 11, 2003
 .Dt PTHREAD_GETCONCURRENCY 3
 .Os
diff --git a/share/man/man3/pthread_getspecific.3 b/share/man/man3/pthread_getspecific.3
index d59003f4e2810..474dd326304f4 100644
--- a/share/man/man3/pthread_getspecific.3
+++ b/share/man/man3/pthread_getspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_getspecific.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_GETSPECIFIC 3
diff --git a/share/man/man3/pthread_join.3 b/share/man/man3/pthread_join.3
index 1aa593222b4cb..65eb39a8ba259 100644
--- a/share/man/man3/pthread_join.3
+++ b/share/man/man3/pthread_join.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_join.3,v 1.17.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_JOIN 3
diff --git a/share/man/man3/pthread_key_create.3 b/share/man/man3/pthread_key_create.3
index a818e1a523648..f0ad8f9cb0b75 100644
--- a/share/man/man3/pthread_key_create.3
+++ b/share/man/man3/pthread_key_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_key_create.3,v 1.15.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_CREATE 3
diff --git a/share/man/man3/pthread_key_delete.3 b/share/man/man3/pthread_key_delete.3
index c7861af50ce20..bda2486d58a55 100644
--- a/share/man/man3/pthread_key_delete.3
+++ b/share/man/man3/pthread_key_delete.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_key_delete.3,v 1.15.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_DELETE 3
diff --git a/share/man/man3/pthread_kill.3 b/share/man/man3/pthread_kill.3
index 1ef879a2f765f..8e91e6e0e155a 100644
--- a/share/man/man3/pthread_kill.3
+++ b/share/man/man3/pthread_kill.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_kill.3,v 1.12.2.1 2007/10/23 12:53:03 ru Exp $
 .Dd April 27, 2000
 .Dt PTHREAD_KILL 3
 .Os
diff --git a/share/man/man3/pthread_main_np.3 b/share/man/man3/pthread_main_np.3
index 43d72920140a6..936abd6e5b67e 100644
--- a/share/man/man3/pthread_main_np.3
+++ b/share/man/man3/pthread_main_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_main_np.3,v 1.5.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_MAIN_NP 3
diff --git a/share/man/man3/pthread_multi_np.3 b/share/man/man3/pthread_multi_np.3
index 9a42a99585bc1..4e65e95d5d771 100644
--- a/share/man/man3/pthread_multi_np.3
+++ b/share/man/man3/pthread_multi_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_multi_np.3,v 1.5.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_MULTI_NP 3
diff --git a/share/man/man3/pthread_mutex_destroy.3 b/share/man/man3/pthread_mutex_destroy.3
index d6c4bcd5e4464..a7d096da3641d 100644
--- a/share/man/man3/pthread_mutex_destroy.3
+++ b/share/man/man3/pthread_mutex_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_destroy.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_DESTROY 3
diff --git a/share/man/man3/pthread_mutex_init.3 b/share/man/man3/pthread_mutex_init.3
index 10a026b9dcbe1..df407157860c3 100644
--- a/share/man/man3/pthread_mutex_init.3
+++ b/share/man/man3/pthread_mutex_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.17.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd November 4, 2006
 .Dt PTHREAD_MUTEX_INIT 3
diff --git a/share/man/man3/pthread_mutex_lock.3 b/share/man/man3/pthread_mutex_lock.3
index 8479a69d3a026..e7d8bd96e7433 100644
--- a/share/man/man3/pthread_mutex_lock.3
+++ b/share/man/man3/pthread_mutex_lock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_lock.3,v 1.17.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd January 31, 2006
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/share/man/man3/pthread_mutex_timedlock.3 b/share/man/man3/pthread_mutex_timedlock.3
index abc7e2a28854e..355a2a9bb08ea 100644
--- a/share/man/man3/pthread_mutex_timedlock.3
+++ b/share/man/man3/pthread_mutex_timedlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_timedlock.3,v 1.5.18.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd December 30, 2003
 .Dt PTHREAD_MUTEX_TIMEDLOCK 3
diff --git a/share/man/man3/pthread_mutex_trylock.3 b/share/man/man3/pthread_mutex_trylock.3
index 049006f916f18..c678bc9cbac1f 100644
--- a/share/man/man3/pthread_mutex_trylock.3
+++ b/share/man/man3/pthread_mutex_trylock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_trylock.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_TRYLOCK 3
diff --git a/share/man/man3/pthread_mutex_unlock.3 b/share/man/man3/pthread_mutex_unlock.3
index 77784e1b1962c..3c80fe4c16a22 100644
--- a/share/man/man3/pthread_mutex_unlock.3
+++ b/share/man/man3/pthread_mutex_unlock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutex_unlock.3,v 1.15.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_UNLOCK 3
diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3
index f97602615be11..8c8d94d4cf5ad 100644
--- a/share/man/man3/pthread_mutexattr.3
+++ b/share/man/man3/pthread_mutexattr.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutexattr.3,v 1.12.2.1 2007/10/23 12:53:03 ru Exp $
 .Dd May 1, 2000
 .Dt PTHREAD_MUTEXATTR 3
 .Os
diff --git a/share/man/man3/pthread_mutexattr_getkind_np.3 b/share/man/man3/pthread_mutexattr_getkind_np.3
index 548045b5aac77..b32c96538a969 100644
--- a/share/man/man3/pthread_mutexattr_getkind_np.3
+++ b/share/man/man3/pthread_mutexattr_getkind_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_mutexattr_getkind_np.3,v 1.6.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_MUTEXATTR_GETKIND_NP 3
diff --git a/share/man/man3/pthread_once.3 b/share/man/man3/pthread_once.3
index fe234187730cb..18c8ed0a0c061 100644
--- a/share/man/man3/pthread_once.3
+++ b/share/man/man3/pthread_once.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_once.3,v 1.20.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
diff --git a/share/man/man3/pthread_resume_all_np.3 b/share/man/man3/pthread_resume_all_np.3
index 4c63c3bf4c37e..2bb239bbc3855 100644
--- a/share/man/man3/pthread_resume_all_np.3
+++ b/share/man/man3/pthread_resume_all_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_resume_all_np.3,v 1.5.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_RESUME_ALL_NP 3
diff --git a/share/man/man3/pthread_resume_np.3 b/share/man/man3/pthread_resume_np.3
index 08f7cb96f1000..64d2753523dd1 100644
--- a/share/man/man3/pthread_resume_np.3
+++ b/share/man/man3/pthread_resume_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_resume_np.3,v 1.5.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_RESUME_NP 3
diff --git a/share/man/man3/pthread_rwlock_destroy.3 b/share/man/man3/pthread_rwlock_destroy.3
index 0129222866b2d..d3d6e37b79c44 100644
--- a/share/man/man3/pthread_rwlock_destroy.3
+++ b/share/man/man3/pthread_rwlock_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_destroy.3,v 1.11.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_DESTROY 3
diff --git a/share/man/man3/pthread_rwlock_init.3 b/share/man/man3/pthread_rwlock_init.3
index cf8cc7e10ed6c..1133beae4e758 100644
--- a/share/man/man3/pthread_rwlock_init.3
+++ b/share/man/man3/pthread_rwlock_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_init.3,v 1.10.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_INIT 3
diff --git a/share/man/man3/pthread_rwlock_rdlock.3 b/share/man/man3/pthread_rwlock_rdlock.3
index 7a197f210ba0e..e7f439923dee5 100644
--- a/share/man/man3/pthread_rwlock_rdlock.3
+++ b/share/man/man3/pthread_rwlock_rdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_rdlock.3,v 1.9.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_RDLOCK 3
diff --git a/share/man/man3/pthread_rwlock_timedrdlock.3 b/share/man/man3/pthread_rwlock_timedrdlock.3
index 78b74700ce755..08963cd6dd5ad 100644
--- a/share/man/man3/pthread_rwlock_timedrdlock.3
+++ b/share/man/man3/pthread_rwlock_timedrdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedrdlock.3,v 1.2.18.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt PTHREAD_RWLOCK_TIMEDRDLOCK 3
diff --git a/share/man/man3/pthread_rwlock_timedwrlock.3 b/share/man/man3/pthread_rwlock_timedwrlock.3
index 9821c5b40bc7d..f0ae554f7a033 100644
--- a/share/man/man3/pthread_rwlock_timedwrlock.3
+++ b/share/man/man3/pthread_rwlock_timedwrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_timedwrlock.3,v 1.2.18.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt PTHREAD_RWLOCK_TIMEDWRLOCK 3
diff --git a/share/man/man3/pthread_rwlock_unlock.3 b/share/man/man3/pthread_rwlock_unlock.3
index 8ad891ea4545f..39f44e4a9fb16 100644
--- a/share/man/man3/pthread_rwlock_unlock.3
+++ b/share/man/man3/pthread_rwlock_unlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_unlock.3,v 1.9.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_UNLOCK 3
diff --git a/share/man/man3/pthread_rwlock_wrlock.3 b/share/man/man3/pthread_rwlock_wrlock.3
index 602b54fd029f1..192de11f5a252 100644
--- a/share/man/man3/pthread_rwlock_wrlock.3
+++ b/share/man/man3/pthread_rwlock_wrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlock_wrlock.3,v 1.10.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
diff --git a/share/man/man3/pthread_rwlockattr_destroy.3 b/share/man/man3/pthread_rwlockattr_destroy.3
index bff808fdbbd9c..302cd9576fd8b 100644
--- a/share/man/man3/pthread_rwlockattr_destroy.3
+++ b/share/man/man3/pthread_rwlockattr_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_destroy.3,v 1.12.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_DESTROY 3
diff --git a/share/man/man3/pthread_rwlockattr_getpshared.3 b/share/man/man3/pthread_rwlockattr_getpshared.3
index 3fe5de1ae0aab..9a7fae43d23ce 100644
--- a/share/man/man3/pthread_rwlockattr_getpshared.3
+++ b/share/man/man3/pthread_rwlockattr_getpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_getpshared.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd March 22, 1999
 .Dt PTHREAD_RWLOCKATTR_GETPSHARED 3
diff --git a/share/man/man3/pthread_rwlockattr_init.3 b/share/man/man3/pthread_rwlockattr_init.3
index 54d319ff84e29..49320ec608b30 100644
--- a/share/man/man3/pthread_rwlockattr_init.3
+++ b/share/man/man3/pthread_rwlockattr_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_init.3,v 1.12.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_INIT 3
diff --git a/share/man/man3/pthread_rwlockattr_setpshared.3 b/share/man/man3/pthread_rwlockattr_setpshared.3
index 36bcc690f46e2..262a867660fcb 100644
--- a/share/man/man3/pthread_rwlockattr_setpshared.3
+++ b/share/man/man3/pthread_rwlockattr_setpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_rwlockattr_setpshared.3,v 1.14.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
diff --git a/share/man/man3/pthread_schedparam.3 b/share/man/man3/pthread_schedparam.3
index 52d72cc1dd9b4..52195813f18aa 100644
--- a/share/man/man3/pthread_schedparam.3
+++ b/share/man/man3/pthread_schedparam.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_schedparam.3,v 1.11.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd October 16, 2006
 .Dt PTHREAD_SCHEDPARAM 3
diff --git a/share/man/man3/pthread_self.3 b/share/man/man3/pthread_self.3
index 4d6aa2bffd20f..b307f70c89ebc 100644
--- a/share/man/man3/pthread_self.3
+++ b/share/man/man3/pthread_self.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_self.3,v 1.13.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SELF 3
diff --git a/share/man/man3/pthread_set_name_np.3 b/share/man/man3/pthread_set_name_np.3
index 3bf430afaca6f..19d061b9a482e 100644
--- a/share/man/man3/pthread_set_name_np.3
+++ b/share/man/man3/pthread_set_name_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_set_name_np.3,v 1.5.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SET_NAME_NP 3
diff --git a/share/man/man3/pthread_setspecific.3 b/share/man/man3/pthread_setspecific.3
index 1ea3002d43a0a..2f1bf54b3299a 100644
--- a/share/man/man3/pthread_setspecific.3
+++ b/share/man/man3/pthread_setspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_setspecific.3,v 1.16.2.1 2007/10/23 12:53:03 ru Exp $
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SETSPECIFIC 3
diff --git a/share/man/man3/pthread_sigmask.3 b/share/man/man3/pthread_sigmask.3
index c4125430d9601..7b814613868b3 100644
--- a/share/man/man3/pthread_sigmask.3
+++ b/share/man/man3/pthread_sigmask.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_sigmask.3,v 1.13.2.1 2007/10/23 12:53:04 ru Exp $
 .Dd April 27, 2000
 .Dt PTHREAD_SIGMASK 3
 .Os
diff --git a/share/man/man3/pthread_spin_init.3 b/share/man/man3/pthread_spin_init.3
index 1f76de1bf6a1c..2abf34de7e088 100644
--- a/share/man/man3/pthread_spin_init.3
+++ b/share/man/man3/pthread_spin_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_spin_init.3,v 1.2.18.1 2007/10/23 12:53:04 ru Exp $
 .\"
 .Dd January 22, 2004
 .Dt PTHREAD_SPIN_INIT 3
diff --git a/share/man/man3/pthread_spin_lock.3 b/share/man/man3/pthread_spin_lock.3
index 24dea92d2397e..4eaf5c1d3e2bb 100644
--- a/share/man/man3/pthread_spin_lock.3
+++ b/share/man/man3/pthread_spin_lock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_spin_lock.3,v 1.3.18.1 2007/10/23 12:53:04 ru Exp $
 .\"
 .Dd January 22, 2004
 .Dt PTHREAD_SPIN_LOCK 3
diff --git a/share/man/man3/pthread_suspend_all_np.3 b/share/man/man3/pthread_suspend_all_np.3
index fdeab1970fc9b..6282fdb3b906a 100644
--- a/share/man/man3/pthread_suspend_all_np.3
+++ b/share/man/man3/pthread_suspend_all_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_suspend_all_np.3,v 1.6 2006/09/30 11:22:26 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SUSPEND_ALL_NP 3
diff --git a/share/man/man3/pthread_suspend_np.3 b/share/man/man3/pthread_suspend_np.3
index 43d2b7ddea971..7cd82fbad2a63 100644
--- a/share/man/man3/pthread_suspend_np.3
+++ b/share/man/man3/pthread_suspend_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_suspend_np.3,v 1.6 2006/09/30 11:22:26 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SUSPEND_NP 3
diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3
index 0c4207271843e..c145143da3edf 100644
--- a/share/man/man3/pthread_switch_add_np.3
+++ b/share/man/man3/pthread_switch_add_np.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_switch_add_np.3,v 1.4.2.1 2007/10/23 12:53:04 ru Exp $
 .\"
 .Dd February 13, 2003
 .Dt PTHREAD_SWITCH_ADD_NP 3
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index 7a73cb9edcbeb..58adf8171d86b 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_testcancel.3,v 1.14.2.1 2007/10/23 12:53:04 ru Exp $
 .Dd January 17, 1999
 .Dt PTHREAD_TESTCANCEL 3
 .Os
diff --git a/share/man/man3/pthread_yield.3 b/share/man/man3/pthread_yield.3
index e47c033acfb7f..3a5141faea539 100644
--- a/share/man/man3/pthread_yield.3
+++ b/share/man/man3/pthread_yield.3
@@ -2,7 +2,7 @@
 .\"
 .\" PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/pthread_yield.3,v 1.1.4.1 2007/10/23 12:53:04 ru Exp $
 .\"
 .Dd September 18, 2006
 .Dt PTHREAD_YIELD 3
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index b92cf74f46f25..67debdedc282d 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/queue.3,v 1.40 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd March 24, 2006
 .Dt QUEUE 3
diff --git a/share/man/man3/siginfo.3 b/share/man/man3/siginfo.3
index 6e6b2a4cd6461..b031449a7747d 100644
--- a/share/man/man3/siginfo.3
+++ b/share/man/man3/siginfo.3
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/siginfo.3,v 1.3 2006/09/30 11:48:12 ru Exp $
 .\"
 .Dd December 8, 2005
 .Dt SIGINFO 3
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index 92a26f7c6d487..775d18641b11f 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)stdarg.3	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/stdarg.3,v 1.15 2005/01/21 08:36:36 ru Exp $
 .\"
 .Dd October 25, 2002
 .Dt STDARG 3
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index b7c006a1390a2..ed615873ded30 100644
--- a/share/man/man3/sysexits.3
+++ b/share/man/man3/sysexits.3
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.16 2005/06/30 13:13:49 hmp Exp $
 .\"
 .\" "
 .Dd March 31, 1996
diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3
index 3e2a8ff68a380..f38eabe12ec6b 100644
--- a/share/man/man3/tgmath.3
+++ b/share/man/man3/tgmath.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.2 2005/01/13 11:22:29 ru Exp $
 .\"
 .Dd August 14, 2004
 .Os
diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3
index 7b6293f0dbfbe..6e08a4d37cf8c 100644
--- a/share/man/man3/timeradd.3
+++ b/share/man/man3/timeradd.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/timeradd.3,v 1.3 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd August 11, 1999
 .Dt TIMERADD 3
diff --git a/share/man/man3/tree.3 b/share/man/man3/tree.3
index 78ba4b0c46216..6e805b3b6e018 100644
--- a/share/man/man3/tree.3
+++ b/share/man/man3/tree.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man3/tree.3,v 1.6 2006/01/19 07:20:20 jasone Exp $
 .\"
 .Dd January 17, 2006
 .Dt TREE 3
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index b9d7561767e3e..87b250bde281c 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.2.2.3 2008/02/06 03:38:47 scottl Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index c578da8dfb141..53840884918ff 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aac.4,v 1.36.2.2 2007/12/10 15:29:32 emaste Exp $
 .Dd November 29, 2007
 .Dt AAC 4
 .Os
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 0b8db99b7878d..64f7ac5f9bee7 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.61 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd July 29, 2006
 .Dt ACPI 4
diff --git a/share/man/man4/acpi_dock.4 b/share/man/man4/acpi_dock.4
index 1fda11d3c09a3..28114738a5dcf 100644
--- a/share/man/man4/acpi_dock.4
+++ b/share/man/man4/acpi_dock.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi_dock.4,v 1.2 2006/09/30 15:14:48 ru Exp $
 .\"
 .Dd May 20, 2006
 .Dt ACPI_DOCK 4
diff --git a/share/man/man4/acpi_thermal.4 b/share/man/man4/acpi_thermal.4
index d1cf8ee60ef21..fbd33e2aa282b 100644
--- a/share/man/man4/acpi_thermal.4
+++ b/share/man/man4/acpi_thermal.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi_thermal.4,v 1.11 2007/03/18 00:57:07 njl Exp $
 .\"
 .Dd March 17, 2007
 .Dt ACPI_THERMAL 4
diff --git a/share/man/man4/acpi_video.4 b/share/man/man4/acpi_video.4
index c28678479e719..1d0567948e0da 100644
--- a/share/man/man4/acpi_video.4
+++ b/share/man/man4/acpi_video.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/acpi_video.4,v 1.4 2005/07/15 17:35:25 hrs Exp $
 .\"
 .Dd November 8, 2004
 .Dt ACPI_VIDEO 4
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 76e37a7c209e5..d58ff949195db 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/adv.4,v 1.22 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 8, 2004
 .Dt ADV 4
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index eae4a774c8d8d..f3ac661c8d8b7 100644
--- a/share/man/man4/adw.4
+++ b/share/man/man4/adw.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/adw.4,v 1.20 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd July 14, 2004
 .Dt ADW 4
diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4
index 06bee7374fb6e..13327acb66d9b 100644
--- a/share/man/man4/agp.4
+++ b/share/man/man4/agp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/agp.4,v 1.10.2.1 2007/12/01 17:24:18 remko Exp $
 .\"
 .Dd November 28, 2007
 .Dt AGP 4
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index f0f8aca236341..7f29a03352c20 100644
--- a/share/man/man4/aha.4
+++ b/share/man/man4/aha.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aha.4,v 1.27 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHA 4
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index 6ef99931a2a5e..103c4cacf852b 100644
--- a/share/man/man4/ahb.4
+++ b/share/man/man4/ahb.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ahb.4,v 1.24 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHB 4
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index cc5db4c014083..6336d712495e1 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ahc.4,v 1.39 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHC 4
diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4
index e00c42758ea72..9ab95ba0e2b93 100644
--- a/share/man/man4/ahd.4
+++ b/share/man/man4/ahd.4
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ahd.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHD 4
diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4
index 3ea71b05d77cb..261328fb6aa86 100644
--- a/share/man/man4/aio.4
+++ b/share/man/man4/aio.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aio.4,v 1.4 2003/01/14 03:42:16 tjr Exp $
 .\"
 .Dd October 24, 2002
 .Dt AIO 4
diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index bc807d347de5c..2b57615fbfaa6 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/altq.4,v 1.32 2007/06/12 02:19:11 yongari Exp $
 .\"
 .Dd June 12, 2007
 .Dt ALTQ 4
diff --git a/share/man/man4/amd.4 b/share/man/man4/amd.4
index ee4236027cf3b..dc6ea2bdf8561 100644
--- a/share/man/man4/amd.4
+++ b/share/man/man4/amd.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/amd.4,v 1.9 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 8, 2004
 .Dt AMD 4
diff --git a/share/man/man4/amdsmb.4 b/share/man/man4/amdsmb.4
index eb02543f806d9..7c280c38026af 100644
--- a/share/man/man4/amdsmb.4
+++ b/share/man/man4/amdsmb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/amdsmb.4,v 1.3 2006/09/30 15:14:48 ru Exp $
 .\"
 .Dd December 31, 2005
 .Dt AMDSMB 4
diff --git a/share/man/man4/amr.4 b/share/man/man4/amr.4
index ad94ffe2c8dc1..128588d4af678 100644
--- a/share/man/man4/amr.4
+++ b/share/man/man4/amr.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/amr.4,v 1.35 2006/06/18 14:45:28 brueffer Exp $
 .\"
 .Dd March 29, 2006
 .Dt AMR 4
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 608a4edf9a0c0..264fe5b6ec4a4 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/an.4,v 1.25 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt AN 4
diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4
index ff6f88bbdfffb..f8e0f189b72c2 100644
--- a/share/man/man4/arcmsr.4
+++ b/share/man/man4/arcmsr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/arcmsr.4,v 1.5 2007/01/10 12:57:46 brueffer Exp $
 .\"
 .Dd January 10, 2007
 .Dt ARCMSR 4
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 955eb0f3655a8..777836a3434f9 100644
--- a/share/man/man4/asr.4
+++ b/share/man/man4/asr.4
@@ -4,7 +4,7 @@
 .\"
 .\" Manpage cleanup by: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/asr.4,v 1.24 2004/08/02 23:33:15 marius Exp $
 .\"
 .Dd July 14, 2004
 .Dt ASR 4
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index 624b104a601f6..61ae017b71dea 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ata.4,v 1.74 2007/10/05 07:06:51 brueffer Exp $
 .\"
 .Dd October 5, 2007
 .Dt ATA 4
diff --git a/share/man/man4/atapicam.4 b/share/man/man4/atapicam.4
index 1c226f2539dca..726bd81adfa4c 100644
--- a/share/man/man4/atapicam.4
+++ b/share/man/man4/atapicam.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.5 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd October 23, 2002
 .Dt ATAPICAM 4
diff --git a/share/man/man4/ataraid.4 b/share/man/man4/ataraid.4
index ee7446dff1a5b..92bd907089042 100644
--- a/share/man/man4/ataraid.4
+++ b/share/man/man4/ataraid.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ataraid.4,v 1.10 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd February 17, 2006
 .Dt ATARAID 4
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 44705f1ca75a5..6793a4295dd03 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.43.4.1 2008/01/30 18:13:52 brueffer Exp $
 .\"/
 .Dd December 7, 2006
 .Dt ATH 4
diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4
index fa6018129c4f2..801cc3991483d 100644
--- a/share/man/man4/ath_hal.4
+++ b/share/man/man4/ath_hal.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.11 2005/01/15 12:49:11 ru Exp $
 .\"/
 .Dd August 26, 2004
 .Dt ATH_HAL 4
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 590b7c1b2213e..645f41c363e37 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/atkbd.4,v 1.28 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 46d30c1ec24e3..18c7877c722ba 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/atkbdc.4,v 1.18 2005/04/07 23:59:37 sobomax Exp $
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
diff --git a/share/man/man4/audit.4 b/share/man/man4/audit.4
index e57b4bc06443f..5de6a54be9b72 100644
--- a/share/man/man4/audit.4
+++ b/share/man/man4/audit.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/audit.4,v 1.10 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd May 5, 2006
 .Os
diff --git a/share/man/man4/auditpipe.4 b/share/man/man4/auditpipe.4
index 8d62e7e3931b3..9a5ec32271d6e 100644
--- a/share/man/man4/auditpipe.4
+++ b/share/man/man4/auditpipe.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd May 5, 2006
 .Os
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index fdb5fb5e4429b..eeffecb43c8bd 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/aue.4,v 1.26 2007/02/03 19:29:31 brueffer Exp $
 .\"
 .Dd October 7, 2006
 .Dt AUE 4
diff --git a/share/man/man4/awi.4 b/share/man/man4/awi.4
index 02fd2164bcb45..c1425720c9449 100644
--- a/share/man/man4/awi.4
+++ b/share/man/man4/awi.4
@@ -1,5 +1,5 @@
 .\"     $NetBSD: awi.4,v 1.6 2000/03/22 11:24:33 onoe Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/awi.4,v 1.23.4.1 2008/01/30 18:13:52 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt AWI 4
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 63b2c2c9926b4..dd8f888c1f87a 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/axe.4,v 1.14 2007/06/06 19:27:10 remko Exp $
 .\"
 .Dd June 6, 2007
 .Dt AXE 4
diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4
index 2a30953e5da7a..fafc30385f6f8 100644
--- a/share/man/man4/bce.4
+++ b/share/man/man4/bce.4
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bce.4,v 1.8 2007/06/24 18:36:07 brueffer Exp $
 .\"
 .Dd June 24, 2007
 .Dt BCE 4
diff --git a/share/man/man4/bfe.4 b/share/man/man4/bfe.4
index 307813b7ab4f4..d1e6c82407e83 100644
--- a/share/man/man4/bfe.4
+++ b/share/man/man4/bfe.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bfe.4,v 1.7 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt BFE 4
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index 70dba2b806b20..41461e4c004a8 100644
--- a/share/man/man4/bge.4
+++ b/share/man/man4/bge.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bge.4,v 1.32.2.1 2007/10/26 19:47:01 jkim Exp $
 .\"
 .Dd October 26, 2007
 .Dt BGE 4
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 32baf3a33ace0..8183fefe1f1fd 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bktr.4,v 1.31 2006/01/21 14:58:25 netchild Exp $
 .\"
 .Dd January 18, 2006
 .Dt BKTR 4
diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4
index 2005aabb31bd5..ec41398932e49 100644
--- a/share/man/man4/blackhole.4
+++ b/share/man/man4/blackhole.4
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/blackhole.4,v 1.14 2007/01/01 21:22:32 danger Exp $
 .Dd January 1, 2007
 .Dt BLACKHOLE 4
 .Os
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index bb278586fbb13..11c6c4ebb6dea 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -20,7 +20,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.48 2007/02/26 22:24:14 jkim Exp $
 .\"
 .Dd February 26, 2007
 .Dt BPF 4
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index d684ee6947dc3..09c49c8c30ddf 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/bt.4,v 1.26 2006/06/18 14:12:27 brueffer Exp $
 .\"
 .Dd June 18, 2006
 .Dt BT 4
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index 1c3600a916834..e4c99a5041b70 100644
--- a/share/man/man4/cardbus.4
+++ b/share/man/man4/cardbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cardbus.4,v 1.6 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt CARDBUS 4
diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4
index 8333b4a088499..cba00d3fbed99 100644
--- a/share/man/man4/carp.4
+++ b/share/man/man4/carp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/carp.4,v 1.10 2006/06/07 10:26:51 glebius Exp $
 .\"
 .Dd June 6, 2006
 .Dt CARP 4
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 8da0e360490a7..6251e7060cacc 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.32 2006/04/14 09:20:24 ru Exp $
 .\"
 .Dd August 9, 1995
 .Dt CCD 4
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 19113b78f28da..905d9e4df960e 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cd.4,v 1.37 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt CD 4
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index d284425857ba6..a0c64aba84476 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -26,7 +26,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cdce.4,v 1.8 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd September 17, 2005
 .Dt CDCE 4
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 0db548c81e602..0ade1ffa4ee73 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ch.4,v 1.35 2005/01/21 20:51:09 ru Exp $
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@FreeBSD.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index 74e54e7b692d0..9a16427a40901 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ciss.4,v 1.14.4.1 2008/02/15 13:55:23 iwasaki Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man4/cm.4 b/share/man/man4/cm.4
index bbeee52f9532c..2ca56714bce35 100644
--- a/share/man/man4/cm.4
+++ b/share/man/man4/cm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cm.4,v 1.9 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt CM 4
diff --git a/share/man/man4/cnw.4 b/share/man/man4/cnw.4
index c15312bf22821..7009ded0f9f2a 100644
--- a/share/man/man4/cnw.4
+++ b/share/man/man4/cnw.4
@@ -35,7 +35,7 @@
 .\"
 .\"	PAO2 Id: cnw.4,v 1.1.1.1 1997/12/11 14:46:23 itojun Exp
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cnw.4,v 1.2 2005/01/13 16:37:26 ru Exp $
 .\"
 .Dd September 5, 2004
 .Dt CNW 4
diff --git a/share/man/man4/coda.4 b/share/man/man4/coda.4
index 9fd6cbb8be113..bfa705c19e47f 100644
--- a/share/man/man4/coda.4
+++ b/share/man/man4/coda.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/coda.4,v 1.2.4.1 2008/01/23 12:22:11 rwatson Exp $
 .\"
 .Dd January 21, 2008
 .Os
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index ce4eb36f1a599..b9250bc3918fa 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/coretemp.4,v 1.1 2007/08/23 20:05:09 des Exp $
 .\"
 .Dd August 23, 2007
 .Dt CORETEMP 4
diff --git a/share/man/man4/cpufreq.4 b/share/man/man4/cpufreq.4
index 50e83ebce547d..64266b0d65507 100644
--- a/share/man/man4/cpufreq.4
+++ b/share/man/man4/cpufreq.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cpufreq.4,v 1.15 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd March 3, 2006
 .Dt CPUFREQ 4
diff --git a/share/man/man4/crypto.4 b/share/man/man4/crypto.4
index abc0d7962fe59..554f624ada484 100644
--- a/share/man/man4/crypto.4
+++ b/share/man/man4/crypto.4
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/crypto.4,v 1.7 2007/08/02 08:04:48 bz Exp $
 .\"
 .Dd August 1, 2007
 .Dt CRYPTO 4
diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4
index a27653cffa8a3..b3bac3ce3ac56 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cue.4,v 1.22 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt CUE 4
diff --git a/share/man/man4/cxgb.4 b/share/man/man4/cxgb.4
index 2647208a3e574..880436efcbc5a 100644
--- a/share/man/man4/cxgb.4
+++ b/share/man/man4/cxgb.4
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cxgb.4,v 1.8 2007/09/26 21:31:47 brueffer Exp $
 .\"
 .Dd March 14, 2007
 .Dt CXGB 4
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index 07974734864e5..a53da6d3f2496 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.16 1995/06/26 06:05:30 bde Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/cy.4,v 1.24 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd May 24, 2004
 .Dt CY 4
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 2ba80965e9799..f778247fdfb06 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/da.4,v 1.48 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt DA 4
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 3516245442863..cc78cdc3cf541 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dc.4,v 1.40 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt DC 4
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index 142a077be1368..65e32e0bc8510 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dcons.4,v 1.11 2006/03/20 17:10:09 wkoszek Exp $
 .\"
 .Dd October 7, 2005
 .Dt DCONS 4
diff --git a/share/man/man4/dcons_crom.4 b/share/man/man4/dcons_crom.4
index b9c5ca09deb19..ccfbe6ce09224 100644
--- a/share/man/man4/dcons_crom.4
+++ b/share/man/man4/dcons_crom.4
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dcons_crom.4,v 1.4 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd June 16, 2003
 .Dt DCONS_CROM 4
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 488c75d81c013..35661f54d1097 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -57,7 +57,7 @@
 .\" 	Created.
 .\" 	[90/08/30            dbg]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.42 2007/08/09 20:14:35 njl Exp $
 .\"
 .Dd August 6, 2007
 .Dt DDB 4
diff --git a/share/man/man4/de.4 b/share/man/man4/de.4
index eeca37665f4a8..33eeb69dc0224 100644
--- a/share/man/man4/de.4
+++ b/share/man/man4/de.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/de.4,v 1.26 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt DE 4
diff --git a/share/man/man4/devctl.4 b/share/man/man4/devctl.4
index 50afee70442ec..dc12b978d473f 100644
--- a/share/man/man4/devctl.4
+++ b/share/man/man4/devctl.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/devctl.4,v 1.5 2006/08/04 07:56:32 yar Exp $
 .\"
 .Dd February 11, 2003
 .Dt DEVCTL 4
diff --git a/share/man/man4/digi.4 b/share/man/man4/digi.4
index e33e365cecf12..859b4f136181d 100644
--- a/share/man/man4/digi.4
+++ b/share/man/man4/digi.4
@@ -35,7 +35,7 @@
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
 .\"	from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/digi.4,v 1.4 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd December 7, 2003
 .Dt DIGI 4
diff --git a/share/man/man4/disc.4 b/share/man/man4/disc.4
index 300e712272fc5..a90f611160e8e 100644
--- a/share/man/man4/disc.4
+++ b/share/man/man4/disc.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/disc.4,v 1.2 2002/05/30 12:23:21 ru Exp $
 .\"
 .Dd May 25, 2002
 .Dt DISC 4
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index d0e67857b1c8e..2bceebd098b2b 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/divert.4,v 1.38 2006/09/24 13:58:44 danger Exp $
 .\"
 .Dd December 17, 2004
 .Dt DIVERT 4
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index fecb7a54583b4..9a3469170eae2 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dpt.4,v 1.20 2006/06/18 14:37:48 brueffer Exp $
 .\"
 .Dd June 18, 2006
 .Dt DPT 4
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index a5d0e6c8d05a3..18995a7993ff1 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/dummynet.4,v 1.23 2006/08/26 21:24:22 marck Exp $
 .\"
 .Dd October 28, 2002
 .Dt DUMMYNET 4
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 34e0250557c6c..1a504e16ceffe 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ed.4,v 1.53 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd October 5, 2005
 .Dt ED 4
diff --git a/share/man/man4/edsc.4 b/share/man/man4/edsc.4
index 075e736176953..2be8d6d6a9465 100644
--- a/share/man/man4/edsc.4
+++ b/share/man/man4/edsc.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/edsc.4,v 1.1.6.1 2008/01/04 13:11:59 gabor Exp $
 .\"
 .Dd March 25, 2007
 .Dt EDSC 4
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index c93d5f12022ba..1baac32737a17 100644
--- a/share/man/man4/ef.4
+++ b/share/man/man4/ef.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ef.4,v 1.11 2004/12/21 01:09:34 brueffer Exp $
 .\"
 .Dd June 20, 1999
 .Dt EF 4
diff --git a/share/man/man4/ehci.4 b/share/man/man4/ehci.4
index 57d47db4633b9..897d6645a6b92 100644
--- a/share/man/man4/ehci.4
+++ b/share/man/man4/ehci.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ehci.4,v 1.2 2005/03/20 17:13:43 iedowse Exp $
 .\"
 .Dd March 20, 2005
 .Dt EHCI 4
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index fec12b680c46f..6075124eb8a5a 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/em.4,v 1.28 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd September 15, 2006
 .Dt EM 4
diff --git a/share/man/man4/en.4 b/share/man/man4/en.4
index a256b9e6ff251..25d7bbb45e8f9 100644
--- a/share/man/man4/en.4
+++ b/share/man/man4/en.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/en.4,v 1.22 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt EN 4
diff --git a/share/man/man4/enc.4 b/share/man/man4/enc.4
index 3da2dfdcaf2ba..1f7c3bfc9730e 100644
--- a/share/man/man4/enc.4
+++ b/share/man/man4/enc.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/enc.4,v 1.5 2007/08/02 08:04:48 bz Exp $
 .\"
 .Dd August 1, 2007
 .Dt ENC 4
diff --git a/share/man/man4/esp.4 b/share/man/man4/esp.4
index 897ee8ee1d4cc..28a34857a39b0 100644
--- a/share/man/man4/esp.4
+++ b/share/man/man4/esp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/esp.4,v 1.6 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd September 18, 2005
 .Dt ESP 4
diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4
index 90b13307fdd31..3b827b7ced917 100644
--- a/share/man/man4/exca.4
+++ b/share/man/man4/exca.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/exca.4,v 1.4 2003/08/20 06:49:57 imp Exp $
 .\"
 .Dd February 23, 2003
 .Dt EXCA 4
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index 3f13cd6625545..d4633dd2427a4 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/faith.4,v 1.14 2005/04/21 13:27:13 suz Exp $
 .\"
 .Dd April 10, 1999
 .Dt FAITH 4
diff --git a/share/man/man4/fatm.4 b/share/man/man4/fatm.4
index 51dc6fc0eb79e..84ea84b97ee5b 100644
--- a/share/man/man4/fatm.4
+++ b/share/man/man4/fatm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fatm.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .\" fatm(4) man page
 .\"
diff --git a/share/man/man4/fd.4 b/share/man/man4/fd.4
index 99a05317c4fb4..3ae22a19a9eee 100644
--- a/share/man/man4/fd.4
+++ b/share/man/man4/fd.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fd.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fd.4,v 1.7 2004/10/24 19:44:23 rwatson Exp $
 .\"
 .Dd June 9, 1993
 .Dt FD 4
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 9ee9561380036..2577e06b28ed8 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fdc.4,v 1.37 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd May 11, 2006
 .Dt FDC 4
diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4
index 9f909f28e67ad..f792cd2b59ea9 100644
--- a/share/man/man4/firewire.4
+++ b/share/man/man4/firewire.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/firewire.4,v 1.12 2006/04/01 10:37:35 brueffer Exp $
 .\"
 .Dd April 1, 2006
 .Dt FIREWIRE 4
diff --git a/share/man/man4/fla.4 b/share/man/man4/fla.4
index 1a02deb9912af..163c8edc93455 100644
--- a/share/man/man4/fla.4
+++ b/share/man/man4/fla.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fla.4,v 1.2 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd July 13, 2003
 .Dt FLA 4
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index b751e296d0dad..1cd6c75e93c4e 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -2,7 +2,7 @@
 .\" Copyright (c) 1995, Matt Thomas
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fpa.4,v 1.22 2003/12/17 10:23:14 brueffer Exp $
 .\"
 .Dd March 13, 1995
 .Dt FPA 4
diff --git a/share/man/man4/fwe.4 b/share/man/man4/fwe.4
index 76fc1ac4f6679..9dc298d791667 100644
--- a/share/man/man4/fwe.4
+++ b/share/man/man4/fwe.4
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fwe.4,v 1.10 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .\"
 .Dd July 16, 2005
diff --git a/share/man/man4/fwip.4 b/share/man/man4/fwip.4
index c2c9f05bb7ebc..bf10586a932e4 100644
--- a/share/man/man4/fwip.4
+++ b/share/man/man4/fwip.4
@@ -23,7 +23,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fwip.4,v 1.9 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt FWIP 4
diff --git a/share/man/man4/fwohci.4 b/share/man/man4/fwohci.4
index 435a6248ce5b7..433af819c27ba 100644
--- a/share/man/man4/fwohci.4
+++ b/share/man/man4/fwohci.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fwohci.4,v 1.16 2007/06/17 10:40:25 simokawa Exp $
 .\"
 .\"
 .Dd June 23, 2005
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index cf745b436fac7..75c1b25edcb9d 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/fxp.4,v 1.40 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd January 7, 2007
 .Dt FXP 4
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index e3bc6c7fb2aa5..e82f416230889 100644
--- a/share/man/man4/gbde.4
+++ b/share/man/man4/gbde.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gbde.4,v 1.11 2006/01/10 18:55:24 schweikh Exp $
 .\"
 .Dd October 19, 2002
 .Os
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index b92958b209b27..3bfd73439ad06 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gdb.4,v 1.14 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd February 8, 2005
 .Dt GDB 4
diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4
index 2e0939fa7df29..f39196b45e756 100644
--- a/share/man/man4/gem.4
+++ b/share/man/man4/gem.4
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gem.4,v 1.8 2007/09/26 21:14:16 marius Exp $
 .\"
 .Dd September 26, 2007
 .Dt GEM 4
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 0bd6207a9f0d1..31259edeab169 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/geom.4,v 1.16 2006/05/25 13:39:27 ceri Exp $
 .\"
 .Dd May 25, 2006
 .Os
diff --git a/share/man/man4/geom_fox.4 b/share/man/man4/geom_fox.4
index 027b73dc66cc4..5bbe6c1eaaec1 100644
--- a/share/man/man4/geom_fox.4
+++ b/share/man/man4/geom_fox.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/geom_fox.4,v 1.3 2006/09/30 15:14:48 ru Exp $
 .\"
 .Dd January 2, 2005
 .Os
diff --git a/share/man/man4/geom_uzip.4 b/share/man/man4/geom_uzip.4
index 30d5ab03e81e6..b18ae6b295068 100644
--- a/share/man/man4/geom_uzip.4
+++ b/share/man/man4/geom_uzip.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/geom_uzip.4,v 1.2 2006/10/09 12:50:16 ceri Exp $
 .\"
 .Dd October 9, 2006
 .Os
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 936898f46008f..b1ef7fee32855 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gif.4,v 1.26 2005/07/26 18:14:22 trhodes Exp $
 .\"
 .Dd April 10, 1999
 .Dt GIF 4
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index 76eed1a2c471b..53b6c89450a55 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/gre.4,v 1.7 2006/10/19 07:41:47 danger Exp $
 .\"
 .Dd June 9, 2002
 .Dt GRE 4
diff --git a/share/man/man4/harp.4 b/share/man/man4/harp.4
index 6f4d9410233f5..9aa04065c00d5 100644
--- a/share/man/man4/harp.4
+++ b/share/man/man4/harp.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/harp.4,v 1.3 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt HARP 4
diff --git a/share/man/man4/hatm.4 b/share/man/man4/hatm.4
index f9b7e705bde00..f5e95c4f33398 100644
--- a/share/man/man4/hatm.4
+++ b/share/man/man4/hatm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hatm.4,v 1.9 2005/01/21 08:36:37 ru Exp $
 .\"
 .\" hatm(4) man page
 .\"
diff --git a/share/man/man4/hfa.4 b/share/man/man4/hfa.4
index 1c254bfeb5a3b..eeffb8a4b9c7d 100644
--- a/share/man/man4/hfa.4
+++ b/share/man/man4/hfa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hfa.4,v 1.6 2005/02/23 19:31:12 brueffer Exp $
 .\"
 .Dd August 6, 2004
 .Dt HFA 4
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index ec7a56438bb40..246ba4ae0a0e0 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hifn.4,v 1.7 2006/04/01 10:56:36 brueffer Exp $
 .\"
 .Dd April 1, 2006
 .Dt HIFN 4
diff --git a/share/man/man4/hme.4 b/share/man/man4/hme.4
index 4e2b4eb00c588..b99ebdb095970 100644
--- a/share/man/man4/hme.4
+++ b/share/man/man4/hme.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hme.4,v 1.8 2007/01/30 08:40:03 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt HME 4
diff --git a/share/man/man4/hptiop.4 b/share/man/man4/hptiop.4
index 83d356be86181..5da9c8bf038ef 100644
--- a/share/man/man4/hptiop.4
+++ b/share/man/man4/hptiop.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hptiop.4,v 1.1.4.1 2008/02/06 03:44:10 scottl Exp $
 .\"
 .Dd May 12, 2007
 .Dt HPTIOP 4
diff --git a/share/man/man4/hptmv.4 b/share/man/man4/hptmv.4
index 240a32fb55059..dc293294b5d6a 100644
--- a/share/man/man4/hptmv.4
+++ b/share/man/man4/hptmv.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hptmv.4,v 1.8 2006/09/18 15:24:18 ru Exp $
 .\"
 .Dd November 17, 2005
 .Dt HPTMV 4
diff --git a/share/man/man4/hptrr.4 b/share/man/man4/hptrr.4
index 24943445ce596..b5f656fcf0641 100644
--- a/share/man/man4/hptrr.4
+++ b/share/man/man4/hptrr.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hptrr.4,v 1.1.2.1.2.2 2008/02/16 20:29:06 brueffer Exp $
 .\"
 .Dd December 14, 2007
 .Dt HPTRR 4
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index af50297634c45..51ccb9a4c079b 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/hwpmc.4,v 1.17 2007/02/12 03:26:22 jkoshy Exp $
 .\"
 .Dd September 28, 2005
 .Dt HWPMC 4
diff --git a/share/man/man4/ichsmb.4 b/share/man/man4/ichsmb.4
index a415941b6001d..b3ad42b5e10c2 100644
--- a/share/man/man4/ichsmb.4
+++ b/share/man/man4/ichsmb.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ichsmb.4,v 1.7.10.1 2007/12/02 08:42:16 remko Exp $
 .\"
 .Dd November 28, 2007
 .Dt ICHSMB 4
diff --git a/share/man/man4/ichwd.4 b/share/man/man4/ichwd.4
index f2608ed986118..2474632a63dbf 100644
--- a/share/man/man4/ichwd.4
+++ b/share/man/man4/ichwd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ichwd.4,v 1.1 2007/08/23 20:05:09 des Exp $
 .\"
 .Dd August 23, 2007
 .Dt ICHWD 4
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index a6fbbf292b882..5bc33f941b65e 100644
--- a/share/man/man4/icmp.4
+++ b/share/man/man4/icmp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)icmp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/icmp.4,v 1.20 2007/02/09 12:30:17 bms Exp $
 .\"
 .Dd February 9, 2007
 .Dt ICMP 4
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 83aff0ebe791f..8d0c201ecc65a 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/icmp6.4,v 1.18 2005/06/15 13:31:22 ru Exp $
 .\"
 .Dd December 20, 2004
 .Dt ICMP6 4
diff --git a/share/man/man4/ida.4 b/share/man/man4/ida.4
index 01e0267cd24ed..2a01f8109d14c 100644
--- a/share/man/man4/ida.4
+++ b/share/man/man4/ida.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ida.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $
 .\" Written by Tom Rhodes
 .\" This file is public domain
 .\"
diff --git a/share/man/man4/idt.4 b/share/man/man4/idt.4
index adf1cf79c0284..cff394fa3cfa6 100644
--- a/share/man/man4/idt.4
+++ b/share/man/man4/idt.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/idt.4,v 1.2 2004/06/17 19:51:17 ru Exp $
 .\"
 .Dd June 3, 2003
 .Dt IDT 4
diff --git a/share/man/man4/ieee80211.4 b/share/man/man4/ieee80211.4
index bbc8c5dc2dc85..f2dbf4cccfd57 100644
--- a/share/man/man4/ieee80211.4
+++ b/share/man/man4/ieee80211.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.10 2007/07/01 10:25:06 thompsa Exp $
 .\"
 .Dd February 23, 2001
 .Dt IEEE80211 4
diff --git a/share/man/man4/if_bridge.4 b/share/man/man4/if_bridge.4
index 0b8a76ce68ab3..ae5d6f3a38523 100644
--- a/share/man/man4/if_bridge.4
+++ b/share/man/man4/if_bridge.4
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.30 2007/09/16 21:14:47 thompsa Exp $
 .\"
 .Dd September 17, 2007
 .Dt IF_BRIDGE 4
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index 3cffbeab18167..db4f6496bd4e5 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ifmib.4,v 1.21 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index 0112ff8a34f10..2fc770f50d94e 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iic.4,v 1.15 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd September 6, 2006
 .Dt IIC 4
diff --git a/share/man/man4/iicbb.4 b/share/man/man4/iicbb.4
index e048c5d9bc75d..f4ccf2d2f743d 100644
--- a/share/man/man4/iicbb.4
+++ b/share/man/man4/iicbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicbb.4,v 1.9 2001/07/10 15:30:37 ru Exp $
 .\"
 .Dd October 25, 1998
 .Dt IICBB 4
diff --git a/share/man/man4/iicbus.4 b/share/man/man4/iicbus.4
index f9e5c58d467af..97d157f2eabe1 100644
--- a/share/man/man4/iicbus.4
+++ b/share/man/man4/iicbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicbus.4,v 1.12 2005/02/13 23:45:49 ru Exp $
 .\"
 .Dd August 6, 1998
 .Dt IICBUS 4
diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4
index 4fdf6d497b8cd..45103479adc38 100644
--- a/share/man/man4/iicsmb.4
+++ b/share/man/man4/iicsmb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iicsmb.4,v 1.9 2001/07/10 15:30:37 ru Exp $
 .\"
 .Dd August 10, 1998
 .Dt IICSMB 4
diff --git a/share/man/man4/iir.4 b/share/man/man4/iir.4
index a7608b2ece7f1..a3c5390fa3703 100644
--- a/share/man/man4/iir.4
+++ b/share/man/man4/iir.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iir.4,v 1.10 2006/06/19 15:22:34 brueffer Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index b1878d58ddefe..ff9da8b9be32c 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/inet.4,v 1.39 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd April 9, 2005
 .Dt INET 4
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 27b08763cdd98..bb3bbede5ff9d 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/inet6.4,v 1.20 2005/08/25 13:47:41 glebius Exp $
 .\"
 .Dd January 29, 1999
 .Dt INET6 4
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 5e015a8f371d9..cd5f9186daf79 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/intpm.4,v 1.15 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd January 8, 1999
 .Dt INTPM 4
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index 93a9ab59d25d1..326d1f2d85f52 100644
--- a/share/man/man4/intro.4
+++ b/share/man/man4/intro.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/intro.4,v 1.29 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 20, 1996
 .Dt INTRO 4
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index 833c4632c01fe..c529f3e5101c1 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ip.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ip.4,v 1.49 2007/06/12 16:24:55 bms Exp $
 .\"
 .Dd April 9, 2007
 .Dt IP 4
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 40f1b6ffafabe..0d1d6b32b9a05 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.22 2006/09/29 16:16:41 bms Exp $
 .\"
 .Dd September 29, 2006
 .Dt IP6 4
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index e1c9a8affce89..9843981172cda 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.33 2006/10/16 07:56:36 danger Exp $
 .\"
 .Dd September 1, 2006
 .Dt IPFW 4
diff --git a/share/man/man4/ipmi.4 b/share/man/man4/ipmi.4
index c34093a9573e0..cdf5ccbb65eb6 100644
--- a/share/man/man4/ipmi.4
+++ b/share/man/man4/ipmi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.8.4.2 2008/01/07 14:53:12 gabor Exp $
 .\"
 .Dd July 10, 2007
 .Dt IPMI 4
diff --git a/share/man/man4/ips.4 b/share/man/man4/ips.4
index 26fc261a02d56..cb3d7cb78d945 100644
--- a/share/man/man4/ips.4
+++ b/share/man/man4/ips.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $
 .\"
 .Dd November 4, 2006
 .Dt IPS 4
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 4bc45d6ee28d9..dabae93206abc 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.22 2007/08/05 16:16:14 bz Exp $
 .\"
 .Dd August 5, 2007
 .Dt IPSEC 4
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index f71c99cb806e5..00e191fe09055 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.16 2007/03/06 13:17:05 brueffer Exp $
 .\"
 .Dd March 6, 2007
 .Os
diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4
index 1697b2f30080c..e8e35611fb5cd 100644
--- a/share/man/man4/iscsi_initiator.4
+++ b/share/man/man4/iscsi_initiator.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.2 2007/07/24 18:08:16 brueffer Exp $
 .\"
 .Dd February 23, 2007
 .Os
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index 68c25cccf87ad..145f8b9de581f 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -27,7 +27,7 @@
 .\"
 .\" Additional Copyright (c) 2006 by Marcus Alves Grando
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/isp.4,v 1.26 2007/03/01 09:07:04 brueffer Exp $
 .\"
 .Dd February 28, 2007
 .Dt ISP 4
diff --git a/share/man/man4/ispfw.4 b/share/man/man4/ispfw.4
index 5755501f3bf37..6e87284499e81 100644
--- a/share/man/man4/ispfw.4
+++ b/share/man/man4/ispfw.4
@@ -20,7 +20,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ispfw.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd July 20, 2000
 .Dt ISPFW 4
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 7f06637ebca96..f9d505c3e3108 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.18 2007/03/06 13:17:05 brueffer Exp $
 .\"
 .Dd March 6, 2007
 .Os
diff --git a/share/man/man4/ixgb.4 b/share/man/man4/ixgb.4
index adb51d4e1e3d8..3a8a9a3b5f306 100644
--- a/share/man/man4/ixgb.4
+++ b/share/man/man4/ixgb.4
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.11 2006/08/29 19:15:59 brueffer Exp $
 .\"
 .Dd August 18, 2006
 .Dt IXGB 4
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index b0839f5f2d799..7efa0c64f3e44 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/joy.4,v 1.30 2007/02/12 20:58:32 brueffer Exp $
 .\"
 .Dd January 23, 1995
 .Dt JOY 4
diff --git a/share/man/man4/kbdmux.4 b/share/man/man4/kbdmux.4
index e29f8cd766e2f..a51a95ec196f3 100644
--- a/share/man/man4/kbdmux.4
+++ b/share/man/man4/kbdmux.4
@@ -1,5 +1,5 @@
 .\" $Id: kbdmux.4,v 1.1 2005/07/14 20:32:10 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.5 2006/05/17 09:33:06 phk Exp $
 .\"
 .Dd July 12, 2005
 .Os
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index e1a5ac28d41aa..cbabe4c98e153 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/keyboard.4,v 1.27 2005/02/23 04:22:17 trhodes Exp $
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index c36f6ab2493a8..c1d08259e3e81 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kld.4,v 1.22 2007/02/13 17:06:15 brueffer Exp $
 .\"
 .Dd November 8, 1998
 .Dt KLD 4
diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index 89f530596f535..af1a83c9dc4cb 100644
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/ktr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ktr.4,v 1.12 2006/06/03 23:20:45 kris Exp $
 .\"
 .Dd January 25, 2005
 .Dt KTR 4
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index c9a8ad710904b..1be5c23b99f92 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/kue.4,v 1.24 2006/10/07 18:03:39 flz Exp $
 .\"
 .Dd October 7, 2006
 .Dt KUE 4
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index e2ee3e9054a42..06f52edb0564a 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.4.4.1 2008/01/08 15:37:22 gabor Exp $
 .\"
 .Dd April 17, 2007
 .Dt LAGG 4
diff --git a/share/man/man4/le.4 b/share/man/man4/le.4
index 0a1823d30311c..039dcba7189fb 100644
--- a/share/man/man4/le.4
+++ b/share/man/man4/le.4
@@ -34,7 +34,7 @@
 .\"
 .\"	from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"	from: @(#)le.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/le.4,v 1.7 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd January 20, 2007
 .Dt LE 4
diff --git a/share/man/man4/led.4 b/share/man/man4/led.4
index 63bb8a28ecd4d..b838fb75271ce 100644
--- a/share/man/man4/led.4
+++ b/share/man/man4/led.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/led.4,v 1.14 2007/04/24 07:10:10 phk Exp $
 .\"
 .Dd April 24, 2007
 .Dt LED 4
diff --git a/share/man/man4/lge.4 b/share/man/man4/lge.4
index 41010b9dfc979..d6d35fd115da2 100644
--- a/share/man/man4/lge.4
+++ b/share/man/man4/lge.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lge.4,v 1.12 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt LGE 4
diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4
index dc8e47b10eafc..e9008b44e0757 100644
--- a/share/man/man4/lmc.4
+++ b/share/man/man4/lmc.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lmc.4,v 1.11 2006/12/14 16:40:57 mpp Exp $
 .\"
 .\" Copyright (c) 2002-2005 David Boggs. (boggs@boggs.palo-alto.ca.us)
 .\" All rights reserved.
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 86dd47eb597ae..b1ba9f3d9cfc7 100644
--- a/share/man/man4/lo.4
+++ b/share/man/man4/lo.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lo.4,v 1.9 2001/07/10 15:30:38 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt LO 4
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index 6976101af2cb8..6176e1c351eee 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	Id: man4.i386/lp.4,v 1.9 1999/02/14 12:06:16 nsouch Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lp.4,v 1.14 2006/02/13 20:47:43 ceri Exp $
 .\"
 .Dd March 4, 1996
 .Os
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 77e70c57b1186..b9c601b9676e8 100644
--- a/share/man/man4/lpbb.4
+++ b/share/man/man4/lpbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lpbb.4,v 1.12 2001/07/14 19:40:47 schweikh Exp $
 .\"
 .Dd October 25, 1998
 .Dt LPBB 4
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index 8b3dd578fa3c8..e40e833419ff6 100644
--- a/share/man/man4/lpt.4
+++ b/share/man/man4/lpt.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/lpt.4,v 1.16 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd February 14, 1999
 .Dt LPT 4
diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4
index a490f5ab94608..ca157988c782f 100644
--- a/share/man/man4/mac.4
+++ b/share/man/man4/mac.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac.4,v 1.13 2007/06/27 09:32:50 kevlo Exp $
 .\"
 .Dd January 8, 2003
 .Os
diff --git a/share/man/man4/mac_biba.4 b/share/man/man4/mac_biba.4
index 20a66615e5f27..56d90ebe15064 100644
--- a/share/man/man4/mac_biba.4
+++ b/share/man/man4/mac_biba.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.19 2005/02/05 13:52:21 brueffer Exp $
 .\"
 .Dd November 18, 2002
 .Os
diff --git a/share/man/man4/mac_bsdextended.4 b/share/man/man4/mac_bsdextended.4
index 899990c34a18e..8def081a2a16e 100644
--- a/share/man/man4/mac_bsdextended.4
+++ b/share/man/man4/mac_bsdextended.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.16 2005/05/21 17:22:12 trhodes Exp $
 .\"
 .Dd May 21, 2005
 .Os
diff --git a/share/man/man4/mac_ifoff.4 b/share/man/man4/mac_ifoff.4
index ede13b0fac5c7..60d70e47ec047 100644
--- a/share/man/man4/mac_ifoff.4
+++ b/share/man/man4/mac_ifoff.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_ifoff.4,v 1.9 2005/02/05 13:52:21 brueffer Exp $
 .\"
 .Dd December 10, 2002
 .Os
diff --git a/share/man/man4/mac_lomac.4 b/share/man/man4/mac_lomac.4
index 8133ad8a83337..6764cadd55c11 100644
--- a/share/man/man4/mac_lomac.4
+++ b/share/man/man4/mac_lomac.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_lomac.4,v 1.9 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 11, 2002
 .Os
diff --git a/share/man/man4/mac_mls.4 b/share/man/man4/mac_mls.4
index 95e66be18c559..a967beb5da7d3 100644
--- a/share/man/man4/mac_mls.4
+++ b/share/man/man4/mac_mls.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.19 2005/01/12 10:14:42 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_none.4 b/share/man/man4/mac_none.4
index 159151e53388a..1f70f2882eec0 100644
--- a/share/man/man4/mac_none.4
+++ b/share/man/man4/mac_none.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_none.4,v 1.12 2005/01/21 20:50:39 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_partition.4 b/share/man/man4/mac_partition.4
index 54abee5ae7bf8..0f046dac10e92 100644
--- a/share/man/man4/mac_partition.4
+++ b/share/man/man4/mac_partition.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_partition.4,v 1.11 2005/02/05 13:52:21 brueffer Exp $
 .\"
 .Dd December 9, 2002
 .Os
diff --git a/share/man/man4/mac_portacl.4 b/share/man/man4/mac_portacl.4
index 698852d579ef8..992c823efcf2a 100644
--- a/share/man/man4/mac_portacl.4
+++ b/share/man/man4/mac_portacl.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_portacl.4,v 1.11 2005/01/15 12:24:26 ru Exp $
 .\"
 .Dd December 9, 2004
 .Dt MAC_PORTACL 4
diff --git a/share/man/man4/mac_seeotheruids.4 b/share/man/man4/mac_seeotheruids.4
index 4eeb7bba9eb6c..551a064383cd6 100644
--- a/share/man/man4/mac_seeotheruids.4
+++ b/share/man/man4/mac_seeotheruids.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_seeotheruids.4,v 1.12 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd October 6, 2005
 .Os
diff --git a/share/man/man4/mac_stub.4 b/share/man/man4/mac_stub.4
index ded95e2c08185..f02ddcf2fe7b1 100644
--- a/share/man/man4/mac_stub.4
+++ b/share/man/man4/mac_stub.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_stub.4,v 1.13 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/mac_test.4 b/share/man/man4/mac_test.4
index dde744589a22b..e57d1e52b9ea5 100644
--- a/share/man/man4/mac_test.4
+++ b/share/man/man4/mac_test.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mac_test.4,v 1.10 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd December 1, 2002
 .Os
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
index 91572229b1e70..6d3718b93a6cb 100644
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.arm/Makefile,v 1.1 2006/12/05 16:57:10 ru Exp $
 
 MAN=	npe.4
 
diff --git a/share/man/man4/man4.arm/npe.4 b/share/man/man4/man4.arm/npe.4
index 035dea1a94b49..3a2d0016afc9e 100644
--- a/share/man/man4/man4.arm/npe.4
+++ b/share/man/man4/man4.arm/npe.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.arm/npe.4,v 1.2 2007/02/03 20:02:29 brueffer Exp $
 .\"
 .Dd December 4, 2006
 .Dt NPE 4 arm
diff --git a/share/man/man4/man4.i386/CPU_ELAN.4 b/share/man/man4/man4.i386/CPU_ELAN.4
index 7fe774170384a..1974b1409bc02 100644
--- a/share/man/man4/man4.i386/CPU_ELAN.4
+++ b/share/man/man4/man4.i386/CPU_ELAN.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/CPU_ELAN.4,v 1.2 2003/11/30 12:42:01 simon Exp $
 .\"
 .Dd November 23, 2003
 .Dt CPU_ELAN 4 i386
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index bdd3bc3d0b9fc..9cd5e9549ccde 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.185 2007/03/30 21:19:10 takawata Exp $
 
 MAN=	acpi_aiboost.4 \
 	acpi_asus.4 \
diff --git a/share/man/man4/man4.i386/acpi_aiboost.4 b/share/man/man4/man4.i386/acpi_aiboost.4
index c5d918ba915f0..f6d10faac0336 100644
--- a/share/man/man4/man4.i386/acpi_aiboost.4
+++ b/share/man/man4/man4.i386/acpi_aiboost.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_aiboost.4,v 1.3 2007/03/30 21:59:55 takawata Exp $
 .\"
 .Dd March 14, 2007
 .Dt ACPI_AIBOOST 4
diff --git a/share/man/man4/man4.i386/acpi_asus.4 b/share/man/man4/man4.i386/acpi_asus.4
index 14fe8bc314c10..9217e3ec83f1a 100644
--- a/share/man/man4/man4.i386/acpi_asus.4
+++ b/share/man/man4/man4.i386/acpi_asus.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_asus.4,v 1.14 2007/06/02 21:10:01 philip Exp $
 .\"
 .Dd June 2, 2007
 .Dt ACPI_ASUS 4 i386
diff --git a/share/man/man4/man4.i386/acpi_fujitsu.4 b/share/man/man4/man4.i386/acpi_fujitsu.4
index 1959bf6a52c12..b696d38a62485 100644
--- a/share/man/man4/man4.i386/acpi_fujitsu.4
+++ b/share/man/man4/man4.i386/acpi_fujitsu.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_fujitsu.4,v 1.5 2006/04/01 11:21:00 brueffer Exp $
 .\"
 .Dd March 20, 2005
 .Dt ACPI_FUJITSU 4 i386
diff --git a/share/man/man4/man4.i386/acpi_ibm.4 b/share/man/man4/man4.i386/acpi_ibm.4
index f0c165d1aeb31..0dab0b2897c97 100644
--- a/share/man/man4/man4.i386/acpi_ibm.4
+++ b/share/man/man4/man4.i386/acpi_ibm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_ibm.4,v 1.15 2006/12/01 09:00:38 ru Exp $
 .\"
 .Dd January 14, 2006
 .Dt ACPI_IBM 4 i386
diff --git a/share/man/man4/man4.i386/acpi_panasonic.4 b/share/man/man4/man4.i386/acpi_panasonic.4
index 8a8851ef1b3cd..f6b9d5c1e02f3 100644
--- a/share/man/man4/man4.i386/acpi_panasonic.4
+++ b/share/man/man4/man4.i386/acpi_panasonic.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_panasonic.4,v 1.7 2006/04/01 11:21:00 brueffer Exp $
 .\"
 .Dd July 11, 2004
 .Dt ACPI_PANASONIC 4 i386
diff --git a/share/man/man4/man4.i386/acpi_sony.4 b/share/man/man4/man4.i386/acpi_sony.4
index d068fe9cc4650..b62e3429db4f7 100644
--- a/share/man/man4/man4.i386/acpi_sony.4
+++ b/share/man/man4/man4.i386/acpi_sony.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_sony.4,v 1.4 2006/11/01 03:45:24 kevlo Exp $
 .\"
 .Dd September 14, 2005
 .Dt ACPI_SONY 4 i386
diff --git a/share/man/man4/man4.i386/acpi_toshiba.4 b/share/man/man4/man4.i386/acpi_toshiba.4
index cb26842566a97..58758fc72b508 100644
--- a/share/man/man4/man4.i386/acpi_toshiba.4
+++ b/share/man/man4/man4.i386/acpi_toshiba.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/acpi_toshiba.4,v 1.7 2006/04/01 11:21:00 brueffer Exp $
 .\"
 .Dd February 19, 2004
 .Dt ACPI_TOSHIBA 4 i386
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index 991a0c50be998..41041634e60ac 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/man4.i386/aic.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/aic.4,v 1.16 2005/01/21 08:36:38 ru Exp $
 .\"
 .Dd November 8, 2003
 .Dt AIC 4 i386
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index f288b72c42f95..c213baed45c55 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/man4.i386/alpm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/alpm.4,v 1.16 2002/03/23 15:26:20 nsouch Exp $
 .\"
 .Dd February 13, 1999
 .Dt ALPM 4 i386
diff --git a/share/man/man4/man4.i386/amdpm.4 b/share/man/man4/man4.i386/amdpm.4
index f8937b314ae89..faf5416f38025 100644
--- a/share/man/man4/man4.i386/amdpm.4
+++ b/share/man/man4/man4.i386/amdpm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/amdpm.4,v 1.5 2005/12/31 16:32:27 brueffer Exp $
 .\"
 .Dd December 31, 2005
 .Dt AMDPM 4 i386
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index e5e5c6a91632c..75df24746faff 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -9,7 +9,7 @@
 .\" the author assume any responsibility for damages incurred with its
 .\" use.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.24 2005/02/13 22:25:18 ru Exp $
 .\"
 .Dd November 1, 1994
 .Dt APM 4 i386
diff --git a/share/man/man4/man4.i386/ar.4 b/share/man/man4/man4.i386/ar.4
index 5a925dfcd46e4..4a20861782084 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ar.4,v 1.28 2005/01/21 08:36:38 ru Exp $
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
diff --git a/share/man/man4/man4.i386/arl.4 b/share/man/man4/man4.i386/arl.4
index d908c8ae02815..99b61c79d9648 100644
--- a/share/man/man4/man4.i386/arl.4
+++ b/share/man/man4/man4.i386/arl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/arl.4,v 1.10 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt ARL 4 i386
diff --git a/share/man/man4/man4.i386/ce.4 b/share/man/man4/man4.i386/ce.4
index fec2dabcb8d70..3789e86149bc4 100644
--- a/share/man/man4/man4.i386/ce.4
+++ b/share/man/man4/man4.i386/ce.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ce.4,v 1.2 2006/01/31 23:06:54 rik Exp $
 .\"
 .Dd January 30, 2006
 .Dt CE 4 i386
diff --git a/share/man/man4/man4.i386/cp.4 b/share/man/man4/man4.i386/cp.4
index 049bb08297496..fe0a68bec45d6 100644
--- a/share/man/man4/man4.i386/cp.4
+++ b/share/man/man4/man4.i386/cp.4
@@ -11,7 +11,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: cp.4,v 1.1.2.5 2004/06/21 17:47:40 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cp.4,v 1.12 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt CP 4 i386
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index c1ee7ae88a51e..2804589e378eb 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cs.4,v 1.22 2006/02/01 14:33:14 joel Exp $
 .\"
 .Dd July 16, 2005
 .Dt CS 4 i386
diff --git a/share/man/man4/man4.i386/ct.4 b/share/man/man4/man4.i386/ct.4
index ac8d6c2ae1e8f..75bc121d554b1 100644
--- a/share/man/man4/man4.i386/ct.4
+++ b/share/man/man4/man4.i386/ct.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ct.4,v 1.9 2004/08/01 19:08:04 simon Exp $
 .\"
 .Dd November 18, 2003
 .Dt CT 4 i386
diff --git a/share/man/man4/man4.i386/ctau.4 b/share/man/man4/man4.i386/ctau.4
index e18dc347ad321..794d5d6e17197 100644
--- a/share/man/man4/man4.i386/ctau.4
+++ b/share/man/man4/man4.i386/ctau.4
@@ -11,7 +11,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: ct.4,v 1.1.2.6 2004/06/21 17:56:40 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ctau.4,v 1.5 2004/09/05 22:09:53 simon Exp $
 .\"
 .Dd September 6, 2004
 .Dt CTAU 4 i386
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 00df603b59413..16a90e0cf6893 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -11,7 +11,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: cx.4,v 1.1.2.6 2004/06/21 17:56:40 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.29 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt CX 4 i386
diff --git a/share/man/man4/man4.i386/ep.4 b/share/man/man4/man4.i386/ep.4
index 9f23e0dd76790..1bd1553d94911 100644
--- a/share/man/man4/man4.i386/ep.4
+++ b/share/man/man4/man4.i386/ep.4
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ep.4,v 1.45 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt EP 4 i386
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index 3ffb3fcf661bd..5c659d89c1c5e 100644
--- a/share/man/man4/man4.i386/ex.4
+++ b/share/man/man4/man4.i386/ex.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ex.4,v 1.26 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt EX 4 i386
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index bacee587afff6..944040fdb9890 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -21,7 +21,7 @@
 .\" Contributed by M. Sekiguchi <seki@sysrap.cs.fujitsu.co.jp>.
 .\" for fe driver.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.39 2007/02/09 21:05:47 brueffer Exp $
 .Dd July 16, 2005
 .Dt FE 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/ichwd.4 b/share/man/man4/man4.i386/ichwd.4
index a6583cce012b4..5b0d873da7902 100644
--- a/share/man/man4/man4.i386/ichwd.4
+++ b/share/man/man4/man4.i386/ichwd.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ichwd.4,v 1.3 2004/08/29 11:19:35 des Exp $
 .\"
 .Dd May 11, 2004
 .Dt ICHWD 4 i386
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index 17d24d23ce615..4222fa54af024 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ie.4,v 1.25 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt IE 4 i386
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 15c0c4d4170c0..b2b885ba2b502 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/man4.i386/io.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/io.4,v 1.13 2004/10/03 13:14:20 simon Exp $
 .\"
 .Dd October 3, 2004
 .Dt IO 4 i386
diff --git a/share/man/man4/man4.i386/linux.4 b/share/man/man4/man4.i386/linux.4
index de05a4de25e2c..1d85084f76a0c 100644
--- a/share/man/man4/man4.i386/linux.4
+++ b/share/man/man4/man4.i386/linux.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/linux.4,v 1.12 2006/09/18 15:24:19 ru Exp $
 .Dd June 18, 2006
 .Dt LINUX 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/longrun.4 b/share/man/man4/man4.i386/longrun.4
index b9bfc66c5e218..8e9fd72f626b4 100644
--- a/share/man/man4/man4.i386/longrun.4
+++ b/share/man/man4/man4.i386/longrun.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/longrun.4,v 1.7 2005/01/21 08:36:39 ru Exp $
 .Dd June 30, 2001
 .Dt LONGRUN 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index a4a93ddb5d4ad..0a4e79117c3a2 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/mcd.4,v 1.24 2005/06/16 22:05:32 brueffer Exp $
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 7f83dcc87a97b..c75af5f0e28f2 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -10,7 +10,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/mse.4,v 1.20 2005/07/15 17:35:26 hrs Exp $
 .\"
 .Dd December 3, 1997
 .Dt MSE 4 i386
diff --git a/share/man/man4/man4.i386/ndis.4 b/share/man/man4/man4.i386/ndis.4
index 7f723d0336cc8..d3c8066016a53 100644
--- a/share/man/man4/man4.i386/ndis.4
+++ b/share/man/man4/man4.i386/ndis.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ndis.4,v 1.13 2007/02/16 13:53:45 brueffer Exp $
 .\"
 .Dd October 13, 2006
 .Dt NDIS 4 i386
diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4
index 7eea3723a47ee..2786216daf0f1 100644
--- a/share/man/man4/man4.i386/npx.4
+++ b/share/man/man4/man4.i386/npx.4
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$Id: npx.4,v 1.1 1993/08/06 10:58:03 cgd Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/npx.4,v 1.17 2003/07/22 08:15:29 peter Exp $
 .\"
 .Dd August 28, 1993
 .Dt NPX 4 i386
diff --git a/share/man/man4/man4.i386/oltr.4 b/share/man/man4/man4.i386/oltr.4
index 4869b0be7e5b7..e95c1dcf87475 100644
--- a/share/man/man4/man4.i386/oltr.4
+++ b/share/man/man4/man4.i386/oltr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/oltr.4,v 1.2 2005/02/12 00:42:14 brueffer Exp $
 .\"
 .Dd February 4, 2005
 .Dt OLTR 4 i386
diff --git a/share/man/man4/man4.i386/padlock.4 b/share/man/man4/man4.i386/padlock.4
index e93d3d9fe2165..06b6382b05447 100644
--- a/share/man/man4/man4.i386/padlock.4
+++ b/share/man/man4/man4.i386/padlock.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/padlock.4,v 1.8 2007/08/02 08:04:48 bz Exp $
 .\"
 .Dd August 1, 2007
 .Dt PADLOCK 4 i386
diff --git a/share/man/man4/man4.i386/pae.4 b/share/man/man4/man4.i386/pae.4
index 718e2b2e20c20..e363c5e064ff4 100644
--- a/share/man/man4/man4.i386/pae.4
+++ b/share/man/man4/man4.i386/pae.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pae.4,v 1.8 2004/07/05 17:12:52 ru Exp $
 .\"
 .Dd April 8, 2003
 .Dt PAE 4 i386
diff --git a/share/man/man4/man4.i386/pbio.4 b/share/man/man4/man4.i386/pbio.4
index f4fbf3b4652ed..12dd17b5d102a 100644
--- a/share/man/man4/man4.i386/pbio.4
+++ b/share/man/man4/man4.i386/pbio.4
@@ -24,7 +24,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pbio.4,v 1.6 2005/07/31 03:30:45 keramida Exp $
 .\"
 .Dd January 14, 2005
 .Dt PBIO 4 i386
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/man4.i386/pcf.4
index f5e9088454c51..76d79580bc8be 100644
--- a/share/man/man4/man4.i386/pcf.4
+++ b/share/man/man4/man4.i386/pcf.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pcf.4,v 1.14 2001/10/13 09:08:37 yokota Exp $
 .\"
 .Dd August 6, 1998
 .Dt PCF 4 i386
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index b9a00f53fd828..21ebe31619b40 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/perfmon.4,v 1.16 2005/11/18 14:05:47 jkoshy Exp $
 .Dd March 26, 1996
 .Dt PERFMON 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 3b0ae3ae170e8..ea8aade4ffded 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pnp.4,v 1.17 2005/07/15 17:35:26 hrs Exp $
 .\"
 .Dd September 20, 2001
 .Dt PNP 4 i386
diff --git a/share/man/man4/man4.i386/pnpbios.4 b/share/man/man4/man4.i386/pnpbios.4
index d8e7609f878f4..b7ab126fa69b7 100644
--- a/share/man/man4/man4.i386/pnpbios.4
+++ b/share/man/man4/man4.i386/pnpbios.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/pnpbios.4,v 1.3 2005/07/15 17:35:26 hrs Exp $
 .Dd September 20, 2001
 .Dt PNPBIOS 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/ray.4 b/share/man/man4/man4.i386/ray.4
index 23eb168acc2df..d7c21634de45a 100644
--- a/share/man/man4/man4.i386/ray.4
+++ b/share/man/man4/man4.i386/ray.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/ray.4,v 1.17 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt RAY 4 i386
diff --git a/share/man/man4/man4.i386/sbni.4 b/share/man/man4/man4.i386/sbni.4
index 31cf610b0095d..463129e04fa53 100644
--- a/share/man/man4/man4.i386/sbni.4
+++ b/share/man/man4/man4.i386/sbni.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.2 2003/05/29 21:28:36 ru Exp $
 .\"
 .Dd January 8, 2002
 .Dt SBNI 4 i386
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index 68960c78c3ffd..605a1f823869e 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/scd.4,v 1.22 2005/03/16 02:03:15 brueffer Exp $
 .\"
 .Dd March 16, 2005
 .Dt SCD 4 i386
diff --git a/share/man/man4/man4.i386/smapi.4 b/share/man/man4/man4.i386/smapi.4
index 8af17fa0a826c..def176787525b 100644
--- a/share/man/man4/man4.i386/smapi.4
+++ b/share/man/man4/man4.i386/smapi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/smapi.4,v 1.2 2005/06/16 08:06:37 brueffer Exp $
 .\"
 .Dd April 1, 2003
 .Dt SMAPI 4 i386
diff --git a/share/man/man4/man4.i386/snc.4 b/share/man/man4/man4.i386/snc.4
index 66b45247822b6..1144a8d5c3515 100644
--- a/share/man/man4/man4.i386/snc.4
+++ b/share/man/man4/man4.i386/snc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.5.4.1 2008/01/30 18:13:53 brueffer Exp $
 .\"
 .Dd September 4, 2004
 .Dt SNC 4 i386
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index cf9ce8b3a457b..1909b70964029 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/sr.4,v 1.28 2005/03/18 02:49:43 brueffer Exp $
 .\"
 .Dd March 18, 2005
 .Dt SR 4 i386
diff --git a/share/man/man4/man4.i386/streams.4 b/share/man/man4/man4.i386/streams.4
index 90d680036e5ea..b01bb3c9e2253 100644
--- a/share/man/man4/man4.i386/streams.4
+++ b/share/man/man4/man4.i386/streams.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/streams.4,v 1.7 2005/01/21 08:36:39 ru Exp $
 .Dd November 6, 2000
 .Dt STREAMS 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/svr4.4 b/share/man/man4/man4.i386/svr4.4
index 9059284bfa8b6..487a0638acbd9 100644
--- a/share/man/man4/man4.i386/svr4.4
+++ b/share/man/man4/man4.i386/svr4.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/svr4.4,v 1.12 2005/02/13 23:45:49 ru Exp $
 .Dd October 28, 2003
 .Dt SVR4 4 i386
 .Os
diff --git a/share/man/man4/man4.i386/viapm.4 b/share/man/man4/man4.i386/viapm.4
index 7457952950f1a..67fecc6fc268f 100644
--- a/share/man/man4/man4.i386/viapm.4
+++ b/share/man/man4/man4.i386/viapm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/viapm.4,v 1.4 2002/09/15 20:33:05 ceri Exp $
 .\"
 .Dd April 20, 2002
 .Dt VIAPM 4 i386
diff --git a/share/man/man4/man4.i386/vpd.4 b/share/man/man4/man4.i386/vpd.4
index 222925e12729d..8eba91d50927c 100644
--- a/share/man/man4/man4.i386/vpd.4
+++ b/share/man/man4/man4.i386/vpd.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/vpd.4,v 1.3 2004/09/19 05:42:04 ru Exp $
 .\"
 .Dd August 31, 2004
 .Dt VPD 4 i386
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index 99d89e92dfed4..63c86b2a8a280 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/vx.4,v 1.24 2005/11/18 10:52:23 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt VX 4 i386
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index 2f8fdc5206936..1b7180d5c0f66 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.i386/wl.4,v 1.22 2006/09/29 16:16:41 bms Exp $
 .Dd September 29, 2006
 .Dt WL 4 i386
 .Os
diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile
index 55d73adb86530..fcb054c53ae8b 100644
--- a/share/man/man4/man4.powerpc/Makefile
+++ b/share/man/man4/man4.powerpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.1 2006/08/01 22:19:00 sobomax Exp $
 
 MAN=	powermac_nvram.4
 
diff --git a/share/man/man4/man4.powerpc/powermac_nvram.4 b/share/man/man4/man4.powerpc/powermac_nvram.4
index 0340422d88852..18a721a746de5 100644
--- a/share/man/man4/man4.powerpc/powermac_nvram.4
+++ b/share/man/man4/man4.powerpc/powermac_nvram.4
@@ -23,7 +23,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.powerpc/powermac_nvram.4,v 1.2 2006/08/02 07:02:19 brueffer Exp $
 .\"
 .Dd August 1, 2006
 .Dt POWERMAC_NVRAM 4 powerpc
diff --git a/share/man/man4/man4.sparc64/Makefile b/share/man/man4/man4.sparc64/Makefile
index 06d99c00a2932..ffac1a1550af9 100644
--- a/share/man/man4/man4.sparc64/Makefile
+++ b/share/man/man4/man4.sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man4/man4.sparc64/Makefile,v 1.3 2005/06/22 15:35:14 ru Exp $
 
 MAN=	auxio.4 \
 	central.4 \
diff --git a/share/man/man4/man4.sparc64/auxio.4 b/share/man/man4/man4.sparc64/auxio.4
index fb3cdbdf20282..3b9f2ef83d711 100644
--- a/share/man/man4/man4.sparc64/auxio.4
+++ b/share/man/man4/man4.sparc64/auxio.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/auxio.4,v 1.4 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt AUXIO 4 sparc64
diff --git a/share/man/man4/man4.sparc64/central.4 b/share/man/man4/man4.sparc64/central.4
index 3fa09bdca0fce..3152a793c9d66 100644
--- a/share/man/man4/man4.sparc64/central.4
+++ b/share/man/man4/man4.sparc64/central.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: central.4,v 1.3 2004/09/24 07:03:47 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/central.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt CENTRAL 4 sparc64
diff --git a/share/man/man4/man4.sparc64/clkbrd.4 b/share/man/man4/man4.sparc64/clkbrd.4
index b6c0bb381d020..524825c959934 100644
--- a/share/man/man4/man4.sparc64/clkbrd.4
+++ b/share/man/man4/man4.sparc64/clkbrd.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: clkbrd.4,v 1.2 2005/02/21 11:29:36 jmc Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/clkbrd.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt CLKBRD 4 sparc64
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index 5f6ab2334b000..c1a0a6e919ac1 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: creator.4,v 1.20 2005/03/05 01:48:59 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/creator.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt CREATOR 4 sparc64
diff --git a/share/man/man4/man4.sparc64/ebus.4 b/share/man/man4/man4.sparc64/ebus.4
index d61cc2b5de175..74f10e50236a4 100644
--- a/share/man/man4/man4.sparc64/ebus.4
+++ b/share/man/man4/man4.sparc64/ebus.4
@@ -27,7 +27,7 @@
 .\"
 .\"	from: OpenBSD: ebus.4,v 1.6 2004/09/23 18:28:51 jason Exp
 .\"	from: NetBSD: ebus.4,v 1.3 2002/03/13 21:42:20 wiz Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/ebus.4,v 1.2 2006/09/01 19:51:26 marius Exp $
 .\"
 .Dd September 1, 2006
 .Dt EBUS 4 sparc64
diff --git a/share/man/man4/man4.sparc64/eeprom.4 b/share/man/man4/man4.sparc64/eeprom.4
index 58af4e892ecf8..5645fec977676 100644
--- a/share/man/man4/man4.sparc64/eeprom.4
+++ b/share/man/man4/man4.sparc64/eeprom.4
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: clock.4,v 1.3 2004/09/24 07:04:15 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/eeprom.4,v 1.2 2006/02/15 16:57:30 marius Exp $
 .\"
 .Dd February 15, 2006
 .Dt EEPROM 4 sparc64
diff --git a/share/man/man4/man4.sparc64/fhc.4 b/share/man/man4/man4.sparc64/fhc.4
index 378737060f380..717f3f1fd4e89 100644
--- a/share/man/man4/man4.sparc64/fhc.4
+++ b/share/man/man4/man4.sparc64/fhc.4
@@ -24,7 +24,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: fhc.4,v 1.5 2004/09/28 21:42:59 jmc Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/fhc.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt FHC 4 sparc64
diff --git a/share/man/man4/man4.sparc64/machfb.4 b/share/man/man4/man4.sparc64/machfb.4
index 7d0af11036579..25a4e60a9c36b 100644
--- a/share/man/man4/man4.sparc64/machfb.4
+++ b/share/man/man4/man4.sparc64/machfb.4
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: creator.4,v 1.20 2005/03/05 01:48:59 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/machfb.4,v 1.5 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd September 2, 2006
 .Dt MACHFB 4 sparc64
diff --git a/share/man/man4/man4.sparc64/ofw_console.4 b/share/man/man4/man4.sparc64/ofw_console.4
index 8ae1c0c04a164..e0f8c373b5ba5 100644
--- a/share/man/man4/man4.sparc64/ofw_console.4
+++ b/share/man/man4/man4.sparc64/ofw_console.4
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: pcons.4,v 1.4 2003/06/02 16:16:26 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/ofw_console.4,v 1.2 2006/12/14 17:03:46 mpp Exp $
 .\"
 .Dd June 18, 2005
 .Dt OFW_CONSOLE 4 sparc64
diff --git a/share/man/man4/man4.sparc64/openfirm.4 b/share/man/man4/man4.sparc64/openfirm.4
index 686fe868c9549..dd71fcc0383f7 100644
--- a/share/man/man4/man4.sparc64/openfirm.4
+++ b/share/man/man4/man4.sparc64/openfirm.4
@@ -58,7 +58,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/openfirm.4,v 1.2 2006/09/01 20:01:51 marius Exp $
 .\"
 .Dd September 1, 2006
 .Dt OPENFIRM 4 sparc64
diff --git a/share/man/man4/man4.sparc64/openprom.4 b/share/man/man4/man4.sparc64/openprom.4
index e66a8d8581d55..b35c39cdb9923 100644
--- a/share/man/man4/man4.sparc64/openprom.4
+++ b/share/man/man4/man4.sparc64/openprom.4
@@ -58,7 +58,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/openprom.4,v 1.2 2005/07/31 03:30:45 keramida Exp $
 .\"
 .Dd June 18, 2005
 .Dt OPENPROM 4 sparc64
diff --git a/share/man/man4/man4.sparc64/rtc.4 b/share/man/man4/man4.sparc64/rtc.4
index 9117bf325b7ca..cfd479b8c03f3 100644
--- a/share/man/man4/man4.sparc64/rtc.4
+++ b/share/man/man4/man4.sparc64/rtc.4
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: OpenBSD: clock.4,v 1.3 2004/09/24 07:04:15 miod Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/rtc.4,v 1.1 2005/06/22 15:35:14 ru Exp $
 .\"
 .Dd June 18, 2005
 .Dt RTC 4 sparc64
diff --git a/share/man/man4/man4.sparc64/sbus.4 b/share/man/man4/man4.sparc64/sbus.4
index d85c85ca7eae9..e4120a39d22ce 100644
--- a/share/man/man4/man4.sparc64/sbus.4
+++ b/share/man/man4/man4.sparc64/sbus.4
@@ -35,7 +35,7 @@
 .\"
 .\"	from: OpenBSD: sbus.4,v 1.27 2005/03/05 01:44:48 miod Exp
 .\"	from: NetBSD: sbus.4,v 1.5 2002/01/21 17:54:10 wiz Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/sbus.4,v 1.3 2006/09/01 19:51:26 marius Exp $
 .\"
 .Dd September 1, 2006
 .Dt SBUS 4 sparc64
diff --git a/share/man/man4/man4.sparc64/snd_audiocs.4 b/share/man/man4/man4.sparc64/snd_audiocs.4
index 5fcc44ab56c3d..fc7026235f864 100644
--- a/share/man/man4/man4.sparc64/snd_audiocs.4
+++ b/share/man/man4/man4.sparc64/snd_audiocs.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/man4.sparc64/snd_audiocs.4,v 1.5 2005/12/15 21:02:16 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_AUDIOCS 4 sparc64
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 7fa8e5ced2cfb..cdaec8473d6e7 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/md.4,v 1.13 2007/05/12 15:33:18 pav Exp $
 .\"
 .Dd November 24, 2006
 .Dt MD 4
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 5dd2cb98f1ec7..0c8b1cc420d7c 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mem.4	5.3 (Berkeley) 5/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mem.4,v 1.21 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd October 3, 2004
 .Dt MEM 4
diff --git a/share/man/man4/meteor.4 b/share/man/man4/meteor.4
index 62ff6e99f6cb6..814174a8768a6 100644
--- a/share/man/man4/meteor.4
+++ b/share/man/man4/meteor.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/meteor.4,v 1.7 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd August 15, 1995
 .Dt METEOR 4
diff --git a/share/man/man4/mfi.4 b/share/man/man4/mfi.4
index 6174caa392d5a..58a81a21ad3d8 100644
--- a/share/man/man4/mfi.4
+++ b/share/man/man4/mfi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.6 2007/08/13 19:29:16 jhb Exp $
 .\"
 .Dd April 3, 2006
 .Dt MFI 4
diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4
index a6c61a8d485f1..5cf09dd72c379 100644
--- a/share/man/man4/miibus.4
+++ b/share/man/man4/miibus.4
@@ -6,7 +6,7 @@
 .\" Originally this file looked much like the NetBSD mii(4) manual page, but
 .\" I doubt you would ever notice due to large differences.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.21 2007/06/12 02:18:04 yongari Exp $
 .\"
 .Dd June 12, 2007
 .Dt MIIBUS 4
diff --git a/share/man/man4/mlx.4 b/share/man/man4/mlx.4
index 696d04812e515..5a6b75ec37ec1 100644
--- a/share/man/man4/mlx.4
+++ b/share/man/man4/mlx.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mlx.4,v 1.19 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLX 4
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index 3affcacbd3cd1..c2735d578ec15 100644
--- a/share/man/man4/mly.4
+++ b/share/man/man4/mly.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mly.4,v 1.10 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd August 10, 2004
 .Dt MLY 4
diff --git a/share/man/man4/mmc.4 b/share/man/man4/mmc.4
index 93d678efd02e5..f746ea284e108 100644
--- a/share/man/man4/mmc.4
+++ b/share/man/man4/mmc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mmc.4,v 1.1 2007/05/27 05:01:19 imp Exp $
 .\"
 .Dd May 26, 2007
 .Dt MMC 4
diff --git a/share/man/man4/mmcsd.4 b/share/man/man4/mmcsd.4
index b871c4f2d5b5f..632d8993904a2 100644
--- a/share/man/man4/mmcsd.4
+++ b/share/man/man4/mmcsd.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mmcsd.4,v 1.1 2007/05/27 05:01:19 imp Exp $
 .\"
 .Dd May 26, 2007
 .Dt MMCSD 4
diff --git a/share/man/man4/mn.4 b/share/man/man4/mn.4
index 0b88f2fb92674..be8257dad0060 100644
--- a/share/man/man4/mn.4
+++ b/share/man/man4/mn.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mn.4,v 1.1 2005/05/10 16:48:03 brueffer Exp $
 .\"
 .Dd May 10, 2005
 .Dt MN 4
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index f50fc0120072b..279b699e395eb 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mouse.4,v 1.14 2004/11/12 23:59:24 philip Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSE 4
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 5c87a50054941..e8303f7cad24d 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.15 2007/04/07 04:01:00 mjacob Exp $
 .\"
 .Dd April 6, 2007
 .Dt MPT 4
diff --git a/share/man/man4/msk.4 b/share/man/man4/msk.4
index ffb2fe011dd59..cd2440879dbcc 100644
--- a/share/man/man4/msk.4
+++ b/share/man/man4/msk.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/msk.4,v 1.4.2.1 2007/12/08 12:16:14 remko Exp $
 .\"
 .Dd December 5, 2007
 .Dt MSK 4
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 735da63583574..cc12d101b4150 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mtio.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mtio.4,v 1.22 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd February 11, 1996
 .Dt MTIO 4
diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4
index 3c53db3511178..32259bf9e128d 100644
--- a/share/man/man4/multicast.4
+++ b/share/man/man4/multicast.4
@@ -23,7 +23,7 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 .\" DEALINGS IN THE SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.6 2007/03/18 15:34:57 bms Exp $
 .\"
 .Dd March 18, 2007
 .Dt MULTICAST 4
diff --git a/share/man/man4/mxge.4 b/share/man/man4/mxge.4
index 87b32177f3a89..abddd6c4a6e39 100644
--- a/share/man/man4/mxge.4
+++ b/share/man/man4/mxge.4
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/mxge.4,v 1.7.6.1 2008/01/04 13:12:47 gabor Exp $
 .\"
 .Dd September 15, 2006
 .Dt MXGE 4
diff --git a/share/man/man4/my.4 b/share/man/man4/my.4
index 28b67ddbd85fa..7265aa69029b1 100644
--- a/share/man/man4/my.4
+++ b/share/man/man4/my.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/my.4,v 1.9 2007/03/11 15:20:03 brueffer Exp $
 .\"
 .Dd March 11, 2007
 .Dt MY 4
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 33bd2b19e8e27..c6d07b5a6c107 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/natm.4,v 1.18 2005/07/15 17:35:25 hrs Exp $
 .\"
 .Dd December 29, 1997
 .Dt NATM 4
diff --git a/share/man/man4/natmip.4 b/share/man/man4/natmip.4
index 154e97da66818..47fb2851f8739 100644
--- a/share/man/man4/natmip.4
+++ b/share/man/man4/natmip.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.9 2004/07/08 10:31:12 ru Exp $
 .\"
 .Dd August 11, 2003
 .Dt NATMIP 4
diff --git a/share/man/man4/ncr.4 b/share/man/man4/ncr.4
index 0521b4d9e1fcf..a88223f9f1785 100644
--- a/share/man/man4/ncr.4
+++ b/share/man/man4/ncr.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ncr.4,v 1.16 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 19, 2004
 .Dt NCR 4
diff --git a/share/man/man4/ncv.4 b/share/man/man4/ncv.4
index 8ab719921b801..071be1e7c5edc 100644
--- a/share/man/man4/ncv.4
+++ b/share/man/man4/ncv.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ncv.4,v 1.7 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 10, 2004
 .Dt NCV 4
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 9f457d917c46b..86b73d01e5e2d 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -34,7 +34,7 @@
 .\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.52 2006/03/06 17:37:42 keramida Exp $
 .\"
 .Dd July 1, 2004
 .Dt NETGRAPH 4
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index f5d479bc18cf0..962432c8a4b1a 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netintro.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/netintro.4,v 1.25 2004/06/21 05:13:22 yar Exp $
 .\"
 .Dd June 18, 2004
 .Dt NETINTRO 4
diff --git a/share/man/man4/nfe.4 b/share/man/man4/nfe.4
index 3a17dbe13cda3..bad1df0b5cf61 100644
--- a/share/man/man4/nfe.4
+++ b/share/man/man4/nfe.4
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.8.2.1 2007/12/02 08:45:57 remko Exp $
 .\"
 .Dd Nov 27, 2007
 .Dt NFE 4
diff --git a/share/man/man4/nfsmb.4 b/share/man/man4/nfsmb.4
index d6f39cec7fc58..79c39b0e13011 100644
--- a/share/man/man4/nfsmb.4
+++ b/share/man/man4/nfsmb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nfsmb.4,v 1.3 2006/09/30 15:14:48 ru Exp $
 .\"
 .Dd December 31, 2005
 .Dt NFSMB 4
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 0f48d4b7a9b71..61eed7ad9c0f5 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_UI.4,v 1.10 2004/07/03 18:29:20 ru Exp $
 .\" $Whistle: ng_UI.8,v 1.4 1999/01/25 02:37:56 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index 4f7a2e1eb1c7c..9b61386699dbd 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_async.4,v 1.14 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_async.8,v 1.6 1999/01/25 23:46:25 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_atm.4 b/share/man/man4/ng_atm.4
index df4c2e341ef91..c70edac6d410e 100644
--- a/share/man/man4/ng_atm.4
+++ b/share/man/man4/ng_atm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_atm.4,v 1.11 2005/02/05 11:31:31 ru Exp $
 .\"
 .\" ng_atm(4) man page
 .\"
diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4
index 81768b54da7cc..9938c9d610982 100644
--- a/share/man/man4/ng_atmllc.4
+++ b/share/man/man4/ng_atmllc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_atmllc.4,v 1.3 2004/07/09 07:26:15 ru Exp $
 .\"
 .Dd March 8, 2004
 .Dt NG_ATMLLC 4
diff --git a/share/man/man4/ng_atmpif.4 b/share/man/man4/ng_atmpif.4
index 3405347d61c6f..bb42692a10d94 100644
--- a/share/man/man4/ng_atmpif.4
+++ b/share/man/man4/ng_atmpif.4
@@ -28,7 +28,7 @@
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\" Author: Vincent Jardin <vjardin@free.fr>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_atmpif.4,v 1.10 2005/02/05 11:31:31 ru Exp $
 .\"
 .\" ng_atmpif(4) man page
 .\"
diff --git a/share/man/man4/ng_bluetooth.4 b/share/man/man4/ng_bluetooth.4
index 2214172b1ada7..67c9d4035f2fc 100644
--- a/share/man/man4/ng_bluetooth.4
+++ b/share/man/man4/ng_bluetooth.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_bluetooth.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bluetooth.4,v 1.9 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd November 9, 2002
 .Dt NG_BLUETOOTH 4
diff --git a/share/man/man4/ng_bpf.4 b/share/man/man4/ng_bpf.4
index 9e6f3d5c6a374..f9b2e19a57923 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bpf.4,v 1.22 2007/05/30 09:05:49 glebius Exp $
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
 .\"
 .Dd May 30, 2007
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 3b1dd71cb62c8..4cadc88379723 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.11 2005/09/27 18:10:42 mlaier Exp $
 .\"
 .Dd August 31, 2000
 .Dt NG_BRIDGE 4
diff --git a/share/man/man4/ng_bt3c.4 b/share/man/man4/ng_bt3c.4
index 157a3788dbfc6..54e2082122ed4 100644
--- a/share/man/man4/ng_bt3c.4
+++ b/share/man/man4/ng_bt3c.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_bt3c.4,v 1.3 2003/09/14 23:28:51 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_bt3c.4,v 1.11 2007/02/09 21:05:47 brueffer Exp $
 .\"
 .Dd December 17, 2004
 .Dt NG_BT3C 4
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index 5146d1507ea1a..f7ce567aedb7c 100644
--- a/share/man/man4/ng_btsocket.4
+++ b/share/man/man4/ng_btsocket.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_btsocket.4,v 1.7 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_btsocket.4,v 1.9 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd July 8, 2002
 .Dt NG_BTSOCKET 4
diff --git a/share/man/man4/ng_car.4 b/share/man/man4/ng_car.4
index 102514c1fda2a..fbabf37d0e4bf 100644
--- a/share/man/man4/ng_car.4
+++ b/share/man/man4/ng_car.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_car.4,v 1.3.2.1 2007/10/31 22:52:51 mav Exp $
 .\"
 .Dd March 11, 2007
 .Dt NG_CAR 4
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index 923b06df2521c..69868633f1614 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ccatm.4,v 1.4 2005/07/15 17:35:25 hrs Exp $
 .\"
 .Dd March 10, 2005
 .Dt NG_CCATM 4
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index 2cccb76fddeb9..6e3d56fd2ffd4 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_cisco.4,v 1.14 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_cisco.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_deflate.4 b/share/man/man4/ng_deflate.4
index 25ba5e8aaf30d..3523e653f2681 100644
--- a/share/man/man4/ng_deflate.4
+++ b/share/man/man4/ng_deflate.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_deflate.4,v 1.2 2007/01/30 20:22:07 glebius Exp $
 .\"
 .Dd December 23, 2006
 .Dt NG_DEFLATE 4
diff --git a/share/man/man4/ng_device.4 b/share/man/man4/ng_device.4
index a03a03b6b0c21..dfb36fd98fe08 100644
--- a/share/man/man4/ng_device.4
+++ b/share/man/man4/ng_device.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_device.4,v 1.4 2005/01/12 10:14:43 ru Exp $
 .\"
 .Dd October 19, 2004
 .Dt NG_DEVICE 4
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index f502c621ac00c..e60bfda2227bc 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_echo.4,v 1.10 2001/10/01 16:09:21 ru Exp $
 .\" $Whistle: ng_echo.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_eiface.4 b/share/man/man4/ng_eiface.4
index 66991533c3522..ebb260889ed32 100644
--- a/share/man/man4/ng_eiface.4
+++ b/share/man/man4/ng_eiface.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_eiface.4,v 1.3 2005/02/03 11:52:41 ru Exp $
 .\"
 .Dd February 3, 2005
 .Dt NG_EIFACE 4
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index 18bb99e88a2aa..cfd16bcbe45b2 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.8 2006/05/15 20:28:18 marius Exp $
 .\"
 .Dd May 16, 2006
 .Dt NG_ETF 4
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 9fd409db00ed3..a1d2dbaee9e8e 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ether.4,v 1.27 2006/08/04 18:28:57 glebius Exp $
 .\"
 .Dd August 4, 2006
 .Dt NG_ETHER 4
diff --git a/share/man/man4/ng_fec.4 b/share/man/man4/ng_fec.4
index 26004eee4dd03..c521142905c6a 100644
--- a/share/man/man4/ng_fec.4
+++ b/share/man/man4/ng_fec.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_fec.4,v 1.6 2007/08/12 16:02:30 danger Exp $
 .\"
 .Dd July 22, 2004
 .Dt NG_FEC 4
diff --git a/share/man/man4/ng_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 79e18e6e26751..e56c69d482572 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_frame_relay.4,v 1.13 2005/01/21 08:36:37 ru Exp $
 .\" $Whistle: ng_frame_relay.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_gif.4 b/share/man/man4/ng_gif.4
index 28a058897c952..f19d96e00d0f7 100644
--- a/share/man/man4/ng_gif.4
+++ b/share/man/man4/ng_gif.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Brooks Davis <brooks@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_gif.4,v 1.3 2001/11/22 11:25:02 ru Exp $
 .\"
 .Dd September 18, 2001
 .Dt NG_GIF 4
diff --git a/share/man/man4/ng_gif_demux.4 b/share/man/man4/ng_gif_demux.4
index e549728c4cd52..71a9371d49d9f 100644
--- a/share/man/man4/ng_gif_demux.4
+++ b/share/man/man4/ng_gif_demux.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Brooks Davis <brooks@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_gif_demux.4,v 1.3 2001/11/22 11:32:27 ru Exp $
 .\"
 .Dd September 18, 2001
 .Dt NG_GIF_DEMUX 4
diff --git a/share/man/man4/ng_h4.4 b/share/man/man4/ng_h4.4
index cda15e409069d..bbf93e34536ac 100644
--- a/share/man/man4/ng_h4.4
+++ b/share/man/man4/ng_h4.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_h4.4,v 1.2 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_h4.4,v 1.7 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt NG_H4 4
diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4
index 28de180c24260..d1db9bfc79c4c 100644
--- a/share/man/man4/ng_hci.4
+++ b/share/man/man4/ng_hci.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_hci.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_hci.4,v 1.11 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd June 25, 2002
 .Dt NG_HCI 4
diff --git a/share/man/man4/ng_hole.4 b/share/man/man4/ng_hole.4
index 8089f541d651d..d36bf36cf7859 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_hole.4,v 1.12 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_hole.8,v 1.4 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd May 19, 2004
diff --git a/share/man/man4/ng_hub.4 b/share/man/man4/ng_hub.4
index a1ad0680171cd..1d5fec55bf9eb 100644
--- a/share/man/man4/ng_hub.4
+++ b/share/man/man4/ng_hub.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_hub.4,v 1.1 2004/04/17 12:42:17 ru Exp $
 .\"
 .Dd April 17, 2004
 .Dt NG_HUB 4
diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4
index 90563b84dc8d1..04d87aa6cf55c 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_iface.4,v 1.20 2005/11/18 10:52:22 ru Exp $
 .\" $Whistle: ng_iface.8,v 1.5 1999/01/25 23:46:26 archie Exp $
 .\"
 .Dd October 28, 2005
diff --git a/share/man/man4/ng_ip_input.4 b/share/man/man4/ng_ip_input.4
index 430f43c6eaa10..9091d20e7b2a7 100644
--- a/share/man/man4/ng_ip_input.4
+++ b/share/man/man4/ng_ip_input.4
@@ -59,7 +59,7 @@
 .\" Author:		Brooks Davis <brooks@FreeBSD.org>
 .\" Derived from:	ng_hole.4
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ip_input.4,v 1.2 2001/11/22 11:36:29 ru Exp $
 .\"
 .Dd September 27, 2001
 .Dt NG_IP_INPUT 4
diff --git a/share/man/man4/ng_ipfw.4 b/share/man/man4/ng_ipfw.4
index ee7d9b0b52fab..2327f7ccf6fb3 100644
--- a/share/man/man4/ng_ipfw.4
+++ b/share/man/man4/ng_ipfw.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ipfw.4,v 1.2 2005/02/07 08:17:51 glebius Exp $
 .\"
 .Dd February 5, 2005
 .Dt NG_IPFW 4
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index d20ee46004304..023b57c9cb77a 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ksocket.4,v 1.22 2006/12/16 10:32:10 rwatson Exp $
 .\"
 .Dd October 28, 2005
 .Dt NG_KSOCKET 4
diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4
index bd050fc13c733..1ffe288dfe8e0 100644
--- a/share/man/man4/ng_l2cap.4
+++ b/share/man/man4/ng_l2cap.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_l2cap.4,v 1.4 2003/09/14 23:37:52 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_l2cap.4,v 1.10 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd July 4, 2002
 .Dt NG_L2CAP 4
diff --git a/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4
index 49fedf1bea4bb..7ce2df04f66c6 100644
--- a/share/man/man4/ng_l2tp.4
+++ b/share/man/man4/ng_l2tp.4
@@ -35,7 +35,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_l2tp.4,v 1.6 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd August 2, 2004
 .Dt NG_L2TP 4
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index 4dc7fdf6062b4..d9f3821a077db 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_lmi.4,v 1.13 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_lmi.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index a146228a743bb..bd02f173ef6a2 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -33,7 +33,7 @@
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $Whistle: ng_mppc.8,v 1.1 1999/12/08 20:20:39 archie Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_mppc.4,v 1.14 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd December 8, 1999
 .Dt NG_MPPC 4
diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4
index dcb521f7fa7ba..222c874733861 100644
--- a/share/man/man4/ng_nat.4
+++ b/share/man/man4/ng_nat.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_nat.4,v 1.3 2007/05/22 12:23:39 mav Exp $
 .\"
 .Dd May 6, 2005
 .Dt NG_NAT 4
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index ebbb6e46fdf4a..5eb88be9c687d 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_netflow.4,v 1.14 2006/07/01 17:59:13 ru Exp $
 .\"
 .Dd March 2, 2006
 .Os
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index e43fd8a2fa523..048e02e3f69b9 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_one2many.4,v 1.25 2006/02/20 07:54:16 glebius Exp $
 .\"
 .Dd February 19, 2006
 .Dt NG_ONE2MANY 4
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index 9fd72cad17c8a..75366027edc06 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ppp.4,v 1.26 2007/08/01 20:49:35 mav Exp $
 .\" $Whistle: ng_ppp.8,v 1.3 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd December 28, 2006
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index 455c9775b6b93..c1403e36dfe89 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.39 2006/10/22 16:21:55 ru Exp $
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd October 22, 2006
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 55ff2e9755592..d6b7af9570c6f 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_pptpgre.4,v 1.21 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
 .\"
 .Dd December 7, 2001
diff --git a/share/man/man4/ng_pred1.4 b/share/man/man4/ng_pred1.4
index 0048962115a86..dd7bb58d9c880 100644
--- a/share/man/man4/ng_pred1.4
+++ b/share/man/man4/ng_pred1.4
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_pred1.4,v 1.1 2006/12/29 10:47:26 glebius Exp $
 .\"
 .Dd December 24, 2006
 .Dt NG_PRED1 4
diff --git a/share/man/man4/ng_rfc1490.4 b/share/man/man4/ng_rfc1490.4
index 54b327ec04afe..3df5dfbca5826 100644
--- a/share/man/man4/ng_rfc1490.4
+++ b/share/man/man4/ng_rfc1490.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_rfc1490.4,v 1.15 2005/01/21 08:36:37 ru Exp $
 .\" $Whistle: ng_rfc1490.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 22c6638a0acfa..d2ff70552d2ee 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_socket.4,v 1.18 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_socket.8,v 1.5 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_source.4 b/share/man/man4/ng_source.4
index 7c55751cb93a5..8f9ab27c0dfc6 100644
--- a/share/man/man4/ng_source.4
+++ b/share/man/man4/ng_source.4
@@ -30,7 +30,7 @@
 .\" DAMAGE.
 .\"
 .\" Author: Dave Chapeskie
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_source.4,v 1.14 2007/03/02 12:55:24 emaste Exp $
 .\"
 .Dd March 1, 2007
 .Dt NG_SOURCE 4
diff --git a/share/man/man4/ng_split.4 b/share/man/man4/ng_split.4
index 9b74863a66416..8a5eacadd456f 100644
--- a/share/man/man4/ng_split.4
+++ b/share/man/man4/ng_split.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Julian Elischer <julian@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_split.4,v 1.6 2002/01/21 12:09:13 mpp Exp $
 .\"
 .Dd February 19, 2001
 .Dt NG_SPLIT 4
diff --git a/share/man/man4/ng_sppp.4 b/share/man/man4/ng_sppp.4
index 49f8a4c27ae99..7a84984cef125 100644
--- a/share/man/man4/ng_sppp.4
+++ b/share/man/man4/ng_sppp.4
@@ -10,7 +10,7 @@
 .\" works or modified versions.
 .\"
 .\" Cronyx Id: ng_sppp.4,v 1.1.2.3 2004/03/30 14:28:34 rik Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_sppp.4,v 1.7 2005/02/03 13:33:34 ru Exp $
 .\"
 .Dd February 3, 2005
 .Dt NG_SPPP 4
diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4
index 0679d58056219..4b9b8cc5033d3 100644
--- a/share/man/man4/ng_sscfu.4
+++ b/share/man/man4/ng_sscfu.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_sscfu.4,v 1.7 2004/07/09 07:26:15 ru Exp $
 .\"
 .\" ng_sscfu(4) man page
 .\"
diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4
index 0c6f0d4564b90..dc4347ea15077 100644
--- a/share/man/man4/ng_sscop.4
+++ b/share/man/man4/ng_sscop.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_sscop.4,v 1.8 2005/01/21 10:40:04 ru Exp $
 .\"
 .\" ng_sscop(4) man page
 .\"
diff --git a/share/man/man4/ng_tag.4 b/share/man/man4/ng_tag.4
index 98cfa24fae6fb..b00ecf0604e40 100644
--- a/share/man/man4/ng_tag.4
+++ b/share/man/man4/ng_tag.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tag.4,v 1.4 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd June 10, 2006
 .Dt NG_TAG 4
diff --git a/share/man/man4/ng_tcpmss.4 b/share/man/man4/ng_tcpmss.4
index fc610b6d66959..5f5059f62a741 100644
--- a/share/man/man4/ng_tcpmss.4
+++ b/share/man/man4/ng_tcpmss.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tcpmss.4,v 1.2 2005/06/16 18:46:16 ru Exp $
 .\"
 .Dd June 9, 2005
 .Dt NG_TCPMSS 4
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index a914ab54f7967..44472b480f198 100644
--- a/share/man/man4/ng_tee.4
+++ b/share/man/man4/ng_tee.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tee.4,v 1.14 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_tee.8,v 1.4 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd May 28, 2004
diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4
index 242065f1a1d4d..c561bd3f778a2 100644
--- a/share/man/man4/ng_tty.4
+++ b/share/man/man4/ng_tty.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.17 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_ubt.4 b/share/man/man4/ng_ubt.4
index ebb454d92a37b..5ff0e20224007 100644
--- a/share/man/man4/ng_ubt.4
+++ b/share/man/man4/ng_ubt.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.11 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd September 13, 2004
 .Dt NG_UBT 4
diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4
index f6eb05fdbe506..f19f823a1cec0 100644
--- a/share/man/man4/ng_uni.4
+++ b/share/man/man4/ng_uni.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_uni.4,v 1.10 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd October 6, 2003
 .Dt NG_UNI 4
diff --git a/share/man/man4/ng_vjc.4 b/share/man/man4/ng_vjc.4
index da0c37b13064a..8bb7fa9bc0367 100644
--- a/share/man/man4/ng_vjc.4
+++ b/share/man/man4/ng_vjc.4
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_vjc.4,v 1.22 2005/02/05 11:31:31 ru Exp $
 .\" $Whistle: ng_vjc.8,v 1.4 1999/01/25 23:46:28 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/share/man/man4/ng_vlan.4 b/share/man/man4/ng_vlan.4
index bf673cf3bd7f1..1ed1d968551a4 100644
--- a/share/man/man4/ng_vlan.4
+++ b/share/man/man4/ng_vlan.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ng_vlan.4,v 1.3 2005/02/05 11:31:31 ru Exp $
 .\"
 .Dd March 1, 2004
 .Dt NG_VLAN 4
diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4
index abee6d8762b09..30ade7931344f 100644
--- a/share/man/man4/ngatmbase.4
+++ b/share/man/man4/ngatmbase.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ngatmbase.4,v 1.3 2005/01/13 16:46:49 ru Exp $
 .\"
 .\" ngatmbase(4) man page
 .\"
diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4
index 855ee461ee6f9..68c5359a05612 100644
--- a/share/man/man4/nge.4
+++ b/share/man/man4/nge.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nge.4,v 1.20 2006/01/14 15:35:21 bz Exp $
 .\"
 .Dd January 14, 2006
 .Dt NGE 4
diff --git a/share/man/man4/nmdm.4 b/share/man/man4/nmdm.4
index 7dccb00bf1bd4..fc4a2e5eeee1a 100644
--- a/share/man/man4/nmdm.4
+++ b/share/man/man4/nmdm.4
@@ -19,7 +19,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nmdm.4,v 1.5 2005/01/27 10:30:53 ru Exp $
 .\"
 .Dd January 27, 2005
 .Dt NMDM 4
diff --git a/share/man/man4/nsp.4 b/share/man/man4/nsp.4
index 7ff7fe176255b..5d1e055c58c74 100644
--- a/share/man/man4/nsp.4
+++ b/share/man/man4/nsp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nsp.4,v 1.7 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 8, 2004
 .Dt NSP 4
diff --git a/share/man/man4/null.4 b/share/man/man4/null.4
index cedfaeb9c7b41..d5a9fe26992dc 100644
--- a/share/man/man4/null.4
+++ b/share/man/man4/null.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)null.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/null.4,v 1.7 2004/05/14 20:07:49 simon Exp $
 .\"
 .Dd June 5, 1993
 .Dt NULL 4
diff --git a/share/man/man4/nve.4 b/share/man/man4/nve.4
index 5fe5229a215ee..fd46d4d990577 100644
--- a/share/man/man4/nve.4
+++ b/share/man/man4/nve.4
@@ -24,7 +24,7 @@
 .\"
 .\" $Id: nvnet.4,v 1.1 2003/10/09 16:48:01 q Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nve.4,v 1.8.4.1 2008/02/14 21:47:49 remko Exp $
 .\"
 .Dd December 8, 2007
 .Dt NVE 4
diff --git a/share/man/man4/nxge.4 b/share/man/man4/nxge.4
index 3d2df2dcce569..ad9e483955a0a 100644
--- a/share/man/man4/nxge.4
+++ b/share/man/man4/nxge.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/nxge.4,v 1.3.2.2 2007/11/03 20:51:50 brueffer Exp $
 .\"
 .Dd October 16, 2007
 .Dt NXGE 4
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index ee56861d281e6..1972b3a3ff1a1 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ohci.4,v 1.20 2006/02/13 21:34:18 joel Exp $
 .\"
 .Dd June 23, 2005
 .Dt OHCI 4
diff --git a/share/man/man4/orm.4 b/share/man/man4/orm.4
index 2ef54a0b5d320..e7d8fda898aa0 100644
--- a/share/man/man4/orm.4
+++ b/share/man/man4/orm.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/orm.4,v 1.3 2001/08/08 21:00:54 sheldonh Exp $
 .\"
 .Dd December 15, 2000
 .Os
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index b96d6ba7283cb..373e928474b79 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pass.4,v 1.14 2005/02/15 09:26:59 ru Exp $
 .\"
 .Dd October 10, 1998
 .Dt PASS 4
diff --git a/share/man/man4/patm.4 b/share/man/man4/patm.4
index 3ab2f7aec5530..c728429186cea 100644
--- a/share/man/man4/patm.4
+++ b/share/man/man4/patm.4
@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/patm.4,v 1.5 2004/07/08 10:31:12 ru Exp $
 .\"
 .\" patm(4) man page
 .\"
diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4
index f955804978e25..d4eed2ac8aad6 100644
--- a/share/man/man4/pccard.4
+++ b/share/man/man4/pccard.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pccard.4,v 1.7 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt PCCARD 4
diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4
index 27ef584f8b107..560944172671c 100644
--- a/share/man/man4/pccbb.4
+++ b/share/man/man4/pccbb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pccbb.4,v 1.8 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd July 21, 2004
 .Dt PCCBB 4
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index dd7763002a5a3..60f281f3a3208 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
 .\"
 .Dd September 30, 2007
 .Dt PCI 4
diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4
index 589a2ed5c9a05..9668f62c907f1 100644
--- a/share/man/man4/pcic.4
+++ b/share/man/man4/pcic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcic.4,v 1.9 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt PCIC 4
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index f7992de186054..153b3f9e4b8b4 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.52 2007/06/23 14:34:30 joel Exp $
 .\"
 .Dd June 23, 2007
 .Dt SOUND 4
diff --git a/share/man/man4/pcn.4 b/share/man/man4/pcn.4
index 38639ad738484..1bf0a9cb30395 100644
--- a/share/man/man4/pcn.4
+++ b/share/man/man4/pcn.4
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pcn.4,v 1.17 2006/07/19 11:49:22 nyan Exp $
 .\"
 .Dd January 31, 2006
 .Dt PCN 4
diff --git a/share/man/man4/pim.4 b/share/man/man4/pim.4
index 7d334b27fd340..b73c42f92becd 100644
--- a/share/man/man4/pim.4
+++ b/share/man/man4/pim.4
@@ -23,7 +23,7 @@
 .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 .\" DEALINGS IN THE SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pim.4,v 1.3 2007/02/12 21:30:34 brueffer Exp $
 .\"
 .Dd February 12, 2007
 .Dt PIM 4
diff --git a/share/man/man4/polling.4 b/share/man/man4/polling.4
index fea0bfb798829..85b99337cf77e 100644
--- a/share/man/man4/polling.4
+++ b/share/man/man4/polling.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/polling.4,v 1.27 2007/04/06 14:25:14 brueffer Exp $
 .\"
 .Dd April 6, 2007
 .Dt POLLING 4
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 4a873056d0a16..bb9aeb8650890 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.24 2007/02/23 16:50:17 schweikh Exp $
 .\"
 .Dd March 1, 1998
 .Dt PPBUS 4
diff --git a/share/man/man4/ppc.4 b/share/man/man4/ppc.4
index 9b96625cb6ece..2c3932380d372 100644
--- a/share/man/man4/ppc.4
+++ b/share/man/man4/ppc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppc.4,v 1.19 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd March 5, 1998
 .Dt PPC 4
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index a6041d2a8fa76..147c1c8c55807 100644
--- a/share/man/man4/ppi.4
+++ b/share/man/man4/ppi.4
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppi.4,v 1.16 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd January 2, 1998
 .Dt PPI 4
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index 4e9ad61e19f3b..afb01a5af9141 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ppp.4,v 1.8 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd August 10, 1996
 .Dt PPP 4
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 39ae333ec481b..15ee8e4bcdbb3 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/psm.4,v 1.48 2005/07/15 17:35:25 hrs Exp $
 .\"
 .Dd September 29, 2004
 .Dt PSM 4
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index f207e2d111e1d..4f4fbef985e28 100644
--- a/share/man/man4/pst.4
+++ b/share/man/man4/pst.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pst.4,v 1.5 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd December 14, 2004
 .Dt PST 4
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index 170956e7ff1dc..f072157a54108 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pt.4,v 1.15 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd March 2, 1995
 .Dt PT 4
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index 868c710c695c1..6e2714b11f745 100644
--- a/share/man/man4/pty.4
+++ b/share/man/man4/pty.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pty.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/pty.4,v 1.19 2007/05/24 09:43:41 yar Exp $
 .\"
 .Dd November 30, 1993
 .Dt PTY 4
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index 9ecc5de151ac7..f04a8a2398746 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/puc.4,v 1.4 2003/09/12 21:54:11 ru Exp $
 .\"
 .Dd February 7, 2002
 .Dt PUC 4
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index 65ee97488597b..4134085743225 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ral.4,v 1.13 2007/09/10 17:54:14 brueffer Exp $
 .\"
 .Dd September 10, 2007
 .Os
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index cccd89c93badf..95791eb365202 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/random.4,v 1.20 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd July 19, 2006
 .Dt RANDOM 4
diff --git a/share/man/man4/rc.4 b/share/man/man4/rc.4
index 60c4fa501f07b..9b06f8db54562 100644
--- a/share/man/man4/rc.4
+++ b/share/man/man4/rc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rc.4,v 1.5 2005/03/18 02:38:03 brueffer Exp $
 .\"
 .Dd March 18, 2005
 .Dt RC 4
diff --git a/share/man/man4/re.4 b/share/man/man4/re.4
index a4a7255d9de41..7ee0a4d59dc05 100644
--- a/share/man/man4/re.4
+++ b/share/man/man4/re.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/re.4,v 1.20 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd January 14, 2006
 .Dt RE 4
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 4d58ee0a3b0ad..ffc10d1c37a21 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rl.4,v 1.44.2.1 2007/12/02 08:38:32 remko Exp $
 .\"
 .Dd November 28, 2007
 .Dt RL 4
diff --git a/share/man/man4/rndtest.4 b/share/man/man4/rndtest.4
index 67448d80dd917..b9ef07bc2ead1 100644
--- a/share/man/man4/rndtest.4
+++ b/share/man/man4/rndtest.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rndtest.4,v 1.3 2003/12/27 15:40:47 brueffer Exp $
 .\"
 .Dd March 11, 2003
 .Dt RNDTEST 4
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index 0e10be5af764f..49773227511a6 100644
--- a/share/man/man4/route.4
+++ b/share/man/man4/route.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)route.4	8.6 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/route.4,v 1.20 2004/11/04 08:29:28 bms Exp $
 .\"
 .Dd November 4, 2004
 .Dt ROUTE 4
diff --git a/share/man/man4/rp.4 b/share/man/man4/rp.4
index 8f0f425c662a0..def907cdd6739 100644
--- a/share/man/man4/rp.4
+++ b/share/man/man4/rp.4
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1995 Comtrol, Inc.
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rp.4,v 1.7 2005/12/19 03:49:15 obrien Exp $
 .Dd November 15, 1995
 .Os
 .Dt RP 4
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index 7522575f5d1d7..15d9cf5eaa6d4 100644
--- a/share/man/man4/rue.4
+++ b/share/man/man4/rue.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rue.4,v 1.11 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt RUE 4
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index ddb71a8327d2e..b52d28b5cb17e 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/rum.4,v 1.3 2007/09/07 15:28:39 brueffer Exp $
 .\"
 .Dd September 7, 2007
 .Os
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index 0a6da7c50dcf8..542776404b258 100644
--- a/share/man/man4/sa.4
+++ b/share/man/man4/sa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sa.4,v 1.38 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd June 6, 1999
 .Dt SA 4
diff --git a/share/man/man4/safe.4 b/share/man/man4/safe.4
index 5cb085fd2bdc4..fce345258dd4f 100644
--- a/share/man/man4/safe.4
+++ b/share/man/man4/safe.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/safe.4,v 1.7 2006/04/01 10:56:36 brueffer Exp $
 .\"/
 .Dd April 1, 2006
 .Dt SAFE 4
diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4
index 0f86213dfd494..c68a2383692dc 100644
--- a/share/man/man4/sbp.4
+++ b/share/man/man4/sbp.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sbp.4,v 1.12 2007/03/15 14:44:03 simokawa Exp $
 .\"
 .Dd May 20, 2002
 .Dt SBP 4
diff --git a/share/man/man4/sbp_targ.4 b/share/man/man4/sbp_targ.4
index 112838074831d..d8aaa149f9d49 100644
--- a/share/man/man4/sbp_targ.4
+++ b/share/man/man4/sbp_targ.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sbp_targ.4,v 1.5 2004/07/08 12:27:12 ru Exp $
 .\"
 .Dd November 7, 2003
 .Dt SBP_TARG 4
diff --git a/share/man/man4/sbsh.4 b/share/man/man4/sbsh.4
index e49c9295f05e7..b119dbc5a71c4 100644
--- a/share/man/man4/sbsh.4
+++ b/share/man/man4/sbsh.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sbsh.4,v 1.4 2007/04/21 00:05:35 brueffer Exp $
 .\"
 .Dd April 11, 2003
 .Dt SBSH 4
diff --git a/share/man/man4/scc.4 b/share/man/man4/scc.4
index b08b3f8dbac65..05b8ae19d2178 100644
--- a/share/man/man4/scc.4
+++ b/share/man/man4/scc.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/scc.4,v 1.1 2006/03/30 18:33:22 marcel Exp $
 .\"
 .Dd March 29, 2006
 .Dt SCC 4
diff --git a/share/man/man4/sched_4bsd.4 b/share/man/man4/sched_4bsd.4
index e72d0555bfc8e..10be0c5ae67da 100644
--- a/share/man/man4/sched_4bsd.4
+++ b/share/man/man4/sched_4bsd.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sched_4bsd.4,v 1.5 2007/06/05 01:09:28 delphij Exp $
 .\"
 .Dd June 5, 2007
 .Os
diff --git a/share/man/man4/sched_ule.4 b/share/man/man4/sched_ule.4
index 95dcf87b968b2..00845f6dc1a3c 100644
--- a/share/man/man4/sched_ule.4
+++ b/share/man/man4/sched_ule.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sched_ule.4,v 1.7 2007/06/05 01:31:04 jeff Exp $
 .\"
 .Dd June 5, 2007
 .Os
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index 2f76f59375414..87c31dcd68c5d 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/screen.4,v 1.27 2004/06/04 15:20:12 roam Exp $
 .\"
 .Dd October 6, 2000
 .Dt SCREEN 4
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 484932260e140..36fbd9d7d01e9 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.32 2005/02/17 16:01:20 brueffer Exp $
 .Dd October 15, 1998
 .Dt SCSI 4
 .Os
diff --git a/share/man/man4/sctp.4 b/share/man/man4/sctp.4
index d5f4d3c5b3186..0588e2d77b0cf 100644
--- a/share/man/man4/sctp.4
+++ b/share/man/man4/sctp.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sctp.4,v 1.3 2007/09/25 16:03:10 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP 4
diff --git a/share/man/man4/sem.4 b/share/man/man4/sem.4
index 4a641dc646f32..14bd65c851ee5 100644
--- a/share/man/man4/sem.4
+++ b/share/man/man4/sem.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sem.4,v 1.3 2006/11/11 16:49:28 trhodes Exp $
 .\"
 .Dd November 11, 2006
 .Dt SEM 4
diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4
index 4070c89d753ea..d4dbd9201e068 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ses.4,v 1.10 2003/09/08 19:57:19 ru Exp $
 .\"
 .Dd January 29, 2000
 .Dt SES 4
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 176f64b7b3688..5353a142b8486 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sf.4,v 1.24 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt SF 4
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 65176bdb78ba0..aca430ad13f0e 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/si.4,v 1.29 2004/07/03 18:29:20 ru Exp $
 .Dd September 16, 1995
 .Os
 .Dt SI 4
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index 07e076d9110ab..881d9e5d3d27d 100644
--- a/share/man/man4/sio.4
+++ b/share/man/man4/sio.4
@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
 .\"	from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.57 2006/08/30 14:38:42 ru Exp $
 .\"
 .Dd August 30, 2006
 .Dt SIO 4
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index a9129412b1451..9a067d2165581 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sis.4,v 1.25 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd October 28, 2006
 .Dt SIS 4
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index cca7dac5fcc3b..941c9b3a2b460 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sk.4,v 1.30 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt SK 4
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index a861b4e3c660d..205ef0649625e 100644
--- a/share/man/man4/sl.4
+++ b/share/man/man4/sl.4
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sl.4,v 1.11 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd August 10, 1996
 .Dt SL 4
diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4
index 3aa93ad99183e..df9ffbdb61ddd 100644
--- a/share/man/man4/smb.4
+++ b/share/man/man4/smb.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smb.4,v 1.12 2005/01/21 20:50:39 ru Exp $
 .\"
 .Dd October 25, 1998
 .Dt SMB 4
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index 9dda4646b7433..8841356b4679a 100644
--- a/share/man/man4/smbus.4
+++ b/share/man/man4/smbus.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smbus.4,v 1.14 2004/05/13 19:31:31 joerg Exp $
 .\"
 .Dd August 10, 1998
 .Dt SMBUS 4
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index c20745ec8e961..ba0e62b3c89c5 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/smp.4,v 1.23 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd December 17, 2004
 .Dt SMP 4
diff --git a/share/man/man4/sn.4 b/share/man/man4/sn.4
index 00c9411c90096..725c93b12ac11 100644
--- a/share/man/man4/sn.4
+++ b/share/man/man4/sn.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sn.4,v 1.14 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt SN 4
diff --git a/share/man/man4/snd_ad1816.4 b/share/man/man4/snd_ad1816.4
index 3d2cb0c444a11..1d14a06e7c700 100644
--- a/share/man/man4/snd_ad1816.4
+++ b/share/man/man4/snd_ad1816.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ad1816.4,v 1.6 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_AD1816 4
diff --git a/share/man/man4/snd_als4000.4 b/share/man/man4/snd_als4000.4
index a13779a29046a..578452c906e4d 100644
--- a/share/man/man4/snd_als4000.4
+++ b/share/man/man4/snd_als4000.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_als4000.4,v 1.7 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_ALS4000 4
diff --git a/share/man/man4/snd_atiixp.4 b/share/man/man4/snd_atiixp.4
index ba02da648bd2b..67d8832b08f37 100644
--- a/share/man/man4/snd_atiixp.4
+++ b/share/man/man4/snd_atiixp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_atiixp.4,v 1.5 2007/05/12 06:33:52 brueffer Exp $
 .\"
 .Dd November 29, 2006
 .Dt SND_ATIIXP 4
diff --git a/share/man/man4/snd_cmi.4 b/share/man/man4/snd_cmi.4
index d6dc088215c74..8957cf5834f06 100644
--- a/share/man/man4/snd_cmi.4
+++ b/share/man/man4/snd_cmi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_cmi.4,v 1.7 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_CMI 4
diff --git a/share/man/man4/snd_cs4281.4 b/share/man/man4/snd_cs4281.4
index 2b94174dde543..ce029af68b93d 100644
--- a/share/man/man4/snd_cs4281.4
+++ b/share/man/man4/snd_cs4281.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_cs4281.4,v 1.6 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_CS4281 4
diff --git a/share/man/man4/snd_csa.4 b/share/man/man4/snd_csa.4
index 36a6857e8ffd4..a7e1e600c70ff 100644
--- a/share/man/man4/snd_csa.4
+++ b/share/man/man4/snd_csa.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_csa.4,v 1.16 2006/06/18 17:53:04 brueffer Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_CSA 4
diff --git a/share/man/man4/snd_ds1.4 b/share/man/man4/snd_ds1.4
index d6919244c80c3..3133ff0b5bb4a 100644
--- a/share/man/man4/snd_ds1.4
+++ b/share/man/man4/snd_ds1.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ds1.4,v 1.6 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_DS1 4
diff --git a/share/man/man4/snd_emu10k1.4 b/share/man/man4/snd_emu10k1.4
index 3052f1238bb04..3ec3e102f56e3 100644
--- a/share/man/man4/snd_emu10k1.4
+++ b/share/man/man4/snd_emu10k1.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_emu10k1.4,v 1.8 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_EMU10K1 4
diff --git a/share/man/man4/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4
index 759cd47f38d87..9b81956def842 100644
--- a/share/man/man4/snd_emu10kx.4
+++ b/share/man/man4/snd_emu10kx.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.5 2007/09/12 07:43:43 ariff Exp $
 .\"
 .Dd July 15, 2007
 .Dt SND_EMU10KX 4
diff --git a/share/man/man4/snd_envy24.4 b/share/man/man4/snd_envy24.4
index 30f13341c4573..38aff3b1d2143 100644
--- a/share/man/man4/snd_envy24.4
+++ b/share/man/man4/snd_envy24.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_envy24.4,v 1.3.6.1 2008/01/04 13:13:19 gabor Exp $
 .\"
 .Dd September 30, 2006
 .Dt SND_ENVY24 4
diff --git a/share/man/man4/snd_envy24ht.4 b/share/man/man4/snd_envy24ht.4
index 807ba6219da1d..3f5b88d46c1af 100644
--- a/share/man/man4/snd_envy24ht.4
+++ b/share/man/man4/snd_envy24ht.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_envy24ht.4,v 1.2.4.1 2008/01/04 13:13:44 gabor Exp $
 .\"
 .Dd May 28, 2007
 .Dt SND_ENVY24HT 4
diff --git a/share/man/man4/snd_es137x.4 b/share/man/man4/snd_es137x.4
index 9602fcec96e2d..5f9f350a57dc3 100644
--- a/share/man/man4/snd_es137x.4
+++ b/share/man/man4/snd_es137x.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_es137x.4,v 1.9 2006/11/29 17:07:02 joel Exp $
 .\"
 .Dd November 29, 2006
 .Dt SND_ES137X 4
diff --git a/share/man/man4/snd_ess.4 b/share/man/man4/snd_ess.4
index bd0d6d75ec036..4335df84752d0 100644
--- a/share/man/man4/snd_ess.4
+++ b/share/man/man4/snd_ess.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ess.4,v 1.7 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_ESS 4
diff --git a/share/man/man4/snd_fm801.4 b/share/man/man4/snd_fm801.4
index 0e6650451d568..2c18e0f4931c4 100644
--- a/share/man/man4/snd_fm801.4
+++ b/share/man/man4/snd_fm801.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_fm801.4,v 1.3 2005/12/01 12:58:50 joel Exp $
 .\"
 .Dd December 1, 2005
 .Dt SND_FM801 4
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 99df5403e1584..2bd830f89f210 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_gusc.4,v 1.14 2006/06/18 17:53:04 brueffer Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_GUSC 4
diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4
index 3cc4210fbd8b1..e0e62ec45f399 100644
--- a/share/man/man4/snd_hda.4
+++ b/share/man/man4/snd_hda.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.12.4.1 2008/01/04 13:14:06 gabor Exp $
 .\"
 .Dd July 14, 2007
 .Dt SND_HDA 4
diff --git a/share/man/man4/snd_ich.4 b/share/man/man4/snd_ich.4
index c415fb881a5f7..32870352b0ea2 100644
--- a/share/man/man4/snd_ich.4
+++ b/share/man/man4/snd_ich.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_ich.4,v 1.9 2006/06/18 17:53:04 brueffer Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_ICH 4
diff --git a/share/man/man4/snd_maestro.4 b/share/man/man4/snd_maestro.4
index d630a3324f975..ce1303e7aef69 100644
--- a/share/man/man4/snd_maestro.4
+++ b/share/man/man4/snd_maestro.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_maestro.4,v 1.3 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_MAESTRO 4
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index 4fadd0453cae5..451c0f2154f79 100644
--- a/share/man/man4/snd_maestro3.4
+++ b/share/man/man4/snd_maestro3.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_maestro3.4,v 1.9 2006/01/09 12:51:45 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_MAESTRO3 4
diff --git a/share/man/man4/snd_mss.4 b/share/man/man4/snd_mss.4
index 76ef18339c6b5..9e59d70c19345 100644
--- a/share/man/man4/snd_mss.4
+++ b/share/man/man4/snd_mss.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_mss.4,v 1.3 2005/12/01 12:58:50 joel Exp $
 .\"
 .Dd December 1, 2005
 .Dt SND_MSS 4
diff --git a/share/man/man4/snd_neomagic.4 b/share/man/man4/snd_neomagic.4
index 430220c231520..117d08fca383f 100644
--- a/share/man/man4/snd_neomagic.4
+++ b/share/man/man4/snd_neomagic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_neomagic.4,v 1.5 2005/12/01 12:58:50 joel Exp $
 .\"
 .Dd December 1, 2005
 .Dt SND_NEOMAGIC 4
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 8b53c8eb9eaa3..99933cf4decbc 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_sbc.4,v 1.19 2007/02/17 11:31:58 joel Exp $
 .\"
 .Dd February 17, 2007
 .Dt SND_SBC 4
diff --git a/share/man/man4/snd_solo.4 b/share/man/man4/snd_solo.4
index 55e12fc002cb0..10ac6a05bd39c 100644
--- a/share/man/man4/snd_solo.4
+++ b/share/man/man4/snd_solo.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_solo.4,v 1.5 2005/11/28 18:47:00 joel Exp $
 .\"
 .Dd November 28, 2005
 .Dt SND_SOLO 4
diff --git a/share/man/man4/snd_spicds.4 b/share/man/man4/snd_spicds.4
index 7b95b8689bd34..c1b45a4f7ee27 100644
--- a/share/man/man4/snd_spicds.4
+++ b/share/man/man4/snd_spicds.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_spicds.4,v 1.3.4.1 2008/01/04 13:14:32 gabor Exp $
 .\"
 .Dd May 28, 2007
 .Dt SND_SPICDS 4
diff --git a/share/man/man4/snd_t4dwave.4 b/share/man/man4/snd_t4dwave.4
index ef916659115f5..bb877804f48a8 100644
--- a/share/man/man4/snd_t4dwave.4
+++ b/share/man/man4/snd_t4dwave.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_t4dwave.4,v 1.3 2005/12/01 12:58:50 joel Exp $
 .\"
 .Dd December 1, 2005
 .Dt SND_T4DWAVE 4
diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4
index 3cc9d124af190..6ccededaf5760 100644
--- a/share/man/man4/snd_uaudio.4
+++ b/share/man/man4/snd_uaudio.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_uaudio.4,v 1.6 2005/12/15 20:25:41 joel Exp $
 .\"
 .Dd December 15, 2005
 .Dt SND_UAUDIO 4
diff --git a/share/man/man4/snd_via8233.4 b/share/man/man4/snd_via8233.4
index 377fbd3ee0b11..f5fb829ee4986 100644
--- a/share/man/man4/snd_via8233.4
+++ b/share/man/man4/snd_via8233.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_via8233.4,v 1.7 2007/05/12 06:41:41 brueffer Exp $
 .\"
 .Dd November 29, 2006
 .Dt SND_VIA8233 4
diff --git a/share/man/man4/snd_via82c686.4 b/share/man/man4/snd_via82c686.4
index 183684ec11704..9affd2a550ddb 100644
--- a/share/man/man4/snd_via82c686.4
+++ b/share/man/man4/snd_via82c686.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_via82c686.4,v 1.3 2005/12/01 12:58:50 joel Exp $
 .\"
 .Dd December 1, 2005
 .Dt SND_VIA82C686 4
diff --git a/share/man/man4/snd_vibes.4 b/share/man/man4/snd_vibes.4
index 716a65cd299ae..2fedfd484672c 100644
--- a/share/man/man4/snd_vibes.4
+++ b/share/man/man4/snd_vibes.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snd_vibes.4,v 1.3 2005/12/01 12:58:51 joel Exp $
 .\"
 .Dd December 1, 2005
 .Dt SND_VIBES 4
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index df70cb2707ca5..13900319e3e99 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/snp.4,v 1.27 2005/09/19 13:48:45 ru Exp $
 .\"
 .Dd September 18, 2005
 .Dt SNP 4
diff --git a/share/man/man4/spic.4 b/share/man/man4/spic.4
index a398007f88ede..695db09793390 100644
--- a/share/man/man4/spic.4
+++ b/share/man/man4/spic.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/spic.4,v 1.3 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd May 20, 2002
 .Dt SPIC 4
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index 1f39a1eec0ecc..49d4d6f6df67e 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/spkr.4,v 1.25 2005/11/11 09:57:32 ru Exp $
 .\"
 .Dd November 10, 2005
 .Dt SPKR 4
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 36ba883ab1199..d39d08959475d 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/splash.4,v 1.28 2006/05/17 09:33:06 phk Exp $
 .\"
 .Dd January 15, 2006
 .Dt SPLASH 4
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 22b238aeff7ff..ba311c78a1c71 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sppp.4,v 1.19 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd December 30, 2001
 .Dt SPPP 4
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 1e652df8df6fd..0b1080217b310 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ste.4,v 1.24 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt STE 4
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 660e33edae9be..7ce5a7d93ec66 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/stf.4,v 1.14 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd April 27, 2001
 .Dt STF 4
diff --git a/share/man/man4/stg.4 b/share/man/man4/stg.4
index 1d088b0077a60..3454c21f55672 100644
--- a/share/man/man4/stg.4
+++ b/share/man/man4/stg.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/stg.4,v 1.8 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 8, 2004
 .Dt STG 4
diff --git a/share/man/man4/stge.4 b/share/man/man4/stge.4
index a3ff67ac0c1d2..90545c78b3ff3 100644
--- a/share/man/man4/stge.4
+++ b/share/man/man4/stge.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/stge.4,v 1.5 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 25, 2006
 .Dt STGE 4
diff --git a/share/man/man4/sym.4 b/share/man/man4/sym.4
index 547d205954746..42531869a1dee 100644
--- a/share/man/man4/sym.4
+++ b/share/man/man4/sym.4
@@ -54,7 +54,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sym.4,v 1.20 2006/06/18 09:53:00 brueffer Exp $
 .\"
 .Dd August 19, 2004
 .Dt SYM 4
diff --git a/share/man/man4/syncache.4 b/share/man/man4/syncache.4
index 5395a50f86834..20980e0ec08f1 100644
--- a/share/man/man4/syncache.4
+++ b/share/man/man4/syncache.4
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/syncache.4,v 1.3.2.1 2007/12/20 12:52:06 ru Exp $
 .\"
 .Dd December 18, 2007
 .Dt SYNCACHE 4
diff --git a/share/man/man4/syncer.4 b/share/man/man4/syncer.4
index 30b38e40ee4a3..123f45b7cae3f 100644
--- a/share/man/man4/syncer.4
+++ b/share/man/man4/syncer.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/syncer.4,v 1.10 2003/06/28 23:53:37 ru Exp $
 .\"
 .Dd July 14, 2000
 .Dt SYNCER 4
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 3f6e9caceb3d4..9ff684ff55f7e 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/syscons.4,v 1.45 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd October 22, 2006
 .Dt SYSCONS 4
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index 96547bcfae781..b67f34611c16a 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/sysmouse.4,v 1.26 2006/03/06 13:05:50 markus Exp $
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index 86c880e4fde03..af177a793897f 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tap.4,v 1.19 2007/03/19 18:27:00 bms Exp $
 .\" Based on PR#2411
 .\"
 .Dd March 19, 2007
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index a1fa449d0f076..374a43af085aa 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/targ.4,v 1.6 2005/01/21 08:36:37 ru Exp $
 .\"
 .Dd November 15, 2002
 .Dt TARG 4
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index 27567d37ce69a..beae0ce60af0b 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.59 2007/04/03 18:57:09 ru Exp $
 .\"
 .Dd February 28, 2007
 .Dt TCP 4
diff --git a/share/man/man4/tdfx.4 b/share/man/man4/tdfx.4
index b785c75ad86ef..c7c2ccbe9d920 100644
--- a/share/man/man4/tdfx.4
+++ b/share/man/man4/tdfx.4
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tdfx.4,v 1.8 2006/03/03 21:37:38 yar Exp $
 .\"
 .Dd February 19, 2001
 .Dt TDFX 4
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index f6cf216bfa344..269f4ad34123e 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)termios.4	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/termios.4,v 1.30 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt TERMIOS 4
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index ba999e237fc41..0ed8650586336 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ti.4,v 1.33 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt TI 4
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 3dd4cbabc97b0..9733c47da592b 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tl.4,v 1.22 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt TL 4
diff --git a/share/man/man4/trm.4 b/share/man/man4/trm.4
index 6180c9423d380..bdc91995858be 100644
--- a/share/man/man4/trm.4
+++ b/share/man/man4/trm.4
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/trm.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd December 8, 2002
 .Dt TRM 4
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index ba0379eb09a27..6214fe663876b 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tty.4	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tty.4,v 1.23 2007/06/27 15:14:06 remko Exp $
 .\"
 .Dd Jun 27, 2007
 .Dt TTY 4
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index b5139a7cdf0db..1bbdcca650cbd 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,5 +1,5 @@
 .\" $NetBSD: tun.4,v 1.1 1996/06/25 22:17:37 pk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tun.4,v 1.25 2007/02/04 16:59:50 bms Exp $
 .\" Based on PR#2411
 .\"
 .Dd February 4, 2007
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index 32cccfc37e9dc..57d8241ef4aaa 100755
--- a/share/man/man4/twa.4
+++ b/share/man/man4/twa.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/twa.4,v 1.8 2007/05/09 20:05:43 brueffer Exp $
 .\"
 .Dd May 9, 2007
 .Dt TWA 4
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index fc73a012cb4ef..c905176fea825 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/twe.4,v 1.17 2006/05/20 09:39:28 brueffer Exp $
 .\"
 .Dd August 15, 2004
 .Dt TWE 4
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index da54d8c336041..27dc1eeece38d 100644
--- a/share/man/man4/tx.4
+++ b/share/man/man4/tx.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/tx.4,v 1.31 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt TX 4
diff --git a/share/man/man4/txp.4 b/share/man/man4/txp.4
index 64a19e876dff0..2c3158deadac9 100644
--- a/share/man/man4/txp.4
+++ b/share/man/man4/txp.4
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/txp.4,v 1.13 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt TXP 4
diff --git a/share/man/man4/uark.4 b/share/man/man4/uark.4
index 6b16fd94298b3..0d0ad0f96a1fc 100644
--- a/share/man/man4/uark.4
+++ b/share/man/man4/uark.4
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uark.4,v 1.3 2007/02/09 20:53:19 brueffer Exp $
 .\"
 .Dd November 15, 2006
 .Dt UARK 4
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index ae2d4562638b0..0713d06a4ffa6 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uart.4,v 1.11 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd March 29, 2006
 .Dt UART 4
diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index 75b0411e657ae..4978b644ffcb1 100644
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.10 2007/05/08 18:51:40 maxim Exp $
 .\"
 .Dd May 8, 2007
 .Dt UBSA 4
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 11bc362cf080e..6d7b678983c9a 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -29,7 +29,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubsec.4,v 1.5 2006/04/01 10:56:36 brueffer Exp $
 .\"
 .Dd April 1, 2006
 .Dt UBSEC 4
diff --git a/share/man/man4/ubser.4 b/share/man/man4/ubser.4
index 6e6fee30def54..27172802cd9a1 100644
--- a/share/man/man4/ubser.4
+++ b/share/man/man4/ubser.4
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubser.4,v 1.6 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UBSER 4
diff --git a/share/man/man4/ubtbcmfw.4 b/share/man/man4/ubtbcmfw.4
index 8451c6f7a4896..b096ea3dd2b29 100644
--- a/share/man/man4/ubtbcmfw.4
+++ b/share/man/man4/ubtbcmfw.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: ubtbcmfw.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.8 2006/12/14 16:40:57 mpp Exp $
 .\"
 .Dd November 22, 2006
 .Dt UBTBCMFW 4
diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index fdda5b52651dc..2797bf74261c2 100644
--- a/share/man/man4/ucom.4
+++ b/share/man/man4/ucom.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.8 2007/06/30 14:36:37 imp Exp $
 .\"
 .Dd November 18, 2006
 .Dt UCOM 4
diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4
index 9e73150bd3f38..ccf9e794446a1 100644
--- a/share/man/man4/ucycom.4
+++ b/share/man/man4/ucycom.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ucycom.4,v 1.4 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UCYCOM 4
diff --git a/share/man/man4/udav.4 b/share/man/man4/udav.4
index dcd0b8bf6834d..e71e1f73b1c5e 100644
--- a/share/man/man4/udav.4
+++ b/share/man/man4/udav.4
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udav.4,v 1.8 2007/07/24 14:49:25 imp Exp $
 .\"
 .Dd July 16, 2005
 .Dt UDAV 4
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index accb4740a40a3..831855eb0b2bf 100644
--- a/share/man/man4/udbp.4
+++ b/share/man/man4/udbp.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udbp.4,v 1.16 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UDBP 4
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 03d6db2eef207..474010d005bf9 100644
--- a/share/man/man4/udp.4
+++ b/share/man/man4/udp.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)udp.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/udp.4,v 1.17 2005/02/13 22:25:17 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt UDP 4
diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4
index f852d6d63bd07..1b67700ca2f62 100644
--- a/share/man/man4/ufm.4
+++ b/share/man/man4/ufm.4
@@ -22,7 +22,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ufm.4,v 1.6 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UFM 4
diff --git a/share/man/man4/ufoma.4 b/share/man/man4/ufoma.4
index a1f6c1fca68aa..886e26188fdde 100644
--- a/share/man/man4/ufoma.4
+++ b/share/man/man4/ufoma.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ufoma.4,v 1.6 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UFOMA 4
diff --git a/share/man/man4/uftdi.4 b/share/man/man4/uftdi.4
index 69cddcbe8db59..b5c4677c61dfb 100644
--- a/share/man/man4/uftdi.4
+++ b/share/man/man4/uftdi.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.11 2007/05/05 08:23:05 phk Exp $
 .\"
 .Dd November 22, 2006
 .Dt UFTDI 4
diff --git a/share/man/man4/ugen.4 b/share/man/man4/ugen.4
index f74752c56350e..db75ce9f8a662 100644
--- a/share/man/man4/ugen.4
+++ b/share/man/man4/ugen.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ugen.4,v 1.6 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UGEN 4
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 089fafb79b211..98f9653b8f3f7 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uhci.4,v 1.18 2005/04/20 07:33:09 simon Exp $
 .\"
 .Dd April 20, 2005
 .Dt UHCI 4
diff --git a/share/man/man4/uhid.4 b/share/man/man4/uhid.4
index b830512988644..65e2643c8774c 100644
--- a/share/man/man4/uhid.4
+++ b/share/man/man4/uhid.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.8 2007/06/30 05:07:51 imp Exp $
 .\"
 .Dd November 22, 2006
 .Dt UHID 4
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 5d94cefd57df4..cb080049f4de2 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ukbd.4,v 1.29 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UKBD 4
diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4
index 229145d0d6211..e414e361a44fe 100644
--- a/share/man/man4/ulpt.4
+++ b/share/man/man4/ulpt.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.8 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt ULPT 4
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index b297c9d16cf2e..1068de124bb34 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/umass.4,v 1.44 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UMASS 4
diff --git a/share/man/man4/umct.4 b/share/man/man4/umct.4
index 7c381a6ff9471..1c674341a6019 100644
--- a/share/man/man4/umct.4
+++ b/share/man/man4/umct.4
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/umct.4,v 1.7 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UMCT 4
diff --git a/share/man/man4/umodem.4 b/share/man/man4/umodem.4
index 40805f60034a8..d1f7ce081720a 100644
--- a/share/man/man4/umodem.4
+++ b/share/man/man4/umodem.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.10 2007/08/21 13:20:13 sanpei Exp $
 .\"
 .Dd November 22, 2006
 .Dt UMODEM 4
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index b56a72fd33e27..bdd4569a73da6 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ums.4,v 1.25 2006/11/27 18:37:45 brueffer Exp $
 .\"
 .Dd November 27, 2006
 .Dt UMS 4
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index 89944ce7a7e2c..39971f430ae07 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unix.4	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/unix.4,v 1.13 2005/12/21 08:23:04 maxim Exp $
 .\"
 .Dd July 15, 2001
 .Dt UNIX 4
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index cc1fa598cc640..9aa86d06dcec4 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.16 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UPLCOM 4
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index b40083899a016..2d60f7be8da5c 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/ural.4,v 1.15 2007/09/10 17:54:14 brueffer Exp $
 .\"
 .Dd September 10, 2007
 .Os
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index d42ff2a7fae6e..bad2b22e1e376 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/urio.4,v 1.12 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt URIO 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index f9af2f4b99395..861988e38bc30 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb.4,v 1.36 2007/07/24 14:51:21 imp Exp $
 .\"
 .Dd November 22, 2006
 .Dt USB 4
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
index 9121616f17470..df54bd8d67d81 100644
--- a/share/man/man4/uscanner.4
+++ b/share/man/man4/uscanner.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.31 2007/10/05 15:17:14 luigi Exp $
 .\"
 .Dd October 5, 2007
 .Dt USCANNER 4
diff --git a/share/man/man4/utopia.4 b/share/man/man4/utopia.4
index 00020ea76ac69..97ff1c360238a 100644
--- a/share/man/man4/utopia.4
+++ b/share/man/man4/utopia.4
@@ -25,7 +25,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/utopia.4,v 1.11 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UTOPIA 4
diff --git a/share/man/man4/uvisor.4 b/share/man/man4/uvisor.4
index ceffa89ff4e18..9d5590fb857e7 100644
--- a/share/man/man4/uvisor.4
+++ b/share/man/man4/uvisor.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.9 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UVISOR 4
diff --git a/share/man/man4/uvscom.4 b/share/man/man4/uvscom.4
index 269667b202583..6bb33169262af 100644
--- a/share/man/man4/uvscom.4
+++ b/share/man/man4/uvscom.4
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/uvscom.4,v 1.5 2006/11/22 21:30:02 brueffer Exp $
 .\"
 .Dd November 22, 2006
 .Dt UVSCOM 4
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index b102d2f6f5d80..17e6173f2b554 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vga.4,v 1.22 2006/02/13 21:34:18 joel Exp $
 .\"
 .Dd June 30, 1999
 .Dt VGA 4
diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4
index 2e9c7a5748896..7f6eb19013855 100644
--- a/share/man/man4/vge.4
+++ b/share/man/man4/vge.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vge.4,v 1.11 2007/02/21 10:00:09 brueffer Exp $
 .\"
 .Dd February 21, 2007
 .Dt VGE 4
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 18081867528e1..104dbd5f3d4e0 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vinum.4,v 1.52 2006/06/11 19:41:07 maxim Exp $
 .\"
 .Dd May 16, 2002
 .Dt VINUM 4
diff --git a/share/man/man4/vkbd.4 b/share/man/man4/vkbd.4
index bdaa941531c57..8d9828610b6f0 100644
--- a/share/man/man4/vkbd.4
+++ b/share/man/man4/vkbd.4
@@ -1,5 +1,5 @@
 .\" $Id: vkbd.4,v 1.4 2004/11/16 16:49:39 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vkbd.4,v 1.7 2006/05/17 09:33:06 phk Exp $
 .\"
 .Dd August 12, 2004
 .Os
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index 6f3a1da0f50ec..6f561edd2ce1e 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.44 2007/05/09 09:02:11 yar Exp $
 .\"
 .Dd May 7, 2007
 .Dt VLAN 4
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index a3b6016cedb39..d4d637ee1bca3 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vpo.4,v 1.23 2007/08/05 07:39:30 maxim Exp $
 .\"
 .Dd December 14, 2004
 .Dt VPO 4
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 1202d8ec136c8..bb0d6badd78da 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/vr.4,v 1.30 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt VR 4
diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4
index f19f3a60f6eab..2bd97af46d3d1 100644
--- a/share/man/man4/watchdog.4
+++ b/share/man/man4/watchdog.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/watchdog.4,v 1.9 2007/03/29 10:11:22 des Exp $
 .\"
 .Dd June 25, 2003
 .Dt WATCHDOG 4
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 2dd51b6335cf6..e78429aa853a8 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wb.4,v 1.21 2005/10/07 02:32:15 trhodes Exp $
 .\"
 .Dd July 16, 2005
 .Dt WB 4
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index 2e355360a3d46..d735481278516 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wi.4,v 1.73.4.1 2008/01/30 18:13:52 brueffer Exp $
 .\"	$OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $
 .\"
 .Dd July 16, 2005
diff --git a/share/man/man4/witness.4 b/share/man/man4/witness.4
index 7aa6553236890..31170b0371797 100644
--- a/share/man/man4/witness.4
+++ b/share/man/man4/witness.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/witness.4,v 1.11 2005/07/31 03:30:44 keramida Exp $
 .\"
 .Dd February 18, 2001
 .Dt WITNESS 4
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index 98936b8bc803a..c864a6539ddde 100644
--- a/share/man/man4/wlan.4
+++ b/share/man/man4/wlan.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.13 2007/09/10 17:20:21 brueffer Exp $
 .\"
 .Dd September 6, 2007
 .Dt WLAN 4
diff --git a/share/man/man4/wlan_acl.4 b/share/man/man4/wlan_acl.4
index 1a95441377302..87096c41f2eb9 100644
--- a/share/man/man4/wlan_acl.4
+++ b/share/man/man4/wlan_acl.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_acl.4,v 1.3 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_ACL 4
diff --git a/share/man/man4/wlan_amrr.4 b/share/man/man4/wlan_amrr.4
index 2883b7a42c2e9..6a8e5c1e0504d 100644
--- a/share/man/man4/wlan_amrr.4
+++ b/share/man/man4/wlan_amrr.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_amrr.4,v 1.2 2007/09/10 18:17:50 brueffer Exp $
 .\"
 .Dd September 10, 2007
 .Dt WLAN_AMRR 4
diff --git a/share/man/man4/wlan_ccmp.4 b/share/man/man4/wlan_ccmp.4
index ccf7a2720635e..ff4e8e5846808 100644
--- a/share/man/man4/wlan_ccmp.4
+++ b/share/man/man4/wlan_ccmp.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_ccmp.4,v 1.3 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_CCMP 4
diff --git a/share/man/man4/wlan_tkip.4 b/share/man/man4/wlan_tkip.4
index 2a2a254fd329e..4814c0895451a 100644
--- a/share/man/man4/wlan_tkip.4
+++ b/share/man/man4/wlan_tkip.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_tkip.4,v 1.4 2005/06/15 19:29:03 wilko Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_TKIP 4
diff --git a/share/man/man4/wlan_wep.4 b/share/man/man4/wlan_wep.4
index 3bf1040d34b5d..195300d7cf361 100644
--- a/share/man/man4/wlan_wep.4
+++ b/share/man/man4/wlan_wep.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_wep.4,v 1.2 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_WEP 4
diff --git a/share/man/man4/wlan_xauth.4 b/share/man/man4/wlan_xauth.4
index cf806a9ee4d04..aaedb823b6243 100644
--- a/share/man/man4/wlan_xauth.4
+++ b/share/man/man4/wlan_xauth.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wlan_xauth.4,v 1.3 2005/01/13 11:09:58 ru Exp $
 .\"
 .Dd December 7, 2004
 .Dt WLAN_XAUTH 4
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index bc6e7964942e7..d9e29fac7d518 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/wpi.4,v 1.3.2.1.2.1 2008/01/14 21:50:06 brueffer Exp $
 .\"
 .Dd March 6, 2007
 .Os
diff --git a/share/man/man4/xe.4 b/share/man/man4/xe.4
index 0935884badc97..dd3953e92a24a 100644
--- a/share/man/man4/xe.4
+++ b/share/man/man4/xe.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xe.4,v 1.13 2005/11/18 10:52:22 ru Exp $
 .\"
 .Dd July 16, 2005
 .Dt XE 4
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index a911f843e91a5..2a777ae551c22 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xl.4,v 1.38 2007/01/30 08:40:04 brueffer Exp $
 .\"
 .Dd July 16, 2005
 .Dt XL 4
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index e670acb199c87..e4ad758f8fe73 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/xpt.4,v 1.11 2004/07/03 18:29:20 ru Exp $
 .\"
 .Dd October 10, 1998
 .Dt XPT 4
diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4
index cb73a2c6549f7..f651d9281baf4 100644
--- a/share/man/man4/zero.4
+++ b/share/man/man4/zero.4
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/zero.4,v 1.4 2000/10/26 15:30:44 asmodai Exp $
 .\"
 .Dd April 7, 1996
 .Dt ZERO 4
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 6599a53937d2e..d34ca98bba8b8 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,6 +1,6 @@
 .\" $OpenBSD: zyd.4,v 1.22 2007/05/24 02:49:57 cnst Exp $
 .\" $NetBSD: zyd.4,v 1.1 2007/06/09 11:20:55 kiyohara Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/zyd.4,v 1.3 2007/09/06 20:13:27 brueffer Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 3e1d832dcd862..165197c4fdbb3 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$FreeBSD: src/share/man/man5/Makefile,v 1.79 2007/09/08 08:04:28 jkoshy Exp $
 
 .include <bsd.own.mk>
 
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 137b2e4a4ead5..29632e08f211d 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/a.out.5,v 1.19 2005/06/30 13:10:37 hmp Exp $
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index 48283a58a6f19..f42fabc21a87a 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/acct.5,v 1.11 2007/05/22 06:51:36 dds Exp $
 .\"
 .Dd May 15, 2007
 .Dt ACCT 5
diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5
index 1796795398d09..7faa2135d83b2 100644
--- a/share/man/man5/ar.5
+++ b/share/man/man5/ar.5
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/ar.5,v 1.1 2007/09/08 08:04:28 jkoshy Exp $
 .\"
 .Dd September 07, 2007
 .Os
diff --git a/share/man/man5/bluetooth.device.conf.5 b/share/man/man5/bluetooth.device.conf.5
index f2004eb882c03..e5ded09c6a820 100644
--- a/share/man/man5/bluetooth.device.conf.5
+++ b/share/man/man5/bluetooth.device.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.2 2006/09/30 16:01:33 ru Exp $
 .\"
 .Dd December 1, 2005
 .Dt BLUETOOTH.DEVICE.CONF 5
diff --git a/share/man/man5/bluetooth.hosts.5 b/share/man/man5/bluetooth.hosts.5
index bda4d920496d7..3aec7009748bd 100644
--- a/share/man/man5/bluetooth.hosts.5
+++ b/share/man/man5/bluetooth.hosts.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bluetooth.hosts.5,v 1.5 2003/05/20 22:52:39 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/bluetooth.hosts.5,v 1.2 2004/07/07 13:09:37 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt BLUETOOTH.HOSTS 5
diff --git a/share/man/man5/bluetooth.protocols.5 b/share/man/man5/bluetooth.protocols.5
index 64a7dd56367bc..30c081d428bf5 100644
--- a/share/man/man5/bluetooth.protocols.5
+++ b/share/man/man5/bluetooth.protocols.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bluetooth.protocols.5,v 1.1 2003/05/20 22:52:39 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/bluetooth.protocols.5,v 1.2 2004/07/07 13:09:37 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt BLUETOOTH.PROTOCOLS 5
diff --git a/share/man/man5/boot.config.5 b/share/man/man5/boot.config.5
index ca8627b6677ae..c3fad52a2445e 100644
--- a/share/man/man5/boot.config.5
+++ b/share/man/man5/boot.config.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/boot.config.5,v 1.1 2007/08/14 15:25:32 danger Exp $
 .Dd May 13, 2007
 .Dt BOOT.CONFIG 5
 .Os
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 2a1e16bfb67ff..edfc0ad385e7a 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)core.5	8.3 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/core.5,v 1.18 2004/11/22 03:15:21 das Exp $
 .\"
 .Dd January 9, 2002
 .Dt CORE 5
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index d93242544c4d7..8228714ee91b4 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/devfs.5,v 1.19 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd December 14, 1996
 .Dt DEVFS 5
diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5
index 9d837263f1a4d..8ba7cb29d249b 100644
--- a/share/man/man5/devfs.conf.5
+++ b/share/man/man5/devfs.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/devfs.conf.5,v 1.5 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd May 17, 2005
 .Dt DEVFS.CONF 5
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index 3722cea1c8b21..d680a172448ee 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/devfs.rules.5,v 1.5 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd January 30, 2006
 .Dt DEVFS.RULES 5
diff --git a/share/man/man5/device.hints.5 b/share/man/man5/device.hints.5
index 578d278f1ce54..51d98bfe0edbf 100644
--- a/share/man/man5/device.hints.5
+++ b/share/man/man5/device.hints.5
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/device.hints.5,v 1.10 2003/09/19 22:27:54 jb Exp $
 .\"
 .Dd October 7, 2001
 .Dt DEVICE.HINTS 5
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index c47104344bf86..cac3cf8cfd6fd 100644
--- a/share/man/man5/dir.5
+++ b/share/man/man5/dir.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dir.5	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/dir.5,v 1.21 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt DIR 5
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 90700bcc2ffa0..9298a32e1ea63 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disktab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/disktab.5,v 1.17 2006/10/14 16:37:53 ru Exp $
 .\"
 .Dd October 14, 2006
 .Dt DISKTAB 5
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index c534e2e2f1eb8..9d5ed7762904c 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/elf.5,v 1.36 2007/09/08 08:12:31 jkoshy Exp $
 .\"
 .Dd December 18, 2005
 .Dt ELF 5
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index e10bf3009e3ba..b42da73242048 100644
--- a/share/man/man5/ethers.5
+++ b/share/man/man5/ethers.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/ethers.5,v 1.14 2005/01/21 10:46:36 ru Exp $
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
diff --git a/share/man/man5/eui64.5 b/share/man/man5/eui64.5
index 4e2dda6159c79..e002e4da1a097 100644
--- a/share/man/man5/eui64.5
+++ b/share/man/man5/eui64.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/eui64.5,v 1.2 2004/07/07 20:32:33 ru Exp $
 .\"
 .Dd May 11, 2004
 .Dt EUI64 5
diff --git a/share/man/man5/ext2fs.5 b/share/man/man5/ext2fs.5
index a74e5997ac636..410bf46c9af79 100644
--- a/share/man/man5/ext2fs.5
+++ b/share/man/man5/ext2fs.5
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/ext2fs.5,v 1.2 2006/09/30 16:01:33 ru Exp $
 .\"
 .Dd May 16, 2006
 .Dt EXT2FS 5
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index 0598fd1199035..cf0b7ff079803 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fbtab.5,v 1.12 2001/11/20 16:18:21 ru Exp $
 .\"
 .Dd August 22, 1994
 .Dt FBTAB 5
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index 4e63f22cfff1c..f77526f35c8d9 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fdescfs.5,v 1.16 2006/11/22 15:52:24 rodrigc Exp $
 .\"
 .Dd December 14, 1996
 .Dt FDESCFS 5
diff --git a/share/man/man5/forward.5 b/share/man/man5/forward.5
index 2234ff3590918..6be74188aa69d 100644
--- a/share/man/man5/forward.5
+++ b/share/man/man5/forward.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/forward.5,v 1.8 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd July 2, 1996
 .Dt FORWARD 5
diff --git a/share/man/man5/freebsd-update.conf.5 b/share/man/man5/freebsd-update.conf.5
index 52b16fadb9c5e..c1f64ba6ab2d4 100644
--- a/share/man/man5/freebsd-update.conf.5
+++ b/share/man/man5/freebsd-update.conf.5
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.2.2.1 2007/11/14 05:10:45 cperciva Exp $
 .\"
 .Dd August 30, 2006
 .Dt FREEBSD-UPDATE.CONF 5
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index abb0f470bf8e4..d0a64b2eba242 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fs.5,v 1.24 2007/03/06 08:13:21 mckusick Exp $
 .\"
 .Dd October 31, 2006
 .Dt FS 5
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 7e8f10ca85cbc..f55c213cd93f1 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/fstab.5,v 1.26 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt FSTAB 5
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index 4aa6affdd9fd0..d9ef310131ed6 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)group.5	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/group.5,v 1.29 2006/02/18 16:48:56 brueffer Exp $
 .\"
 .Dd September 29, 1994
 .Dt GROUP 5
diff --git a/share/man/man5/hesiod.conf.5 b/share/man/man5/hesiod.conf.5
index 364ea8041e6c6..f437638c08b42 100644
--- a/share/man/man5/hesiod.conf.5
+++ b/share/man/man5/hesiod.conf.5
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hesiod.conf.5,v 1.3 2005/02/09 18:07:16 ru Exp $
 .\"
 .Dd November 30, 1996
 .Dt HESIOD.CONF 5
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index 218a4df37196d..a37884dfab488 100644
--- a/share/man/man5/hosts.5
+++ b/share/man/man5/hosts.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hosts.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.5,v 1.10 2004/07/03 18:29:22 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt HOSTS 5
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index 6bf8e0d1e2c14..8f2e1dd80a8b1 100644
--- a/share/man/man5/hosts.equiv.5
+++ b/share/man/man5/hosts.equiv.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.21.4.1 2008/02/14 21:48:53 remko Exp $
 .\"
 .Dd December 8, 2007
 .Dt HOSTS.EQUIV 5
diff --git a/share/man/man5/hosts.lpd.5 b/share/man/man5/hosts.lpd.5
index 910ac66c59643..8a73e2800d4d9 100644
--- a/share/man/man5/hosts.lpd.5
+++ b/share/man/man5/hosts.lpd.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/hosts.lpd.5,v 1.10 2004/06/16 08:33:55 ru Exp $
 .\"
 .Dd June 1, 1996
 .Dt HOSTS.LPD 5
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index 764ba4d2ba219..f5ec5ad776a1c 100644
--- a/share/man/man5/intro.5
+++ b/share/man/man5/intro.5
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/intro.5,v 1.7 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 5
diff --git a/share/man/man5/libmap.conf.5 b/share/man/man5/libmap.conf.5
index 6959ce2aaa932..3a7d73dd672d1 100644
--- a/share/man/man5/libmap.conf.5
+++ b/share/man/man5/libmap.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/libmap.conf.5,v 1.14 2006/03/27 14:37:54 pav Exp $
 .\"
 .Dd January 31, 2004
 .Dt LIBMAP.CONF 5
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 73f0a45553572..e1fd5efeab0b5 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/link.5,v 1.28 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
diff --git a/share/man/man5/linprocfs.5 b/share/man/man5/linprocfs.5
index a85afe96fd31e..f639ab0b1e79c 100644
--- a/share/man/man5/linprocfs.5
+++ b/share/man/man5/linprocfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/linprocfs.5,v 1.15 2006/09/18 15:24:19 ru Exp $
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/linsysfs.5 b/share/man/man5/linsysfs.5
index a5865642a1361..e4a2ce075afbb 100644
--- a/share/man/man5/linsysfs.5
+++ b/share/man/man5/linsysfs.5
@@ -1,7 +1,7 @@
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/linsysfs.5,v 1.6.4.1 2008/01/04 13:15:02 gabor Exp $
 .\"
 .Dd February 5, 2007
 .Dt LINSYSFS 5
diff --git a/share/man/man5/mailer.conf.5 b/share/man/man5/mailer.conf.5
index f17c44bb4836c..e46826bb7d190 100644
--- a/share/man/man5/mailer.conf.5
+++ b/share/man/man5/mailer.conf.5
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/mailer.conf.5,v 1.13 2006/09/18 15:24:19 ru Exp $
 .\"
 .Dd May 31, 2006
 .Dt MAILER.CONF 5
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index f8dbef491cf04..8bc6f663929b7 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.140 2007/06/15 03:21:20 gshapiro Exp $
 .\"
 .Dd September 5, 2006
 .Dt MAKE.CONF 5
diff --git a/share/man/man5/moduli.5 b/share/man/man5/moduli.5
index 32d7989236f33..1bb718783b803 100644
--- a/share/man/man5/moduli.5
+++ b/share/man/man5/moduli.5
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/moduli.5,v 1.4 2002/05/30 13:13:05 ru Exp $
 .\"
 .Dd July 28, 1997
 .Dt MODULI 5
diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5
index 2ffbc9e419bf5..122f8557c224b 100644
--- a/share/man/man5/motd.5
+++ b/share/man/man5/motd.5
@@ -1,7 +1,7 @@
 .\"	$NetBSD: motd.5,v 1.2 1994/12/28 18:58:53 glass Exp $
 .\"
 .\" This file is in the public domain.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/motd.5,v 1.5 2001/07/14 19:41:09 schweikh Exp $
 .\"
 .Dd February 13, 1997
 .Dt MOTD 5
diff --git a/share/man/man5/mqueuefs.5 b/share/man/man5/mqueuefs.5
index d5de933885f46..578c269de8b3e 100644
--- a/share/man/man5/mqueuefs.5
+++ b/share/man/man5/mqueuefs.5
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/mqueuefs.5,v 1.5 2006/11/21 06:52:55 maxim Exp $
 .\"
 .Dd November 30, 2005
 .Dt MQUEUEFS 5
diff --git a/share/man/man5/msdosfs.5 b/share/man/man5/msdosfs.5
index 9dd679c1b0c89..e95dfd37cf530 100644
--- a/share/man/man5/msdosfs.5
+++ b/share/man/man5/msdosfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.6 2007/08/22 18:04:08 gabor Exp $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 386ee7dd10211..ee98ae7d420dc 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)networks.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/networks.5,v 1.10 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt NETWORKS 5
diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5
index 1c439bec88b75..123169663d72e 100644
--- a/share/man/man5/nsmb.conf.5
+++ b/share/man/man5/nsmb.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/nsmb.conf.5,v 1.1 2003/08/09 19:11:52 trhodes Exp $
 .\"
 .Dd June 30, 2003
 .Dt NSMB.CONF 5
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index 2ded02bc0b103..0c16d5d682851 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -31,7 +31,7 @@
 .\" TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/nsswitch.conf.5,v 1.17.2.1 2007/10/19 00:18:19 bushman Exp $
 .\"
 .Dd January 22, 2007
 .Dt NSSWITCH.CONF 5
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 2acef53688193..c5716f22a9a59 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/passwd.5,v 1.50 2007/05/08 11:00:07 yar Exp $
 .\"
 .Dd May 8, 2007
 .Dt PASSWD 5
diff --git a/share/man/man5/pbm.5 b/share/man/man5/pbm.5
index 55d2c5c1be39a..bd7be1e958cf8 100644
--- a/share/man/man5/pbm.5
+++ b/share/man/man5/pbm.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/pbm.5,v 1.8 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd September 27, 1991
 .Dt PBM 5
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index 2052a1b488016..9f011f2ce975a 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.65 2007/05/13 09:33:35 maxim Exp $
 .\"
 .Dd May 12, 2007
 .Dt PERIODIC.CONF 5
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index 59b491b61eb91..f99566d5bed92 100644
--- a/share/man/man5/phones.5
+++ b/share/man/man5/phones.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)phones.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/phones.5,v 1.5 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt PHONES 5
diff --git a/share/man/man5/portsnap.conf.5 b/share/man/man5/portsnap.conf.5
index 9204e83ddda26..1f80b15f04a18 100644
--- a/share/man/man5/portsnap.conf.5
+++ b/share/man/man5/portsnap.conf.5
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/portsnap.conf.5,v 1.3 2006/09/18 15:24:20 ru Exp $
 .\"
 .Dd January 30, 2005
 .Dt PORTSNAP.CONF 5
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index 8d85f955ec617..e66aad1906fa8 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.33 2006/05/19 00:23:29 rodrigc Exp $
 .\" Written by Garrett Wollman
 .\" This file is in the public domain.
 .\"
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 37d3541daca03..2fc784ad316f1 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)protocols.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/protocols.5,v 1.7 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt PROTOCOLS 5
diff --git a/share/man/man5/quota.user.5 b/share/man/man5/quota.user.5
index 6523d51d3d447..bdfee587a72eb 100644
--- a/share/man/man5/quota.user.5
+++ b/share/man/man5/quota.user.5
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/quota.user.5,v 1.4 2007/02/04 07:44:40 mpp Exp $
 .\"
 .Dd February 3, 2007
 .Dt QUOTA.USER 5
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 02c643213dc2f..50a5e72c60e2f 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.327 2007/09/06 21:00:48 mlaier Exp $
 .\"
 .Dd September 3, 2007
 .Dt RC.CONF 5
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index b7445a6a3a47e..4b6ed1d89418a 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/reiserfs.5,v 1.2 2006/09/30 16:01:33 ru Exp $
 .\"
 .Dd May 16, 2006
 .Dt REISERFS 5
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 666608d1d6c0a..36ff9cd89e8a7 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)remote.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/remote.5,v 1.18 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd October 20, 2003
 .Dt REMOTE 5
diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5
index 5c196f386d7fb..02c4cecd7a6f6 100644
--- a/share/man/man5/resolver.5
+++ b/share/man/man5/resolver.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/resolver.5,v 1.12 2004/09/09 17:19:27 yar Exp $
 .\"
 .Dd September 9, 2004
 .Dt RESOLVER 5
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 40320f9ffe89a..82e0df4df32b0 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)services.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/services.5,v 1.12 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt SERVICES 5
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index 585cc8385dd72..aac9caf00ca0a 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shells.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/shells.5,v 1.5 2001/07/10 15:30:51 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt SHELLS 5
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index f5a995b06debf..b97055cc80489 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: src/tools/build/options/makeman,v 1.6.2.1.2.1 2008/01/28 08:57:11 dougb Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.18.2.2.2.2 2008/01/28 09:00:43 dougb Exp $
 .Dd January 28, 2008
 .Dt SRC.CONF 5
 .Os
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index bbbd29208394e..b9bf2084540e1 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/stab.5,v 1.12 2005/01/21 08:36:39 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt STAB 5
diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5
index bdf2830282899..af8445bf3c7fc 100644
--- a/share/man/man5/style.Makefile.5
+++ b/share/man/man5/style.Makefile.5
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/style.Makefile.5,v 1.16 2005/10/10 14:55:58 yar Exp $
 .\"
 .Dd January 8, 2005
 .Dt STYLE.MAKEFILE 5
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 0e69bcc13859d..fd5611fc257a1 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/sysctl.conf.5,v 1.16 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd December 30, 1999
 .Dt SYSCTL.CONF 5
diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5
index 8916437aa5203..88701e053b538 100644
--- a/share/man/man5/tmpfs.5
+++ b/share/man/man5/tmpfs.5
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/tmpfs.5,v 1.3 2007/06/18 19:19:02 brueffer Exp $
 .\"
 .Dd June 18, 2007
 .Dt TMPFS 5
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index c342041874154..776d79aecaa9f 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utmp.5	8.2 (Berkeley) 3/17/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/utmp.5,v 1.21 2003/09/08 19:57:20 ru Exp $
 .\"
 .Dd November 14, 2001
 .Dt UTMP 5
diff --git a/share/man/man5/xfs.5 b/share/man/man5/xfs.5
index 44654843fda73..f6a0539ba4d58 100644
--- a/share/man/man5/xfs.5
+++ b/share/man/man5/xfs.5
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man5/xfs.5,v 1.1.2.1 2007/11/01 14:20:37 rodrigc Exp $
 .\"
 .Dd June 16, 2007
 .Dt XFS 5
diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile
index be6547e592b53..136a77a015d24 100644
--- a/share/man/man6/Makefile
+++ b/share/man/man6/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man6/Makefile,v 1.3 2001/03/27 13:48:22 ru Exp $
 
 MAN=	intro.6
 
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index a7d08c5e9aa5f..da71f4b8e73d4 100644
--- a/share/man/man6/intro.6
+++ b/share/man/man6/intro.6
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man6/intro.6,v 1.11 2005/11/29 17:11:09 jhb Exp $
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index f602e4cd91942..e132e1625d00e 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man7/Makefile,v 1.32 2007/06/01 21:48:07 remko Exp $
 
 #MISSING: eqnchar.7 ms.7 term.7
 MAN=	ascii.7 \
diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7
index feba23385c215..619522fddcb0d 100644
--- a/share/man/man7/ascii.7
+++ b/share/man/man7/ascii.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ascii.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ascii.7,v 1.6 2002/12/05 08:50:00 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt ASCII 7
diff --git a/share/man/man7/bsd.snmpmod.mk.7 b/share/man/man7/bsd.snmpmod.mk.7
index bc2f5161aaf9b..cc7155fadb31a 100644
--- a/share/man/man7/bsd.snmpmod.mk.7
+++ b/share/man/man7/bsd.snmpmod.mk.7
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.4 2005/11/18 12:01:14 ru Exp $
 .\"
 .Dd November 10, 2005
 .Dt BSD.SNMPMOD.MK 7
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 447ae79cdd1bb..8bc4457c69f76 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/build.7,v 1.46 2006/12/14 13:37:08 mpp Exp $
 .\"
 .Dd October 1, 2006
 .Dt BUILD 7
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index af4bdd2dc7ed2..d28542ea844a6 100644
--- a/share/man/man7/clocks.7
+++ b/share/man/man7/clocks.7
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/clocks.7,v 1.24 2005/06/30 13:04:25 hmp Exp $
 .\" "
 .Dd February 24, 2005
 .Os
diff --git a/share/man/man7/development.7 b/share/man/man7/development.7
index af8db3a75d21f..32591511c9550 100644
--- a/share/man/man7/development.7
+++ b/share/man/man7/development.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/development.7,v 1.17 2006/12/14 13:35:59 mpp Exp $
 .\"
 .Dd December 21, 2002
 .Dt DEVELOPMENT 7
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index 51f9a4e18e064..facf2976c793a 100644
--- a/share/man/man7/environ.7
+++ b/share/man/man7/environ.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)environ.7	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/environ.7,v 1.25 2006/12/14 13:37:08 mpp Exp $
 .\"
 .Dd April 12, 2003
 .Dt ENVIRON 7
diff --git a/share/man/man7/ffs.7 b/share/man/man7/ffs.7
index fc8c61a3ad245..d2e1a96cb64c5 100644
--- a/share/man/man7/ffs.7
+++ b/share/man/man7/ffs.7
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ffs.7,v 1.13 2005/07/23 15:09:27 markus Exp $
 .\"
 .Dd December 26, 2001
 .Dt FFS 7
diff --git a/share/man/man7/firewall.7 b/share/man/man7/firewall.7
index 9760b9f39e2ff..968d65139831f 100644
--- a/share/man/man7/firewall.7
+++ b/share/man/man7/firewall.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/firewall.7,v 1.26 2005/07/14 20:29:06 brueffer Exp $
 .\"
 .Dd May 26, 2001
 .Dt FIREWALL 7
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 637d1fabc50ed..86e5ce3d9209a 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.129 2007/07/01 12:08:07 gnn Exp $
 .\"
 .Dd June 28, 2007
 .Dt HIER 7
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 713a8b1555254..49704f373cbbb 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hostname.7	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/hostname.7,v 1.7 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt HOSTNAME 7
diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7
index 1d9968c215df7..b84dc07a98168 100644
--- a/share/man/man7/intro.7
+++ b/share/man/man7/intro.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/intro.7,v 1.7 2001/07/10 15:30:53 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt INTRO 7
diff --git a/share/man/man7/maclabel.7 b/share/man/man7/maclabel.7
index 05c3654aa9e75..9b0edd2a7a8bb 100644
--- a/share/man/man7/maclabel.7
+++ b/share/man/man7/maclabel.7
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/maclabel.7,v 1.6 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd October 25, 2002
 .Os
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index 07370fb99b907..74f7331c2b271 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/mailaddr.7,v 1.8 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd June 16, 1993
 .Dt MAILADDR 7
diff --git a/share/man/man7/operator.7 b/share/man/man7/operator.7
index b092befa8ea98..ed77963480034 100644
--- a/share/man/man7/operator.7
+++ b/share/man/man7/operator.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)operator.7	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/operator.7,v 1.6 2003/02/24 22:53:23 ru Exp $
 .\"
 .Dd January 22, 2003
 .Dt OPERATOR 7
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 690d98ef4e69b..0c8261921965a 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/ports.7,v 1.61.4.2 2008/01/24 07:11:29 brueffer Exp $
 .\"
 .Dd January 21, 2008
 .Dt PORTS 7
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index a026db51d3e4e..b8ab3641aa767 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/release.7,v 1.58 2006/11/11 23:18:28 ru Exp $
 .\"
 .Dd November 12, 2006
 .Dt RELEASE 7
diff --git a/share/man/man7/sdoc.7 b/share/man/man7/sdoc.7
index 2a7e626e1a705..180b879aff152 100644
--- a/share/man/man7/sdoc.7
+++ b/share/man/man7/sdoc.7
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sec-doc.7,v 1.7 2001/12/22 00:14:12 rwatson Exp$
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/sdoc.7,v 1.11 2005/09/05 10:03:07 tjr Exp $
 .\"
 .Dd September 5, 2005
 .Dt SDOC 7
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 68cec46c83ad7..d77e9441d8f6f 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/security.7,v 1.48 2006/09/08 04:56:21 trhodes Exp $
 .\"
 .Dd September 8, 2006
 .Dt SECURITY 7
diff --git a/share/man/man7/sprog.7 b/share/man/man7/sprog.7
index cde04b2f7cbb9..e6e91c35c033c 100644
--- a/share/man/man7/sprog.7
+++ b/share/man/man7/sprog.7
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/sprog.7,v 1.1 2001/06/04 15:32:44 eric Exp $
 .\"
 .Dd June 3, 2001
 .Dt SPROG 7
diff --git a/share/man/man7/stdint.7 b/share/man/man7/stdint.7
index 2f36953d9a16d..734333b040f6b 100644
--- a/share/man/man7/stdint.7
+++ b/share/man/man7/stdint.7
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/stdint.7,v 1.5 2003/09/08 19:57:21 ru Exp $
 .\"
 .Dd September 15, 2002
 .Dt STDINT 7
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 278195e0004f4..d5786e1a44569 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.74 2007/01/17 22:23:28 bms Exp $
 .\"
 .Dd January 17, 2007
 .Dt TUNING 7
diff --git a/share/man/man8/MAKEDEV.8 b/share/man/man8/MAKEDEV.8
index 8b42493c27f61..61f9ed280d65d 100644
--- a/share/man/man8/MAKEDEV.8
+++ b/share/man/man8/MAKEDEV.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/MAKEDEV.8,v 1.3 2006/11/22 11:45:06 rodrigc Exp $
 .\"
 .Dd March 25, 2003
 .Dt MAKEDEV 8
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 2f5d1cf7744fa..4f50312a5b48a 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/share/man/man8/Makefile,v 1.36 2006/08/29 09:12:48 danger Exp $
 
 MAN=	adding_user.8 \
 	crash.8 \
diff --git a/share/man/man8/adding_user.8 b/share/man/man8/adding_user.8
index 2f4dab108fc54..632e46caf6989 100644
--- a/share/man/man8/adding_user.8
+++ b/share/man/man8/adding_user.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)adduser.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/adding_user.8,v 1.10 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt ADDING_USER 8
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 94a0ecce0eae7..bf401ae56c1db 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/crash.8,v 1.22 2005/06/30 13:01:44 hmp Exp $
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 64e879567bbcc..1a4ca2804f9e0 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.30 2005/12/30 14:43:31 ceri Exp $
 .\"
 .Dd December 10, 2005
 .Dt DISKLESS 8
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 96406937da915..ad97e4438d5a6 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/intro.8,v 1.12 2006/10/21 20:35:49 ru Exp $
 .\"
 .Dd October 22, 2006
 .Dt INTRO 8
diff --git a/share/man/man8/nanobsd.8 b/share/man/man8/nanobsd.8
index 6fee39aab6680..06922864d365b 100644
--- a/share/man/man8/nanobsd.8
+++ b/share/man/man8/nanobsd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.4 2007/05/21 15:29:42 ru Exp $
 .\"
 .Dd August 28, 2006
 .Dt NANOBSD 8
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 9f36eca192c20..437d7393ef01c 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -1,5 +1,5 @@
 .\" -*- nroff-fill -*-
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/picobsd.8,v 1.29 2006/09/18 15:24:20 ru Exp $
 .Dd January 31, 2006
 .Os
 .Dt PICOBSD 8
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index aa607beb554d2..229e10f0f7dd7 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.8,v 1.33 2007/07/24 06:41:06 delphij Exp $
 .\"
 .Dd May 18, 2007
 .Dt RC 8
diff --git a/share/man/man8/rc.sendmail.8 b/share/man/man8/rc.sendmail.8
index 7b05ced128d03..3fe145a3d7820 100644
--- a/share/man/man8/rc.sendmail.8
+++ b/share/man/man8/rc.sendmail.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.sendmail.8,v 1.6 2002/11/29 11:39:20 ru Exp $
 .\"
 .Dd March 30, 2002
 .Dt RC.SENDMAIL 8
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 682acd92a3e7d..c04b77232046d 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rc.subr.8,v 1.18 2007/05/18 12:04:41 mtm Exp $
 .\"
 .Dd May 18, 2007
 .Dt RC.SUBR 8
diff --git a/share/man/man8/rescue.8 b/share/man/man8/rescue.8
index 685827f3d5987..ced020bc95785 100644
--- a/share/man/man8/rescue.8
+++ b/share/man/man8/rescue.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/rescue.8,v 1.3 2005/11/10 15:42:51 kientzle Exp $
 .\"
 .Dd July 23, 2003
 .Os
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index aa94a1149b254..ae7c8ea201dc5 100644
--- a/share/man/man8/sticky.8
+++ b/share/man/man8/sticky.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/sticky.8,v 1.11 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 75e3cc1403ebd..b903753ab44ec 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man8/yp.8,v 1.36 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd April 5, 1993
 .Dt YP 8
diff --git a/share/man/man9/BUF_LOCK.9 b/share/man/man9/BUF_LOCK.9
index ca414ecdbaa09..b85d0b92093da 100644
--- a/share/man/man9/BUF_LOCK.9
+++ b/share/man/man9/BUF_LOCK.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_LOCK.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_LOCK 9
diff --git a/share/man/man9/BUF_LOCKFREE.9 b/share/man/man9/BUF_LOCKFREE.9
index d356f0d8be467..f4f52600b8794 100644
--- a/share/man/man9/BUF_LOCKFREE.9
+++ b/share/man/man9/BUF_LOCKFREE.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_LOCKFREE.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_LOCKFREE 9
diff --git a/share/man/man9/BUF_LOCKINIT.9 b/share/man/man9/BUF_LOCKINIT.9
index 286e7f8db2a05..418e4272740cd 100644
--- a/share/man/man9/BUF_LOCKINIT.9
+++ b/share/man/man9/BUF_LOCKINIT.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_LOCKINIT.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUF_LOCKINIT 9
diff --git a/share/man/man9/BUF_REFCNT.9 b/share/man/man9/BUF_REFCNT.9
index 622c2c579986f..27c74ce5d6cc4 100644
--- a/share/man/man9/BUF_REFCNT.9
+++ b/share/man/man9/BUF_REFCNT.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_REFCNT.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_REFCNT 9
diff --git a/share/man/man9/BUF_TIMELOCK.9 b/share/man/man9/BUF_TIMELOCK.9
index 31ca2007c9dd1..7f5e1b9490c2c 100644
--- a/share/man/man9/BUF_TIMELOCK.9
+++ b/share/man/man9/BUF_TIMELOCK.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_TIMELOCK.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_TIMELOCK 9
diff --git a/share/man/man9/BUF_UNLOCK.9 b/share/man/man9/BUF_UNLOCK.9
index 0b6b0b35080fd..b9dba682b6c74 100644
--- a/share/man/man9/BUF_UNLOCK.9
+++ b/share/man/man9/BUF_UNLOCK.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUF_UNLOCK.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt BUF_UNLOCK 9
diff --git a/share/man/man9/BUS_ADD_CHILD.9 b/share/man/man9/BUS_ADD_CHILD.9
index 8b69d5a7834e6..477be3503724c 100644
--- a/share/man/man9/BUS_ADD_CHILD.9
+++ b/share/man/man9/BUS_ADD_CHILD.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_ADD_CHILD.9,v 1.4 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd May 13, 2004
 .Dt BUS_ADD_CHILD 9
diff --git a/share/man/man9/BUS_CONFIG_INTR.9 b/share/man/man9/BUS_CONFIG_INTR.9
index a3b4c543c9174..b81dd027e234a 100644
--- a/share/man/man9/BUS_CONFIG_INTR.9
+++ b/share/man/man9/BUS_CONFIG_INTR.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_CONFIG_INTR.9,v 1.5 2005/01/06 17:08:51 keramida Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUS_CONFIG_INTR 9
diff --git a/share/man/man9/BUS_PRINT_CHILD.9 b/share/man/man9/BUS_PRINT_CHILD.9
index a3709d94866b8..415d30be85440 100644
--- a/share/man/man9/BUS_PRINT_CHILD.9
+++ b/share/man/man9/BUS_PRINT_CHILD.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_PRINT_CHILD.9,v 1.16 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 6, 2005
 .Dt BUS_PRINT_CHILD 9
diff --git a/share/man/man9/BUS_READ_IVAR.9 b/share/man/man9/BUS_READ_IVAR.9
index 153b324b56a45..2a95b42face69 100644
--- a/share/man/man9/BUS_READ_IVAR.9
+++ b/share/man/man9/BUS_READ_IVAR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_READ_IVAR.9,v 1.9 2003/10/23 06:22:40 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_READ_IVAR 9
diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9
index dc92dc90d323d..084b947cc9738 100644
--- a/share/man/man9/BUS_SETUP_INTR.9
+++ b/share/man/man9/BUS_SETUP_INTR.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/BUS_SETUP_INTR.9,v 1.20 2007/03/01 14:33:29 ru Exp $
 .\"
 .Dd March 1, 2007
 .Dt BUS_SETUP_INTR 9
diff --git a/share/man/man9/CTASSERT.9 b/share/man/man9/CTASSERT.9
index 5c9d30eb2361d..c18f7f9131d83 100644
--- a/share/man/man9/CTASSERT.9
+++ b/share/man/man9/CTASSERT.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/CTASSERT.9,v 1.2 2003/05/30 21:13:32 ru Exp $
 .\"
 .Dd May 15, 2003
 .Os
diff --git a/share/man/man9/DECLARE_GEOM_CLASS.9 b/share/man/man9/DECLARE_GEOM_CLASS.9
index a47ea8e89e8c8..b6215cfe82234 100644
--- a/share/man/man9/DECLARE_GEOM_CLASS.9
+++ b/share/man/man9/DECLARE_GEOM_CLASS.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DECLARE_GEOM_CLASS.9,v 1.5 2007/09/20 10:52:08 gabor Exp $
 .\"
 .Dd August 13, 2007
 .Dt DECLARE_GEOM_CLASS 9
diff --git a/share/man/man9/DECLARE_MODULE.9 b/share/man/man9/DECLARE_MODULE.9
index d33c18ed60811..bd61708b7994a 100644
--- a/share/man/man9/DECLARE_MODULE.9
+++ b/share/man/man9/DECLARE_MODULE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DECLARE_MODULE.9,v 1.9 2005/01/13 09:33:06 ru Exp $
 .\"
 .Dd January 6, 2005
 .Dt DECLARE_MODULE 9
diff --git a/share/man/man9/DELAY.9 b/share/man/man9/DELAY.9
index ac6231c2bc706..bd92b0a4d65a3 100644
--- a/share/man/man9/DELAY.9
+++ b/share/man/man9/DELAY.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DELAY.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2000
 .Os
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index ccb9f27b69307..6b55726a9e544 100644
--- a/share/man/man9/DEVICE_ATTACH.9
+++ b/share/man/man9/DEVICE_ATTACH.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_ATTACH.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt DEVICE_ATTACH 9
diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9
index 8b4c43c2f2d05..63fc53c9d1d4a 100644
--- a/share/man/man9/DEVICE_DETACH.9
+++ b/share/man/man9/DEVICE_DETACH.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_DETACH.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_DETACH 9
diff --git a/share/man/man9/DEVICE_IDENTIFY.9 b/share/man/man9/DEVICE_IDENTIFY.9
index 4257407eac8b8..12312d48f91f6 100644
--- a/share/man/man9/DEVICE_IDENTIFY.9
+++ b/share/man/man9/DEVICE_IDENTIFY.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_IDENTIFY.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 13, 2004
 .Dt DEVICE_IDENTIFY 9
diff --git a/share/man/man9/DEVICE_PROBE.9 b/share/man/man9/DEVICE_PROBE.9
index b7b67f68d086d..a64836a65c147 100644
--- a/share/man/man9/DEVICE_PROBE.9
+++ b/share/man/man9/DEVICE_PROBE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt DEVICE_PROBE 9
diff --git a/share/man/man9/DEVICE_SHUTDOWN.9 b/share/man/man9/DEVICE_SHUTDOWN.9
index 0bf6a8bc86717..1216edb6a7bbe 100644
--- a/share/man/man9/DEVICE_SHUTDOWN.9
+++ b/share/man/man9/DEVICE_SHUTDOWN.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEVICE_SHUTDOWN.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd January 6, 2005
 .Dt DEVICE_SHUTDOWN 9
diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9
index 13a81c1986367..f206686de4074 100644
--- a/share/man/man9/DEV_MODULE.9
+++ b/share/man/man9/DEV_MODULE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DEV_MODULE.9,v 1.4 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 11, 2001
 .Dt DEV_MODULE 9
diff --git a/share/man/man9/DRIVER_MODULE.9 b/share/man/man9/DRIVER_MODULE.9
index 346177a6aabca..85976561b35c1 100644
--- a/share/man/man9/DRIVER_MODULE.9
+++ b/share/man/man9/DRIVER_MODULE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/DRIVER_MODULE.9,v 1.10 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd May 16, 2000
 .Dt DRIVER_MODULE 9
diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9
index ed83018d763c4..3ca835d699830 100644
--- a/share/man/man9/EVENTHANDLER.9
+++ b/share/man/man9/EVENTHANDLER.9
@@ -21,7 +21,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/EVENTHANDLER.9,v 1.4 2005/10/11 16:05:35 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Dt EVENTHANDLER 9
diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9
index e53e9b605a8e0..f78d5bf949591 100644
--- a/share/man/man9/KASSERT.9
+++ b/share/man/man9/KASSERT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/KASSERT.9,v 1.12 2003/05/16 19:54:20 hmp Exp $
 .\"
 .Dd January 14, 2000
 .Os
diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9
index 23aba541d3ffd..44c5284484ba9 100644
--- a/share/man/man9/LOCK_PROFILING.9
+++ b/share/man/man9/LOCK_PROFILING.9
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/LOCK_PROFILING.9,v 1.2 2006/12/01 17:46:25 ru Exp $
 .\"
 .Dd November 11, 2006
 .Dt LOCK_PROFILING 9
diff --git a/share/man/man9/MD5.9 b/share/man/man9/MD5.9
index d51a9fc231fc8..fe2eb8b08b2e7 100644
--- a/share/man/man9/MD5.9
+++ b/share/man/man9/MD5.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/MD5.9,v 1.10 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd April 17, 1996
 .Dt MD5 9
diff --git a/share/man/man9/MODULE_DEPEND.9 b/share/man/man9/MODULE_DEPEND.9
index c0a8fdd44c94a..e3eaddd4990c9 100644
--- a/share/man/man9/MODULE_DEPEND.9
+++ b/share/man/man9/MODULE_DEPEND.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/MODULE_DEPEND.9,v 1.7 2005/01/11 20:56:03 simon Exp $
 .\"
 .Dd January 11, 2005
 .Dt MODULE_DEPEND 9
diff --git a/share/man/man9/MODULE_VERSION.9 b/share/man/man9/MODULE_VERSION.9
index 2f284b874b916..f7462931b1d57 100644
--- a/share/man/man9/MODULE_VERSION.9
+++ b/share/man/man9/MODULE_VERSION.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/MODULE_VERSION.9,v 1.5 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 11, 2001
 .Dt MODULE_VERSION 9
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index c05ae1c846ff2..e40fb44964dcd 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/man/man9/Makefile,v 1.310.2.1.2.1 2008/02/15 15:19:26 brueffer Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index 973adebf2cfb0..5b8fa0ee435fb 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/SYSCALL_MODULE.9,v 1.7 2006/04/15 12:04:18 maxim Exp $
 .\"
 .Dd January 7, 2005
 .Dt SYSCALL_MODULE 9
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index 21e609e826975..c5cabe3406dc3 100644
--- a/share/man/man9/VFS.9
+++ b/share/man/man9/VFS.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS.9,v 1.12 2005/07/27 02:08:59 scottl Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_CHECKEXP.9 b/share/man/man9/VFS_CHECKEXP.9
index a3afd2e0e455e..5e42ff8a3bee4 100644
--- a/share/man/man9/VFS_CHECKEXP.9
+++ b/share/man/man9/VFS_CHECKEXP.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_CHECKEXP.9,v 1.12 2005/01/07 11:39:36 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_FHTOVP.9 b/share/man/man9/VFS_FHTOVP.9
index e17133e5ce2f4..36d85c576bd16 100644
--- a/share/man/man9/VFS_FHTOVP.9
+++ b/share/man/man9/VFS_FHTOVP.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_FHTOVP.9,v 1.17 2005/01/07 11:45:59 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_LOCK_GIANT.9 b/share/man/man9/VFS_LOCK_GIANT.9
index 9249e6c761573..da24750fa438b 100644
--- a/share/man/man9/VFS_LOCK_GIANT.9
+++ b/share/man/man9/VFS_LOCK_GIANT.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_LOCK_GIANT.9,v 1.5 2006/01/03 14:00:22 rwatson Exp $
 .\"
 .Dd September 21, 2005
 .Dt VFS_LOCK_GIANT 9
diff --git a/share/man/man9/VFS_MOUNT.9 b/share/man/man9/VFS_MOUNT.9
index 97d85faa8d718..7f015e8e05bf0 100644
--- a/share/man/man9/VFS_MOUNT.9
+++ b/share/man/man9/VFS_MOUNT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_MOUNT.9,v 1.14 2005/01/07 10:57:33 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_QUOTACTL.9 b/share/man/man9/VFS_QUOTACTL.9
index 4c3620a6e135a..46c40029f5a32 100644
--- a/share/man/man9/VFS_QUOTACTL.9
+++ b/share/man/man9/VFS_QUOTACTL.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_QUOTACTL.9,v 1.10 2003/10/23 06:24:55 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_ROOT.9 b/share/man/man9/VFS_ROOT.9
index 1aa019461c28d..90c7719dea7fe 100644
--- a/share/man/man9/VFS_ROOT.9
+++ b/share/man/man9/VFS_ROOT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_ROOT.9,v 1.12 2006/09/18 15:24:20 ru Exp $
 .\"
 .Dd August 26, 2006
 .Os
diff --git a/share/man/man9/VFS_SET.9 b/share/man/man9/VFS_SET.9
index 656b72879978b..c45d69d06220c 100644
--- a/share/man/man9/VFS_SET.9
+++ b/share/man/man9/VFS_SET.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_SET.9,v 1.11 2007/04/05 21:17:52 pjd Exp $
 .\"
 .Dd April 5, 2007
 .Dt VFS_SET 9
diff --git a/share/man/man9/VFS_STATFS.9 b/share/man/man9/VFS_STATFS.9
index dd8dcc7c52f3d..7bbac86f1c8f6 100644
--- a/share/man/man9/VFS_STATFS.9
+++ b/share/man/man9/VFS_STATFS.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_STATFS.9,v 1.12 2005/01/13 09:33:06 ru Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_SYNC.9 b/share/man/man9/VFS_SYNC.9
index 6f603ab8ee14d..d4e822f6f1a7b 100644
--- a/share/man/man9/VFS_SYNC.9
+++ b/share/man/man9/VFS_SYNC.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_UNMOUNT.9 b/share/man/man9/VFS_UNMOUNT.9
index 1face4913e1bd..a410acb27469f 100644
--- a/share/man/man9/VFS_UNMOUNT.9
+++ b/share/man/man9/VFS_UNMOUNT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_UNMOUNT.9,v 1.11 2005/01/07 11:45:11 keramida Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VFS_VGET.9 b/share/man/man9/VFS_VGET.9
index 02b55364127d9..71b9bfba9c590 100644
--- a/share/man/man9/VFS_VGET.9
+++ b/share/man/man9/VFS_VGET.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VFS_VGET.9,v 1.18 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd January 7, 2005
 .Os
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index 55a9302d5feaf..8893eb7c2dc53 100644
--- a/share/man/man9/VOP_ACCESS.9
+++ b/share/man/man9/VOP_ACCESS.9
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ACLCHECK.9 b/share/man/man9/VOP_ACLCHECK.9
index 62102281ce7b5..82fa82bd55b7c 100644
--- a/share/man/man9/VOP_ACLCHECK.9
+++ b/share/man/man9/VOP_ACLCHECK.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ACLCHECK.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index bdb00b7070e73..b5657e9fbe9b7 100644
--- a/share/man/man9/VOP_ADVLOCK.9
+++ b/share/man/man9/VOP_ADVLOCK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ADVLOCK.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/VOP_ATTRIB.9 b/share/man/man9/VOP_ATTRIB.9
index 0ea3ee6692d57..7983a2c434a23 100644
--- a/share/man/man9/VOP_ATTRIB.9
+++ b/share/man/man9/VOP_ATTRIB.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.25 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_BWRITE.9 b/share/man/man9/VOP_BWRITE.9
index 0b8f7e0e1c662..a7fcfcb43bd71 100644
--- a/share/man/man9/VOP_BWRITE.9
+++ b/share/man/man9/VOP_BWRITE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_BWRITE.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9
index 691c93bee134e..ffef2d8a81e18 100644
--- a/share/man/man9/VOP_CREATE.9
+++ b/share/man/man9/VOP_CREATE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_CREATE.9,v 1.18 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index 5f7ddd21ccf58..ecfa1db13337f 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_GETACL.9 b/share/man/man9/VOP_GETACL.9
index ba819085bb759..45ff9b3ed03e8 100644
--- a/share/man/man9/VOP_GETACL.9
+++ b/share/man/man9/VOP_GETACL.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETACL.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9
index 0971c27a2951a..47a97a670f927 100644
--- a/share/man/man9/VOP_GETEXTATTR.9
+++ b/share/man/man9/VOP_GETEXTATTR.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.22 2005/01/28 10:43:05 ru Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9
index ffac609de1335..78048d7c52d9b 100644
--- a/share/man/man9/VOP_GETPAGES.9
+++ b/share/man/man9/VOP_GETPAGES.9
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETPAGES.9,v 1.12 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd September 27, 2003
 .Os
diff --git a/share/man/man9/VOP_GETVOBJECT.9 b/share/man/man9/VOP_GETVOBJECT.9
index e2e0ba471a85f..21e2291ce5f42 100644
--- a/share/man/man9/VOP_GETVOBJECT.9
+++ b/share/man/man9/VOP_GETVOBJECT.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_GETVOBJECT.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd September 10, 2000
 .Os
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index f74b020c4a85e..61195aef917a8 100644
--- a/share/man/man9/VOP_INACTIVE.9
+++ b/share/man/man9/VOP_INACTIVE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_INACTIVE.9,v 1.16 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_IOCTL.9 b/share/man/man9/VOP_IOCTL.9
index 6b2f94a9156f7..9d7d3ab37371a 100644
--- a/share/man/man9/VOP_IOCTL.9
+++ b/share/man/man9/VOP_IOCTL.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_IOCTL.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LEASE.9 b/share/man/man9/VOP_LEASE.9
index becf68b543c30..547362218ef65 100644
--- a/share/man/man9/VOP_LEASE.9
+++ b/share/man/man9/VOP_LEASE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LEASE.9,v 1.10 2003/10/23 03:14:21 hmp Exp $
 .\"
 .Dd September 24, 1999
 .Os
diff --git a/share/man/man9/VOP_LINK.9 b/share/man/man9/VOP_LINK.9
index 559526cf4417f..2675e67960383 100644
--- a/share/man/man9/VOP_LINK.9
+++ b/share/man/man9/VOP_LINK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LINK.9,v 1.23 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LISTEXTATTR.9 b/share/man/man9/VOP_LISTEXTATTR.9
index 4c8b744efcfad..7502f364b8a22 100644
--- a/share/man/man9/VOP_LISTEXTATTR.9
+++ b/share/man/man9/VOP_LISTEXTATTR.9
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LISTEXTATTR.9,v 1.7 2005/08/19 12:17:47 rodrigc Exp $
 .\"
 .Dd August 19, 2005
 .Os
diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index 57d8f72112e26..8ab8afe145fce 100644
--- a/share/man/man9/VOP_LOCK.9
+++ b/share/man/man9/VOP_LOCK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.17 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 270f83fa71c92..0f26b24c0d48b 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_LOOKUP.9,v 1.24 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 24, 1997
 .Os
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index 959e095995406..67079fed743fd 100644
--- a/share/man/man9/VOP_OPENCLOSE.9
+++ b/share/man/man9/VOP_OPENCLOSE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_OPENCLOSE.9,v 1.19 2007/06/05 10:48:29 kib Exp $
 .\"
 .Dd June 5, 2007
 .Os
diff --git a/share/man/man9/VOP_PATHCONF.9 b/share/man/man9/VOP_PATHCONF.9
index 056f6479a8398..f313d0480bd39 100644
--- a/share/man/man9/VOP_PATHCONF.9
+++ b/share/man/man9/VOP_PATHCONF.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_PATHCONF.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PRINT.9 b/share/man/man9/VOP_PRINT.9
index 2da85f9a9d7bd..71035dba53905 100644
--- a/share/man/man9/VOP_PRINT.9
+++ b/share/man/man9/VOP_PRINT.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_PRINT.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RDWR.9 b/share/man/man9/VOP_RDWR.9
index 28f495f2dde0f..1032f637eac91 100644
--- a/share/man/man9/VOP_RDWR.9
+++ b/share/man/man9/VOP_RDWR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_RDWR.9,v 1.19 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READDIR.9 b/share/man/man9/VOP_READDIR.9
index bf4c6b2431dfe..e04d47fe40cda 100644
--- a/share/man/man9/VOP_READDIR.9
+++ b/share/man/man9/VOP_READDIR.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_READDIR.9,v 1.14 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READLINK.9 b/share/man/man9/VOP_READLINK.9
index 0fb5e47623196..7f48d8136d5c8 100644
--- a/share/man/man9/VOP_READLINK.9
+++ b/share/man/man9/VOP_READLINK.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_READLINK.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REALLOCBLKS.9 b/share/man/man9/VOP_REALLOCBLKS.9
index 9209844eb8dd0..4e649e7bdd668 100644
--- a/share/man/man9/VOP_REALLOCBLKS.9
+++ b/share/man/man9/VOP_REALLOCBLKS.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_REALLOCBLKS.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REMOVE.9 b/share/man/man9/VOP_REMOVE.9
index aa04405cdcc4d..73cc6c98d39eb 100644
--- a/share/man/man9/VOP_REMOVE.9
+++ b/share/man/man9/VOP_REMOVE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.15 2006/11/04 23:58:15 pjd Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RENAME.9 b/share/man/man9/VOP_RENAME.9
index 4c2e58a65a3c8..a64f3b7947740 100644
--- a/share/man/man9/VOP_RENAME.9
+++ b/share/man/man9/VOP_RENAME.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.22 2006/11/04 23:59:51 pjd Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REVOKE.9 b/share/man/man9/VOP_REVOKE.9
index 6e0401435348d..fe06ca0df6d01 100644
--- a/share/man/man9/VOP_REVOKE.9
+++ b/share/man/man9/VOP_REVOKE.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_REVOKE.9,v 1.6 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 5, 2002
 .Os
diff --git a/share/man/man9/VOP_SETACL.9 b/share/man/man9/VOP_SETACL.9
index b6a7003a86b6d..7da88d6eed0ef 100644
--- a/share/man/man9/VOP_SETACL.9
+++ b/share/man/man9/VOP_SETACL.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_SETACL.9,v 1.13 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9
index ccb8aaad0fb69..275fbfbab49e6 100644
--- a/share/man/man9/VOP_SETEXTATTR.9
+++ b/share/man/man9/VOP_SETEXTATTR.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.20 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/VOP_STRATEGY.9 b/share/man/man9/VOP_STRATEGY.9
index 709a929921b5c..22f7f35e232dd 100644
--- a/share/man/man9/VOP_STRATEGY.9
+++ b/share/man/man9/VOP_STRATEGY.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_STRATEGY.9,v 1.17 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_VPTOFH.9 b/share/man/man9/VOP_VPTOFH.9
index 36e703d7958d9..48b15a0441520 100644
--- a/share/man/man9/VOP_VPTOFH.9
+++ b/share/man/man9/VOP_VPTOFH.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/VOP_VPTOFH.9,v 1.10 2007/02/16 14:27:59 pjd Exp $
 .\"
 .Dd February 16, 2007
 .Os
diff --git a/share/man/man9/accept_filter.9 b/share/man/man9/accept_filter.9
index af9e888a52f1c..ca9971996f986 100644
--- a/share/man/man9/accept_filter.9
+++ b/share/man/man9/accept_filter.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/accept_filter.9,v 1.13 2004/06/16 08:33:57 ru Exp $
 .\" "
 .Dd June 25, 2000
 .Os
diff --git a/share/man/man9/accf_data.9 b/share/man/man9/accf_data.9
index 7eba8654a75c4..ed49fac19a977 100644
--- a/share/man/man9/accf_data.9
+++ b/share/man/man9/accf_data.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/accf_data.9,v 1.8 2005/01/18 20:52:51 ru Exp $
 .\" "
 .Dd November 15, 2000
 .Os
diff --git a/share/man/man9/accf_http.9 b/share/man/man9/accf_http.9
index a75321c9b1b21..fa4f7a811bcfc 100644
--- a/share/man/man9/accf_http.9
+++ b/share/man/man9/accf_http.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/accf_http.9,v 1.11 2005/01/18 20:52:51 ru Exp $
 .\" "
 .Dd November 15, 2000
 .Os
diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9
index dc3f7ad2e8eff..6996974b3ddac 100644
--- a/share/man/man9/acl.9
+++ b/share/man/man9/acl.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/acl.9,v 1.15 2006/02/13 21:34:18 joel Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/alloc_unr.9 b/share/man/man9/alloc_unr.9
index ee805a3bda575..78302060646d1 100644
--- a/share/man/man9/alloc_unr.9
+++ b/share/man/man9/alloc_unr.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/alloc_unr.9,v 1.3 2005/11/24 09:25:09 joel Exp $
 .\"
 .Dd March 23, 2005
 .Dt ALLOC_UNR 9
diff --git a/share/man/man9/alq.9 b/share/man/man9/alq.9
index ec6ef2688c3a8..60cff9424a88c 100644
--- a/share/man/man9/alq.9
+++ b/share/man/man9/alq.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/alq.9,v 1.6 2005/04/16 12:12:27 rwatson Exp $
 .\"
 .Dd May 16, 2003
 .Dt ALQ 9
diff --git a/share/man/man9/altq.9 b/share/man/man9/altq.9
index 6ed338bdabde6..c272731e8c59b 100644
--- a/share/man/man9/altq.9
+++ b/share/man/man9/altq.9
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/altq.9,v 1.5 2004/10/07 12:10:25 mlaier Exp $
 .\"
 .Dd August 25, 2004
 .Dt ALTQ 9
diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9
index be5c74ea2e9e2..026121aac708c 100644
--- a/share/man/man9/atomic.9
+++ b/share/man/man9/atomic.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/atomic.9,v 1.13 2005/11/18 10:52:24 ru Exp $
 .\"
 .Dd September 27, 2005
 .Os
diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9
index e7922aff8dff6..3c5d3f0b233f6 100644
--- a/share/man/man9/bios.9
+++ b/share/man/man9/bios.9
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bios.9,v 1.16 2005/11/18 10:52:24 ru Exp $
 .\"
 .\" Copyright (c) 1997 Michael Smith
 .\" All rights reserved.
diff --git a/share/man/man9/boot.9 b/share/man/man9/boot.9
index cbd0099e4e184..a0370b22dea88 100644
--- a/share/man/man9/boot.9
+++ b/share/man/man9/boot.9
@@ -32,7 +32,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/boot.9,v 1.10 2004/07/03 18:29:23 ru Exp $
 .\"
 .Dd February 14, 1997
 .Dt BOOT 9
diff --git a/share/man/man9/bpf.9 b/share/man/man9/bpf.9
index 5a3ac07ad2701..57832843af105 100644
--- a/share/man/man9/bpf.9
+++ b/share/man/man9/bpf.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bpf.9,v 1.7 2006/12/13 06:27:20 ru Exp $
 .\"
 .Dd December 13, 2006
 .Dt BPF 9
diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9
index cba34998b76f8..fd7c649af648b 100644
--- a/share/man/man9/buf.9
+++ b/share/man/man9/buf.9
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/buf.9,v 1.18 2006/02/13 21:34:18 joel Exp $
 .\"
 .Dd December 22, 1998
 .Dt BUF 9
diff --git a/share/man/man9/bus_activate_resource.9 b/share/man/man9/bus_activate_resource.9
index eb5b3e824e79d..5055919e83843 100644
--- a/share/man/man9/bus_activate_resource.9
+++ b/share/man/man9/bus_activate_resource.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_activate_resource.9,v 1.3 2003/05/30 21:13:32 ru Exp $
 .\"
 .Dd March 28, 2003
 .Dt BUS_ACTIVATE_RESOURCE 9
diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9
index dd19627683bd4..b6638892a92c7 100644
--- a/share/man/man9/bus_alloc_resource.9
+++ b/share/man/man9/bus_alloc_resource.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_alloc_resource.9,v 1.23 2007/05/27 20:49:08 imp Exp $
 .\"
 .Dd May 18, 2000
 .Dt BUS_ALLOC_RESOURCE 9
diff --git a/share/man/man9/bus_child_present.9 b/share/man/man9/bus_child_present.9
index 12577ad3d54b7..1573104058385 100644
--- a/share/man/man9/bus_child_present.9
+++ b/share/man/man9/bus_child_present.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_child_present.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 27, 2003
 .Dt BUS_CHILD_PRESENT 9
diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9
index b081cf4aa905b..34bcb6f9d508e 100644
--- a/share/man/man9/bus_dma.9
+++ b/share/man/man9/bus_dma.9
@@ -57,7 +57,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_dma.9,v 1.40 2007/03/06 17:32:49 jhb Exp $
 .\" $NetBSD: bus_dma.9,v 1.25 2002/10/14 13:43:16 wiz Exp $
 .\"
 .Dd March 6, 2007
diff --git a/share/man/man9/bus_generic_attach.9 b/share/man/man9/bus_generic_attach.9
index e53bd5d080f3f..425bc310ae056 100644
--- a/share/man/man9/bus_generic_attach.9
+++ b/share/man/man9/bus_generic_attach.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_attach.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_ATTACH 9
diff --git a/share/man/man9/bus_generic_detach.9 b/share/man/man9/bus_generic_detach.9
index 9a2a6f8bb8ae1..c8e27a0f496ea 100644
--- a/share/man/man9/bus_generic_detach.9
+++ b/share/man/man9/bus_generic_detach.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_detach.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_DETACH 9
diff --git a/share/man/man9/bus_generic_print_child.9 b/share/man/man9/bus_generic_print_child.9
index 80a04ff3d5060..a25145de9561c 100644
--- a/share/man/man9/bus_generic_print_child.9
+++ b/share/man/man9/bus_generic_print_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_print_child.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_PRINT_CHILD 9
diff --git a/share/man/man9/bus_generic_read_ivar.9 b/share/man/man9/bus_generic_read_ivar.9
index 5474b436901cb..c00f5e7da5e25 100644
--- a/share/man/man9/bus_generic_read_ivar.9
+++ b/share/man/man9/bus_generic_read_ivar.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_read_ivar.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_READ_IVAR 9
diff --git a/share/man/man9/bus_generic_shutdown.9 b/share/man/man9/bus_generic_shutdown.9
index 215d8594275e4..52577f80f502e 100644
--- a/share/man/man9/bus_generic_shutdown.9
+++ b/share/man/man9/bus_generic_shutdown.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_generic_shutdown.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_SHUTDOWN 9
diff --git a/share/man/man9/bus_release_resource.9 b/share/man/man9/bus_release_resource.9
index 68187ccc7872f..da83f0be02c50 100644
--- a/share/man/man9/bus_release_resource.9
+++ b/share/man/man9/bus_release_resource.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_release_resource.9,v 1.11 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 18, 2000
 .Dt BUS_RELEASE_RESOURCE 9
diff --git a/share/man/man9/bus_set_resource.9 b/share/man/man9/bus_set_resource.9
index cda47b62b6825..904b961752dc2 100644
--- a/share/man/man9/bus_set_resource.9
+++ b/share/man/man9/bus_set_resource.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_set_resource.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 29, 2003
 .Dt BUS_SET_RESOURCE 9
diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9
index 5836b89dddc9e..402e0882732bc 100644
--- a/share/man/man9/bus_space.9
+++ b/share/man/man9/bus_space.9
@@ -56,7 +56,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/bus_space.9,v 1.4 2006/09/18 14:31:03 ru Exp $
 .\"
 .Dd June 13, 2005
 .Dt BUS_SPACE 9
diff --git a/share/man/man9/byteorder.9 b/share/man/man9/byteorder.9
index f47f609758d3c..3ba6943e455ed 100644
--- a/share/man/man9/byteorder.9
+++ b/share/man/man9/byteorder.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/byteorder.9,v 1.6 2003/05/21 17:32:55 ru Exp $
 .\"
 .Dd April 29, 2002
 .Dt BYTEORDER 9
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 59f796dc3d24b..0abde9c60e8b2 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/cd.9,v 1.23 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd September 2, 2003
 .Dt CD 9
diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9
index 2ac8906ebd86b..6bed5f808623c 100644
--- a/share/man/man9/condvar.9
+++ b/share/man/man9/condvar.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.21 2007/06/05 20:53:18 imp Exp $
 .\"
 .Dd June 5, 2007
 .Dt CONDVAR 9
diff --git a/share/man/man9/config_intrhook.9 b/share/man/man9/config_intrhook.9
index 083a2a2a375c6..e4e49e3b82c1e 100644
--- a/share/man/man9/config_intrhook.9
+++ b/share/man/man9/config_intrhook.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/config_intrhook.9,v 1.4 2006/12/14 14:33:13 mpp Exp $
 .\"
 .Dd September 24, 2006
 .Dt CONFIG_INTRHOOK 9
diff --git a/share/man/man9/contigmalloc.9 b/share/man/man9/contigmalloc.9
index f0797be612762..0a9da7c1d5b20 100644
--- a/share/man/man9/contigmalloc.9
+++ b/share/man/man9/contigmalloc.9
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/contigmalloc.9,v 1.7 2007/07/19 17:23:20 alc Exp $
 .\"
 .Dd July 19, 2007
 .Dt CONTIGMALLOC 9
diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9
index b6b975f828402..e2a4071d1dda8 100644
--- a/share/man/man9/copy.9
+++ b/share/man/man9/copy.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/copy.9,v 1.15 2004/06/16 08:33:57 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt COPY 9
diff --git a/share/man/man9/cr_cansee.9 b/share/man/man9/cr_cansee.9
index 53823c16371a4..efaebb3fbf6ba 100644
--- a/share/man/man9/cr_cansee.9
+++ b/share/man/man9/cr_cansee.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/cr_cansee.9,v 1.1 2006/11/19 13:35:03 ceri Exp $
 .\"
 .Dd November 19, 2006
 .Os
diff --git a/share/man/man9/cr_seeothergids.9 b/share/man/man9/cr_seeothergids.9
index 1f5f4ee05dbad..c6af67adf64e8 100644
--- a/share/man/man9/cr_seeothergids.9
+++ b/share/man/man9/cr_seeothergids.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/cr_seeothergids.9,v 1.3 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd November 11, 2003
 .Os
diff --git a/share/man/man9/cr_seeotheruids.9 b/share/man/man9/cr_seeotheruids.9
index e79363f225eb1..0aabbdf028447 100644
--- a/share/man/man9/cr_seeotheruids.9
+++ b/share/man/man9/cr_seeotheruids.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/cr_seeotheruids.9,v 1.3 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd November 11, 2003
 .Os
diff --git a/share/man/man9/critical_enter.9 b/share/man/man9/critical_enter.9
index a1d63fccd1bb0..8560f2ca10721 100644
--- a/share/man/man9/critical_enter.9
+++ b/share/man/man9/critical_enter.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/critical_enter.9,v 1.8 2005/10/05 19:48:21 jhb Exp $
 .\"
 .Dd October 5, 2005
 .Dt CRITICAL_ENTER 9
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index ed2a0cf9a9037..a31ff7b6331d1 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -15,7 +15,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/crypto.9,v 1.14 2007/09/19 16:28:46 brueffer Exp $
 .\"
 .Dd September 19, 2007
 .Dt CRYPTO 9
diff --git a/share/man/man9/devclass.9 b/share/man/man9/devclass.9
index d3e848e8d904e..16ce5fdb13bc7 100644
--- a/share/man/man9/devclass.9
+++ b/share/man/man9/devclass.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS 9
diff --git a/share/man/man9/devclass_add_driver.9 b/share/man/man9/devclass_add_driver.9
index 8ac632af7b96f..f0c1ead9f5bd9 100644
--- a/share/man/man9/devclass_add_driver.9
+++ b/share/man/man9/devclass_add_driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_add_driver.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_ADD_DRIVER 9
diff --git a/share/man/man9/devclass_find.9 b/share/man/man9/devclass_find.9
index 2a2c88d45e207..2155782e68269 100644
--- a/share/man/man9/devclass_find.9
+++ b/share/man/man9/devclass_find.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_find.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_FIND 9
diff --git a/share/man/man9/devclass_get_count.9 b/share/man/man9/devclass_get_count.9
index f645a49454f2e..6596e047715b7 100644
--- a/share/man/man9/devclass_get_count.9
+++ b/share/man/man9/devclass_get_count.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_count.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 5, 2004
 .Dt DEVCLASS_GET_COUNT 9
diff --git a/share/man/man9/devclass_get_device.9 b/share/man/man9/devclass_get_device.9
index 242785e1931a0..cae091f814c5f 100644
--- a/share/man/man9/devclass_get_device.9
+++ b/share/man/man9/devclass_get_device.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_device.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_DEVICE 9
diff --git a/share/man/man9/devclass_get_devices.9 b/share/man/man9/devclass_get_devices.9
index e6f8a15b69788..2f960aae06a9a 100644
--- a/share/man/man9/devclass_get_devices.9
+++ b/share/man/man9/devclass_get_devices.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_devices.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 19, 2005
 .Dt DEVCLASS_GET_DEVICES 9
diff --git a/share/man/man9/devclass_get_drivers.9 b/share/man/man9/devclass_get_drivers.9
index f2ba1481436c0..7ad4e47e5bdba 100644
--- a/share/man/man9/devclass_get_drivers.9
+++ b/share/man/man9/devclass_get_drivers.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_drivers.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd May 19, 2005
 .Dt DEVCLASS_GET_DRIVERS 9
diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9
index c1fa694cbf870..21dfa1efd0718 100644
--- a/share/man/man9/devclass_get_maxunit.9
+++ b/share/man/man9/devclass_get_maxunit.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_maxunit.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd April 3, 2005
 .Dt DEVCLASS_GET_MAXUNIT 9
diff --git a/share/man/man9/devclass_get_name.9 b/share/man/man9/devclass_get_name.9
index 5978dc16d9445..0b15ab6ee5423 100644
--- a/share/man/man9/devclass_get_name.9
+++ b/share/man/man9/devclass_get_name.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_name.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_NAME 9
diff --git a/share/man/man9/devclass_get_softc.9 b/share/man/man9/devclass_get_softc.9
index e4c55334fad45..35515fb7bd6d3 100644
--- a/share/man/man9/devclass_get_softc.9
+++ b/share/man/man9/devclass_get_softc.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devclass_get_softc.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_SOFTC 9
diff --git a/share/man/man9/device.9 b/share/man/man9/device.9
index 3cc3462c89772..c9b81c76e2751 100644
--- a/share/man/man9/device.9
+++ b/share/man/man9/device.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device.9,v 1.16 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE 9
diff --git a/share/man/man9/device_add_child.9 b/share/man/man9/device_add_child.9
index 7ddd19a1564bc..3e60a86f95eb4 100644
--- a/share/man/man9/device_add_child.9
+++ b/share/man/man9/device_add_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.25 2006/09/12 15:48:22 imp Exp $
 .\"
 .Dd September 12, 2006
 .Dt DEVICE_ADD_CHILD 9
diff --git a/share/man/man9/device_delete_child.9 b/share/man/man9/device_delete_child.9
index df56c599e9b92..ec023915fb730 100644
--- a/share/man/man9/device_delete_child.9
+++ b/share/man/man9/device_delete_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_delete_child.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_DELETE_CHILD 9
diff --git a/share/man/man9/device_enable.9 b/share/man/man9/device_enable.9
index 85b4f6ea5e6cb..0b278b71d9b79 100644
--- a/share/man/man9/device_enable.9
+++ b/share/man/man9/device_enable.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_enable.9,v 1.10 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ENABLE 9
diff --git a/share/man/man9/device_find_child.9 b/share/man/man9/device_find_child.9
index a23b2b2a145a4..d03d2710f9de8 100644
--- a/share/man/man9/device_find_child.9
+++ b/share/man/man9/device_find_child.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_find_child.9,v 1.10 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd February 8, 2005
 .Dt DEVICE_FIND_CHILD 9
diff --git a/share/man/man9/device_get_children.9 b/share/man/man9/device_get_children.9
index bad2fdd6d2d79..2c30ef0032d8c 100644
--- a/share/man/man9/device_get_children.9
+++ b/share/man/man9/device_get_children.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_children.9,v 1.5 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd December 1, 1999
 .Dt DEVICE_GET_CHILDREN 9
diff --git a/share/man/man9/device_get_devclass.9 b/share/man/man9/device_get_devclass.9
index fcf869565aebe..287bba33af086 100644
--- a/share/man/man9/device_get_devclass.9
+++ b/share/man/man9/device_get_devclass.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_devclass.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_DEVCLASS 9
diff --git a/share/man/man9/device_get_driver.9 b/share/man/man9/device_get_driver.9
index d764768b11f60..c0f6bcb96d53f 100644
--- a/share/man/man9/device_get_driver.9
+++ b/share/man/man9/device_get_driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_driver.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_DRIVER 9
diff --git a/share/man/man9/device_get_ivars.9 b/share/man/man9/device_get_ivars.9
index dd1450c32f933..a48e9b367fdcc 100644
--- a/share/man/man9/device_get_ivars.9
+++ b/share/man/man9/device_get_ivars.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_ivars.9,v 1.9 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_IVARS 9
diff --git a/share/man/man9/device_get_name.9 b/share/man/man9/device_get_name.9
index 3149f8c6c9cf2..b27ccf7ab6f2c 100644
--- a/share/man/man9/device_get_name.9
+++ b/share/man/man9/device_get_name.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_name.9,v 1.4 2003/11/06 15:54:32 des Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_GET_NAME 9
diff --git a/share/man/man9/device_get_parent.9 b/share/man/man9/device_get_parent.9
index 63669d33a16e8..be22a081d1620 100644
--- a/share/man/man9/device_get_parent.9
+++ b/share/man/man9/device_get_parent.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_parent.9,v 1.3 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_GET_PARENT 9
diff --git a/share/man/man9/device_get_softc.9 b/share/man/man9/device_get_softc.9
index 76f94d448affa..70fb17abe9828 100644
--- a/share/man/man9/device_get_softc.9
+++ b/share/man/man9/device_get_softc.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_softc.9,v 1.13 2005/11/18 10:52:24 ru Exp $
 .\"
 .Dd August 2, 2005
 .Dt DEVICE_GET_SOFTC 9
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index 384395a302885..cb419e7593c22 100644
--- a/share/man/man9/device_get_state.9
+++ b/share/man/man9/device_get_state.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_state.9,v 1.12 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_STATE 9
diff --git a/share/man/man9/device_get_sysctl.9 b/share/man/man9/device_get_sysctl.9
index 4dcc2abb87eee..7cfcc961e77f0 100644
--- a/share/man/man9/device_get_sysctl.9
+++ b/share/man/man9/device_get_sysctl.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_sysctl.9,v 1.2 2006/09/30 17:09:59 ru Exp $
 .\"
 .Dd May 23, 2006
 .Dt DEVICE_GET_SYSCTL 9
diff --git a/share/man/man9/device_get_unit.9 b/share/man/man9/device_get_unit.9
index 0b222e96dd6dc..31c467bf4b4dd 100644
--- a/share/man/man9/device_get_unit.9
+++ b/share/man/man9/device_get_unit.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_get_unit.9,v 1.7 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_UNIT 9
diff --git a/share/man/man9/device_ids.9 b/share/man/man9/device_ids.9
index fc7c9fd36c758..12484434383a5 100644
--- a/share/man/man9/device_ids.9
+++ b/share/man/man9/device_ids.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_ids.9,v 1.3 2004/06/22 20:18:15 le Exp $
 .\"
 .Dd June 22, 2004
 .Dt DEVICE_IDS 9
diff --git a/share/man/man9/device_printf.9 b/share/man/man9/device_printf.9
index 297cce731a153..f0262b130955c 100644
--- a/share/man/man9/device_printf.9
+++ b/share/man/man9/device_printf.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_printf.9,v 1.2 2003/05/30 21:13:32 ru Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_PRINTF 9
diff --git a/share/man/man9/device_probe_and_attach.9 b/share/man/man9/device_probe_and_attach.9
index 8f8c4af18d223..b02a5b4cb2918 100644
--- a/share/man/man9/device_probe_and_attach.9
+++ b/share/man/man9/device_probe_and_attach.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_probe_and_attach.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_PROBE_AND_ATTACH 9
diff --git a/share/man/man9/device_quiet.9 b/share/man/man9/device_quiet.9
index 0e5526d689aab..bd163ab3443bf 100644
--- a/share/man/man9/device_quiet.9
+++ b/share/man/man9/device_quiet.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_quiet.9,v 1.11 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 21, 1999
 .Dt DEVICE_QUIET 9
diff --git a/share/man/man9/device_set_desc.9 b/share/man/man9/device_set_desc.9
index ae29010450b16..1645898a905d5 100644
--- a/share/man/man9/device_set_desc.9
+++ b/share/man/man9/device_set_desc.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_set_desc.9,v 1.11 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_SET_DESC 9
diff --git a/share/man/man9/device_set_driver.9 b/share/man/man9/device_set_driver.9
index 7f8ceb21e2ae2..58728e294cedb 100644
--- a/share/man/man9/device_set_driver.9
+++ b/share/man/man9/device_set_driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_set_driver.9,v 1.4 2007/02/09 21:12:21 brueffer Exp $
 .\"
 .Dd April 21, 2003
 .Dt DEVICE_SET_DRIVER 9
diff --git a/share/man/man9/device_set_flags.9 b/share/man/man9/device_set_flags.9
index aed306950e169..0bffd80dc244e 100644
--- a/share/man/man9/device_set_flags.9
+++ b/share/man/man9/device_set_flags.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/device_set_flags.9,v 1.8 2003/10/23 06:19:45 hmp Exp $
 .\"
 .Dd September 6, 1999
 .Dt DEVICE_GET_FLAGS 9
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 45e17b7bb0a59..8796c0da55a1a 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devstat.9,v 1.22 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
diff --git a/share/man/man9/devtoname.9 b/share/man/man9/devtoname.9
index 9a62a5ededb6b..cf38aacb95504 100644
--- a/share/man/man9/devtoname.9
+++ b/share/man/man9/devtoname.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/devtoname.9,v 1.8 2003/10/23 01:54:06 hmp Exp $
 .\"
 .Dd September 25, 1999
 .Os
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9
index a25134fc0b9c2..81c6f7d6a0c76 100644
--- a/share/man/man9/disk.9
+++ b/share/man/man9/disk.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/disk.9,v 1.10 2007/05/05 17:12:15 pjd Exp $
 .\"
 .Dd February 18, 2004
 .Dt DISK 9
diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9
index 4b7b83e4b9c15..69b938aa20d29 100644
--- a/share/man/man9/domain.9
+++ b/share/man/man9/domain.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/domain.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 7, 2001
 .Dt DOMAIN 9
diff --git a/share/man/man9/driver.9 b/share/man/man9/driver.9
index 0030915fc6238..a1cfbb2e5b4a4 100644
--- a/share/man/man9/driver.9
+++ b/share/man/man9/driver.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/driver.9,v 1.12 2005/08/08 12:16:53 brian Exp $
 .\"
 .Dd June 16, 1998
 .Dt DRIVER 9
diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9
index 9c74a60bf9bc6..07c93883ebb14 100644
--- a/share/man/man9/extattr.9
+++ b/share/man/man9/extattr.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/extattr.9,v 1.17 2007/03/06 08:13:21 mckusick Exp $
 .\"
 .Dd December 23, 1999
 .Os
diff --git a/share/man/man9/fetch.9 b/share/man/man9/fetch.9
index 7de3ff7fbb992..eec328c5f8e75 100644
--- a/share/man/man9/fetch.9
+++ b/share/man/man9/fetch.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/fetch.9,v 1.10 2001/10/01 16:09:24 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt FETCH 9
diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9
index 3dc33f84f36fa..cbeeef07f31be 100644
--- a/share/man/man9/firmware.9
+++ b/share/man/man9/firmware.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/firmware.9,v 1.6 2007/02/15 17:52:17 luigi Exp $
 .\"
 .Dd January 6, 2006
 .Os
diff --git a/share/man/man9/g_access.9 b/share/man/man9/g_access.9
index 95ad1da91a32e..ef660aa9f19ff 100644
--- a/share/man/man9/g_access.9
+++ b/share/man/man9/g_access.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_access.9,v 1.9 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_ACCESS 9
diff --git a/share/man/man9/g_attach.9 b/share/man/man9/g_attach.9
index 4bf7d9c514934..c138d55d55f5e 100644
--- a/share/man/man9/g_attach.9
+++ b/share/man/man9/g_attach.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_attach.9,v 1.9 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_ATTACH 9
diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9
index e7351b8054e45..a37ed0dacea2e 100644
--- a/share/man/man9/g_bio.9
+++ b/share/man/man9/g_bio.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_bio.9,v 1.13 2007/05/06 12:48:39 wkoszek Exp $
 .\"
 .Dd November 1, 2006
 .Dt G_BIO 9
diff --git a/share/man/man9/g_consumer.9 b/share/man/man9/g_consumer.9
index e30fb80280b55..cb5255d8f91b5 100644
--- a/share/man/man9/g_consumer.9
+++ b/share/man/man9/g_consumer.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_consumer.9,v 1.8 2006/03/17 13:13:18 des Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_CONSUMER 9
diff --git a/share/man/man9/g_data.9 b/share/man/man9/g_data.9
index f5cd6961a04a9..e5fe8cb865c20 100644
--- a/share/man/man9/g_data.9
+++ b/share/man/man9/g_data.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_data.9,v 1.8 2005/02/16 22:24:15 pjd Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_DATA 9
diff --git a/share/man/man9/g_event.9 b/share/man/man9/g_event.9
index 380caa82a0b87..438745fe43503 100644
--- a/share/man/man9/g_event.9
+++ b/share/man/man9/g_event.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_event.9,v 1.7 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_EVENT 9
diff --git a/share/man/man9/g_geom.9 b/share/man/man9/g_geom.9
index 19c4910980182..f5f84446effe6 100644
--- a/share/man/man9/g_geom.9
+++ b/share/man/man9/g_geom.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_geom.9,v 1.7 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_GEOM 9
diff --git a/share/man/man9/g_provider.9 b/share/man/man9/g_provider.9
index 05e4addabf368..8bf8f0eda1468 100644
--- a/share/man/man9/g_provider.9
+++ b/share/man/man9/g_provider.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_provider.9,v 1.8 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_PROVIDER 9
diff --git a/share/man/man9/g_provider_by_name.9 b/share/man/man9/g_provider_by_name.9
index 58da421a243d5..b57a03e6472fa 100644
--- a/share/man/man9/g_provider_by_name.9
+++ b/share/man/man9/g_provider_by_name.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_provider_by_name.9,v 1.5 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_PROVIDER_BY_NAME 9
diff --git a/share/man/man9/g_wither_geom.9 b/share/man/man9/g_wither_geom.9
index 2c4b10eeaa348..915dca70dcba7 100644
--- a/share/man/man9/g_wither_geom.9
+++ b/share/man/man9/g_wither_geom.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/g_wither_geom.9,v 1.5 2004/07/06 08:21:12 ru Exp $
 .\"
 .Dd January 16, 2004
 .Dt G_WITHER_GEOM 9
diff --git a/share/man/man9/get_cyclecount.9 b/share/man/man9/get_cyclecount.9
index c673111731351..595c1d6a7f88f 100644
--- a/share/man/man9/get_cyclecount.9
+++ b/share/man/man9/get_cyclecount.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/get_cyclecount.9,v 1.10 2004/11/16 21:22:09 jhb Exp $
 .\"
 .Dd November 20, 2000
 .Dt GET_CYCLECOUNT 9
diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9
index 2e81212630fd3..1b0f6949fbcfc 100644
--- a/share/man/man9/getnewvnode.9
+++ b/share/man/man9/getnewvnode.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/getnewvnode.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt GETNEWVNODE 9
diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9
index 0d3629a1ad450..1da7c58a95293 100644
--- a/share/man/man9/groupmember.9
+++ b/share/man/man9/groupmember.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/groupmember.9,v 1.2 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt GROUPMEMBER 9
diff --git a/share/man/man9/hash.9 b/share/man/man9/hash.9
index d977ac30bef36..1a7da55c9779f 100644
--- a/share/man/man9/hash.9
+++ b/share/man/man9/hash.9
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"     $OpenBSD: hash.9,v 1.5 2003/04/17 05:08:39 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/hash.9,v 1.4 2007/04/09 22:55:14 thompsa Exp $
 .\"
 .Dd April 3, 2007
 .Dt HASH 9
diff --git a/share/man/man9/hashinit.9 b/share/man/man9/hashinit.9
index d186dcfe18e29..46cf452a9939d 100644
--- a/share/man/man9/hashinit.9
+++ b/share/man/man9/hashinit.9
@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/hashinit.9,v 1.4 2007/01/27 23:06:00 ru Exp $
 .\"
 .Dd October 10, 2004
 .Dt HASHINIT 9
diff --git a/share/man/man9/hexdump.9 b/share/man/man9/hexdump.9
index 656299cd5611c..a289ac9755964 100644
--- a/share/man/man9/hexdump.9
+++ b/share/man/man9/hexdump.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/hexdump.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 7, 2003
 .Os
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index 827daece94d57..387d0e8008778 100644
--- a/share/man/man9/ieee80211.9
+++ b/share/man/man9/ieee80211.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_crypto.9 b/share/man/man9/ieee80211_crypto.9
index bf4bb60491784..03b0b9445e536 100644
--- a/share/man/man9/ieee80211_crypto.9
+++ b/share/man/man9/ieee80211_crypto.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_crypto.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_crypto.9,v 1.3 2004/03/04 10:42:56 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_input.9 b/share/man/man9/ieee80211_input.9
index 21c9f253c2efb..7bc6d1b54b641 100644
--- a/share/man/man9/ieee80211_input.9
+++ b/share/man/man9/ieee80211_input.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_input.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_input.9,v 1.6 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_ioctl.9 b/share/man/man9/ieee80211_ioctl.9
index 7f94bceba5314..12e2ea2df345e 100644
--- a/share/man/man9/ieee80211_ioctl.9
+++ b/share/man/man9/ieee80211_ioctl.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_ioctl.9,v 1.5 2007/07/01 10:25:06 thompsa Exp $
 .\" $Id: ieee80211_ioctl.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9
index c9d142a31a3cc..3c3180010f0b6 100644
--- a/share/man/man9/ieee80211_node.9
+++ b/share/man/man9/ieee80211_node.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_node.9,v 1.6 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd July 4, 2004
diff --git a/share/man/man9/ieee80211_output.9 b/share/man/man9/ieee80211_output.9
index f553c4f3783b3..2a7a6b2b62c5c 100644
--- a/share/man/man9/ieee80211_output.9
+++ b/share/man/man9/ieee80211_output.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_output.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_output.9,v 1.5 2004/03/04 12:31:18 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_proto.9 b/share/man/man9/ieee80211_proto.9
index 0de486451d396..1f9d8c71ba093 100644
--- a/share/man/man9/ieee80211_proto.9
+++ b/share/man/man9/ieee80211_proto.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_proto.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\" $Id: ieee80211_proto.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9
index 3749826a9352d..7ce247f061d9e 100644
--- a/share/man/man9/ieee80211_radiotap.9
+++ b/share/man/man9/ieee80211_radiotap.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.3 2004/07/07 12:59:39 ru Exp $
 .\" $Id: ieee80211_radiotap.9,v 1.3 2004/03/04 11:38:52 bruce Exp $
 .\"
 .Dd March 2, 2004
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 56b85b80f500a..f1930b7579984 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.53 2007/03/14 13:19:50 bms Exp $
 .\"
 .Dd March 14, 2007
 .Os
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 61524f2062966..56a8ae6264888 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/inittodr.9,v 1.11 2003/10/23 02:33:03 hmp Exp $
 .\"
 .Dd March 22, 1997
 .Dt INITTODR 9
diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index 0e0fe8188d7ae..87ef63aaefc85 100644
--- a/share/man/man9/intro.9
+++ b/share/man/man9/intro.9
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/intro.9,v 1.16 2005/02/13 22:25:19 ru Exp $
 .\"
 .Dd December 13, 1995
 .Dt INTRO 9
diff --git a/share/man/man9/ithread.9 b/share/man/man9/ithread.9
index 498c51abf8461..89a40887d43bb 100644
--- a/share/man/man9/ithread.9
+++ b/share/man/man9/ithread.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ithread.9,v 1.12 2006/08/25 19:04:42 pav Exp $
 .\"
 .Dd August 25, 2006
 .Dt ITHREAD 9
diff --git a/share/man/man9/kernacc.9 b/share/man/man9/kernacc.9
index 8a28b080c2385..00b06e020f7e4 100644
--- a/share/man/man9/kernacc.9
+++ b/share/man/man9/kernacc.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kernacc.9,v 1.13 2003/01/21 11:34:57 alfred Exp $
 .\"
 .Dd June 16, 1996
 .Dt KERNACC 9
diff --git a/share/man/man9/kernel_mount.9 b/share/man/man9/kernel_mount.9
index f34e759016ad7..d276a30c933fd 100644
--- a/share/man/man9/kernel_mount.9
+++ b/share/man/man9/kernel_mount.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kernel_mount.9,v 1.2 2004/12/14 18:07:46 trhodes Exp $
 .\"
 .Dd December 13, 2004
 .Dt KERNEL_MOUNT 9
diff --git a/share/man/man9/kobj.9 b/share/man/man9/kobj.9
index aed1244247dc8..5c7e29db443cf 100644
--- a/share/man/man9/kobj.9
+++ b/share/man/man9/kobj.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kobj.9,v 1.17 2006/10/28 10:57:35 maxim Exp $
 .\"
 .Dd April 4, 2000
 .Dt KOBJ 9
diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9
index c6570886e91e8..c52783b2c85c1 100644
--- a/share/man/man9/kqueue.9
+++ b/share/man/man9/kqueue.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kqueue.9,v 1.6 2006/12/29 22:30:10 jmg Exp $
 .\"
 .Dd December 28, 2006
 .Dt KQUEUE 9
diff --git a/share/man/man9/kthread.9 b/share/man/man9/kthread.9
index 0dd77053f401c..33c5ed8717387 100644
--- a/share/man/man9/kthread.9
+++ b/share/man/man9/kthread.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/kthread.9,v 1.14 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd September 24, 2004
 .Dt KTHREAD 9
diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9
index ca7d336382413..a99501abd7447 100644
--- a/share/man/man9/ktr.9
+++ b/share/man/man9/ktr.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ktr.9,v 1.13 2006/10/16 07:59:05 danger Exp $
 .\"
 .Dd December 27, 2005
 .Dt KTR 9
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index 5968745caddf1..4b33ba08fe165 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.17 2007/06/21 16:39:25 brueffer Exp $
 .\"
 .Dd June 20, 2006
 .Dt LOCK 9
diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9
index 2328b1b96dbbe..e80d4ab9f517f 100644
--- a/share/man/man9/locking.9
+++ b/share/man/man9/locking.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/locking.9,v 1.11 2007/08/09 21:09:56 julian Exp $
 .\"
 .Dd March 14, 2007
 .Dt LOCKING 9
diff --git a/share/man/man9/mac.9 b/share/man/man9/mac.9
index 395f7a089ff7d..78fd6713be5ef 100644
--- a/share/man/man9/mac.9
+++ b/share/man/man9/mac.9
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mac.9,v 1.17 2006/07/11 16:26:40 joel Exp $
 .\"
 .Dd July 10, 2006
 .Dt MAC 9
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index 7680052417e88..0917776372fd0 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.23 2007/05/09 05:05:50 brueffer Exp $
 .\"
 .Dd May 6, 2007
 .Os
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 430845266fc8f..f097d28b99546 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -34,7 +34,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.42 2005/02/22 17:20:20 brueffer Exp $
 .\"
 .Dd June 12, 2003
 .Dt MALLOC 9
diff --git a/share/man/man9/mbchain.9 b/share/man/man9/mbchain.9
index 7eb27462f80e0..4823f3a17222c 100644
--- a/share/man/man9/mbchain.9
+++ b/share/man/man9/mbchain.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbchain.9,v 1.6 2005/01/28 10:48:52 ru Exp $
 .\"
 .Dd February 20, 2001
 .Dt MBCHAIN 9
diff --git a/share/man/man9/mbpool.9 b/share/man/man9/mbpool.9
index b042973ac84d5..0d74be6239aef 100644
--- a/share/man/man9/mbpool.9
+++ b/share/man/man9/mbpool.9
@@ -25,7 +25,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbpool.9,v 1.5 2004/07/07 07:56:58 ru Exp $
 .\"
 .Dd July 15, 2003
 .Dt MBPOOL 9
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 4ea3a72701da6..5a04a94f1a535 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.65 2007/02/26 15:17:19 bms Exp $
 .\"
 .Dd February 26, 2007
 .Dt MBUF 9
diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9
index 7ce192c4fdd1c..e83fd4b27e499 100644
--- a/share/man/man9/mbuf_tags.9
+++ b/share/man/man9/mbuf_tags.9
@@ -18,7 +18,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mbuf_tags.9,v 1.7 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 18, 2004
 .Dt MBUF_TAGS 9
diff --git a/share/man/man9/mdchain.9 b/share/man/man9/mdchain.9
index 57291c70f6ed6..015cd533a791e 100644
--- a/share/man/man9/mdchain.9
+++ b/share/man/man9/mdchain.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mdchain.9,v 1.8 2005/01/28 10:48:52 ru Exp $
 .\"
 .Dd February 28, 2001
 .Dt MDCHAIN 9
diff --git a/share/man/man9/memguard.9 b/share/man/man9/memguard.9
index 72a41e59e5be4..36d00a9744486 100644
--- a/share/man/man9/memguard.9
+++ b/share/man/man9/memguard.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/memguard.9,v 1.5 2006/09/18 15:24:20 ru Exp $
 .\"
 .Dd January 31, 2006
 .Dt MEMGUARD 9
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index fe97bc5ed9219..05e9188407aa5 100644
--- a/share/man/man9/mi_switch.9
+++ b/share/man/man9/mi_switch.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mi_switch.9,v 1.20 2007/03/09 22:41:01 jhb Exp $
 .\"
 .Dd November 24, 1996
 .Dt MI_SWITCH 9
diff --git a/share/man/man9/microseq.9 b/share/man/man9/microseq.9
index 041e2be28fe95..9e30097bd9e6d 100644
--- a/share/man/man9/microseq.9
+++ b/share/man/man9/microseq.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/microseq.9,v 1.19 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd June 6, 1998
 .Dt MICROSEQ 9
diff --git a/share/man/man9/microtime.9 b/share/man/man9/microtime.9
index 3288578e17362..54195ed1550f0 100644
--- a/share/man/man9/microtime.9
+++ b/share/man/man9/microtime.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/microtime.9,v 1.11 2005/10/13 16:01:28 jhb Exp $
 .\"
 .Dd September 16, 2004
 .Dt MICROTIME 9
diff --git a/share/man/man9/microuptime.9 b/share/man/man9/microuptime.9
index 8f9985f72aa97..6974a84d3e8aa 100644
--- a/share/man/man9/microuptime.9
+++ b/share/man/man9/microuptime.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/microuptime.9,v 1.7 2005/01/12 21:48:25 ru Exp $
 .\"
 .Dd September 16, 2004
 .Dt MICROUPTIME 9
diff --git a/share/man/man9/module.9 b/share/man/man9/module.9
index 055dab94d7230..2662ee6220ee5 100644
--- a/share/man/man9/module.9
+++ b/share/man/man9/module.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/module.9,v 1.11 2007/07/19 11:22:34 flz Exp $
 .\"
 .Dd July 19, 2007
 .Dt MODULE 9
diff --git a/share/man/man9/mtx_pool.9 b/share/man/man9/mtx_pool.9
index e289f3c18363c..9b29ab77cad4e 100644
--- a/share/man/man9/mtx_pool.9
+++ b/share/man/man9/mtx_pool.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mtx_pool.9,v 1.8 2007/03/30 18:07:26 julian Exp $
 .\"
 .Dd March 25, 2002
 .Dt MTX_POOL 9
diff --git a/share/man/man9/mutex.9 b/share/man/man9/mutex.9
index b27f7f9463c45..398036318c008 100644
--- a/share/man/man9/mutex.9
+++ b/share/man/man9/mutex.9
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from BSDI $Id: mutex.4,v 1.1.2.3 1998/04/27 22:53:13 ewv Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/mutex.9,v 1.55 2007/03/30 18:07:26 julian Exp $
 .\"
 .Dd December 21, 2006
 .Dt MUTEX 9
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index 19516651949f5..92f5bbad63156 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -31,7 +31,7 @@
 .\" If you integrate this manpage in another OS, I'd appreciate a note
 .\"	- eivind@FreeBSD.org
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/namei.9,v 1.29 2005/12/13 17:07:52 ru Exp $
 .\"
 .Dd September 21, 2005
 .Os
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index 2127fbc4a2866..a93c852eeb20c 100644
--- a/share/man/man9/p_candebug.9
+++ b/share/man/man9/p_candebug.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/p_candebug.9,v 1.5 2006/11/19 13:36:04 ceri Exp $
 .\"
 .Dd November 19, 2006
 .Os
diff --git a/share/man/man9/p_cansee.9 b/share/man/man9/p_cansee.9
index 92ffeeaaa786e..a166e6a4baa10 100644
--- a/share/man/man9/p_cansee.9
+++ b/share/man/man9/p_cansee.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/p_cansee.9,v 1.1 2006/11/19 13:35:03 ceri Exp $
 .\"
 .Dd November 19, 2006
 .Os
diff --git a/share/man/man9/panic.9 b/share/man/man9/panic.9
index 44439dd913b0d..9668444c6d714 100644
--- a/share/man/man9/panic.9
+++ b/share/man/man9/panic.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/panic.9,v 1.9 2003/10/17 06:25:37 bde Exp $
 .\"
 .Dd August 11, 1995
 .Dt PANIC 9
diff --git a/share/man/man9/pbuf.9 b/share/man/man9/pbuf.9
index 4329ac9c84fe1..4ff281ec80a5e 100644
--- a/share/man/man9/pbuf.9
+++ b/share/man/man9/pbuf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pbuf.9,v 1.3 2003/09/10 19:24:35 ru Exp $
 .\"
 .Dd July 9, 2001
 .Dt PBUF 9
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index 21dfbbedca403..e2288b0ec41f6 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
 .\"
 .Dd September 30, 2007
 .Dt PCI 9
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index e0df8c96d58dd..3472c45cbe778 100644
--- a/share/man/man9/pfil.9
+++ b/share/man/man9/pfil.9
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pfil.9,v 1.22 2006/09/18 15:24:20 ru Exp $
 .\"
 .Dd September 29, 2004
 .Dt PFIL 9
diff --git a/share/man/man9/pfind.9 b/share/man/man9/pfind.9
index 58adab3fad329..6a3d05a13ee10 100644
--- a/share/man/man9/pfind.9
+++ b/share/man/man9/pfind.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pfind.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 11, 2001
 .Os
diff --git a/share/man/man9/pgfind.9 b/share/man/man9/pgfind.9
index 96abd0ae52141..8d079f7202723 100644
--- a/share/man/man9/pgfind.9
+++ b/share/man/man9/pgfind.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pgfind.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 8, 2001
 .Os
diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9
index c4f24a880905f..2110be0d6eed3 100644
--- a/share/man/man9/physio.9
+++ b/share/man/man9/physio.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/physio.9,v 1.17 2005/01/12 21:48:25 ru Exp $
 .\"
 .Dd July 8, 2004
 .Dt PHYSIO 9
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index 05445a2050270..921357a251e61 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap.9,v 1.10 2005/06/15 00:21:02 hmp Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP 9
diff --git a/share/man/man9/pmap_activate.9 b/share/man/man9/pmap_activate.9
index 840d8a19c270b..78d900b959333 100644
--- a/share/man/man9/pmap_activate.9
+++ b/share/man/man9/pmap_activate.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_activate.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ACTIVATE 9
diff --git a/share/man/man9/pmap_addr_hint.9 b/share/man/man9/pmap_addr_hint.9
index 5313b2660c7dd..b84b8158a7038 100644
--- a/share/man/man9/pmap_addr_hint.9
+++ b/share/man/man9/pmap_addr_hint.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_addr_hint.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ADDR_HINT 9
diff --git a/share/man/man9/pmap_change_wiring.9 b/share/man/man9/pmap_change_wiring.9
index f3952f89b6cfe..c97b645b42d3c 100644
--- a/share/man/man9/pmap_change_wiring.9
+++ b/share/man/man9/pmap_change_wiring.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_change_wiring.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_CHANGE_WIRING 9
diff --git a/share/man/man9/pmap_clear_modify.9 b/share/man/man9/pmap_clear_modify.9
index 002300b5625eb..3a099984bb2e7 100644
--- a/share/man/man9/pmap_clear_modify.9
+++ b/share/man/man9/pmap_clear_modify.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_clear_modify.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_CLEAR_MODIFY 9
diff --git a/share/man/man9/pmap_copy.9 b/share/man/man9/pmap_copy.9
index 1541fa5e09b1a..0456caa3f997b 100644
--- a/share/man/man9/pmap_copy.9
+++ b/share/man/man9/pmap_copy.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_copy.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_COPY 9
diff --git a/share/man/man9/pmap_enter.9 b/share/man/man9/pmap_enter.9
index 2e524532b1176..a5ab26e49348c 100644
--- a/share/man/man9/pmap_enter.9
+++ b/share/man/man9/pmap_enter.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_enter.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ENTER 9
diff --git a/share/man/man9/pmap_extract.9 b/share/man/man9/pmap_extract.9
index 0622b65ccd31f..89d5ca408d4c2 100644
--- a/share/man/man9/pmap_extract.9
+++ b/share/man/man9/pmap_extract.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_extract.9,v 1.4 2007/01/28 16:23:55 rwatson Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_EXTRACT 9
diff --git a/share/man/man9/pmap_growkernel.9 b/share/man/man9/pmap_growkernel.9
index f038fb53d93be..33c025df3c00c 100644
--- a/share/man/man9/pmap_growkernel.9
+++ b/share/man/man9/pmap_growkernel.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_growkernel.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_GROWKERNEL 9
diff --git a/share/man/man9/pmap_init.9 b/share/man/man9/pmap_init.9
index 1a8d74c94a032..842e8fb65927d 100644
--- a/share/man/man9/pmap_init.9
+++ b/share/man/man9/pmap_init.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_init.9,v 1.3 2005/06/10 17:19:27 hmp Exp $
 .\"
 .Dd June 10, 2005
 .Dt PMAP_INIT 9
diff --git a/share/man/man9/pmap_is_modified.9 b/share/man/man9/pmap_is_modified.9
index 591a985394008..3c19437e2b173 100644
--- a/share/man/man9/pmap_is_modified.9
+++ b/share/man/man9/pmap_is_modified.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_is_modified.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_IS_MODIFIED 9
diff --git a/share/man/man9/pmap_is_prefaultable.9 b/share/man/man9/pmap_is_prefaultable.9
index c6f28709b6665..3e84d470e5d72 100644
--- a/share/man/man9/pmap_is_prefaultable.9
+++ b/share/man/man9/pmap_is_prefaultable.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_is_prefaultable.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_IS_PREFAULTABLE 9
diff --git a/share/man/man9/pmap_map.9 b/share/man/man9/pmap_map.9
index 2c472fe97b497..b4eafb19da725 100644
--- a/share/man/man9/pmap_map.9
+++ b/share/man/man9/pmap_map.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_map.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_MAP 9
diff --git a/share/man/man9/pmap_mincore.9 b/share/man/man9/pmap_mincore.9
index d0e45ea5db3aa..5b8018d6ead82 100644
--- a/share/man/man9/pmap_mincore.9
+++ b/share/man/man9/pmap_mincore.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_mincore.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_MINCORE 9
diff --git a/share/man/man9/pmap_object_init_pt.9 b/share/man/man9/pmap_object_init_pt.9
index 90ae75f44621d..83d63c82003ff 100644
--- a/share/man/man9/pmap_object_init_pt.9
+++ b/share/man/man9/pmap_object_init_pt.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_object_init_pt.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_OBJECT_INIT_PT 9
diff --git a/share/man/man9/pmap_page_exists_quick.9 b/share/man/man9/pmap_page_exists_quick.9
index 8db2580144051..1b43ed42cf4ae 100644
--- a/share/man/man9/pmap_page_exists_quick.9
+++ b/share/man/man9/pmap_page_exists_quick.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_page_exists_quick.9,v 1.3 2005/01/21 08:36:40 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PAGE_EXISTS_QUICK 9
diff --git a/share/man/man9/pmap_page_init.9 b/share/man/man9/pmap_page_init.9
index 65f72ec850e5d..dd98dac8fac24 100644
--- a/share/man/man9/pmap_page_init.9
+++ b/share/man/man9/pmap_page_init.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_page_init.9,v 1.1 2005/06/10 17:16:16 hmp Exp $
 .\"
 .Dd June 10, 2005
 .Dt PMAP_PAGE_INIT 9
diff --git a/share/man/man9/pmap_page_protect.9 b/share/man/man9/pmap_page_protect.9
index f77d57def77e1..832466af1531a 100644
--- a/share/man/man9/pmap_page_protect.9
+++ b/share/man/man9/pmap_page_protect.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_page_protect.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PROTECT 9
diff --git a/share/man/man9/pmap_pinit.9 b/share/man/man9/pmap_pinit.9
index d52172934c3ac..fa332905e1dfa 100644
--- a/share/man/man9/pmap_pinit.9
+++ b/share/man/man9/pmap_pinit.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_pinit.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_PINIT 9
diff --git a/share/man/man9/pmap_qenter.9 b/share/man/man9/pmap_qenter.9
index b148b69f694a1..8d08a17624aa6 100644
--- a/share/man/man9/pmap_qenter.9
+++ b/share/man/man9/pmap_qenter.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_qenter.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_QENTER 9
diff --git a/share/man/man9/pmap_release.9 b/share/man/man9/pmap_release.9
index ef2964161802d..52fc73ec9bd53 100644
--- a/share/man/man9/pmap_release.9
+++ b/share/man/man9/pmap_release.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_release.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_RELEASE 9
diff --git a/share/man/man9/pmap_remove.9 b/share/man/man9/pmap_remove.9
index 12664dce74a1c..710ff001008a8 100644
--- a/share/man/man9/pmap_remove.9
+++ b/share/man/man9/pmap_remove.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_remove.9,v 1.3 2006/04/03 21:17:36 peter Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_REMOVE 9
diff --git a/share/man/man9/pmap_resident_count.9 b/share/man/man9/pmap_resident_count.9
index bf39548cea095..9569eae79a9e9 100644
--- a/share/man/man9/pmap_resident_count.9
+++ b/share/man/man9/pmap_resident_count.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_resident_count.9,v 1.2 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_RESIDENT_COUNT 9
diff --git a/share/man/man9/pmap_zero_page.9 b/share/man/man9/pmap_zero_page.9
index 541eef06104bd..9287966744348 100644
--- a/share/man/man9/pmap_zero_page.9
+++ b/share/man/man9/pmap_zero_page.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pmap_zero_page.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt PMAP_ZERO 9
diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9
index 571e7e638c368..7267ef0cd03a7 100644
--- a/share/man/man9/printf.9
+++ b/share/man/man9/printf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/printf.9,v 1.8 2006/09/08 14:05:03 ru Exp $
 .\"
 .Dd September 8, 2006
 .Dt PRINTF 9
diff --git a/share/man/man9/prison_check.9 b/share/man/man9/prison_check.9
index a8ba040131aa8..eb40b2a2f0ed2 100644
--- a/share/man/man9/prison_check.9
+++ b/share/man/man9/prison_check.9
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/prison_check.9,v 1.2 2004/07/06 07:26:23 ru Exp $
 .\"
 .Dd December 11, 2003
 .Os
diff --git a/share/man/man9/priv.9 b/share/man/man9/priv.9
index 2756da912ce77..16a65b089d9e6 100644
--- a/share/man/man9/priv.9
+++ b/share/man/man9/priv.9
@@ -26,7 +26,7 @@
 .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/priv.9,v 1.6 2007/06/26 23:12:05 rwatson Exp $
 .\"
 .Dd August 30, 2006
 .Dt PRIV 9
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index ea7f27762e0ef..b8b963f278dc2 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.6 2007/04/20 15:38:06 brueffer Exp $
 .\"
 .Dd April 20, 2007
 .Dt PSEUDOFS 9
diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9
index 16575f143d9f3..df42e461afde0 100644
--- a/share/man/man9/psignal.9
+++ b/share/man/man9/psignal.9
@@ -33,7 +33,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$NetBSD: psignal.9,v 1.1 1996/06/22 22:57:35 pk Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/psignal.9,v 1.10 2004/11/18 02:06:17 jkoshy Exp $
 .\"
 .Dd June 22, 1996
 .Dt PSIGNAL 9
diff --git a/share/man/man9/random.9 b/share/man/man9/random.9
index 426774e9083f6..f65097539d292 100644
--- a/share/man/man9/random.9
+++ b/share/man/man9/random.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/random.9,v 1.10 2004/07/03 18:29:24 ru Exp $
 .\" "
 .Dd September 25, 2000
 .Os
diff --git a/share/man/man9/random_harvest.9 b/share/man/man9/random_harvest.9
index 7b72f3e996daf..37ff8aff3b2e5 100644
--- a/share/man/man9/random_harvest.9
+++ b/share/man/man9/random_harvest.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/random_harvest.9,v 1.3 2002/04/12 05:22:24 davidc Exp $
 .\"
 .Dd February 6, 2002
 .Dt RANDOM_HARVEST 9
diff --git a/share/man/man9/redzone.9 b/share/man/man9/redzone.9
index ef3cb53ca5407..8db977dd97e66 100644
--- a/share/man/man9/redzone.9
+++ b/share/man/man9/redzone.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/redzone.9,v 1.1 2006/01/31 11:09:20 pjd Exp $
 .\"
 .Dd January 31, 2006
 .Dt REDZONE 9
diff --git a/share/man/man9/resettodr.9 b/share/man/man9/resettodr.9
index 9818c8fd435b4..4f62e31ccecdc 100644
--- a/share/man/man9/resettodr.9
+++ b/share/man/man9/resettodr.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/resettodr.9,v 1.7 2003/10/23 02:33:03 hmp Exp $
 .\"
 .Dd November 13, 1995
 .Dt RESETTODR 9
diff --git a/share/man/man9/resource_int_value.9 b/share/man/man9/resource_int_value.9
index e82853513c199..09a4043a0ae29 100644
--- a/share/man/man9/resource_int_value.9
+++ b/share/man/man9/resource_int_value.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/resource_int_value.9,v 1.7 2001/12/26 23:14:04 davidc Exp $
 .\"
 .Dd March 1, 2001
 .Dt RESOURCE_INT_VALUE 9
diff --git a/share/man/man9/rijndael.9 b/share/man/man9/rijndael.9
index 5ee423971de13..484cfff18ea57 100644
--- a/share/man/man9/rijndael.9
+++ b/share/man/man9/rijndael.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rijndael.9,v 1.5 2003/10/22 10:00:09 hmp Exp $
 .\" "
 .Dd February 6, 2002
 .Os
diff --git a/share/man/man9/rman.9 b/share/man/man9/rman.9
index 43c32280cce4c..ecaf35cba13e7 100644
--- a/share/man/man9/rman.9
+++ b/share/man/man9/rman.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rman.9,v 1.9 2007/04/29 19:46:33 jmg Exp $
 .\"
 .Dd April 29, 2007
 .Dt RMAN 9
diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9
index 4e7f8181d29be..f2fbc137bd64d 100644
--- a/share/man/man9/rtalloc.9
+++ b/share/man/man9/rtalloc.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.19 2004/10/11 20:48:36 glebius Exp $
 .Dd October 11, 2004
 .Os
 .Dt RTALLOC 9
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index a1c48a6860529..541cda96e013b 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rtentry.9,v 1.25 2007/08/05 07:38:09 maxim Exp $
 .\"
 .Dd October 7, 2004
 .Os
diff --git a/share/man/man9/runqueue.9 b/share/man/man9/runqueue.9
index 09b46d4a10b99..45ed423dd84a2 100644
--- a/share/man/man9/runqueue.9
+++ b/share/man/man9/runqueue.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/runqueue.9,v 1.6 2004/07/07 07:56:36 ru Exp $
 .\"
 .Dd November 3, 2000
 .Dt RUNQUEUE 9
diff --git a/share/man/man9/rwlock.9 b/share/man/man9/rwlock.9
index 51082debf4119..5abd9714c49bf 100644
--- a/share/man/man9/rwlock.9
+++ b/share/man/man9/rwlock.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/rwlock.9,v 1.10.2.1 2007/11/27 14:08:14 attilio Exp $
 .\"
 .Dd November 25, 2007
 .Dt RWLOCK 9
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 1a752dbc45fd6..2dd149a725eec 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sbuf.9,v 1.26 2006/09/18 15:24:20 ru Exp $
 .\"
 .Dd July 9, 2004
 .Dt SBUF 9
diff --git a/share/man/man9/scheduler.9 b/share/man/man9/scheduler.9
index c56fd0b6c6538..f0f53a5c27b46 100644
--- a/share/man/man9/scheduler.9
+++ b/share/man/man9/scheduler.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/scheduler.9,v 1.7 2002/12/30 21:18:05 schweikh Exp $
 .\"
 .Dd November 3, 2000
 .Dt SCHEDULER 9
diff --git a/share/man/man9/securelevel_gt.9 b/share/man/man9/securelevel_gt.9
index b2706948eb838..5f527c1194905 100644
--- a/share/man/man9/securelevel_gt.9
+++ b/share/man/man9/securelevel_gt.9
@@ -24,7 +24,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/securelevel_gt.9,v 1.2 2007/06/02 20:15:59 remko Exp $
 .\"
 .Dd June 2, 2007
 .Dt SECURELEVEL_GT 9
diff --git a/share/man/man9/selrecord.9 b/share/man/man9/selrecord.9
index 15c5a18cf444c..157d079697d78 100644
--- a/share/man/man9/selrecord.9
+++ b/share/man/man9/selrecord.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/selrecord.9,v 1.4 2007/06/14 22:38:50 njl Exp $
 .\"
 .Dd June 13, 2007
 .Dt SELRECORD 9
diff --git a/share/man/man9/sema.9 b/share/man/man9/sema.9
index 1f6e3b54eb247..cbfb55b2eef0f 100644
--- a/share/man/man9/sema.9
+++ b/share/man/man9/sema.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sema.9,v 1.11 2007/03/30 18:07:26 julian Exp $
 .\"
 .Dd February 1, 2006
 .Dt SEMA 9
diff --git a/share/man/man9/sf_buf.9 b/share/man/man9/sf_buf.9
index a73ef452b07e9..4359e2162a374 100644
--- a/share/man/man9/sf_buf.9
+++ b/share/man/man9/sf_buf.9
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sf_buf.9,v 1.2 2007/01/31 09:40:31 rwatson Exp $
 .\"
 .Dd January 28, 2007
 .Dt SF_BUF 9
diff --git a/share/man/man9/signal.9 b/share/man/man9/signal.9
index 6f377eeb346bf..1b5e89b817560 100644
--- a/share/man/man9/signal.9
+++ b/share/man/man9/signal.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/signal.9,v 1.10 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 20, 2004
 .Dt SIGNAL 9
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index 0029242473016..97622cd392f1a 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.61 2007/03/30 18:07:26 julian Exp $
 .\"
 .Dd February 27, 2007
 .Os
diff --git a/share/man/man9/sleepqueue.9 b/share/man/man9/sleepqueue.9
index f0654d587c7e7..152abfa93beea 100644
--- a/share/man/man9/sleepqueue.9
+++ b/share/man/man9/sleepqueue.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.16 2007/09/28 11:13:40 gabor Exp $
 .\"
 .Dd August 13, 2007
 .Dt SLEEPQUEUE 9
diff --git a/share/man/man9/socket.9 b/share/man/man9/socket.9
index 8320d84914c24..467a74467a0d5 100644
--- a/share/man/man9/socket.9
+++ b/share/man/man9/socket.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/socket.9,v 1.2 2006/12/16 10:32:10 rwatson Exp $
 .\"
 .Dd December 14, 2006
 .Dt SOCKET 9
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index 6a295e8178ec8..9a5264bb01ec1 100644
--- a/share/man/man9/spl.9
+++ b/share/man/man9/spl.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/spl.9,v 1.20 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 21, 1996
 .Os
diff --git a/share/man/man9/stack.9 b/share/man/man9/stack.9
index dabef1aa321be..88c14a474739b 100644
--- a/share/man/man9/stack.9
+++ b/share/man/man9/stack.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/stack.9,v 1.5.2.1 2007/12/04 15:22:31 rwatson Exp $
 .\"
 .Dd February 27, 2007
 .Dt STACK 9
diff --git a/share/man/man9/store.9 b/share/man/man9/store.9
index 4438d84ca5aa7..c8d30835c69c6 100644
--- a/share/man/man9/store.9
+++ b/share/man/man9/store.9
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/store.9,v 1.11 2001/10/01 16:09:25 ru Exp $
 .\"
 .Dd January 7, 1996
 .Dt STORE 9
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index ad3364f1ec784..2284cb66edb9a 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $
 .\"
 .Dd February 10, 2005
 .Dt STYLE 9
@@ -46,7 +46,7 @@ is silent on an issue.
  * Style guide for FreeBSD.  Based on the CSRG's KNF (Kernel Normal Form).
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $
  */
 
 /*
@@ -111,7 +111,7 @@ static char sccsid[] = "@(#)style	1.14 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $");
 .Ed
 .Pp
 Leave another blank line before the header files.
diff --git a/share/man/man9/suser.9 b/share/man/man9/suser.9
index 5411955950f4b..afea9635d154e 100644
--- a/share/man/man9/suser.9
+++ b/share/man/man9/suser.9
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/suser.9,v 1.34 2007/08/30 15:03:21 danger Exp $
 .\"
 .Dd August 30, 2007
 .Dt SUSER 9
diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9
index ea0b32b033a29..1f4c9443484a8 100644
--- a/share/man/man9/swi.9
+++ b/share/man/man9/swi.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/swi.9,v 1.14 2004/12/29 04:29:06 jkoshy Exp $
 .\"
 .Dd October 30, 2000
 .Dt SWI 9
diff --git a/share/man/man9/sx.9 b/share/man/man9/sx.9
index 41a7faad75c32..b175621392252 100644
--- a/share/man/man9/sx.9
+++ b/share/man/man9/sx.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sx.9,v 1.41.2.1 2007/11/27 14:08:14 attilio Exp $
 .\"
 .Dd November 25, 2007
 .Dt SX 9
diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9
index fe346687c373c..5a9e7e6b17cdf 100644
--- a/share/man/man9/sysctl.9
+++ b/share/man/man9/sysctl.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sysctl.9,v 1.8 2006/12/14 14:33:13 mpp Exp $
 .\"
 .Dd November 23, 2006
 .Dt SYSCTL 9
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index 41de908d3e89e..3540990312fb2 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sysctl_add_oid.9,v 1.21 2006/04/28 10:45:27 rwatson Exp $
 .\"
 .Dd July 15, 2000
 .Dt SYSCTL_ADD_OID 9
diff --git a/share/man/man9/sysctl_ctx_init.9 b/share/man/man9/sysctl_ctx_init.9
index ba8c7f29e7952..aecd13fef208f 100644
--- a/share/man/man9/sysctl_ctx_init.9
+++ b/share/man/man9/sysctl_ctx_init.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/sysctl_ctx_init.9,v 1.14 2007/07/27 19:55:42 remko Exp $
 .\"
 .Dd July 15, 2000
 .Dt SYSCTL_CTX_INIT 9
diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9
index 2a63a4218f993..47a7240b3213d 100644
--- a/share/man/man9/taskqueue.9
+++ b/share/man/man9/taskqueue.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/taskqueue.9,v 1.21 2007/07/09 06:24:10 jmg Exp $
 .\"
 .Dd May 19, 2005
 .Dt TASKQUEUE 9
diff --git a/share/man/man9/thread_exit.9 b/share/man/man9/thread_exit.9
index 6a06433acebd8..bce7793fce862 100644
--- a/share/man/man9/thread_exit.9
+++ b/share/man/man9/thread_exit.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/thread_exit.9,v 1.3 2007/03/09 22:41:01 jhb Exp $
 .\"
 .Dd July 5, 2002
 .Dt THREAD_EXIT 9
diff --git a/share/man/man9/time.9 b/share/man/man9/time.9
index 4a2b2f7240e12..72e484a236f91 100644
--- a/share/man/man9/time.9
+++ b/share/man/man9/time.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/time.9,v 1.17 2006/03/02 19:47:41 ru Exp $
 .\"
 .Dd September 17, 2004
 .Dt TIME 9
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index c875ce3b6ebf8..1e4f3c84c8833 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/timeout.9,v 1.31 2005/12/01 19:16:35 jhb Exp $
 .\"
 .Dd September 8, 2005
 .Dt TIMEOUT 9
diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9
index 672aaf9dbbe78..5c37b0dbfde84 100644
--- a/share/man/man9/tvtohz.9
+++ b/share/man/man9/tvtohz.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/tvtohz.9,v 1.4 2005/02/09 18:07:17 ru Exp $
 .\"
 .Dd January 3, 2000
 .Dt TVTOHZ 9
diff --git a/share/man/man9/ucred.9 b/share/man/man9/ucred.9
index bd16fe36303b5..85712e6255b66 100644
--- a/share/man/man9/ucred.9
+++ b/share/man/man9/ucred.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/ucred.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd March 3, 2002
 .Dt UCRED 9
diff --git a/share/man/man9/uidinfo.9 b/share/man/man9/uidinfo.9
index 8a3d708bc4663..b7e52c90ade12 100644
--- a/share/man/man9/uidinfo.9
+++ b/share/man/man9/uidinfo.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/uidinfo.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 10, 2001
 .Dt UIDINFO 9
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index b2bbffadbce92..083b08cf5e2bf 100644
--- a/share/man/man9/uio.9
+++ b/share/man/man9/uio.9
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/uio.9,v 1.21 2006/11/29 20:24:56 alfred Exp $
 .\"
 .Dd December 8, 2006
 .Os
diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9
index 582754fa66227..82465b9593ad0 100644
--- a/share/man/man9/usbdi.9
+++ b/share/man/man9/usbdi.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/man/man9/usbdi.9,v 1.2 2006/12/14 14:33:13 mpp Exp $
 .Dd December 30, 2005
 .Os
 .Dt USBDI 9
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index a7d02c19bee20..dc128b66eae9b 100644
--- a/share/man/man9/utopia.9
+++ b/share/man/man9/utopia.9
@@ -25,7 +25,7 @@
 .\"
 .\" Author: Hartmut Brandt <harti@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/utopia.9,v 1.8 2006/12/14 14:33:13 mpp Exp $
 .\"
 .Dd May 8, 2003
 .Dt UTOPIA 9
diff --git a/share/man/man9/vaccess.9 b/share/man/man9/vaccess.9
index f5d6664c643af..71c737f773ba0 100644
--- a/share/man/man9/vaccess.9
+++ b/share/man/man9/vaccess.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 22, 2001
 .Os
diff --git a/share/man/man9/vaccess_acl_posix1e.9 b/share/man/man9/vaccess_acl_posix1e.9
index 24193d4c8fab6..02ae05738177a 100644
--- a/share/man/man9/vaccess_acl_posix1e.9
+++ b/share/man/man9/vaccess_acl_posix1e.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 22, 2001
 .Os
diff --git a/share/man/man9/vcount.9 b/share/man/man9/vcount.9
index 610891b6a8dd0..fb0c70e31f444 100644
--- a/share/man/man9/vcount.9
+++ b/share/man/man9/vcount.9
@@ -30,7 +30,7 @@
 .\" FreeBSD) I would love to hear about it.
 .\"     Andrew <andrew@ugh.net.au>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vcount.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd February 6, 2001
 .Os
diff --git a/share/man/man9/vflush.9 b/share/man/man9/vflush.9
index 37aa31bbfcf1a..db4bdad45ca34 100644
--- a/share/man/man9/vflush.9
+++ b/share/man/man9/vflush.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vflush.9,v 1.6 2006/06/08 04:39:02 maxim Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFLUSH 9
diff --git a/share/man/man9/vfs_busy.9 b/share/man/man9/vfs_busy.9
index 4021e124c8918..557e3dbbb3f74 100644
--- a/share/man/man9/vfs_busy.9
+++ b/share/man/man9/vfs_busy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_busy.9,v 1.7 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd July 8, 2001
 .Dt VFS_BUSY 9
diff --git a/share/man/man9/vfs_getnewfsid.9 b/share/man/man9/vfs_getnewfsid.9
index b6f12382fe130..bde877389570e 100644
--- a/share/man/man9/vfs_getnewfsid.9
+++ b/share/man/man9/vfs_getnewfsid.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_getnewfsid.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_GETNEWFSID 9
diff --git a/share/man/man9/vfs_getopt.9 b/share/man/man9/vfs_getopt.9
index c3932091817c0..b4fa784e19d2b 100644
--- a/share/man/man9/vfs_getopt.9
+++ b/share/man/man9/vfs_getopt.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_getopt.9,v 1.2 2007/03/04 19:04:39 ru Exp $
 .\"
 .Dd February 28, 2007
 .Dt VFS_GETOPT 9
diff --git a/share/man/man9/vfs_getvfs.9 b/share/man/man9/vfs_getvfs.9
index c563adcddca33..ddbbc89181b35 100644
--- a/share/man/man9/vfs_getvfs.9
+++ b/share/man/man9/vfs_getvfs.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_getvfs.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_GETVFS 9
diff --git a/share/man/man9/vfs_mount.9 b/share/man/man9/vfs_mount.9
index b64698c119c78..4e4caab361eb5 100644
--- a/share/man/man9/vfs_mount.9
+++ b/share/man/man9/vfs_mount.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.12 2004/11/29 09:56:12 ru Exp $
 .\"
 .Dd November 26, 2004
 .Dt VFS_MOUNT 9
diff --git a/share/man/man9/vfs_mountedon.9 b/share/man/man9/vfs_mountedon.9
index 8ffdbbed314bb..b672744ad18af 100644
--- a/share/man/man9/vfs_mountedon.9
+++ b/share/man/man9/vfs_mountedon.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_mountedon.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_MOUNTEDON 9
diff --git a/share/man/man9/vfs_rootmountalloc.9 b/share/man/man9/vfs_rootmountalloc.9
index ecad73e3af200..b7c8a8686f72a 100644
--- a/share/man/man9/vfs_rootmountalloc.9
+++ b/share/man/man9/vfs_rootmountalloc.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_rootmountalloc.9,v 1.3 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_ROOTMOUNTALLOC 9
diff --git a/share/man/man9/vfs_suser.9 b/share/man/man9/vfs_suser.9
index 749557af51834..cb7849d21f5cb 100644
--- a/share/man/man9/vfs_suser.9
+++ b/share/man/man9/vfs_suser.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_suser.9,v 1.3 2005/06/15 13:31:23 ru Exp $
 .\"
 .Dd April 2, 2004
 .Dt VFS_SUSER 9
diff --git a/share/man/man9/vfs_timestamp.9 b/share/man/man9/vfs_timestamp.9
index 455d6f6ba427f..112eb5eac45a5 100644
--- a/share/man/man9/vfs_timestamp.9
+++ b/share/man/man9/vfs_timestamp.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_timestamp.9,v 1.4 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFS_TIMESTAMP 9
diff --git a/share/man/man9/vfs_unbusy.9 b/share/man/man9/vfs_unbusy.9
index 7a6b911d43c3d..1ccb3702c0348 100644
--- a/share/man/man9/vfs_unbusy.9
+++ b/share/man/man9/vfs_unbusy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_unbusy.9,v 1.9 2003/10/23 06:17:12 hmp Exp $
 .\"
 .Dd July 8, 2001
 .Dt VFS_UNBUSY 9
diff --git a/share/man/man9/vfs_unmountall.9 b/share/man/man9/vfs_unmountall.9
index e200203281532..24ec8461dee79 100644
--- a/share/man/man9/vfs_unmountall.9
+++ b/share/man/man9/vfs_unmountall.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfs_unmountall.9,v 1.7 2005/02/09 18:07:17 ru Exp $
 .\"
 .Dd July 26, 2001
 .Dt VFS_UNMOUNTALL 9
diff --git a/share/man/man9/vfsconf.9 b/share/man/man9/vfsconf.9
index f7b160e213137..cfbca386c7fa8 100644
--- a/share/man/man9/vfsconf.9
+++ b/share/man/man9/vfsconf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vfsconf.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd November 21, 2001
 .Dt VFSCONF 9
diff --git a/share/man/man9/vget.9 b/share/man/man9/vget.9
index ef8fb10dd05f9..c3ffda0a81aea 100644
--- a/share/man/man9/vget.9
+++ b/share/man/man9/vget.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vget.9,v 1.12 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vgone.9 b/share/man/man9/vgone.9
index 09722834a7585..2c7ee8878b413 100644
--- a/share/man/man9/vgone.9
+++ b/share/man/man9/vgone.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vgone.9,v 1.5 2006/06/07 16:51:54 jkoshy Exp $
 .\"
 .Dd November 21, 2001
 .Dt VGONE 9
diff --git a/share/man/man9/vhold.9 b/share/man/man9/vhold.9
index 6eafd3fc3db53..005e1345dbf57 100644
--- a/share/man/man9/vhold.9
+++ b/share/man/man9/vhold.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vhold.9,v 1.5 2007/04/01 09:48:59 maxim Exp $
 .\"
 .Dd April 1, 2007
 .Dt VHOLD 9
diff --git a/share/man/man9/vinvalbuf.9 b/share/man/man9/vinvalbuf.9
index 9ed361b714176..9dfe9b9a78bf3 100644
--- a/share/man/man9/vinvalbuf.9
+++ b/share/man/man9/vinvalbuf.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vinvalbuf.9,v 1.8 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 7, 2001
 .Dt VINVALBUF 9
diff --git a/share/man/man9/vm_fault_prefault.9 b/share/man/man9/vm_fault_prefault.9
index dcc7e7abfa373..6ce956b0bb7d9 100644
--- a/share/man/man9/vm_fault_prefault.9
+++ b/share/man/man9/vm_fault_prefault.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_fault_prefault.9,v 1.4 2004/07/06 07:12:34 ru Exp $
 .\"
 .Dd July 21, 2003
 .Dt VM_FAULT_PREFAULT 9
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index 285d1d750eaa3..8e6acb32bb439 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map.9,v 1.10 2007/01/27 18:58:33 rwatson Exp $
 .\"
 .Dd September 26, 2004
 .Dt VM_MAP 9
diff --git a/share/man/man9/vm_map_check_protection.9 b/share/man/man9/vm_map_check_protection.9
index abaf6d0301e69..344e0c10599ee 100644
--- a/share/man/man9/vm_map_check_protection.9
+++ b/share/man/man9/vm_map_check_protection.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_check_protection.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_CHECK_PROTECTION 9
diff --git a/share/man/man9/vm_map_clean.9 b/share/man/man9/vm_map_clean.9
index eeea5bc741bb9..2e46256088372 100644
--- a/share/man/man9/vm_map_clean.9
+++ b/share/man/man9/vm_map_clean.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_clean.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_CLEAN 9
diff --git a/share/man/man9/vm_map_create.9 b/share/man/man9/vm_map_create.9
index 0574f396f82b9..2419bf1f99049 100644
--- a/share/man/man9/vm_map_create.9
+++ b/share/man/man9/vm_map_create.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_create.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_CREATE 9
diff --git a/share/man/man9/vm_map_delete.9 b/share/man/man9/vm_map_delete.9
index e884f366aaaf7..622b5487b1fff 100644
--- a/share/man/man9/vm_map_delete.9
+++ b/share/man/man9/vm_map_delete.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_delete.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_DELETE 9
diff --git a/share/man/man9/vm_map_entry_resize_free.9 b/share/man/man9/vm_map_entry_resize_free.9
index b037bcb456215..a9512fcffdd41 100644
--- a/share/man/man9/vm_map_entry_resize_free.9
+++ b/share/man/man9/vm_map_entry_resize_free.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_entry_resize_free.9,v 1.3 2005/01/14 17:22:51 ru Exp $
 .\"
 .Dd August 17, 2004
 .Os
diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9
index e1e8f4030d406..3b5d3740fd953 100644
--- a/share/man/man9/vm_map_find.9
+++ b/share/man/man9/vm_map_find.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_find.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_FIND 9
diff --git a/share/man/man9/vm_map_findspace.9 b/share/man/man9/vm_map_findspace.9
index a12e78961574e..4561842e0dbb4 100644
--- a/share/man/man9/vm_map_findspace.9
+++ b/share/man/man9/vm_map_findspace.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_findspace.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_FINDSPACE 9
diff --git a/share/man/man9/vm_map_inherit.9 b/share/man/man9/vm_map_inherit.9
index fb5a9d5ff37bb..c3782c7995f9c 100644
--- a/share/man/man9/vm_map_inherit.9
+++ b/share/man/man9/vm_map_inherit.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_inherit.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_INHERIT 9
diff --git a/share/man/man9/vm_map_init.9 b/share/man/man9/vm_map_init.9
index c65f611fbb8d0..7729434fbaa79 100644
--- a/share/man/man9/vm_map_init.9
+++ b/share/man/man9/vm_map_init.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_init.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_INIT 9
diff --git a/share/man/man9/vm_map_insert.9 b/share/man/man9/vm_map_insert.9
index 3a6a51fd07841..4e0ba3a06d03f 100644
--- a/share/man/man9/vm_map_insert.9
+++ b/share/man/man9/vm_map_insert.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_insert.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_INSERT 9
diff --git a/share/man/man9/vm_map_lock.9 b/share/man/man9/vm_map_lock.9
index 619f8c766927b..3ff6ec44c1ee2 100644
--- a/share/man/man9/vm_map_lock.9
+++ b/share/man/man9/vm_map_lock.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_lock.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_LOCK 9
diff --git a/share/man/man9/vm_map_lookup.9 b/share/man/man9/vm_map_lookup.9
index 759b5f6673fd4..562d2f7baa136 100644
--- a/share/man/man9/vm_map_lookup.9
+++ b/share/man/man9/vm_map_lookup.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_lookup.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_LOOKUP 9
diff --git a/share/man/man9/vm_map_madvise.9 b/share/man/man9/vm_map_madvise.9
index 97ba6040de8d3..5ae2f1b486d72 100644
--- a/share/man/man9/vm_map_madvise.9
+++ b/share/man/man9/vm_map_madvise.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_madvise.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_MADVISE 9
diff --git a/share/man/man9/vm_map_max.9 b/share/man/man9/vm_map_max.9
index e694983ba6aa0..a2966427b889d 100644
--- a/share/man/man9/vm_map_max.9
+++ b/share/man/man9/vm_map_max.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_max.9,v 1.3 2004/07/06 07:02:31 ru Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_MAX 9
diff --git a/share/man/man9/vm_map_protect.9 b/share/man/man9/vm_map_protect.9
index 8976781297e55..bded895b20b41 100644
--- a/share/man/man9/vm_map_protect.9
+++ b/share/man/man9/vm_map_protect.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_protect.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_PROTECT 9
diff --git a/share/man/man9/vm_map_remove.9 b/share/man/man9/vm_map_remove.9
index 53da53349bb2e..1460829fb1487 100644
--- a/share/man/man9/vm_map_remove.9
+++ b/share/man/man9/vm_map_remove.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_remove.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_REMOVE 9
diff --git a/share/man/man9/vm_map_simplify_entry.9 b/share/man/man9/vm_map_simplify_entry.9
index 8bb5484b4cb78..c6e35683e55e7 100644
--- a/share/man/man9/vm_map_simplify_entry.9
+++ b/share/man/man9/vm_map_simplify_entry.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_simplify_entry.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_SIMPLIFY_ENTRY 9
diff --git a/share/man/man9/vm_map_stack.9 b/share/man/man9/vm_map_stack.9
index dabe937cac2ba..4b942d378ffdd 100644
--- a/share/man/man9/vm_map_stack.9
+++ b/share/man/man9/vm_map_stack.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_stack.9,v 1.5 2006/12/14 14:33:13 mpp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_STACK 9
diff --git a/share/man/man9/vm_map_submap.9 b/share/man/man9/vm_map_submap.9
index 704151aa5fc73..dfa7804ac653a 100644
--- a/share/man/man9/vm_map_submap.9
+++ b/share/man/man9/vm_map_submap.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_submap.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_SUBMAP 9
diff --git a/share/man/man9/vm_map_wire.9 b/share/man/man9/vm_map_wire.9
index 12bb3f675aed2..52f33b7644650 100644
--- a/share/man/man9/vm_map_wire.9
+++ b/share/man/man9/vm_map_wire.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_map_wire.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 19, 2003
 .Dt VM_MAP_WIRE 9
diff --git a/share/man/man9/vm_page_alloc.9 b/share/man/man9/vm_page_alloc.9
index 02e2b939b486e..50c33276d8db2 100644
--- a/share/man/man9/vm_page_alloc.9
+++ b/share/man/man9/vm_page_alloc.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_alloc.9,v 1.6 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_ALLOC 9
diff --git a/share/man/man9/vm_page_bits.9 b/share/man/man9/vm_page_bits.9
index 991c7637e53bd..23dbef677d06b 100644
--- a/share/man/man9/vm_page_bits.9
+++ b/share/man/man9/vm_page_bits.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_bits.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd December 1, 2001
 .Dt VM_PAGE_BITS 9
diff --git a/share/man/man9/vm_page_cache.9 b/share/man/man9/vm_page_cache.9
index 0379e8c7a9c12..d0cbb42458eaa 100644
--- a/share/man/man9/vm_page_cache.9
+++ b/share/man/man9/vm_page_cache.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_cache.9,v 1.1 2001/07/30 22:14:23 alfred Exp $
 .\"
 .Dd July 24, 2001
 .Dt VM_PAGE_CACHE 9
diff --git a/share/man/man9/vm_page_copy.9 b/share/man/man9/vm_page_copy.9
index 3cf7304883c63..246dbe0181ee2 100644
--- a/share/man/man9/vm_page_copy.9
+++ b/share/man/man9/vm_page_copy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_copy.9,v 1.2 2001/07/30 22:14:23 alfred Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_COPY 9
diff --git a/share/man/man9/vm_page_deactivate.9 b/share/man/man9/vm_page_deactivate.9
index 30bb7fa11acec..76ec1b292acdc 100644
--- a/share/man/man9/vm_page_deactivate.9
+++ b/share/man/man9/vm_page_deactivate.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_deactivate.9,v 1.3 2007/02/25 06:51:11 ru Exp $
 .\"
 .Dd July 24, 2001
 .Dt VM_PAGE_DEACTIVATE 9
diff --git a/share/man/man9/vm_page_dontneed.9 b/share/man/man9/vm_page_dontneed.9
index 99baa330816d3..ed9194a4a8502 100644
--- a/share/man/man9/vm_page_dontneed.9
+++ b/share/man/man9/vm_page_dontneed.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_dontneed.9,v 1.2 2001/12/14 09:11:13 ru Exp $
 .\"
 .Dd July 30, 2001
 .Dt VM_PAGE_DONTNEED 9
diff --git a/share/man/man9/vm_page_flag.9 b/share/man/man9/vm_page_flag.9
index 5a1d75fbd472d..3e9122c45d686 100644
--- a/share/man/man9/vm_page_flag.9
+++ b/share/man/man9/vm_page_flag.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_flag.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 14, 2001
 .Dt VM_PAGE_FLAG 9
diff --git a/share/man/man9/vm_page_free.9 b/share/man/man9/vm_page_free.9
index a78e577adbd4c..acdc68a683498 100644
--- a/share/man/man9/vm_page_free.9
+++ b/share/man/man9/vm_page_free.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_free.9,v 1.2 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 24, 2001
 .Dt VM_PAGE_FREE 9
diff --git a/share/man/man9/vm_page_grab.9 b/share/man/man9/vm_page_grab.9
index d0d3a321be5ac..c4bc56ac0a2cc 100644
--- a/share/man/man9/vm_page_grab.9
+++ b/share/man/man9/vm_page_grab.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_grab.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd August 7, 2001
 .Dt VM_PAGE_GRAB 9
diff --git a/share/man/man9/vm_page_hold.9 b/share/man/man9/vm_page_hold.9
index 183fa4020d56a..48c44c2ad345d 100644
--- a/share/man/man9/vm_page_hold.9
+++ b/share/man/man9/vm_page_hold.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_hold.9,v 1.4 2002/04/05 08:05:11 davidc Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_HOLD 9
diff --git a/share/man/man9/vm_page_insert.9 b/share/man/man9/vm_page_insert.9
index 53f1eba82933d..203f05c0953b3 100644
--- a/share/man/man9/vm_page_insert.9
+++ b/share/man/man9/vm_page_insert.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_insert.9,v 1.3 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_INSERT 9
diff --git a/share/man/man9/vm_page_io.9 b/share/man/man9/vm_page_io.9
index 396cb1903bb5c..8a0b11cf7af2c 100644
--- a/share/man/man9/vm_page_io.9
+++ b/share/man/man9/vm_page_io.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_io.9,v 1.5 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_IO_START 9
diff --git a/share/man/man9/vm_page_lookup.9 b/share/man/man9/vm_page_lookup.9
index 7f8cd5e1dd77b..8150223304382 100644
--- a/share/man/man9/vm_page_lookup.9
+++ b/share/man/man9/vm_page_lookup.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_lookup.9,v 1.2 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_LOOKUP 9
diff --git a/share/man/man9/vm_page_protect.9 b/share/man/man9/vm_page_protect.9
index 8b4911d506073..94a641739a6ed 100644
--- a/share/man/man9/vm_page_protect.9
+++ b/share/man/man9/vm_page_protect.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_protect.9,v 1.3 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 14, 2001
 .Dt VM_PAGE_PROTECT 9
diff --git a/share/man/man9/vm_page_rename.9 b/share/man/man9/vm_page_rename.9
index bb8591fae3ab9..8b6e0365e904b 100644
--- a/share/man/man9/vm_page_rename.9
+++ b/share/man/man9/vm_page_rename.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_rename.9,v 1.2 2001/08/08 10:04:08 ru Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_RENAME 9
diff --git a/share/man/man9/vm_page_sleep_busy.9 b/share/man/man9/vm_page_sleep_busy.9
index 45aa97761c980..983512a1fb318 100644
--- a/share/man/man9/vm_page_sleep_busy.9
+++ b/share/man/man9/vm_page_sleep_busy.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_sleep_busy.9,v 1.2 2005/06/28 20:15:18 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_SLEEP_BUSY 9
diff --git a/share/man/man9/vm_page_wakeup.9 b/share/man/man9/vm_page_wakeup.9
index adb03a13c05b6..2a2ec400e4d83 100644
--- a/share/man/man9/vm_page_wakeup.9
+++ b/share/man/man9/vm_page_wakeup.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_wakeup.9,v 1.3 2006/02/13 21:34:19 joel Exp $
 .\"
 .Dd July 14, 2001
 .Dt VM_PAGE_BUSY 9
diff --git a/share/man/man9/vm_page_wire.9 b/share/man/man9/vm_page_wire.9
index f988dd96e467e..3a6d6f21fa23c 100644
--- a/share/man/man9/vm_page_wire.9
+++ b/share/man/man9/vm_page_wire.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_wire.9,v 1.3 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 13, 2001
 .Dt VM_PAGE_WIRE 9
diff --git a/share/man/man9/vm_page_zero_fill.9 b/share/man/man9/vm_page_zero_fill.9
index 2adb3013b32a1..c1e14e2a3ad25 100644
--- a/share/man/man9/vm_page_zero_fill.9
+++ b/share/man/man9/vm_page_zero_fill.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_page_zero_fill.9,v 1.3 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_PAGE_ZERO_FILL 9
diff --git a/share/man/man9/vm_set_page_size.9 b/share/man/man9/vm_set_page_size.9
index d37dee819f3d3..225d15aa7db35 100644
--- a/share/man/man9/vm_set_page_size.9
+++ b/share/man/man9/vm_set_page_size.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vm_set_page_size.9,v 1.4 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 17, 2001
 .Dt VM_SET_PAGE_SIZE 9
diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9
index dd0dbe3bf9ef4..cc71d7dca5039 100644
--- a/share/man/man9/vn_fullpath.9
+++ b/share/man/man9/vn_fullpath.9
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vn_fullpath.9,v 1.4 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd January 11, 2004
 .Dt VN_FULLPATH 9
diff --git a/share/man/man9/vn_isdisk.9 b/share/man/man9/vn_isdisk.9
index 59096347526e9..2e605e87641d4 100644
--- a/share/man/man9/vn_isdisk.9
+++ b/share/man/man9/vn_isdisk.9
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vn_isdisk.9,v 1.6 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 9, 2001
 .Dt VN_ISDISK 9
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index b55b19b650bf4..00d45416e97c1 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vnode.9,v 1.29 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd May 20, 2003
 .Os
diff --git a/share/man/man9/vput.9 b/share/man/man9/vput.9
index e0697c20751ed..777448828e7cf 100644
--- a/share/man/man9/vput.9
+++ b/share/man/man9/vput.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vput.9,v 1.11 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vref.9 b/share/man/man9/vref.9
index b5d11a0f88c1c..d3991467e327e 100644
--- a/share/man/man9/vref.9
+++ b/share/man/man9/vref.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vref.9,v 1.13 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9
index e0295c8062178..b7514eb3e9cb4 100644
--- a/share/man/man9/vrele.9
+++ b/share/man/man9/vrele.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vrele.9,v 1.12 2005/06/28 20:15:19 hmp Exp $
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vslock.9 b/share/man/man9/vslock.9
index fdab0eb52e8ce..5a0bf7f0407d0 100644
--- a/share/man/man9/vslock.9
+++ b/share/man/man9/vslock.9
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/vslock.9,v 1.15 2004/08/16 03:12:10 green Exp $
 .\"
 .Dd August 10, 2004
 .Dt VSLOCK 9
diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9
index 25634c9055c98..940ad8c4d70b7 100644
--- a/share/man/man9/watchdog.9
+++ b/share/man/man9/watchdog.9
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/watchdog.9,v 1.6 2007/03/28 21:21:22 brueffer Exp $
 .\"
 .Dd February 28, 2004
 .Dt WATCHDOG 9
diff --git a/share/man/man9/zero_copy.9 b/share/man/man9/zero_copy.9
index 50488d35ab040..9745bf020d38c 100644
--- a/share/man/man9/zero_copy.9
+++ b/share/man/man9/zero_copy.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/zero_copy.9,v 1.8 2006/05/15 20:58:05 wilko Exp $
 .\"
 .Dd December 5, 2004
 .Dt ZERO_COPY 9
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index 0782a0277dbba..78377920af335 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man9/zone.9,v 1.28 2006/10/21 16:08:21 ru Exp $
 .\"
 .Dd October 2, 2006
 .Dt ZONE 9
diff --git a/share/me/Makefile b/share/me/Makefile
index 6a9d6de5b33c2..8d5014fbb8ee2 100644
--- a/share/me/Makefile
+++ b/share/me/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/share/me/Makefile,v 1.8 2002/03/20 16:26:35 ru Exp $
 
 MELIB=	${BINDIR}/me
 TMLIB=	${BINDIR}/tmac
diff --git a/share/me/eqn.me b/share/me/eqn.me
index df2671c442951..29e53843ca856 100644
--- a/share/me/eqn.me
+++ b/share/me/eqn.me
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)eqn.me	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/me/eqn.me,v 1.2 2001/02/18 10:25:31 asmodai Exp $
 .\"
 .\"	%beginstrip%
 .\"
diff --git a/share/me/orig_me.7 b/share/me/orig_me.7
index afb7cb95b0704..0df3f893bea58 100644
--- a/share/me/orig_me.7
+++ b/share/me/orig_me.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)me.7	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/me/orig_me.7,v 1.6 2002/03/20 16:26:35 ru Exp $
 .\"
 .hc %
 .TH ORIG_ME 7 "June 5, 1993"
diff --git a/share/me/tmac.orig_me b/share/me/tmac.orig_me
index 87c1687a3e045..491e4cf397c1f 100644
--- a/share/me/tmac.orig_me
+++ b/share/me/tmac.orig_me
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)tmac.e	8.1 (Berkeley) 6/5/93
 .\"
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/share/me/tmac.orig_me,v 1.3 2002/08/12 10:04:31 schweikh Exp $
 .\"
 .\"	%beginstrip%
 .\"
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 52cbcc76dec89..de1fa4f713d9b 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/misc/Makefile,v 1.26 2007/03/31 07:28:53 simon Exp $
 
 FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
 	committers-src.dot eqnchar flowers init.ee \
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 2a5fc1d93205b..292088437b807 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -528,4 +528,4 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages.
 Copyright (c) 1997-2007 Wolfram Schneider <wosch@FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD$
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.115 2007/08/07 15:35:24 maxim Exp $
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index ba9226be22e2c..0562aace08e64 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/committers-doc.dot,v 1.17 2007/08/02 15:23:01 loader Exp $
 
 # This file is meant to list all FreeBSD doc+www committers and describe the
 # mentor-mentee relationships between them.
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index 0d9552208af80..69264dd799000 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/committers-ports.dot,v 1.63 2007/09/21 13:03:24 tabthorpe Exp $
 
 # This file is meant to list all FreeBSD ports committers and describe the
 # mentor-mentee relationships between them.
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 2171e66f0cc96..1667b2b6782fe 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.66 2007/09/29 17:01:19 kaiw Exp $
 
 # This file is meant to list all FreeBSD src committers and describe the
 # mentor-mentee relationships between them.
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index b8f65aa49df24..73ad8f7b2b298 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/iso3166,v 1.15.4.1 2008/01/06 07:25:43 edwin Exp $
 #
 # ISO 3166 country codes
 # This includes many places that are not legally independent countries,
diff --git a/share/misc/iso639 b/share/misc/iso639
index 57d62a0c40501..d934ab9aadb26 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/iso639,v 1.4 2002/02/04 17:35:33 wollman Exp $
 #
 # ISO 639-2 language codes
 #
diff --git a/share/misc/latin1 b/share/misc/latin1
index a4144e678dfca..28844bb637b43 100644
--- a/share/misc/latin1
+++ b/share/misc/latin1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/latin1,v 1.1 2002/08/18 16:57:45 schweikh Exp $
 
 |240 nbs|241  ¡ |242  ¢ |243  £ |244  ¤ |245  ¥ |246  ¦ |247  § |
 |250  ¨ |251  © |252  ª |253  « |254  ¬ |255  ­ |256  ® |257  ¯ |
diff --git a/share/misc/mdoc.template b/share/misc/mdoc.template
index 1ecacfc7909af..74ee9bf652c4c 100644
--- a/share/misc/mdoc.template
+++ b/share/misc/mdoc.template
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/misc/mdoc.template,v 1.5 2005/01/16 22:26:05 ru Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd Month day, year
diff --git a/share/misc/operator b/share/misc/operator
index b293f31da9b27..bcd0abb3d8cdc 100644
--- a/share/misc/operator
+++ b/share/misc/operator
@@ -16,4 +16,4 @@ Operator				Associativity
 = += -= *= /= %= <<= >>= &= ^= |=	right to left
 ,					left to right
 
-$FreeBSD$
+$FreeBSD: src/share/misc/operator,v 1.2 2003/01/22 15:19:07 fanf Exp $
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index 5b65bed42f54f..e3312bee8d0fb 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/organization.dot,v 1.2 2007/04/22 21:11:46 erwin Exp $
 
 # This file is meant to show the infrastructural organization of the
 # FreeBSD Project; what kind of teams we have and how they relate to
diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors
index 8286310b80b76..c0a60c8272f4f 100644
--- a/share/misc/pci_vendors
+++ b/share/misc/pci_vendors
@@ -1,4 +1,4 @@
-; $FreeBSD$
+; $FreeBSD: src/share/misc/pci_vendors,v 1.35.2.1 2007/11/06 04:02:45 benjsc Exp $
 ;
 ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl
 ; (with the -l option), using the following source lists:
diff --git a/share/misc/scsi_modes b/share/misc/scsi_modes
index 687bcfa93533d..60b8085128f55 100644
--- a/share/misc/scsi_modes
+++ b/share/misc/scsi_modes
@@ -29,7 +29,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/misc/scsi_modes,v 1.12 2004/10/12 08:51:04 bms Exp $
 #
 # The ordering is alphabetical by page name, as it appears in the SCSI spec.
 
diff --git a/share/misc/usb_hid_usages b/share/misc/usb_hid_usages
index 2e668365abfb5..21a21f0e79283 100644
--- a/share/misc/usb_hid_usages
+++ b/share/misc/usb_hid_usages
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/misc/usb_hid_usages,v 1.2 2006/10/24 23:52:22 markus Exp $
 #
 # USB HID usage table
 # Syntax:
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 3d58f28d3e7f9..dd7c5d80b500b 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/Makefile,v 1.51 2007/06/01 15:32:23 pav Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 2c8a8cd0fedd8..f4c6919379179 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,5 +1,5 @@
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.README,v 1.33 2006/06/18 11:26:17 yar Exp $
 
 This is the README file for the "include" files for the FreeBSD
 source tree.  The files are installed in /usr/share/mk, and are by
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 6a86871d13236..8595ce4aee37a 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.compat.mk,v 1.23.2.1 2007/10/23 15:36:41 ru Exp $
 
 .if !defined(BURN_BRIDGES)
 .for oldnew in \
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index fdcd6f0bda50a..510b3c8bad3ec 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.62.2.1 2007/10/19 17:08:38 cognet Exp $
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index cdcadb034b44d..3c6f263d30b1a 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.48 2005/01/06 11:12:43 krion Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 539d4c341ddb2..a3af63be520a2 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.doc.mk	5.3 (Berkeley) 1/2/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.59 2004/12/21 09:33:42 ru Exp $
 #
 # The include file <bsd.doc.mk> handles installing BSD troff documents.
 #
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
index 56aa0cfec3d30..293e92fde41db 100644
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.endian.mk,v 1.4 2006/11/05 15:33:26 cognet Exp $
 
 .if ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 240f958f1a9b6..93e6d7cf04ab0 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.files.mk,v 1.4 2005/04/11 07:13:29 harti Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.files.mk cannot be included directly.
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index d51fb1750a0dc..5b72cbdc221e8 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.7 2006/03/17 18:54:34 ru Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.incs.mk cannot be included directly.
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 9c3220df63551..a4ba5961e9b40 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.info.mk,v 1.74 2006/09/29 15:36:19 ru Exp $
 #
 # The include file <bsd.info.mk> handles installing GNU (tech)info files.
 # Texinfo is a documentation system that uses a single source
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index 72a6de0ef342a..e4b3fe52f6ec3 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.init.mk,v 1.5 2005/04/11 07:13:29 harti Exp $
 
 # The include file <bsd.init.mk> includes ../Makefile.inc and
 # <bsd.own.mk>; this is used at the top of all <bsd.*.mk> files
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 8cc15b09c5c41..bd6a97b586592 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.kmod.mk,v 1.91 2004/06/21 16:12:02 bde Exp $
 
 # Search for kernel source tree in standard places.
 .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 3a42925197361..bb422689bd838 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.182.2.1 2007/10/23 15:41:34 ru Exp $
 #
 
 .include <bsd.init.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 2eaf9c33d72b8..c430112333e19 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.105 2007/10/01 18:15:11 ru Exp $
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
index 49f557a7e1fb9..009095bb0cff1 100644
--- a/share/mk/bsd.links.mk
+++ b/share/mk/bsd.links.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.links.mk,v 1.2 2002/07/03 12:28:03 ru Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.links.mk cannot be included directly.
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 8602b55f21792..72dc8ff2b97bb 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.man.mk,v 1.57 2007/03/12 13:54:52 ru Exp $
 #
 # The include file <bsd.man.mk> handles installing manual pages and
 # their links.
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index 48093ebf08382..e0136ff1bd74c 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.14 2006/03/17 18:54:34 ru Exp $
 #
 # This include file <bsd.nls.mk> handles building and installing Native
 # Language Support (NLS) catalogs
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index bd8f2aabc2189..a7ec139ce876c 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.54 2005/04/11 07:13:29 harti Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index a535b9da0ef52..bb2f9eb39b018 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.67.2.2.2.2 2008/01/28 08:57:11 dougb Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
diff --git a/share/mk/bsd.pkg.mk b/share/mk/bsd.pkg.mk
index 3d1ca42e9355b..a4ccf90816510 100644
--- a/share/mk/bsd.pkg.mk
+++ b/share/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.pkg.mk,v 1.1 2004/12/20 15:46:56 paul Exp $
 
 WRKDIR=${.OBJDIR}
 .if ${.OBJDIR} == ${.CURDIR}
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 99374a5024bed..8ad3d7b35f581 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.mk,v 1.309 2006/11/19 16:28:52 ru Exp $
 
 PORTSDIR?=	/usr/ports
 BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
diff --git a/share/mk/bsd.port.options.mk b/share/mk/bsd.port.options.mk
index e043cc2cb49ac..c31cbe4216768 100644
--- a/share/mk/bsd.port.options.mk
+++ b/share/mk/bsd.port.options.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.options.mk,v 1.1 2007/06/01 15:17:51 pav Exp $
 
 USEOPTIONSMK=	yes
 INOPTIONSMK=	yes
diff --git a/share/mk/bsd.port.post.mk b/share/mk/bsd.port.post.mk
index d64dc1276b44f..b0446d07f27c5 100644
--- a/share/mk/bsd.port.post.mk
+++ b/share/mk/bsd.port.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.post.mk,v 1.4 2002/04/19 07:42:41 ru Exp $
 
 AFTERPORTMK=	yes
 
diff --git a/share/mk/bsd.port.pre.mk b/share/mk/bsd.port.pre.mk
index dff464ec32da6..7430d9c814d3f 100644
--- a/share/mk/bsd.port.pre.mk
+++ b/share/mk/bsd.port.pre.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.pre.mk,v 1.4 2002/04/19 07:42:41 ru Exp $
 
 BEFOREPORTMK=	yes
 
diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk
index 51156023efff7..643b95e9e925f 100644
--- a/share/mk/bsd.port.subdir.mk
+++ b/share/mk/bsd.port.subdir.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.port.subdir.mk,v 1.31 2004/07/02 20:47:18 eik Exp $
 
 PORTSDIR?=	/usr/ports
 BSDPORTSUBDIRMK?=	${PORTSDIR}/Mk/bsd.port.subdir.mk
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index b9fee3287d626..c16e9afd5326b 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.150 2007/10/01 18:15:11 ru Exp $
 
 .include <bsd.init.mk>
 
diff --git a/share/mk/bsd.snmpmod.mk b/share/mk/bsd.snmpmod.mk
index 92b40dcd7b65b..312f4f3e95e79 100644
--- a/share/mk/bsd.snmpmod.mk
+++ b/share/mk/bsd.snmpmod.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.snmpmod.mk,v 1.2 2005/11/10 12:07:12 harti Exp $
 
 INCSDIR=	${INCLUDEDIR}/bsnmp
 
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 6ee952f36a5b6..27593e2522397 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.50 2005/05/31 07:14:51 ru Exp $
 #
 # The include file <bsd.subdir.mk> contains the default targets
 # for building subdirectories.
diff --git a/share/mk/bsd.symver.mk b/share/mk/bsd.symver.mk
index 30a822e1c1f56..a4573fda80e02 100644
--- a/share/mk/bsd.symver.mk
+++ b/share/mk/bsd.symver.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.symver.mk,v 1.4 2007/05/21 09:01:23 ru Exp $
 
 .if !target(__<bsd.symver.mk>__)
 __<bsd.symver.mk>__:
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 169268f9a68ee..96157ef0a894f 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.41 2007/05/24 21:53:42 obrien Exp $
 #
 # This file contains common settings used for building FreeBSD
 # sources.
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index edde5ec0fb4c2..907d837ca2962 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-# $FreeBSD$
+# $FreeBSD: src/share/mk/sys.mk,v 1.92.2.1 2007/12/02 13:24:43 cognet Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 .FreeBSD	?=	true
diff --git a/share/mk/version_gen.awk b/share/mk/version_gen.awk
index 11aaa29c52d10..ef9001458cef5 100644
--- a/share/mk/version_gen.awk
+++ b/share/mk/version_gen.awk
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/share/mk/version_gen.awk,v 1.3 2007/07/21 20:52:32 kan Exp $
 #
 
 #
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index a69ec24e6273c..1745e2990d1e8 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mklocale/Makefile,v 1.65 2006/11/09 18:10:33 des Exp $
 
 LOCALES=	UTF-8 \
 		am_ET.UTF-8 \
diff --git a/share/mklocale/README.locale_name b/share/mklocale/README.locale_name
index 08faffe5e3bed..cc9111ecb8fe6 100644
--- a/share/mklocale/README.locale_name
+++ b/share/mklocale/README.locale_name
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/share/mklocale/README.locale_name,v 1.2 2001/06/10 22:13:29 ache Exp $
 
 Locale name string format must be compliant with XPG3 and
 using following format.
diff --git a/share/mklocale/UTF-8.src b/share/mklocale/UTF-8.src
index 73a7cc79ff677..915b4ac8d13e2 100644
--- a/share/mklocale/UTF-8.src
+++ b/share/mklocale/UTF-8.src
@@ -6,7 +6,7 @@
  * WARNING: UCS-4 used here as the internal representation, not UTF-8.
  * See lib/libc/locale/utf8.c.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/UTF-8.src,v 1.2.2.1 2007/10/24 14:29:32 rafan Exp $
  */
 
 /*
diff --git a/share/mklocale/am_ET.UTF-8.src b/share/mklocale/am_ET.UTF-8.src
index 312a268ca9999..fef5bfa864a46 100644
--- a/share/mklocale/am_ET.UTF-8.src
+++ b/share/mklocale/am_ET.UTF-8.src
@@ -4,7 +4,7 @@
  * ሚካኤ� ጥላ�ን <mtm@FreeBSD.Org>
  * Last updated Mon Aug 04 02:06:00 EST 2003
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/am_ET.UTF-8.src,v 1.2 2003/08/05 06:34:16 ache Exp $
  */
 
 ENCODING	"UTF-8"
diff --git a/share/mklocale/be_BY.CP1131.src b/share/mklocale/be_BY.CP1131.src
index 7674e1dfebc3a..a018cdb83918a 100644
--- a/share/mklocale/be_BY.CP1131.src
+++ b/share/mklocale/be_BY.CP1131.src
@@ -1,7 +1,7 @@
 /*
  * Belarusian language. Modern/standard (1959) grammar.
  * Prepared by Yury Tarasievich <spytar@yahoo.com>
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/be_BY.CP1131.src,v 1.2 2005/04/21 09:15:19 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/bg_BG.CP1251.src b/share/mklocale/bg_BG.CP1251.src
index 4540c47c446d2..458717357da1f 100644
--- a/share/mklocale/bg_BG.CP1251.src
+++ b/share/mklocale/bg_BG.CP1251.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Bulgarian Cyrillic character set (CP1251)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/bg_BG.CP1251.src,v 1.4 2002/03/28 01:13:04 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Bulgarian Cyrillic character set (CP1251) by <roam@ringlet.net>
diff --git a/share/mklocale/el_GR.ISO8859-7.src b/share/mklocale/el_GR.ISO8859-7.src
index aeaba38a30c28..28ebf7413d7f3 100644
--- a/share/mklocale/el_GR.ISO8859-7.src
+++ b/share/mklocale/el_GR.ISO8859-7.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Greek/ISO8859-7 set
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/el_GR.ISO8859-7.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/hi_IN.ISCII-DEV.src b/share/mklocale/hi_IN.ISCII-DEV.src
index 59916e8c8d5f4..194980e8c6733 100644
--- a/share/mklocale/hi_IN.ISCII-DEV.src
+++ b/share/mklocale/hi_IN.ISCII-DEV.src
@@ -4,7 +4,7 @@
  * Arun Sharma <arun@sharma-home.net> 
  * Last updated Mon Nov 19 23:07:46 PST 2001
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/hi_IN.ISCII-DEV.src,v 1.5 2001/11/30 07:19:21 ache Exp $
  */
 
 ENCODING     "NONE"
diff --git a/share/mklocale/hy_AM.ARMSCII-8.src b/share/mklocale/hy_AM.ARMSCII-8.src
index 7ccc8d6672abf..bb1d036c16393 100644
--- a/share/mklocale/hy_AM.ARMSCII-8.src
+++ b/share/mklocale/hy_AM.ARMSCII-8.src
@@ -3,7 +3,7 @@
  * 
  * Made available by Vahe Khachikyan <vahe@khachikyan.de>
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:16 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE	Armenian ARMSCII-8 character set by <vahe@khachikyan.de>
diff --git a/share/mklocale/ja_JP.SJIS.src b/share/mklocale/ja_JP.SJIS.src
index 0de5a88458b10..542a07f3d7f3e 100644
--- a/share/mklocale/ja_JP.SJIS.src
+++ b/share/mklocale/ja_JP.SJIS.src
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ja_JP.SJIS.src,v 1.5 2006/02/12 17:56:16 ume Exp $
  */
 
 ENCODING	"MSKanji"
diff --git a/share/mklocale/ja_JP.eucJP.src b/share/mklocale/ja_JP.eucJP.src
index 50f2275af9b6f..96eb12221ab24 100644
--- a/share/mklocale/ja_JP.eucJP.src
+++ b/share/mklocale/ja_JP.eucJP.src
@@ -3,7 +3,7 @@
 /*
  * Japanese LOCALE_CTYPE definitions using EUC of JIS character sets
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ja_JP.eucJP.src,v 1.5 2007/05/09 21:34:51 ache Exp $
  */
 
 ENCODING	"EUC"
diff --git a/share/mklocale/kk_KZ.PT154.src b/share/mklocale/kk_KZ.PT154.src
index 2c6ac798dd559..7a27caf3a510e 100644
--- a/share/mklocale/kk_KZ.PT154.src
+++ b/share/mklocale/kk_KZ.PT154.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for PT154 character set (IANA PTCP154)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:20 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        PT154 character set by Birsh T <birsh@mail.kz>
diff --git a/share/mklocale/ko_KR.CP949.src b/share/mklocale/ko_KR.CP949.src
index cda9626164ebd..2c20f0086ff1d 100644
--- a/share/mklocale/ko_KR.CP949.src
+++ b/share/mklocale/ko_KR.CP949.src
@@ -9,7 +9,7 @@
  *  <0x81-0xa0><0x41-0xfe>	Hangul syllables GAGG-JWAK
  *  <0xa1-0xc6><0x41-0xa0>	Hangul syllables JWAT-HIH (ends with C652)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ko_KR.CP949.src,v 1.2 2003/08/08 14:02:20 ache Exp $
  */
 
 ENCODING        "GBK" /* CP949 isn't GBK, but they have same encoding method. */
diff --git a/share/mklocale/ko_KR.eucKR.src b/share/mklocale/ko_KR.eucKR.src
index 9870adc687f09..7cd7feeab4839 100644
--- a/share/mklocale/ko_KR.eucKR.src
+++ b/share/mklocale/ko_KR.eucKR.src
@@ -8,7 +8,7 @@
  *
  * It is based on manpage mklocale(1), euc(4), ja_JP.EUC.src.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ko_KR.eucKR.src,v 1.5 2006/02/25 17:12:43 ume Exp $
  */
 
 ENCODING     "EUC"
diff --git a/share/mklocale/la_LN.ISO8859-1.src b/share/mklocale/la_LN.ISO8859-1.src
index 0545dd1195384..724eacd99aa0f 100644
--- a/share/mklocale/la_LN.ISO8859-1.src
+++ b/share/mklocale/la_LN.ISO8859-1.src
@@ -1,7 +1,7 @@
 /*
  * Standard LOCALE_CTYPE for the ISO 8859-1 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-1.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        ISO 8859-1 Latin-1 character set
diff --git a/share/mklocale/la_LN.ISO8859-15.src b/share/mklocale/la_LN.ISO8859-15.src
index ac780d3ad483d..cfa2ec72d119b 100644
--- a/share/mklocale/la_LN.ISO8859-15.src
+++ b/share/mklocale/la_LN.ISO8859-15.src
@@ -1,7 +1,7 @@
 /*
  * Standard LOCALE_CTYPE for the ISO 8859-15 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-15.src,v 1.3 2002/06/03 21:30:28 tobez Exp $
  */
 ENCODING	"NONE"
 VARIABLE        ISO 8859-15 Latin-9 character set
diff --git a/share/mklocale/la_LN.ISO8859-2.src b/share/mklocale/la_LN.ISO8859-2.src
index 9a28807bf9df7..7f7fd4fc0e8e9 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-2.src,v 1.4 2001/11/30 05:05:53 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/la_LN.ISO8859-4.src b/share/mklocale/la_LN.ISO8859-4.src
index 2a4d8339de1e4..f3922554cb72f 100644
--- a/share/mklocale/la_LN.ISO8859-4.src
+++ b/share/mklocale/la_LN.ISO8859-4.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_4 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.ISO8859-4.src,v 1.4 2001/11/30 05:24:09 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/la_LN.US-ASCII.src b/share/mklocale/la_LN.US-ASCII.src
index 2c22f70b93646..ca7296ff0fc90 100644
--- a/share/mklocale/la_LN.US-ASCII.src
+++ b/share/mklocale/la_LN.US-ASCII.src
@@ -1,7 +1,7 @@
 /*
  * Standard LOCALE_CTYPE for the US-ASCII Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/la_LN.US-ASCII.src,v 1.2 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING        "NONE"
 VARIABLE        Strict 7bit US-ASCII locale
diff --git a/share/mklocale/lt_LT.ISO8859-13.src b/share/mklocale/lt_LT.ISO8859-13.src
index ddd248f1cc1e7..1777ea8324e3a 100644
--- a/share/mklocale/lt_LT.ISO8859-13.src
+++ b/share/mklocale/lt_LT.ISO8859-13.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_13 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/ru_RU.CP866.src b/share/mklocale/ru_RU.CP866.src
index 081f75752b898..3b594a257011d 100644
--- a/share/mklocale/ru_RU.CP866.src
+++ b/share/mklocale/ru_RU.CP866.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Russian Alternative character set (CP866)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ru_RU.CP866.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Russian Alternative code table (CP866) by <ache@nagual.pp.ru>
diff --git a/share/mklocale/ru_RU.ISO8859-5.src b/share/mklocale/ru_RU.ISO8859-5.src
index 4b6f637051066..cecc054ab6380 100644
--- a/share/mklocale/ru_RU.ISO8859-5.src
+++ b/share/mklocale/ru_RU.ISO8859-5.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for ISO8859-5 set
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ru_RU.ISO8859-5.src,v 1.3 2001/12/20 20:33:30 ache Exp $
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/ru_RU.KOI8-R.src b/share/mklocale/ru_RU.KOI8-R.src
index d9eac8f791ea8..901c12d1e10b5 100644
--- a/share/mklocale/ru_RU.KOI8-R.src
+++ b/share/mklocale/ru_RU.KOI8-R.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Russian koi8-r character set (RFC1489)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/ru_RU.KOI8-R.src,v 1.4 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Russian KOI8-R character set by <ache@nagual.pp.ru>
diff --git a/share/mklocale/uk_UA.KOI8-U.src b/share/mklocale/uk_UA.KOI8-U.src
index 6abe203793fa9..850b543c8b4eb 100644
--- a/share/mklocale/uk_UA.KOI8-U.src
+++ b/share/mklocale/uk_UA.KOI8-U.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for Ukrainian koi8-u character set (RFC2319)
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/uk_UA.KOI8-U.src,v 1.3 2001/11/30 05:05:53 ache Exp $
  */
 ENCODING	"NONE"
 VARIABLE        Ukrainian koi8-u character set
diff --git a/share/mklocale/zh_CN.GB18030.src b/share/mklocale/zh_CN.GB18030.src
index 9c2d8751b6557..6572f038aa856 100644
--- a/share/mklocale/zh_CN.GB18030.src
+++ b/share/mklocale/zh_CN.GB18030.src
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.GB18030.src,v 1.3 2003/08/21 19:23:15 ache Exp $
  */
 
 ENCODING	"GB18030"
diff --git a/share/mklocale/zh_CN.GB2312.src b/share/mklocale/zh_CN.GB2312.src
index 8836089c8b742..147e6a8466d2c 100644
--- a/share/mklocale/zh_CN.GB2312.src
+++ b/share/mklocale/zh_CN.GB2312.src
@@ -2,7 +2,7 @@
  * GB2312   first byte:   A1-FE
  *          second byte:  A1-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.GB2312.src,v 1.1 2003/11/05 22:54:54 davidxu Exp $
  */
 
 ENCODING	"GB2312"
diff --git a/share/mklocale/zh_CN.GBK.src b/share/mklocale/zh_CN.GBK.src
index 3af1f1bbee1b2..4956b9e2d4a6d 100644
--- a/share/mklocale/zh_CN.GBK.src
+++ b/share/mklocale/zh_CN.GBK.src
@@ -2,7 +2,7 @@
  * GBK      first byte:   81-FE
  *          second byte:  40-7E, 80-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.GBK.src,v 1.2 2006/02/26 14:03:13 delphij Exp $
  */
 
 ENCODING	"GBK"
diff --git a/share/mklocale/zh_CN.eucCN.src b/share/mklocale/zh_CN.eucCN.src
index 477244b1d5374..b5ebc57461d05 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_CN.eucCN.src,v 1.5 2006/02/27 06:11:58 delphij Exp $
  */
 
 ENCODING	"EUC"
diff --git a/share/mklocale/zh_HK.Big5HKSCS.src b/share/mklocale/zh_HK.Big5HKSCS.src
index aa2600e92ba9f..06a2a6e1f3861 100644
--- a/share/mklocale/zh_HK.Big5HKSCS.src
+++ b/share/mklocale/zh_HK.Big5HKSCS.src
@@ -2,7 +2,7 @@
  * big5hkscs   first byte:    81-FE
  *             second byte:   40-7E, A1-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_HK.Big5HKSCS.src,v 1.2 2003/12/19 12:51:40 ache Exp $
  */
 
 ENCODING        "GBK"
diff --git a/share/mklocale/zh_TW.Big5.src b/share/mklocale/zh_TW.Big5.src
index 6671c8741b21c..6200474fa4ac4 100644
--- a/share/mklocale/zh_TW.Big5.src
+++ b/share/mklocale/zh_TW.Big5.src
@@ -2,7 +2,7 @@
  * big5   first byte:   A1-FE
  *        second byte:   40-7E, A1-FE
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/mklocale/zh_TW.Big5.src,v 1.5 2006/02/25 23:28:19 delphij Exp $
  */
 
 ENCODING        "BIG5"
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 3c72505eca82a..98908e1de35d5 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/Makefile,v 1.64 2006/11/09 18:10:33 des Exp $
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
diff --git a/share/monetdef/af_ZA.ISO8859-1.src b/share/monetdef/af_ZA.ISO8859-1.src
index 4a17750e0a0fb..88fdd3fa5dd82 100644
--- a/share/monetdef/af_ZA.ISO8859-1.src
+++ b/share/monetdef/af_ZA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/af_ZA.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/am_ET.UTF-8.src b/share/monetdef/am_ET.UTF-8.src
index dfabaec0e5534..5b4b0e985b4ad 100644
--- a/share/monetdef/am_ET.UTF-8.src
+++ b/share/monetdef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/am_ET.UTF-8.src,v 1.1 2003/08/05 05:42:08 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/be_BY.CP1131.src b/share/monetdef/be_BY.CP1131.src
index a39e5f30d5149..b4e2a638608cf 100644
--- a/share/monetdef/be_BY.CP1131.src
+++ b/share/monetdef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/be_BY.CP1251.src b/share/monetdef/be_BY.CP1251.src
index ec4f95f63b1da..d1afd2e12c7a6 100644
--- a/share/monetdef/be_BY.CP1251.src
+++ b/share/monetdef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/be_BY.ISO8859-5.src b/share/monetdef/be_BY.ISO8859-5.src
index e49691c93c3f2..d64cb98f312e5 100644
--- a/share/monetdef/be_BY.ISO8859-5.src
+++ b/share/monetdef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:42 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/be_BY.UTF-8.src b/share/monetdef/be_BY.UTF-8.src
index a103547f787d9..ec1e2c436f2ff 100644
--- a/share/monetdef/be_BY.UTF-8.src
+++ b/share/monetdef/be_BY.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/be_BY.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/monetdef/bg_BG.CP1251.src b/share/monetdef/bg_BG.CP1251.src
index 4d8efffa438db..c82f64a0db95a 100644
--- a/share/monetdef/bg_BG.CP1251.src
+++ b/share/monetdef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:08:39 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/bg_BG.UTF-8.src b/share/monetdef/bg_BG.UTF-8.src
index be1d6882f18d3..f0d71ddf1d042 100644
--- a/share/monetdef/bg_BG.UTF-8.src
+++ b/share/monetdef/bg_BG.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/bg_BG.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ca_ES.ISO8859-1.src b/share/monetdef/ca_ES.ISO8859-1.src
index c6b2a13345b94..a4e8624a71a5c 100644
--- a/share/monetdef/ca_ES.ISO8859-1.src
+++ b/share/monetdef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:57 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/cs_CZ.ISO8859-2.src b/share/monetdef/cs_CZ.ISO8859-2.src
index 2ca0f33b8f6b3..dea589faac488 100644
--- a/share/monetdef/cs_CZ.ISO8859-2.src
+++ b/share/monetdef/cs_CZ.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/cs_CZ.ISO8859-2.src,v 1.3 2001/09/09 14:49:13 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/cs_CZ.UTF-8.src b/share/monetdef/cs_CZ.UTF-8.src
index cc10a621212e8..4bb71f7c719ac 100644
--- a/share/monetdef/cs_CZ.UTF-8.src
+++ b/share/monetdef/cs_CZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/cs_CZ.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/da_DK.ISO8859-1.src b/share/monetdef/da_DK.ISO8859-1.src
index a18b4cb4b0144..274e20b6b5bc0 100644
--- a/share/monetdef/da_DK.ISO8859-1.src
+++ b/share/monetdef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/da_DK.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/de_AT.ISO8859-1.src b/share/monetdef/de_AT.ISO8859-1.src
index 63f77740326f8..d48b310710b88 100644
--- a/share/monetdef/de_AT.ISO8859-1.src
+++ b/share/monetdef/de_AT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/de_AT.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/de_CH.ISO8859-1.src b/share/monetdef/de_CH.ISO8859-1.src
index 9bb3e8e23cd4d..23e680b948fe0 100644
--- a/share/monetdef/de_CH.ISO8859-1.src
+++ b/share/monetdef/de_CH.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/de_CH.ISO8859-1.src,v 1.1 2001/12/25 18:50:48 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/de_DE.ISO8859-1.src b/share/monetdef/de_DE.ISO8859-1.src
index c95cd1e9612fb..911abc0f2cc7e 100644
--- a/share/monetdef/de_DE.ISO8859-1.src
+++ b/share/monetdef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/de_DE.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/el_GR.ISO8859-7.src b/share/monetdef/el_GR.ISO8859-7.src
index 8b1a9a503a5a5..3e38c0186ddb5 100644
--- a/share/monetdef/el_GR.ISO8859-7.src
+++ b/share/monetdef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/el_GR.ISO8859-7.src,v 1.3 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_AU.ISO8859-1.src b/share/monetdef/en_AU.ISO8859-1.src
index 32c4298364106..4022454c973b1 100644
--- a/share/monetdef/en_AU.ISO8859-1.src
+++ b/share/monetdef/en_AU.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_AU.ISO8859-1.src,v 1.7 2002/10/09 09:25:11 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_CA.ISO8859-1.src b/share/monetdef/en_CA.ISO8859-1.src
index 75e31f60cc5db..2fd5c2f7c81c1 100644
--- a/share/monetdef/en_CA.ISO8859-1.src
+++ b/share/monetdef/en_CA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_CA.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_GB.ISO8859-1.src b/share/monetdef/en_GB.ISO8859-1.src
index a0472d3079686..8e6dd9da46605 100644
--- a/share/monetdef/en_GB.ISO8859-1.src
+++ b/share/monetdef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_GB.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_GB.UTF-8.src b/share/monetdef/en_GB.UTF-8.src
index e187d8c0cee31..32ccffc86aa4d 100644
--- a/share/monetdef/en_GB.UTF-8.src
+++ b/share/monetdef/en_GB.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_GB.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_IE.UTF-8.src b/share/monetdef/en_IE.UTF-8.src
index 1ddcc5ccaf68e..74943b6272050 100644
--- a/share/monetdef/en_IE.UTF-8.src
+++ b/share/monetdef/en_IE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_IE.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_NZ.ISO8859-1.src b/share/monetdef/en_NZ.ISO8859-1.src
index 1cb82617599f7..592410bedc138 100644
--- a/share/monetdef/en_NZ.ISO8859-1.src
+++ b/share/monetdef/en_NZ.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_NZ.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/en_US.ISO8859-1.src b/share/monetdef/en_US.ISO8859-1.src
index faf42e5ae7809..16bf488be979b 100644
--- a/share/monetdef/en_US.ISO8859-1.src
+++ b/share/monetdef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/en_US.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/es_ES.ISO8859-1.src b/share/monetdef/es_ES.ISO8859-1.src
index 81d7a600a0376..64a11078bb840 100644
--- a/share/monetdef/es_ES.ISO8859-1.src
+++ b/share/monetdef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/es_ES.ISO8859-1.src,v 1.3 2004/09/24 07:48:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/et_EE.ISO8859-15.src b/share/monetdef/et_EE.ISO8859-15.src
index a03ad1a2afbf6..7dd29cc1bcff1 100644
--- a/share/monetdef/et_EE.ISO8859-15.src
+++ b/share/monetdef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/et_EE.ISO8859-15.src,v 1.1 2001/03/16 12:27:20 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fi_FI.ISO8859-1.src b/share/monetdef/fi_FI.ISO8859-1.src
index 372e77b3facda..51928d5f5ad42 100644
--- a/share/monetdef/fi_FI.ISO8859-1.src
+++ b/share/monetdef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fi_FI.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fr_BE.ISO8859-1.src b/share/monetdef/fr_BE.ISO8859-1.src
index 23c0fcdfded60..c0f0c752c8272 100644
--- a/share/monetdef/fr_BE.ISO8859-1.src
+++ b/share/monetdef/fr_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fr_BE.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fr_CA.ISO8859-1.src b/share/monetdef/fr_CA.ISO8859-1.src
index 64ff444dae09f..e41d7c072bc10 100644
--- a/share/monetdef/fr_CA.ISO8859-1.src
+++ b/share/monetdef/fr_CA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fr_CA.ISO8859-1.src,v 1.6 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/fr_FR.ISO8859-1.src b/share/monetdef/fr_FR.ISO8859-1.src
index 8211d1449dc71..b56aeae2ee457 100644
--- a/share/monetdef/fr_FR.ISO8859-1.src
+++ b/share/monetdef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/fr_FR.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/he_IL.UTF-8.src b/share/monetdef/he_IL.UTF-8.src
index 7468457572373..c7dc500ea1dbe 100644
--- a/share/monetdef/he_IL.UTF-8.src
+++ b/share/monetdef/he_IL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/he_IL.UTF-8.src,v 1.2 2005/11/16 11:20:51 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hi_IN.ISCII-DEV.src b/share/monetdef/hi_IN.ISCII-DEV.src
index cc6de7446dfe4..29359dd06f12f 100644
--- a/share/monetdef/hi_IN.ISCII-DEV.src
+++ b/share/monetdef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:08 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hr_HR.ISO8859-2.src b/share/monetdef/hr_HR.ISO8859-2.src
index ea1cc94f0829f..48e44e2cac847 100644
--- a/share/monetdef/hr_HR.ISO8859-2.src
+++ b/share/monetdef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hr_HR.ISO8859-2.src,v 1.1 2001/04/28 15:13:20 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hu_HU.ISO8859-2.src b/share/monetdef/hu_HU.ISO8859-2.src
index 183f155d2c3e4..45795b9f4e578 100644
--- a/share/monetdef/hu_HU.ISO8859-2.src
+++ b/share/monetdef/hu_HU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hu_HU.ISO8859-2.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/hy_AM.ARMSCII-8.src b/share/monetdef/hy_AM.ARMSCII-8.src
index 5d8ed16090c9e..b3e8c614aa444 100644
--- a/share/monetdef/hy_AM.ARMSCII-8.src
+++ b/share/monetdef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # LC_MONETARY source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/monetdef/hy_AM.UTF-8.src b/share/monetdef/hy_AM.UTF-8.src
index 80396b1e982db..6f79911ff7ec8 100644
--- a/share/monetdef/hy_AM.UTF-8.src
+++ b/share/monetdef/hy_AM.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/hy_AM.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # LC_MONETARY source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/monetdef/is_IS.ISO8859-1.src b/share/monetdef/is_IS.ISO8859-1.src
index 66a80374e449e..d85f75e1075a3 100644
--- a/share/monetdef/is_IS.ISO8859-1.src
+++ b/share/monetdef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/is_IS.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/it_IT.ISO8859-1.src b/share/monetdef/it_IT.ISO8859-1.src
index c6b2a13345b94..c1aefbc2ddd92 100644
--- a/share/monetdef/it_IT.ISO8859-1.src
+++ b/share/monetdef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/it_IT.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ja_JP.UTF-8.src b/share/monetdef/ja_JP.UTF-8.src
index fce3288abd003..8680cf3e87e32 100644
--- a/share/monetdef/ja_JP.UTF-8.src
+++ b/share/monetdef/ja_JP.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ja_JP.UTF-8.src,v 1.1 2004/03/29 01:29:13 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ja_JP.eucJP.src b/share/monetdef/ja_JP.eucJP.src
index 462a88dc286c9..53f6c4d46cfe3 100644
--- a/share/monetdef/ja_JP.eucJP.src
+++ b/share/monetdef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ja_JP.eucJP.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/kk_KZ.PT154.src b/share/monetdef/kk_KZ.PT154.src
index 8b61e80973306..443ceccea47fb 100644
--- a/share/monetdef/kk_KZ.PT154.src
+++ b/share/monetdef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:20 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/kk_KZ.UTF-8.src b/share/monetdef/kk_KZ.UTF-8.src
index ddf0353e82392..e96895f0b4223 100644
--- a/share/monetdef/kk_KZ.UTF-8.src
+++ b/share/monetdef/kk_KZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/kk_KZ.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ko_KR.UTF-8.src b/share/monetdef/ko_KR.UTF-8.src
index 5d69ac5fdc7e7..1f253f50aa0b4 100644
--- a/share/monetdef/ko_KR.UTF-8.src
+++ b/share/monetdef/ko_KR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ko_KR.UTF-8.src,v 1.1 2004/03/29 01:53:31 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ko_KR.eucKR.src b/share/monetdef/ko_KR.eucKR.src
index 0723dfa245969..17b492d31829d 100644
--- a/share/monetdef/ko_KR.eucKR.src
+++ b/share/monetdef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ko_KR.eucKR.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/lt_LT.ISO8859-13.src b/share/monetdef/lt_LT.ISO8859-13.src
index 790e0c9a41c3c..a65209388fc87 100644
--- a/share/monetdef/lt_LT.ISO8859-13.src
+++ b/share/monetdef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/mn_MN.UTF-8.src b/share/monetdef/mn_MN.UTF-8.src
index a2638a734bf1e..b3c0e11dd34ec 100644
--- a/share/monetdef/mn_MN.UTF-8.src
+++ b/share/monetdef/mn_MN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/mn_MN.UTF-8.src,v 1.1 2006/10/02 00:36:51 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/nl_BE.ISO8859-1.src b/share/monetdef/nl_BE.ISO8859-1.src
index 23c0fcdfded60..2b53c0d5ce8f2 100644
--- a/share/monetdef/nl_BE.ISO8859-1.src
+++ b/share/monetdef/nl_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/nl_BE.ISO8859-1.src,v 1.2 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/nl_NL.ISO8859-1.src b/share/monetdef/nl_NL.ISO8859-1.src
index b5a0992b36c98..0503e09345060 100644
--- a/share/monetdef/nl_NL.ISO8859-1.src
+++ b/share/monetdef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/nl_NL.ISO8859-1.src,v 1.8 2002/02/19 18:38:04 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/no_NO.ISO8859-1.src b/share/monetdef/no_NO.ISO8859-1.src
index 181953389aa16..079bb457a1758 100644
--- a/share/monetdef/no_NO.ISO8859-1.src
+++ b/share/monetdef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/no_NO.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pl_PL.ISO8859-2.src b/share/monetdef/pl_PL.ISO8859-2.src
index b749031e99604..550ed7bb1134e 100644
--- a/share/monetdef/pl_PL.ISO8859-2.src
+++ b/share/monetdef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pl_PL.ISO8859-2.src,v 1.3 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pl_PL.UTF-8.src b/share/monetdef/pl_PL.UTF-8.src
index 5138186d82dd1..7faf038a86568 100644
--- a/share/monetdef/pl_PL.UTF-8.src
+++ b/share/monetdef/pl_PL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pl_PL.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pt_BR.ISO8859-1.src b/share/monetdef/pt_BR.ISO8859-1.src
index 0614e9fcba241..ef1dfa7b3608d 100644
--- a/share/monetdef/pt_BR.ISO8859-1.src
+++ b/share/monetdef/pt_BR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pt_BR.ISO8859-1.src,v 1.1 2002/04/05 15:03:12 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/pt_PT.ISO8859-1.src b/share/monetdef/pt_PT.ISO8859-1.src
index 23c0fcdfded60..aaa56f2d68800 100644
--- a/share/monetdef/pt_PT.ISO8859-1.src
+++ b/share/monetdef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/pt_PT.ISO8859-1.src,v 1.3 2006/06/11 14:43:18 simon Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ro_RO.ISO8859-2.src b/share/monetdef/ro_RO.ISO8859-2.src
index 4f543c4a2ad31..4571d681fb0ea 100644
--- a/share/monetdef/ro_RO.ISO8859-2.src
+++ b/share/monetdef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.CP1251.src b/share/monetdef/ru_RU.CP1251.src
index e02ea16d33733..5a4552db70622 100644
--- a/share/monetdef/ru_RU.CP1251.src
+++ b/share/monetdef/ru_RU.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.CP1251.src,v 1.2 2007/02/28 16:28:49 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.CP866.src b/share/monetdef/ru_RU.CP866.src
index 26473b35236df..a6a9fb4fa5e04 100644
--- a/share/monetdef/ru_RU.CP866.src
+++ b/share/monetdef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.CP866.src,v 1.2 2007/02/28 16:28:49 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.ISO8859-5.src b/share/monetdef/ru_RU.ISO8859-5.src
index 82b1e53ab244f..90a6a45336e64 100644
--- a/share/monetdef/ru_RU.ISO8859-5.src
+++ b/share/monetdef/ru_RU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.ISO8859-5.src,v 1.2 2007/02/28 16:28:49 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.KOI8-R.src b/share/monetdef/ru_RU.KOI8-R.src
index 168caf7ec569f..0b6bfa107955f 100644
--- a/share/monetdef/ru_RU.KOI8-R.src
+++ b/share/monetdef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.KOI8-R.src,v 1.8 2007/02/28 16:28:49 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/ru_RU.UTF-8.src b/share/monetdef/ru_RU.UTF-8.src
index fe823caa842ee..a94fb0cacb15c 100644
--- a/share/monetdef/ru_RU.UTF-8.src
+++ b/share/monetdef/ru_RU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/ru_RU.UTF-8.src,v 1.2 2007/02/28 16:28:49 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sk_SK.ISO8859-2.src b/share/monetdef/sk_SK.ISO8859-2.src
index dc2ac34f5564d..217c6b9e34b53 100644
--- a/share/monetdef/sk_SK.ISO8859-2.src
+++ b/share/monetdef/sk_SK.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sk_SK.ISO8859-2.src,v 1.1 2001/05/18 13:53:21 ache Exp $
 #
 # Slovak monetary definition by Juraj Bednar <juraj@bednar.sk>
 #
diff --git a/share/monetdef/sl_SI.ISO8859-2.src b/share/monetdef/sl_SI.ISO8859-2.src
index 2448e452bc536..c7f36e7634a28 100644
--- a/share/monetdef/sl_SI.ISO8859-2.src
+++ b/share/monetdef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sl_SI.ISO8859-2.src,v 1.1 2001/04/28 15:13:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sr_YU.ISO8859-2.src b/share/monetdef/sr_YU.ISO8859-2.src
index b706e29154e09..46b082059dbee 100644
--- a/share/monetdef/sr_YU.ISO8859-2.src
+++ b/share/monetdef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sr_YU.ISO8859-5.src b/share/monetdef/sr_YU.ISO8859-5.src
index e5e9f4c967ae1..66fcebc66667b 100644
--- a/share/monetdef/sr_YU.ISO8859-5.src
+++ b/share/monetdef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sr_YU.UTF-8.src b/share/monetdef/sr_YU.UTF-8.src
index 6e8b013707e2f..3fcb35806f634 100644
--- a/share/monetdef/sr_YU.UTF-8.src
+++ b/share/monetdef/sr_YU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sr_YU.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/sv_SE.ISO8859-1.src b/share/monetdef/sv_SE.ISO8859-1.src
index a835567ef9be6..23a673473cfe3 100644
--- a/share/monetdef/sv_SE.ISO8859-1.src
+++ b/share/monetdef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/sv_SE.ISO8859-1.src,v 1.7 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/tr_TR.ISO8859-9.src b/share/monetdef/tr_TR.ISO8859-9.src
index 41d45477cd931..b83e6d1c18506 100644
--- a/share/monetdef/tr_TR.ISO8859-9.src
+++ b/share/monetdef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/tr_TR.ISO8859-9.src,v 1.1 2001/04/28 15:13:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.CP1251.src b/share/monetdef/uk_UA.CP1251.src
index 807dded42272c..05fdeb6cae9eb 100644
--- a/share/monetdef/uk_UA.CP1251.src
+++ b/share/monetdef/uk_UA.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:29 ru Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.ISO8859-5.src b/share/monetdef/uk_UA.ISO8859-5.src
index b95e3bd3be7ff..b25fb3f71ed3e 100644
--- a/share/monetdef/uk_UA.ISO8859-5.src
+++ b/share/monetdef/uk_UA.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.ISO8859-5.src,v 1.1 2001/12/20 20:48:31 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.KOI8-U.src b/share/monetdef/uk_UA.KOI8-U.src
index 5464d142d093e..6e11244cd64fc 100644
--- a/share/monetdef/uk_UA.KOI8-U.src
+++ b/share/monetdef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.KOI8-U.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/uk_UA.UTF-8.src b/share/monetdef/uk_UA.UTF-8.src
index 842c02f176a1e..5c2aae59f3f46 100644
--- a/share/monetdef/uk_UA.UTF-8.src
+++ b/share/monetdef/uk_UA.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/uk_UA.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.GB18030.src b/share/monetdef/zh_CN.GB18030.src
index e1c0ef28d3e02..3e37216b9ef9c 100644
--- a/share/monetdef/zh_CN.GB18030.src
+++ b/share/monetdef/zh_CN.GB18030.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.GB18030.src,v 1.1 2003/07/29 16:12:56 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.GB2312.src b/share/monetdef/zh_CN.GB2312.src
index e1c0ef28d3e02..7cec677b7e0ad 100644
--- a/share/monetdef/zh_CN.GB2312.src
+++ b/share/monetdef/zh_CN.GB2312.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.GB2312.src,v 1.1 2003/11/05 22:59:02 davidxu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.UTF-8.src b/share/monetdef/zh_CN.UTF-8.src
index 136d66cddd02f..a97c6c70ac142 100644
--- a/share/monetdef/zh_CN.UTF-8.src
+++ b/share/monetdef/zh_CN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_CN.eucCN.src b/share/monetdef/zh_CN.eucCN.src
index 3f5fc2409c1e4..7720e17d3fa18 100644
--- a/share/monetdef/zh_CN.eucCN.src
+++ b/share/monetdef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_CN.eucCN.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_HK.UTF-8.src b/share/monetdef/zh_HK.UTF-8.src
index 64921a9e56dca..a356d801f9c7d 100644
--- a/share/monetdef/zh_HK.UTF-8.src
+++ b/share/monetdef/zh_HK.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_HK.UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/monetdef/zh_TW.Big5.src b/share/monetdef/zh_TW.Big5.src
index 1e86417df204d..077fa98baedf0 100644
--- a/share/monetdef/zh_TW.Big5.src
+++ b/share/monetdef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/monetdef/zh_TW.Big5.src,v 1.2 2001/02/19 18:55:34 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 32bafff60b483..c155740fd3c51 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/Makefile,v 1.65 2006/11/09 18:10:33 des Exp $
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
diff --git a/share/msgdef/af_ZA.ISO8859-1.src b/share/msgdef/af_ZA.ISO8859-1.src
index a87da07feee20..383ff8b151f14 100644
--- a/share/msgdef/af_ZA.ISO8859-1.src
+++ b/share/msgdef/af_ZA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/af_ZA.ISO8859-1.src,v 1.1 2001/02/09 12:39:27 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/am_ET.UTF-8.src b/share/msgdef/am_ET.UTF-8.src
index a2b25ed14958c..0287fdc2658ef 100644
--- a/share/msgdef/am_ET.UTF-8.src
+++ b/share/msgdef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/am_ET.UTF-8.src,v 1.2 2006/02/18 22:08:28 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/be_BY.CP1131.src b/share/msgdef/be_BY.CP1131.src
index ed0a05eea079a..4a16b0e175fb4 100644
--- a/share/msgdef/be_BY.CP1131.src
+++ b/share/msgdef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/be_BY.CP1251.src b/share/msgdef/be_BY.CP1251.src
index a401228e58b2b..2da6d1b9d5648 100644
--- a/share/msgdef/be_BY.CP1251.src
+++ b/share/msgdef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/be_BY.ISO8859-5.src b/share/msgdef/be_BY.ISO8859-5.src
index a36e12673ee1c..2470ebaf4d684 100644
--- a/share/msgdef/be_BY.ISO8859-5.src
+++ b/share/msgdef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/be_BY.UTF-8.src b/share/msgdef/be_BY.UTF-8.src
index 8d23237784f7e..193c05e181891 100644
--- a/share/msgdef/be_BY.UTF-8.src
+++ b/share/msgdef/be_BY.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/be_BY.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/msgdef/bg_BG.CP1251.src b/share/msgdef/bg_BG.CP1251.src
index e52d30d64cf3d..a8a64a691902e 100644
--- a/share/msgdef/bg_BG.CP1251.src
+++ b/share/msgdef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:13:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/bg_BG.UTF-8.src b/share/msgdef/bg_BG.UTF-8.src
index 72dca12b49a97..219141f05e5d2 100644
--- a/share/msgdef/bg_BG.UTF-8.src
+++ b/share/msgdef/bg_BG.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/bg_BG.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ca_ES.ISO8859-1.src b/share/msgdef/ca_ES.ISO8859-1.src
index e839a0a217bac..a69e430f1586b 100644
--- a/share/msgdef/ca_ES.ISO8859-1.src
+++ b/share/msgdef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/cs_CZ.ISO8859-2.src b/share/msgdef/cs_CZ.ISO8859-2.src
index a6fc836343976..7767ba0663a12 100644
--- a/share/msgdef/cs_CZ.ISO8859-2.src
+++ b/share/msgdef/cs_CZ.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/cs_CZ.ISO8859-2.src,v 1.2 2001/02/14 12:17:10 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/da_DK.ISO8859-1.src b/share/msgdef/da_DK.ISO8859-1.src
index a87da07feee20..4d3ae18bc199f 100644
--- a/share/msgdef/da_DK.ISO8859-1.src
+++ b/share/msgdef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/da_DK.ISO8859-1.src,v 1.1 2001/02/09 12:08:11 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/de_DE.ISO8859-1.src b/share/msgdef/de_DE.ISO8859-1.src
index a87da07feee20..620f81bdbdf6c 100644
--- a/share/msgdef/de_DE.ISO8859-1.src
+++ b/share/msgdef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/de_DE.ISO8859-1.src,v 1.1 2001/02/09 12:21:16 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/el_GR.ISO8859-7.src b/share/msgdef/el_GR.ISO8859-7.src
index 85d433e990cf3..8de0021570ba4 100644
--- a/share/msgdef/el_GR.ISO8859-7.src
+++ b/share/msgdef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/el_GR.ISO8859-7.src,v 1.2 2001/02/14 23:34:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/el_GR.UTF-8.src b/share/msgdef/el_GR.UTF-8.src
index 560675e005c0e..0f515973f2884 100644
--- a/share/msgdef/el_GR.UTF-8.src
+++ b/share/msgdef/el_GR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/el_GR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/en_CA.ISO8859-1.src b/share/msgdef/en_CA.ISO8859-1.src
index 7a66f558ef570..6fd62d5a92c06 100644
--- a/share/msgdef/en_CA.ISO8859-1.src
+++ b/share/msgdef/en_CA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/en_CA.ISO8859-1.src,v 1.1 2001/04/28 15:13:24 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/en_GB.ISO8859-1.src b/share/msgdef/en_GB.ISO8859-1.src
index f80c8facd17be..7d3695787b575 100644
--- a/share/msgdef/en_GB.ISO8859-1.src
+++ b/share/msgdef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/en_GB.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/en_US.ISO8859-1.src b/share/msgdef/en_US.ISO8859-1.src
index bc2594ded3dfc..d2b351bd8a060 100644
--- a/share/msgdef/en_US.ISO8859-1.src
+++ b/share/msgdef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/en_US.ISO8859-1.src,v 1.2 2001/02/08 22:45:44 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/es_ES.ISO8859-1.src b/share/msgdef/es_ES.ISO8859-1.src
index e839a0a217bac..3ca4c74524826 100644
--- a/share/msgdef/es_ES.ISO8859-1.src
+++ b/share/msgdef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/es_ES.ISO8859-1.src,v 1.1 2001/04/29 00:38:26 jmas Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/et_EE.ISO8859-15.src b/share/msgdef/et_EE.ISO8859-15.src
index 0d31afd0a2ecd..86ede7cb083e0 100644
--- a/share/msgdef/et_EE.ISO8859-15.src
+++ b/share/msgdef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/et_EE.ISO8859-15.src,v 1.1 2001/03/16 12:16:42 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/eu_ES.ISO8859-1.src b/share/msgdef/eu_ES.ISO8859-1.src
index 8eaba389694b5..7c9a4b5f0f793 100644
--- a/share/msgdef/eu_ES.ISO8859-1.src
+++ b/share/msgdef/eu_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/eu_ES.ISO8859-1.src,v 1.1 2004/08/28 12:52:31 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fi_FI.ISO8859-1.src b/share/msgdef/fi_FI.ISO8859-1.src
index ac0092a84b3fd..790b56aed208d 100644
--- a/share/msgdef/fi_FI.ISO8859-1.src
+++ b/share/msgdef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fi_FI.ISO8859-1.src,v 1.1 2001/02/09 13:35:49 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fr_BE.ISO8859-1.src b/share/msgdef/fr_BE.ISO8859-1.src
index 14f8e236ee4a5..2f6db327e7823 100644
--- a/share/msgdef/fr_BE.ISO8859-1.src
+++ b/share/msgdef/fr_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fr_BE.ISO8859-1.src,v 1.1 2002/02/12 18:23:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fr_CH.ISO8859-1.src b/share/msgdef/fr_CH.ISO8859-1.src
index 4af763873c0d0..3af8b42bd1c28 100644
--- a/share/msgdef/fr_CH.ISO8859-1.src
+++ b/share/msgdef/fr_CH.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fr_CH.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/fr_FR.ISO8859-1.src b/share/msgdef/fr_FR.ISO8859-1.src
index 80d0218e78e66..ea0f663bdabdf 100644
--- a/share/msgdef/fr_FR.ISO8859-1.src
+++ b/share/msgdef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/fr_FR.ISO8859-1.src,v 1.1 2001/02/09 12:30:52 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/he_IL.UTF-8.src b/share/msgdef/he_IL.UTF-8.src
index ef87399e0769f..ba4a90cfa2ce4 100644
--- a/share/msgdef/he_IL.UTF-8.src
+++ b/share/msgdef/he_IL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/he_IL.UTF-8.src,v 1.1 2004/04/21 15:28:22 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hi_IN.ISCII-DEV.src b/share/msgdef/hi_IN.ISCII-DEV.src
index f9ec934117f47..65012913da8e5 100644
--- a/share/msgdef/hi_IN.ISCII-DEV.src
+++ b/share/msgdef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:08 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hr_HR.ISO8859-2.src b/share/msgdef/hr_HR.ISO8859-2.src
index a711ff76db9d9..547c250641f25 100644
--- a/share/msgdef/hr_HR.ISO8859-2.src
+++ b/share/msgdef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hr_HR.ISO8859-2.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hu_HU.ISO8859-2.src b/share/msgdef/hu_HU.ISO8859-2.src
index 4f009c700567c..6d0e8602253fb 100644
--- a/share/msgdef/hu_HU.ISO8859-2.src
+++ b/share/msgdef/hu_HU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hu_HU.ISO8859-2.src,v 1.1 2001/02/18 06:47:43 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/hy_AM.ARMSCII-8.src b/share/msgdef/hy_AM.ARMSCII-8.src
index c11b38e51caf1..677f81f4fa60f 100644
--- a/share/msgdef/hy_AM.ARMSCII-8.src
+++ b/share/msgdef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # msgdef source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/msgdef/hy_AM.UTF-8.src b/share/msgdef/hy_AM.UTF-8.src
index 749637de33c3b..2893b34196c27 100644
--- a/share/msgdef/hy_AM.UTF-8.src
+++ b/share/msgdef/hy_AM.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/hy_AM.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # msgdef source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/msgdef/is_IS.ISO8859-1.src b/share/msgdef/is_IS.ISO8859-1.src
index a87da07feee20..0d1222f699cef 100644
--- a/share/msgdef/is_IS.ISO8859-1.src
+++ b/share/msgdef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/is_IS.ISO8859-1.src,v 1.1 2001/02/09 14:08:51 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/it_IT.ISO8859-1.src b/share/msgdef/it_IT.ISO8859-1.src
index e839a0a217bac..59b3b3a1b99e6 100644
--- a/share/msgdef/it_IT.ISO8859-1.src
+++ b/share/msgdef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/it_IT.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ja_JP.SJIS.src b/share/msgdef/ja_JP.SJIS.src
index 8a209e5b8526d..e3ccfb58b1cd7 100644
--- a/share/msgdef/ja_JP.SJIS.src
+++ b/share/msgdef/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ja_JP.SJIS.src,v 1.1 2002/04/05 15:39:15 phantom Exp $
 #
 # XXX: ja_JP.SJIS contains english messages only. Someone familiar with
 # this locale is wanted to complete it!
diff --git a/share/msgdef/ja_JP.UTF-8.src b/share/msgdef/ja_JP.UTF-8.src
index 476ef44b3d62f..2fc9a45a04595 100644
--- a/share/msgdef/ja_JP.UTF-8.src
+++ b/share/msgdef/ja_JP.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ja_JP.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ja_JP.eucJP.src b/share/msgdef/ja_JP.eucJP.src
index 2f06e015abae7..3d8630b679d19 100644
--- a/share/msgdef/ja_JP.eucJP.src
+++ b/share/msgdef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ja_JP.eucJP.src,v 1.1 2001/02/11 16:19:42 knu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/kk_KZ.PT154.src b/share/msgdef/kk_KZ.PT154.src
index 583096f3ef5ef..808a71a0ccd8b 100644
--- a/share/msgdef/kk_KZ.PT154.src
+++ b/share/msgdef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:21 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/kk_KZ.UTF-8.src b/share/msgdef/kk_KZ.UTF-8.src
index 23cd9cbb88a79..f31009257d6b9 100644
--- a/share/msgdef/kk_KZ.UTF-8.src
+++ b/share/msgdef/kk_KZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/kk_KZ.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ko_KR.eucKR.src b/share/msgdef/ko_KR.eucKR.src
index e839a0a217bac..4d33e216d739d 100644
--- a/share/msgdef/ko_KR.eucKR.src
+++ b/share/msgdef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ko_KR.eucKR.src,v 1.1 2001/02/11 15:39:59 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/lt_LT.ISO8859-13.src b/share/msgdef/lt_LT.ISO8859-13.src
index 296f1584c1b05..a0743bc4fb1bf 100644
--- a/share/msgdef/lt_LT.ISO8859-13.src
+++ b/share/msgdef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:09 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/mn_MN.UTF-8.src b/share/msgdef/mn_MN.UTF-8.src
index 8851f6a043614..259f6c55f6d46 100644
--- a/share/msgdef/mn_MN.UTF-8.src
+++ b/share/msgdef/mn_MN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/mn_MN.UTF-8.src,v 1.1 2006/10/02 00:36:52 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/nl_NL.ISO8859-1.src b/share/msgdef/nl_NL.ISO8859-1.src
index a87da07feee20..0dad08b7ceb53 100644
--- a/share/msgdef/nl_NL.ISO8859-1.src
+++ b/share/msgdef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/nl_NL.ISO8859-1.src,v 1.1 2001/02/08 23:06:09 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/no_NO.ISO8859-1.src b/share/msgdef/no_NO.ISO8859-1.src
index a87da07feee20..566201569dc59 100644
--- a/share/msgdef/no_NO.ISO8859-1.src
+++ b/share/msgdef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/no_NO.ISO8859-1.src,v 1.1 2001/02/09 11:53:53 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/pl_PL.ISO8859-2.src b/share/msgdef/pl_PL.ISO8859-2.src
index a7acd2adf1f00..ce1e0b75a3f41 100644
--- a/share/msgdef/pl_PL.ISO8859-2.src
+++ b/share/msgdef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/pl_PL.ISO8859-2.src,v 1.2 2001/02/18 11:17:41 abial Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/pt_PT.ISO8859-1.src b/share/msgdef/pt_PT.ISO8859-1.src
index e839a0a217bac..e3734a69117a1 100644
--- a/share/msgdef/pt_PT.ISO8859-1.src
+++ b/share/msgdef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/pt_PT.ISO8859-1.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ro_RO.ISO8859-2.src b/share/msgdef/ro_RO.ISO8859-2.src
index a711ff76db9d9..488ecb0aed1a4 100644
--- a/share/msgdef/ro_RO.ISO8859-2.src
+++ b/share/msgdef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ro_RO.ISO8859-2.src,v 1.2 2006/02/18 22:08:28 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.CP1251.src b/share/msgdef/ru_RU.CP1251.src
index 5774d94f6f542..4069f34075f5c 100644
--- a/share/msgdef/ru_RU.CP1251.src
+++ b/share/msgdef/ru_RU.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.CP1251.src,v 1.1 2003/06/07 00:26:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.CP866.src b/share/msgdef/ru_RU.CP866.src
index df2b035bb4b6e..1dfc6a7818a72 100644
--- a/share/msgdef/ru_RU.CP866.src
+++ b/share/msgdef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.CP866.src,v 1.1 2001/02/19 20:05:10 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.ISO8859-5.src b/share/msgdef/ru_RU.ISO8859-5.src
index 360485e980e44..8fdede3b2dfd5 100644
--- a/share/msgdef/ru_RU.ISO8859-5.src
+++ b/share/msgdef/ru_RU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.ISO8859-5.src,v 1.1 2001/02/19 20:05:10 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.KOI8-R.src b/share/msgdef/ru_RU.KOI8-R.src
index 465cfa69f2599..90f566d0f6d37 100644
--- a/share/msgdef/ru_RU.KOI8-R.src
+++ b/share/msgdef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.KOI8-R.src,v 1.2 2001/02/13 23:36:15 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/ru_RU.UTF-8.src b/share/msgdef/ru_RU.UTF-8.src
index 21882ca80b382..d95f19b907b53 100644
--- a/share/msgdef/ru_RU.UTF-8.src
+++ b/share/msgdef/ru_RU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/ru_RU.UTF-8.src,v 1.2 2004/08/28 10:59:03 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sl_SI.ISO8859-2.src b/share/msgdef/sl_SI.ISO8859-2.src
index 9686b4f232fc1..a80b02783a7cb 100644
--- a/share/msgdef/sl_SI.ISO8859-2.src
+++ b/share/msgdef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sl_SI.ISO8859-2.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sr_YU.ISO8859-2.src b/share/msgdef/sr_YU.ISO8859-2.src
index a711ff76db9d9..3274b36c001ca 100644
--- a/share/msgdef/sr_YU.ISO8859-2.src
+++ b/share/msgdef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sr_YU.ISO8859-5.src b/share/msgdef/sr_YU.ISO8859-5.src
index 24ec0c74090de..244265ecfc871 100644
--- a/share/msgdef/sr_YU.ISO8859-5.src
+++ b/share/msgdef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:04 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sr_YU.UTF-8.src b/share/msgdef/sr_YU.UTF-8.src
index 72dca12b49a97..8ed8d731cd9e7 100644
--- a/share/msgdef/sr_YU.UTF-8.src
+++ b/share/msgdef/sr_YU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sr_YU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/sv_SE.ISO8859-1.src b/share/msgdef/sv_SE.ISO8859-1.src
index a87da07feee20..075fc59b2d76f 100644
--- a/share/msgdef/sv_SE.ISO8859-1.src
+++ b/share/msgdef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/sv_SE.ISO8859-1.src,v 1.1 2001/02/09 11:38:55 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/tr_TR.ISO8859-9.src b/share/msgdef/tr_TR.ISO8859-9.src
index 47329944b0400..150f37efafce8 100644
--- a/share/msgdef/tr_TR.ISO8859-9.src
+++ b/share/msgdef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/tr_TR.ISO8859-9.src,v 1.1 2001/04/28 15:13:25 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.CP1251.src b/share/msgdef/uk_UA.CP1251.src
index f3fd7765ad95b..37d7cb64ee74d 100644
--- a/share/msgdef/uk_UA.CP1251.src
+++ b/share/msgdef/uk_UA.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:29 ru Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.ISO8859-5.src b/share/msgdef/uk_UA.ISO8859-5.src
index cc508146e8278..aefec88dd86a4 100644
--- a/share/msgdef/uk_UA.ISO8859-5.src
+++ b/share/msgdef/uk_UA.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.ISO8859-5.src,v 1.1 2001/12/20 20:48:30 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.KOI8-U.src b/share/msgdef/uk_UA.KOI8-U.src
index 5eec97264d5d1..66ab25b996bb4 100644
--- a/share/msgdef/uk_UA.KOI8-U.src
+++ b/share/msgdef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.KOI8-U.src,v 1.1 2001/02/17 08:31:31 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/uk_UA.UTF-8.src b/share/msgdef/uk_UA.UTF-8.src
index cfc5a2e64bc06..71052e676c263 100644
--- a/share/msgdef/uk_UA.UTF-8.src
+++ b/share/msgdef/uk_UA.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/uk_UA.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.GB18030.src b/share/msgdef/zh_CN.GB18030.src
index 6e9cd83e04e36..3d15aa19344d0 100644
--- a/share/msgdef/zh_CN.GB18030.src
+++ b/share/msgdef/zh_CN.GB18030.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.GB18030.src,v 1.1 2003/07/29 16:12:56 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.GB2312.src b/share/msgdef/zh_CN.GB2312.src
index 6e9cd83e04e36..f7aad9e00acb1 100644
--- a/share/msgdef/zh_CN.GB2312.src
+++ b/share/msgdef/zh_CN.GB2312.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.GB2312.src,v 1.1 2003/11/05 22:59:02 davidxu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.UTF-8.src b/share/msgdef/zh_CN.UTF-8.src
index 975134e8173ef..a2420e5a364a2 100644
--- a/share/msgdef/zh_CN.UTF-8.src
+++ b/share/msgdef/zh_CN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_CN.eucCN.src b/share/msgdef/zh_CN.eucCN.src
index 6e9cd83e04e36..4152049045bc0 100644
--- a/share/msgdef/zh_CN.eucCN.src
+++ b/share/msgdef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_CN.eucCN.src,v 1.1 2001/02/17 18:45:08 keith Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_TW.Big5.src b/share/msgdef/zh_TW.Big5.src
index cc1bfce720273..74e5e05e517fd 100644
--- a/share/msgdef/zh_TW.Big5.src
+++ b/share/msgdef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_TW.Big5.src,v 1.1 2001/02/17 18:45:08 keith Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/msgdef/zh_TW.UTF-8.src b/share/msgdef/zh_TW.UTF-8.src
index 975134e8173ef..0a8b96140f1eb 100644
--- a/share/msgdef/zh_TW.UTF-8.src
+++ b/share/msgdef/zh_TW.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/msgdef/zh_TW.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 6f9124010f0de..300d9faa5821b 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/Makefile,v 1.61 2006/11/09 18:10:34 des Exp $
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
diff --git a/share/numericdef/af_ZA.ISO8859-1.src b/share/numericdef/af_ZA.ISO8859-1.src
index 9c48fd3b15931..7a8679c529beb 100644
--- a/share/numericdef/af_ZA.ISO8859-1.src
+++ b/share/numericdef/af_ZA.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/af_ZA.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/am_ET.UTF-8.src b/share/numericdef/am_ET.UTF-8.src
index cd49d3608dc5a..b45fc76dd8e2a 100644
--- a/share/numericdef/am_ET.UTF-8.src
+++ b/share/numericdef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/am_ET.UTF-8.src,v 1.1 2003/08/05 05:42:08 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/be_BY.CP1251.src b/share/numericdef/be_BY.CP1251.src
index 0b0b623dac02f..4c6ae214c387c 100644
--- a/share/numericdef/be_BY.CP1251.src
+++ b/share/numericdef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/numericdef/bg_BG.CP1251.src b/share/numericdef/bg_BG.CP1251.src
index 68677812c3555..88f849a44a450 100644
--- a/share/numericdef/bg_BG.CP1251.src
+++ b/share/numericdef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:17:33 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ca_ES.ISO8859-1.src b/share/numericdef/ca_ES.ISO8859-1.src
index 0036ad362aaea..65f4d1eb04a60 100644
--- a/share/numericdef/ca_ES.ISO8859-1.src
+++ b/share/numericdef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/cs_CZ.ISO8859-2.src b/share/numericdef/cs_CZ.ISO8859-2.src
index 68677812c3555..b8107c0c279e2 100644
--- a/share/numericdef/cs_CZ.ISO8859-2.src
+++ b/share/numericdef/cs_CZ.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/cs_CZ.ISO8859-2.src,v 1.1 2001/02/10 13:31:36 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/da_DK.ISO8859-1.src b/share/numericdef/da_DK.ISO8859-1.src
index 9c48fd3b15931..f5ca876de9359 100644
--- a/share/numericdef/da_DK.ISO8859-1.src
+++ b/share/numericdef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/da_DK.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/de_DE.ISO8859-1.src b/share/numericdef/de_DE.ISO8859-1.src
index 0036ad362aaea..11c1749af22f4 100644
--- a/share/numericdef/de_DE.ISO8859-1.src
+++ b/share/numericdef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/de_DE.ISO8859-1.src,v 1.3 2001/02/10 03:20:27 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/el_GR.ISO8859-7.src b/share/numericdef/el_GR.ISO8859-7.src
index 20911c9719686..91d79477decbc 100644
--- a/share/numericdef/el_GR.ISO8859-7.src
+++ b/share/numericdef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/el_GR.ISO8859-7.src,v 1.3 2004/10/13 22:12:59 keramida Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/en_US.ISO8859-1.src b/share/numericdef/en_US.ISO8859-1.src
index cd49d3608dc5a..7220e4f32d03e 100644
--- a/share/numericdef/en_US.ISO8859-1.src
+++ b/share/numericdef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/en_US.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/es_ES.ISO8859-1.src b/share/numericdef/es_ES.ISO8859-1.src
index 0036ad362aaea..ec30db51cb534 100644
--- a/share/numericdef/es_ES.ISO8859-1.src
+++ b/share/numericdef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/es_ES.ISO8859-1.src,v 1.1 2001/04/29 00:38:26 jmas Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/et_EE.ISO8859-15.src b/share/numericdef/et_EE.ISO8859-15.src
index 4ebc899962aab..06d6a2e2d0e21 100644
--- a/share/numericdef/et_EE.ISO8859-15.src
+++ b/share/numericdef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/et_EE.ISO8859-15.src,v 1.1 2001/03/16 12:21:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/eu_ES.ISO8859-1.src b/share/numericdef/eu_ES.ISO8859-1.src
index f182a559619c2..c31478ec3ba20 100644
--- a/share/numericdef/eu_ES.ISO8859-1.src
+++ b/share/numericdef/eu_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/eu_ES.ISO8859-1.src,v 1.2 2004/11/16 14:58:20 tobez Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/fi_FI.ISO8859-1.src b/share/numericdef/fi_FI.ISO8859-1.src
index 9c48fd3b15931..fee1267e780a1 100644
--- a/share/numericdef/fi_FI.ISO8859-1.src
+++ b/share/numericdef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/fi_FI.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/fr_BE.ISO8859-1.src b/share/numericdef/fr_BE.ISO8859-1.src
index f182a559619c2..78d69a634ad9c 100644
--- a/share/numericdef/fr_BE.ISO8859-1.src
+++ b/share/numericdef/fr_BE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/fr_BE.ISO8859-1.src,v 1.1 2002/02/12 18:23:21 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/fr_FR.ISO8859-1.src b/share/numericdef/fr_FR.ISO8859-1.src
index 0036ad362aaea..3d75dfb273ce2 100644
--- a/share/numericdef/fr_FR.ISO8859-1.src
+++ b/share/numericdef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/fr_FR.ISO8859-1.src,v 1.3 2001/02/10 03:20:27 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hi_IN.ISCII-DEV.src b/share/numericdef/hi_IN.ISCII-DEV.src
index 99d11f681e1cb..d12487b540249 100644
--- a/share/numericdef/hi_IN.ISCII-DEV.src
+++ b/share/numericdef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:10 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hr_HR.ISO8859-2.src b/share/numericdef/hr_HR.ISO8859-2.src
index 27148ff2de298..fe4828dd721d2 100644
--- a/share/numericdef/hr_HR.ISO8859-2.src
+++ b/share/numericdef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hr_HR.ISO8859-2.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hu_HU.ISO8859-2.src b/share/numericdef/hu_HU.ISO8859-2.src
index 68677812c3555..72b9722ecdb6d 100644
--- a/share/numericdef/hu_HU.ISO8859-2.src
+++ b/share/numericdef/hu_HU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hu_HU.ISO8859-2.src,v 1.1 2001/02/18 06:44:09 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/hy_AM.ARMSCII-8.src b/share/numericdef/hy_AM.ARMSCII-8.src
index 70aeb8d163b03..86ee3bba3ace4 100644
--- a/share/numericdef/hy_AM.ARMSCII-8.src
+++ b/share/numericdef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # LC_NUMERIC source file for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/numericdef/is_IS.ISO8859-1.src b/share/numericdef/is_IS.ISO8859-1.src
index 4ebc899962aab..69bf543ac2aff 100644
--- a/share/numericdef/is_IS.ISO8859-1.src
+++ b/share/numericdef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/is_IS.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/it_IT.ISO8859-1.src b/share/numericdef/it_IT.ISO8859-1.src
index 8e5095d653a4c..8515f521a7e34 100644
--- a/share/numericdef/it_IT.ISO8859-1.src
+++ b/share/numericdef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/it_IT.ISO8859-1.src,v 1.2 2004/02/18 05:23:09 cperciva Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ja_JP.eucJP.src b/share/numericdef/ja_JP.eucJP.src
index cd49d3608dc5a..4f8ae2b1c50b3 100644
--- a/share/numericdef/ja_JP.eucJP.src
+++ b/share/numericdef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ja_JP.eucJP.src,v 1.1 2001/02/11 16:19:43 knu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/kk_KZ.PT154.src b/share/numericdef/kk_KZ.PT154.src
index 4ebc899962aab..d08a5504570f2 100644
--- a/share/numericdef/kk_KZ.PT154.src
+++ b/share/numericdef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:21 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ko_KR.eucKR.src b/share/numericdef/ko_KR.eucKR.src
index cd49d3608dc5a..2aa23b1f50f8b 100644
--- a/share/numericdef/ko_KR.eucKR.src
+++ b/share/numericdef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ko_KR.eucKR.src,v 1.1 2001/02/11 15:40:01 asmodai Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/lt_LT.ISO8859-13.src b/share/numericdef/lt_LT.ISO8859-13.src
index 4ebc899962aab..85ede21faa4c1 100644
--- a/share/numericdef/lt_LT.ISO8859-13.src
+++ b/share/numericdef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:10 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/mn_MN.UTF-8.src b/share/numericdef/mn_MN.UTF-8.src
index cd49d3608dc5a..4b91371bd36b7 100644
--- a/share/numericdef/mn_MN.UTF-8.src
+++ b/share/numericdef/mn_MN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/mn_MN.UTF-8.src,v 1.1 2006/10/02 00:36:52 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/nl_NL.ISO8859-1.src b/share/numericdef/nl_NL.ISO8859-1.src
index 0036ad362aaea..ac8d35bf8d07f 100644
--- a/share/numericdef/nl_NL.ISO8859-1.src
+++ b/share/numericdef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/nl_NL.ISO8859-1.src,v 1.3 2001/02/10 03:20:27 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/no_NO.ISO8859-1.src b/share/numericdef/no_NO.ISO8859-1.src
index 9c48fd3b15931..a7efef4ec95f9 100644
--- a/share/numericdef/no_NO.ISO8859-1.src
+++ b/share/numericdef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/no_NO.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/pl_PL.ISO8859-2.src b/share/numericdef/pl_PL.ISO8859-2.src
index 68677812c3555..534224670c1a9 100644
--- a/share/numericdef/pl_PL.ISO8859-2.src
+++ b/share/numericdef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/pl_PL.ISO8859-2.src,v 1.1 2001/02/10 22:44:31 abial Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/pt_BR.ISO8859-1.src b/share/numericdef/pt_BR.ISO8859-1.src
index 9c48fd3b15931..b95cf397ee57e 100644
--- a/share/numericdef/pt_BR.ISO8859-1.src
+++ b/share/numericdef/pt_BR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/pt_BR.ISO8859-1.src,v 1.1 2002/04/05 15:03:13 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/pt_PT.ISO8859-1.src b/share/numericdef/pt_PT.ISO8859-1.src
index 27148ff2de298..258a738c6138c 100644
--- a/share/numericdef/pt_PT.ISO8859-1.src
+++ b/share/numericdef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/pt_PT.ISO8859-1.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ro_RO.ISO8859-2.src b/share/numericdef/ro_RO.ISO8859-2.src
index 4ebc899962aab..6e1e046e48d39 100644
--- a/share/numericdef/ro_RO.ISO8859-2.src
+++ b/share/numericdef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/ru_RU.KOI8-R.src b/share/numericdef/ru_RU.KOI8-R.src
index 4ebc899962aab..96516273b7ffd 100644
--- a/share/numericdef/ru_RU.KOI8-R.src
+++ b/share/numericdef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/ru_RU.KOI8-R.src,v 1.5 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sk_SK.ISO8859-2.src b/share/numericdef/sk_SK.ISO8859-2.src
index 19776246f8ca6..66352426039ab 100644
--- a/share/numericdef/sk_SK.ISO8859-2.src
+++ b/share/numericdef/sk_SK.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sk_SK.ISO8859-2.src,v 1.1 2001/05/18 13:55:25 ache Exp $
 #
 # Slovak numeric definition
 #
diff --git a/share/numericdef/sl_SI.ISO8859-2.src b/share/numericdef/sl_SI.ISO8859-2.src
index 900949a3652d2..b1bcab8f40695 100644
--- a/share/numericdef/sl_SI.ISO8859-2.src
+++ b/share/numericdef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sl_SI.ISO8859-2.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sr_YU.ISO8859-2.src b/share/numericdef/sr_YU.ISO8859-2.src
index 27148ff2de298..3d93ebbf0a81d 100644
--- a/share/numericdef/sr_YU.ISO8859-2.src
+++ b/share/numericdef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sr_YU.ISO8859-5.src b/share/numericdef/sr_YU.ISO8859-5.src
index 4ebc899962aab..f085a09b74f83 100644
--- a/share/numericdef/sr_YU.ISO8859-5.src
+++ b/share/numericdef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/sv_SE.ISO8859-1.src b/share/numericdef/sv_SE.ISO8859-1.src
index 4ebc899962aab..af5f24e3e7736 100644
--- a/share/numericdef/sv_SE.ISO8859-1.src
+++ b/share/numericdef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/sv_SE.ISO8859-1.src,v 1.4 2001/02/10 19:06:32 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/tr_TR.ISO8859-9.src b/share/numericdef/tr_TR.ISO8859-9.src
index 27148ff2de298..96c81720ab58e 100644
--- a/share/numericdef/tr_TR.ISO8859-9.src
+++ b/share/numericdef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/tr_TR.ISO8859-9.src,v 1.1 2001/04/28 15:13:30 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/uk_UA.KOI8-U.src b/share/numericdef/uk_UA.KOI8-U.src
index 4ebc899962aab..db1a4981e3571 100644
--- a/share/numericdef/uk_UA.KOI8-U.src
+++ b/share/numericdef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/uk_UA.KOI8-U.src,v 1.1 2001/02/17 08:35:14 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/numericdef/zh_CN.eucCN.src b/share/numericdef/zh_CN.eucCN.src
index cd49d3608dc5a..5a1e34cf1cc25 100644
--- a/share/numericdef/zh_CN.eucCN.src
+++ b/share/numericdef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/numericdef/zh_CN.eucCN.src,v 1.1 2001/02/17 18:45:08 keith Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/security/Makefile b/share/security/Makefile
index c25a52dd1e55e..a0d78c8ebd3c2 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/security/Makefile,v 1.4 2004/12/21 08:46:54 ru Exp $
 
 FILES=	lomac-policy.contexts
 NO_OBJ=
diff --git a/share/security/lomac-policy.contexts b/share/security/lomac-policy.contexts
index e01bd2842c60a..fcc6424b0c2a0 100644
--- a/share/security/lomac-policy.contexts
+++ b/share/security/lomac-policy.contexts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/security/lomac-policy.contexts,v 1.1 2002/12/03 15:16:10 rwatson Exp $
 #
 # This is a sample LOMAC policy based upon the PLM defined in the
 # original FreeBSD LOMAC port.  It may be configured on a
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index ef5fd382c31cf..148f8825c0a42 100644
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/sendmail/Makefile,v 1.10 2004/12/21 08:46:54 ru Exp $
 #
 # Doing a make install builds /usr/share/sendmail/
 
diff --git a/share/skel/Makefile b/share/skel/Makefile
index ffe80152eeafb..98185c1234059 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/skel/Makefile,v 1.11 2004/12/21 08:46:54 ru Exp $
 
 FILESGROUPS=	FILES1 FILES2
 FILES1=		dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 5fa231979148c..923b9d938d218 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.cshrc,v 1.14 2007/05/29 22:07:57 dougb Exp $
 #
 # .cshrc - csh resource script, read at beginning of execution by each shell
 #
diff --git a/share/skel/dot.login b/share/skel/dot.login
index 894021a83794e..ac4f9f511eda2 100644
--- a/share/skel/dot.login
+++ b/share/skel/dot.login
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.login,v 1.16 2001/06/25 20:40:02 nik Exp $
 #
 # .login - csh login script, read by login shell, after `.cshrc' at login.
 #
diff --git a/share/skel/dot.login_conf b/share/skel/dot.login_conf
index 3c4b025f2000e..5d94fdcd03a55 100644
--- a/share/skel/dot.login_conf
+++ b/share/skel/dot.login_conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.login_conf,v 1.3 2001/06/10 17:08:53 ache Exp $
 #
 # see login.conf(5)
 #
diff --git a/share/skel/dot.mail_aliases b/share/skel/dot.mail_aliases
index e319ef8e79828..4f34ffb5ed027 100644
--- a/share/skel/dot.mail_aliases
+++ b/share/skel/dot.mail_aliases
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.mail_aliases,v 1.3 2003/09/28 16:17:30 rwatson Exp $
 #
 # .mail_aliases - private mail aliases
 #
diff --git a/share/skel/dot.mailrc b/share/skel/dot.mailrc
index 9ab6ac0c8e8c3..be99f5b707dfb 100644
--- a/share/skel/dot.mailrc
+++ b/share/skel/dot.mailrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.mailrc,v 1.6 1999/08/28 00:21:53 peter Exp $
 #
 # .mailrc - mail resources
 #
diff --git a/share/skel/dot.profile b/share/skel/dot.profile
index 2e1ca0cd22207..88c5d864354d6 100644
--- a/share/skel/dot.profile
+++ b/share/skel/dot.profile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.profile,v 1.22 2007/05/29 22:07:57 dougb Exp $
 #
 # .profile - Bourne Shell startup script for login shells
 #
diff --git a/share/skel/dot.rhosts b/share/skel/dot.rhosts
index 30132d57c4bee..875e9bfb0b567 100644
--- a/share/skel/dot.rhosts
+++ b/share/skel/dot.rhosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.rhosts,v 1.6 1999/08/28 00:21:53 peter Exp $
 #
 # .rhosts - trusted remote host name and user data base
 #
diff --git a/share/skel/dot.shrc b/share/skel/dot.shrc
index 73491698e8e7b..c1ddfe5247aea 100644
--- a/share/skel/dot.shrc
+++ b/share/skel/dot.shrc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/skel/dot.shrc,v 1.3 2002/07/23 12:28:16 jmallett Exp $
 #
 # .shrc - bourne shell startup file 
 #
diff --git a/share/snmp/Makefile b/share/snmp/Makefile
index 1bfc5b9b5e744..420bb62a5e21a 100644
--- a/share/snmp/Makefile
+++ b/share/snmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/snmp/Makefile,v 1.1 2004/04/24 19:54:54 phk Exp $
 
 SUBDIR= mibs
 
diff --git a/share/snmp/mibs/FREEBSD-MIB.txt b/share/snmp/mibs/FREEBSD-MIB.txt
index cf6f08042ac5b..f7f838b2895cb 100644
--- a/share/snmp/mibs/FREEBSD-MIB.txt
+++ b/share/snmp/mibs/FREEBSD-MIB.txt
@@ -3,7 +3,7 @@
 --
 -- FreeBSD SMI { enterprises 2238 }
 --
--- $FreeBSD$
+-- $FreeBSD: src/share/snmp/mibs/FREEBSD-MIB.txt,v 1.5 2006/10/31 10:09:10 harti Exp $
 --
 -- *****************************************************************
 
diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile
index 8de73c9be550d..6e1bde7f88770 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/snmp/mibs/Makefile,v 1.3 2004/12/21 08:46:55 ru Exp $
 
 FILES=	FREEBSD-MIB.txt
 NO_OBJ=
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 9cbf100f13b97..452901010f130 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/Makefile,v 1.4 1999/08/28 00:21:55 peter Exp $
 
 SUBDIR= fonts keymaps scrnmaps
 
diff --git a/share/syscons/fonts/INDEX.fonts b/share/syscons/fonts/INDEX.fonts
index b7a786cce3ccb..f02eed7401504 100644
--- a/share/syscons/fonts/INDEX.fonts
+++ b/share/syscons/fonts/INDEX.fonts
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/INDEX.fonts,v 1.27 2003/12/20 11:18:43 ache Exp $
 #
 # database for vidfont(8) 
 #
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index e915309fe7455..7856b90390a94 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/Makefile,v 1.37 2004/12/21 08:46:55 ru Exp $
 
 FILES=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
diff --git a/share/syscons/fonts/armscii8-8x14.fnt b/share/syscons/fonts/armscii8-8x14.fnt
index edc81c96cf991..b0f019ddcb773 100644
--- a/share/syscons/fonts/armscii8-8x14.fnt
+++ b/share/syscons/fonts/armscii8-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/armscii8-8x14.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 armscii8-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/armscii8-8x16.fnt b/share/syscons/fonts/armscii8-8x16.fnt
index 2a7767fb1702f..2bb3aabca1031 100644
--- a/share/syscons/fonts/armscii8-8x16.fnt
+++ b/share/syscons/fonts/armscii8-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/armscii8-8x16.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 armscii8-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/armscii8-8x8.fnt b/share/syscons/fonts/armscii8-8x8.fnt
index 338e465bec373..29f8dde8398b0 100644
--- a/share/syscons/fonts/armscii8-8x8.fnt
+++ b/share/syscons/fonts/armscii8-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/armscii8-8x8.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 armscii8-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp1251-8x14.fnt b/share/syscons/fonts/cp1251-8x14.fnt
index ae7075a66ec9e..0b1dbaae097e8 100644
--- a/share/syscons/fonts/cp1251-8x14.fnt
+++ b/share/syscons/fonts/cp1251-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp1251-8x14.fnt,v 1.2 2001/11/23 00:10:17 ache Exp $
 begin 644 cp1251-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp1251-8x16.fnt b/share/syscons/fonts/cp1251-8x16.fnt
index 184728e966dc5..ccc6b401279ec 100644
--- a/share/syscons/fonts/cp1251-8x16.fnt
+++ b/share/syscons/fonts/cp1251-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp1251-8x16.fnt,v 1.2 2001/11/23 00:10:17 ache Exp $
 begin 644 cp1251-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp1251-8x8.fnt b/share/syscons/fonts/cp1251-8x8.fnt
index 9cb2270221276..97954c43e1500 100644
--- a/share/syscons/fonts/cp1251-8x8.fnt
+++ b/share/syscons/fonts/cp1251-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp1251-8x8.fnt,v 1.2 2001/11/23 00:10:17 ache Exp $
 begin 644 cp1251-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/cp866u-8x14.fnt b/share/syscons/fonts/cp866u-8x14.fnt
index 9251f5e5d19e8..f5147d983c668 100644
--- a/share/syscons/fonts/cp866u-8x14.fnt
+++ b/share/syscons/fonts/cp866u-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp866u-8x14.fnt,v 1.1 2001/04/17 12:51:20 sobomax Exp $
 begin 644 cp866u-8x14.fnt
 M`````````````````````'Z!I8&!I9F!?@``````?O_;___#Y_]^````````
 M;/[^_OY\.!`````````0.'S^?#@0````````&#P\Y^?G&!@\```````8/'[_
diff --git a/share/syscons/fonts/cp866u-8x16.fnt b/share/syscons/fonts/cp866u-8x16.fnt
index 78965b06aec84..67cf656f9ca8f 100644
--- a/share/syscons/fonts/cp866u-8x16.fnt
+++ b/share/syscons/fonts/cp866u-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp866u-8x16.fnt,v 1.1 2001/04/17 12:51:20 sobomax Exp $
 begin 644 cp866u-8x16.fnt
 M````````````````````````?H&E@8&EF8&!?@```````'[_V___V^?__WX`
 M`````````&S^_O[^?#@0```````````0.'S^?#@0```````````8/#SGY^<8
diff --git a/share/syscons/fonts/cp866u-8x8.fnt b/share/syscons/fonts/cp866u-8x8.fnt
index f979393c3135a..5183726327ace 100644
--- a/share/syscons/fonts/cp866u-8x8.fnt
+++ b/share/syscons/fonts/cp866u-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/cp866u-8x8.fnt,v 1.1 2001/04/17 12:51:20 sobomax Exp $
 begin 644 cp866u-8x8.fnt
 M``````````!^@:6!O9F!?G[_V__#Y_]^;/[^_GPX$``0.'S^?#@0`#A\./[^
 M?#A\$!`X?/Y\.'P``!@\/!@``/__Y\/#Y___`#QF0D)F/`#_PYF]O9G#_P\'
diff --git a/share/syscons/fonts/haik8-8x14.fnt b/share/syscons/fonts/haik8-8x14.fnt
index ce9fead1108d4..db7cd683f9ea7 100644
--- a/share/syscons/fonts/haik8-8x14.fnt
+++ b/share/syscons/fonts/haik8-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/haik8-8x14.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 haik8-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/haik8-8x16.fnt b/share/syscons/fonts/haik8-8x16.fnt
index 6ada66060788b..d444b9266e3ed 100644
--- a/share/syscons/fonts/haik8-8x16.fnt
+++ b/share/syscons/fonts/haik8-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/haik8-8x16.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 haik8-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/haik8-8x8.fnt b/share/syscons/fonts/haik8-8x8.fnt
index 84b61b5ec7628..0a29a10eb49c3 100644
--- a/share/syscons/fonts/haik8-8x8.fnt
+++ b/share/syscons/fonts/haik8-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/haik8-8x8.fnt,v 1.1 2003/07/05 12:38:17 ache Exp $
 begin 644 haik8-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-8x14.fnt b/share/syscons/fonts/iso-8x14.fnt
index 45d93a7e6d8eb..c74a0d84c93b4 100644
--- a/share/syscons/fonts/iso-8x14.fnt
+++ b/share/syscons/fonts/iso-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-8x16.fnt b/share/syscons/fonts/iso-8x16.fnt
index e596679f0e1a1..5d90c0322acfa 100644
--- a/share/syscons/fonts/iso-8x16.fnt
+++ b/share/syscons/fonts/iso-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-8x8.fnt b/share/syscons/fonts/iso-8x8.fnt
index 2a5b4bb8254cd..86cb38f83fffb 100644
--- a/share/syscons/fonts/iso-8x8.fnt
+++ b/share/syscons/fonts/iso-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso-thin-8x16.fnt b/share/syscons/fonts/iso-thin-8x16.fnt
index 50abaca08f0bd..87b17d6194b7e 100644
--- a/share/syscons/fonts/iso-thin-8x16.fnt
+++ b/share/syscons/fonts/iso-thin-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso-thin-8x16.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso-thin-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso02-8x14.fnt b/share/syscons/fonts/iso02-8x14.fnt
index 68b9c0d1ea2c2..86884b1e110bc 100644
--- a/share/syscons/fonts/iso02-8x14.fnt
+++ b/share/syscons/fonts/iso02-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso02-8x14.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso02-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso02-8x16.fnt b/share/syscons/fonts/iso02-8x16.fnt
index da3fe09f6100f..75efeb8dd7a09 100644
--- a/share/syscons/fonts/iso02-8x16.fnt
+++ b/share/syscons/fonts/iso02-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso02-8x16.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso02-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso02-8x8.fnt b/share/syscons/fonts/iso02-8x8.fnt
index 4246950a8c09c..7596bffae75bc 100644
--- a/share/syscons/fonts/iso02-8x8.fnt
+++ b/share/syscons/fonts/iso02-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso02-8x8.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso02-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-8x14.fnt b/share/syscons/fonts/iso04-8x14.fnt
index f6e1b339d2507..a54c92671cf76 100644
--- a/share/syscons/fonts/iso04-8x14.fnt
+++ b/share/syscons/fonts/iso04-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-8x16.fnt b/share/syscons/fonts/iso04-8x16.fnt
index 861a6cf9ecd11..77c75cd1464aa 100644
--- a/share/syscons/fonts/iso04-8x16.fnt
+++ b/share/syscons/fonts/iso04-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-8x8.fnt b/share/syscons/fonts/iso04-8x8.fnt
index 8d9fdc6bb5071..c5cb55a40f31a 100644
--- a/share/syscons/fonts/iso04-8x8.fnt
+++ b/share/syscons/fonts/iso04-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-8x14.fnt b/share/syscons/fonts/iso04-vga9-8x14.fnt
index 0cf883883b942..6a19c8379ce78 100644
--- a/share/syscons/fonts/iso04-vga9-8x14.fnt
+++ b/share/syscons/fonts/iso04-vga9-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-8x16.fnt b/share/syscons/fonts/iso04-vga9-8x16.fnt
index 42cf6312facea..a563abfd55007 100644
--- a/share/syscons/fonts/iso04-vga9-8x16.fnt
+++ b/share/syscons/fonts/iso04-vga9-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-8x8.fnt b/share/syscons/fonts/iso04-vga9-8x8.fnt
index 53b81a285623d..3520cba478f14 100644
--- a/share/syscons/fonts/iso04-vga9-8x8.fnt
+++ b/share/syscons/fonts/iso04-vga9-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-vga9-wide-8x16.fnt b/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
index 7f78bb70fa1e7..2e2c3a0b3d922 100644
--- a/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
+++ b/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-vga9-wide-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-vga9-wide-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso04-wide-8x16.fnt b/share/syscons/fonts/iso04-wide-8x16.fnt
index e216b5b957277..cff22b9ee5c85 100644
--- a/share/syscons/fonts/iso04-wide-8x16.fnt
+++ b/share/syscons/fonts/iso04-wide-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso04-wide-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso04-wide-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso05-8x14.fnt b/share/syscons/fonts/iso05-8x14.fnt
index f1df5408830a2..c7c3df7ab2dc0 100644
--- a/share/syscons/fonts/iso05-8x14.fnt
+++ b/share/syscons/fonts/iso05-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso05-8x14.fnt,v 1.2 2002/01/01 07:43:45 ache Exp $
 begin 644 iso05-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso05-8x16.fnt b/share/syscons/fonts/iso05-8x16.fnt
index 3fdaa20b9afd6..6449e3a446460 100644
--- a/share/syscons/fonts/iso05-8x16.fnt
+++ b/share/syscons/fonts/iso05-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso05-8x16.fnt,v 1.2 2002/01/01 07:43:45 ache Exp $
 begin 644 iso05-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso05-8x8.fnt b/share/syscons/fonts/iso05-8x8.fnt
index e34a79bd2e77a..a942eb33fce70 100644
--- a/share/syscons/fonts/iso05-8x8.fnt
+++ b/share/syscons/fonts/iso05-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso05-8x8.fnt,v 1.2 2002/01/01 07:43:45 ache Exp $
 begin 644 iso05-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso07-8x14.fnt b/share/syscons/fonts/iso07-8x14.fnt
index e89426b224f36..25e8d6cb642bd 100644
--- a/share/syscons/fonts/iso07-8x14.fnt
+++ b/share/syscons/fonts/iso07-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso07-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso07-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso07-8x16.fnt b/share/syscons/fonts/iso07-8x16.fnt
index 932b19eb1d53c..6f30d4c023f49 100644
--- a/share/syscons/fonts/iso07-8x16.fnt
+++ b/share/syscons/fonts/iso07-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso07-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso07-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso07-8x8.fnt b/share/syscons/fonts/iso07-8x8.fnt
index 956b39948f200..d433c154dd880 100644
--- a/share/syscons/fonts/iso07-8x8.fnt
+++ b/share/syscons/fonts/iso07-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso07-8x8.fnt,v 1.3 2001/11/22 23:39:06 ache Exp $
 begin 644 iso07-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso08-8x14.fnt b/share/syscons/fonts/iso08-8x14.fnt
index 560c46c8671ab..6e1aef87561da 100644
--- a/share/syscons/fonts/iso08-8x14.fnt
+++ b/share/syscons/fonts/iso08-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso08-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso08-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso08-8x16.fnt b/share/syscons/fonts/iso08-8x16.fnt
index a89d77073868e..9b83154ba4163 100644
--- a/share/syscons/fonts/iso08-8x16.fnt
+++ b/share/syscons/fonts/iso08-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso08-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso08-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso08-8x8.fnt b/share/syscons/fonts/iso08-8x8.fnt
index ca563fcf1e6b3..e5d5040d5a17c 100644
--- a/share/syscons/fonts/iso08-8x8.fnt
+++ b/share/syscons/fonts/iso08-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso08-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso08-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso09-8x16.fnt b/share/syscons/fonts/iso09-8x16.fnt
index 8eff1b795a866..f6bb1acddc593 100644
--- a/share/syscons/fonts/iso09-8x16.fnt
+++ b/share/syscons/fonts/iso09-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso09-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 iso09-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-8x14.fnt b/share/syscons/fonts/iso15-8x14.fnt
index 2c8adda91e0e1..d2e7260c66376 100644
--- a/share/syscons/fonts/iso15-8x14.fnt
+++ b/share/syscons/fonts/iso15-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-8x14.fnt,v 1.4 2006/04/30 09:05:56 matteo Exp $
 begin 644 iso15-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-8x16.fnt b/share/syscons/fonts/iso15-8x16.fnt
index 617f16619c7c3..90147cd3d2cbb 100644
--- a/share/syscons/fonts/iso15-8x16.fnt
+++ b/share/syscons/fonts/iso15-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-8x16.fnt,v 1.4 2006/04/30 09:05:56 matteo Exp $
 begin 644 iso15-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-8x8.fnt b/share/syscons/fonts/iso15-8x8.fnt
index c0e65fa41ce47..55644d66f8e01 100644
--- a/share/syscons/fonts/iso15-8x8.fnt
+++ b/share/syscons/fonts/iso15-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-8x8.fnt,v 1.4 2006/04/30 09:05:56 matteo Exp $
 begin 644 iso15-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/iso15-thin-8x16.fnt b/share/syscons/fonts/iso15-thin-8x16.fnt
index 1cb4d678b25f1..18f57f39a97a2 100644
--- a/share/syscons/fonts/iso15-thin-8x16.fnt
+++ b/share/syscons/fonts/iso15-thin-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/iso15-thin-8x16.fnt,v 1.4 2006/04/30 09:05:56 matteo Exp $
 begin 644 iso15-thin-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-r-8x14.fnt b/share/syscons/fonts/koi8-r-8x14.fnt
index 1a137c6586387..a50aa24ed60ff 100644
--- a/share/syscons/fonts/koi8-r-8x14.fnt
+++ b/share/syscons/fonts/koi8-r-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-r-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-r-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-r-8x16.fnt b/share/syscons/fonts/koi8-r-8x16.fnt
index 6d088c79b1611..4a3a8db669e01 100644
--- a/share/syscons/fonts/koi8-r-8x16.fnt
+++ b/share/syscons/fonts/koi8-r-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-r-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-r-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-r-8x8.fnt b/share/syscons/fonts/koi8-r-8x8.fnt
index 1c08eabdd91b6..4f5c8e2d68c15 100644
--- a/share/syscons/fonts/koi8-r-8x8.fnt
+++ b/share/syscons/fonts/koi8-r-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-r-8x8.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-r-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-rb-8x16.fnt b/share/syscons/fonts/koi8-rb-8x16.fnt
index 698971962661e..1e69de3291938 100644
--- a/share/syscons/fonts/koi8-rb-8x16.fnt
+++ b/share/syscons/fonts/koi8-rb-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-rb-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-rb-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-rc-8x16.fnt b/share/syscons/fonts/koi8-rc-8x16.fnt
index 36ec698f1d79b..eb41cfc0e04f7 100644
--- a/share/syscons/fonts/koi8-rc-8x16.fnt
+++ b/share/syscons/fonts/koi8-rc-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-rc-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-rc-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-u-8x14.fnt b/share/syscons/fonts/koi8-u-8x14.fnt
index 919d0422c9f5e..31bebf2a52a5a 100644
--- a/share/syscons/fonts/koi8-u-8x14.fnt
+++ b/share/syscons/fonts/koi8-u-8x14.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-u-8x14.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-u-8x14
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-u-8x16.fnt b/share/syscons/fonts/koi8-u-8x16.fnt
index 5b7b880fcee1f..2900f04fba732 100644
--- a/share/syscons/fonts/koi8-u-8x16.fnt
+++ b/share/syscons/fonts/koi8-u-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-u-8x16.fnt,v 1.2 2001/11/22 23:39:06 ache Exp $
 begin 644 koi8-u-8x16
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/koi8-u-8x8.fnt b/share/syscons/fonts/koi8-u-8x8.fnt
index a27eb8ac82199..0718e8d24f089 100644
--- a/share/syscons/fonts/koi8-u-8x8.fnt
+++ b/share/syscons/fonts/koi8-u-8x8.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/koi8-u-8x8.fnt,v 1.3 2001/12/05 16:09:10 sobomax Exp $
 begin 644 koi8-u-8x8
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/share/syscons/fonts/swiss-1131-8x16.fnt b/share/syscons/fonts/swiss-1131-8x16.fnt
index c5ed88754e929..58f68a32004cd 100644
--- a/share/syscons/fonts/swiss-1131-8x16.fnt
+++ b/share/syscons/fonts/swiss-1131-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/swiss-1131-8x16.fnt,v 1.1 2003/12/20 11:18:43 ache Exp $
 begin 600 swiss-1131-8x16
 M`````````!``````````````/$*!YZ69@9E"/````````#Q^_YG;Y__G?CP`
 M````````;/[^_O[^?#@0```````````0.'S^?#@0`````````#@X$-;^UA`X
diff --git a/share/syscons/fonts/swiss-1251-8x16.fnt b/share/syscons/fonts/swiss-1251-8x16.fnt
index c6862069dfefe..9c1de17798e94 100644
--- a/share/syscons/fonts/swiss-1251-8x16.fnt
+++ b/share/syscons/fonts/swiss-1251-8x16.fnt
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/fonts/swiss-1251-8x16.fnt,v 1.1 2003/12/20 11:18:43 ache Exp $
 begin 600 swiss-1251-8x16
 M`````````!``````````````/$*!YZ69@9E"/````````#Q^_YG;Y__G?CP`
 M````````;/[^_O[^?#@0```````````0.'S^?#@0`````````#@X$-;^UA`X
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index 20acd3cc615f3..19373bb981155 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.56 2007/07/13 08:29:24 roberto Exp $
 #
 # database for kbdmap(8) 
 #
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 649a0e36117cd..7c82ead893e38 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.72 2007/07/13 08:29:24 roberto Exp $
 
 FILES=	INDEX.keymaps \
 	be.iso.kbd be.iso.acc.kbd \
diff --git a/share/syscons/keymaps/be.iso.acc.kbd b/share/syscons/keymaps/be.iso.acc.kbd
index 83a093c61df81..4b66deebd32cb 100644
--- a/share/syscons/keymaps/be.iso.acc.kbd
+++ b/share/syscons/keymaps/be.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/be.iso.acc.kbd,v 1.5 2004/07/02 18:19:01 philip Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/be.iso.kbd b/share/syscons/keymaps/be.iso.kbd
index 8d16a81805c63..89c4488ce7c10 100644
--- a/share/syscons/keymaps/be.iso.kbd
+++ b/share/syscons/keymaps/be.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/be.iso.kbd,v 1.13 2004/07/02 18:19:01 philip Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/bg.bds.ctrlcaps.kbd b/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
index 5c76466e1a5a2..0d82629c2e2c4 100644
--- a/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
+++ b/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/bg.bds.ctrlcaps.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                        alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd b/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
index 20a22ad10c119..2107ba93ed065 100644
--- a/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
+++ b/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/br275.cp850.kbd b/share/syscons/keymaps/br275.cp850.kbd
index 36ab3edd38108..0342a1c2319dc 100644
--- a/share/syscons/keymaps/br275.cp850.kbd
+++ b/share/syscons/keymaps/br275.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/br275.cp850.kbd,v 1.8 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/br275.iso.acc.kbd b/share/syscons/keymaps/br275.iso.acc.kbd
index 01d04f69fcd84..debf844691ca9 100644
--- a/share/syscons/keymaps/br275.iso.acc.kbd
+++ b/share/syscons/keymaps/br275.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/br275.iso.acc.kbd,v 1.5 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/br275.iso.kbd b/share/syscons/keymaps/br275.iso.kbd
index cec66de355b21..71765c1e92f97 100644
--- a/share/syscons/keymaps/br275.iso.kbd
+++ b/share/syscons/keymaps/br275.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/br275.iso.kbd,v 1.7 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/by.cp1131.kbd b/share/syscons/keymaps/by.cp1131.kbd
index 1c526e6265de0..71f05386a6cbb 100644
--- a/share/syscons/keymaps/by.cp1131.kbd
+++ b/share/syscons/keymaps/by.cp1131.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/by.cp1131.kbd,v 1.1 2003/12/20 11:18:43 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/by.cp1251.kbd b/share/syscons/keymaps/by.cp1251.kbd
index 596507de55cd5..28112fe047775 100644
--- a/share/syscons/keymaps/by.cp1251.kbd
+++ b/share/syscons/keymaps/by.cp1251.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/by.cp1251.kbd,v 1.1 2003/12/20 11:18:43 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/by.iso5.kbd b/share/syscons/keymaps/by.iso5.kbd
index bd17ec0d873ea..edc3e52d7ef10 100644
--- a/share/syscons/keymaps/by.iso5.kbd
+++ b/share/syscons/keymaps/by.iso5.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/by.iso5.kbd,v 1.1 2003/12/20 11:18:43 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ce.iso2.kbd b/share/syscons/keymaps/ce.iso2.kbd
index 68d2bf84c39a9..baf2b6ee8e70a 100644
--- a/share/syscons/keymaps/ce.iso2.kbd
+++ b/share/syscons/keymaps/ce.iso2.kbd
@@ -3,7 +3,7 @@
 #
 # Version 1.0 - 1999-03-18
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ce.iso2.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #
 # This map uses the US QWERTY keyboard for its basic layout.
 # It adds a "third row" to the top of the PC keyboard. To
diff --git a/share/syscons/keymaps/cs.latin2.qwertz.kbd b/share/syscons/keymaps/cs.latin2.qwertz.kbd
index fefebe0c4e4d2..21229c2ffb08f 100644
--- a/share/syscons/keymaps/cs.latin2.qwertz.kbd
+++ b/share/syscons/keymaps/cs.latin2.qwertz.kbd
@@ -1,7 +1,7 @@
 # Czech Standard Typewriter QWERTZ Keyboard
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/cs.latin2.qwertz.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #
 # English/Czech keyboard lock:  (Left)Alt+Shift
 # English/Czech keyboard shift: (Right)AltGr
diff --git a/share/syscons/keymaps/cz.iso2.kbd b/share/syscons/keymaps/cz.iso2.kbd
index 50626c0091ed5..0acd71887f48c 100644
--- a/share/syscons/keymaps/cz.iso2.kbd
+++ b/share/syscons/keymaps/cz.iso2.kbd
@@ -3,7 +3,7 @@
 #
 # Version 1.1 - 1999-03-25
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/cz.iso2.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #
 # This map is derived from my Central European map
 # (ce.iso2.kbd). The description of the CE map is next.
diff --git a/share/syscons/keymaps/danish.cp865.kbd b/share/syscons/keymaps/danish.cp865.kbd
index 026af06ca06d8..2c982d6394414 100644
--- a/share/syscons/keymaps/danish.cp865.kbd
+++ b/share/syscons/keymaps/danish.cp865.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/danish.cp865.kbd,v 1.15 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/danish.iso.kbd b/share/syscons/keymaps/danish.iso.kbd
index 7286ba0d4a65f..ae729dd1dde67 100644
--- a/share/syscons/keymaps/danish.iso.kbd
+++ b/share/syscons/keymaps/danish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/danish.iso.kbd,v 1.16 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/dutch.iso.acc.kbd b/share/syscons/keymaps/dutch.iso.acc.kbd
index 79169a9c25449..24afffdb5031a 100644
--- a/share/syscons/keymaps/dutch.iso.acc.kbd
+++ b/share/syscons/keymaps/dutch.iso.acc.kbd
@@ -5,7 +5,7 @@
 # Based on the US standard keymap
 # Accent coding by M. Blapp <mb@imp.ch>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/dutch.iso.acc.kbd,v 1.1 2002/10/17 19:56:00 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/el.iso07.kbd b/share/syscons/keymaps/el.iso07.kbd
index dccf68e87df27..371e22b31354e 100644
--- a/share/syscons/keymaps/el.iso07.kbd
+++ b/share/syscons/keymaps/el.iso07.kbd
@@ -1,7 +1,7 @@
 # Greek ISO 8859-7 keyboard for FreeBSD
 # by Basileios Anastasatos <B.Anastasatos@Freemail.gr>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/el.iso07.kbd,v 1.1 2001/11/20 18:48:57 ache Exp $
 #
 # English/Greek keyboard lock:  (Left)Alt+(Left|Right)Shift
 # English/Greek keyboard shift: (Right)AltGr
diff --git a/share/syscons/keymaps/estonian.cp850.kbd b/share/syscons/keymaps/estonian.cp850.kbd
index b1003ff07863a..d3f3bc9955986 100644
--- a/share/syscons/keymaps/estonian.cp850.kbd
+++ b/share/syscons/keymaps/estonian.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.cp850.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/estonian.iso.kbd b/share/syscons/keymaps/estonian.iso.kbd
index 94394f4023dd3..ea6c67a05ff1f 100644
--- a/share/syscons/keymaps/estonian.iso.kbd
+++ b/share/syscons/keymaps/estonian.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.iso.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/estonian.iso15.kbd b/share/syscons/keymaps/estonian.iso15.kbd
index 3e3c33b2ebb5c..07a38136e4cab 100644
--- a/share/syscons/keymaps/estonian.iso15.kbd
+++ b/share/syscons/keymaps/estonian.iso15.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/estonian.iso15.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/finnish.cp850.kbd b/share/syscons/keymaps/finnish.cp850.kbd
index 11b42eef17dab..6e411bee1515e 100644
--- a/share/syscons/keymaps/finnish.cp850.kbd
+++ b/share/syscons/keymaps/finnish.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/finnish.cp850.kbd,v 1.3 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/finnish.iso.kbd b/share/syscons/keymaps/finnish.iso.kbd
index 07a448787d198..deceed0b90bbf 100644
--- a/share/syscons/keymaps/finnish.iso.kbd
+++ b/share/syscons/keymaps/finnish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/finnish.iso.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.dvorak.acc.kbd b/share/syscons/keymaps/fr.dvorak.acc.kbd
index ba5fa9dd05afa..06a4af67e586d 100644
--- a/share/syscons/keymaps/fr.dvorak.acc.kbd
+++ b/share/syscons/keymaps/fr.dvorak.acc.kbd
@@ -11,7 +11,7 @@
 #   -Frédéric Praca <frederic.praca@freebsd-fr.org>
 #   -Clément Pillias <clement.pillias@free.fr> for accent keys
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.dvorak.acc.kbd,v 1.1 2007/01/16 10:47:56 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.dvorak.kbd b/share/syscons/keymaps/fr.dvorak.kbd
index c473f8d12f342..635366cf6bf6c 100644
--- a/share/syscons/keymaps/fr.dvorak.kbd
+++ b/share/syscons/keymaps/fr.dvorak.kbd
@@ -6,7 +6,7 @@
 #
 #   -Frédéric Praca <frederic.praca@freebsd-fr.org>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.dvorak.kbd,v 1.1 2003/05/16 03:46:53 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.iso.acc.kbd b/share/syscons/keymaps/fr.iso.acc.kbd
index 99483be569326..a74b8ccd6473e 100644
--- a/share/syscons/keymaps/fr.iso.acc.kbd
+++ b/share/syscons/keymaps/fr.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.iso.acc.kbd,v 1.5 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.iso.kbd b/share/syscons/keymaps/fr.iso.kbd
index 1eb4626ccafe9..37fb3cd2a8c6c 100644
--- a/share/syscons/keymaps/fr.iso.kbd
+++ b/share/syscons/keymaps/fr.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.iso.kbd,v 1.14 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr.macbook.acc.kbd b/share/syscons/keymaps/fr.macbook.acc.kbd
index e4cad941d153c..e1f68ed523d1d 100644
--- a/share/syscons/keymaps/fr.macbook.acc.kbd
+++ b/share/syscons/keymaps/fr.macbook.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr.macbook.acc.kbd,v 1.1 2007/07/13 08:29:24 roberto Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/fr_CA.iso.acc.kbd b/share/syscons/keymaps/fr_CA.iso.acc.kbd
index e758eb242cb0a..63e3ccb39dfb8 100644
--- a/share/syscons/keymaps/fr_CA.iso.acc.kbd
+++ b/share/syscons/keymaps/fr_CA.iso.acc.kbd
@@ -4,7 +4,7 @@
 # 
 # July 4, 1999
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/fr_CA.iso.acc.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
diff --git a/share/syscons/keymaps/german.cp850.kbd b/share/syscons/keymaps/german.cp850.kbd
index 64b7dc92c453e..5329664c00b0f 100644
--- a/share/syscons/keymaps/german.cp850.kbd
+++ b/share/syscons/keymaps/german.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/german.cp850.kbd,v 1.15 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/german.iso.acc.kbd b/share/syscons/keymaps/german.iso.acc.kbd
index 6a9223bc6321e..4a518dc2288c1 100644
--- a/share/syscons/keymaps/german.iso.acc.kbd
+++ b/share/syscons/keymaps/german.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/german.iso.acc.kbd,v 1.1 2003/06/19 08:34:38 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/german.iso.kbd b/share/syscons/keymaps/german.iso.kbd
index ca987c8001282..4464b49475826 100644
--- a/share/syscons/keymaps/german.iso.kbd
+++ b/share/syscons/keymaps/german.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/german.iso.kbd,v 1.17 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/gr.elot.acc.kbd b/share/syscons/keymaps/gr.elot.acc.kbd
index 2abc97dc93ce3..b783f03c247e2 100644
--- a/share/syscons/keymaps/gr.elot.acc.kbd
+++ b/share/syscons/keymaps/gr.elot.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/gr.elot.acc.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #
 # Built on Wed  1 Apr 15:59:44 EEST 1998 by peppe@cs.uoi.gr
 #                                                         alt
diff --git a/share/syscons/keymaps/gr.us101.acc.kbd b/share/syscons/keymaps/gr.us101.acc.kbd
index a3a4f41c408cf..a23e91a835f36 100644
--- a/share/syscons/keymaps/gr.us101.acc.kbd
+++ b/share/syscons/keymaps/gr.us101.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/gr.us101.acc.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #
 # Built on Wed  1 Apr 15:59:44 EEST 1998 by peppe@cs.uoi.gr
 #                                                         alt
diff --git a/share/syscons/keymaps/hr.iso.kbd b/share/syscons/keymaps/hr.iso.kbd
index a396a31d96823..9557e3a7c6a63 100644
--- a/share/syscons/keymaps/hr.iso.kbd
+++ b/share/syscons/keymaps/hr.iso.kbd
@@ -1,6 +1,6 @@
 # Slovenian keyboard
 # Blaz Zupan <blaz@amis.net>
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hr.iso.kbd,v 1.4 2007/02/04 17:10:18 philip Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/hu.iso2.101keys.kbd b/share/syscons/keymaps/hu.iso2.101keys.kbd
index 71862585aa485..54334e8c745b0 100644
--- a/share/syscons/keymaps/hu.iso2.101keys.kbd
+++ b/share/syscons/keymaps/hu.iso2.101keys.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hu.iso2.101keys.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 #
 # This is for use with a US keyboard, with only the
 # Hungarian accented characters added to it, and some tricks:
diff --git a/share/syscons/keymaps/hu.iso2.102keys.kbd b/share/syscons/keymaps/hu.iso2.102keys.kbd
index 3166a6719a134..027498c602fce 100644
--- a/share/syscons/keymaps/hu.iso2.102keys.kbd
+++ b/share/syscons/keymaps/hu.iso2.102keys.kbd
@@ -2,7 +2,7 @@
 # Hungarian keyboard standard (after M$'s W*).  There are so many PCs in
 # Hungary with that type of keyboard.
 # 
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hu.iso2.102keys.kbd,v 1.4 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/hy.armscii-8.kbd b/share/syscons/keymaps/hy.armscii-8.kbd
index d7e8cc9217956..66e27e55c3899 100644
--- a/share/syscons/keymaps/hy.armscii-8.kbd
+++ b/share/syscons/keymaps/hy.armscii-8.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/hy.armscii-8.kbd,v 1.1 2003/07/05 12:38:17 ache Exp $
 #
 # FreeBSD Armenian Phonetic keyboard layout
 # by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/syscons/keymaps/icelandic.iso.acc.kbd b/share/syscons/keymaps/icelandic.iso.acc.kbd
index 3b93007317b8a..74446fcd9db66 100644
--- a/share/syscons/keymaps/icelandic.iso.acc.kbd
+++ b/share/syscons/keymaps/icelandic.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/icelandic.iso.acc.kbd,v 1.6 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/icelandic.iso.kbd b/share/syscons/keymaps/icelandic.iso.kbd
index 4d4b1508132d8..2ac204d5f1b7e 100644
--- a/share/syscons/keymaps/icelandic.iso.kbd
+++ b/share/syscons/keymaps/icelandic.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/icelandic.iso.kbd,v 1.6 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/it.iso.kbd b/share/syscons/keymaps/it.iso.kbd
index 9097696d7422d..ca89e92787ecf 100644
--- a/share/syscons/keymaps/it.iso.kbd
+++ b/share/syscons/keymaps/it.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/it.iso.kbd,v 1.11 2004/01/23 16:37:51 ale Exp $
 #
 # Aggiunte ad una tastiera italiana standard :
 #
diff --git a/share/syscons/keymaps/iw.iso8.kbd b/share/syscons/keymaps/iw.iso8.kbd
index 1c047b83b893e..00e1dc602dc9a 100644
--- a/share/syscons/keymaps/iw.iso8.kbd
+++ b/share/syscons/keymaps/iw.iso8.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/iw.iso8.kbd,v 1.2 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/jp.106.kbd b/share/syscons/keymaps/jp.106.kbd
index c12fbf5f6e5f1..d00077065f3d8 100644
--- a/share/syscons/keymaps/jp.106.kbd
+++ b/share/syscons/keymaps/jp.106.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.106.kbd,v 1.9 2001/03/11 23:41:18 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/jp.106x.kbd b/share/syscons/keymaps/jp.106x.kbd
index cca3a9ec0238f..abbc94d5d1170 100644
--- a/share/syscons/keymaps/jp.106x.kbd
+++ b/share/syscons/keymaps/jp.106x.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.106x.kbd,v 1.8 2001/03/11 23:41:18 ache Exp $
 #
 # (this one has capslock and control swapped)
 #                                                         alt
diff --git a/share/syscons/keymaps/jp.pc98.iso.kbd b/share/syscons/keymaps/jp.pc98.iso.kbd
index 43719f51737c7..6e53334dd723c 100644
--- a/share/syscons/keymaps/jp.pc98.iso.kbd
+++ b/share/syscons/keymaps/jp.pc98.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.pc98.iso.kbd,v 1.1 2001/06/17 03:10:38 nyan Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/jp.pc98.kbd b/share/syscons/keymaps/jp.pc98.kbd
index d9a5d44a36b0d..00b0f8d78818f 100644
--- a/share/syscons/keymaps/jp.pc98.kbd
+++ b/share/syscons/keymaps/jp.pc98.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/jp.pc98.kbd,v 1.1 2001/06/17 03:10:38 nyan Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/kk.pt154.io.kbd b/share/syscons/keymaps/kk.pt154.io.kbd
index 1f1727a3dde9e..7f371a5c860ff 100644
--- a/share/syscons/keymaps/kk.pt154.io.kbd
+++ b/share/syscons/keymaps/kk.pt154.io.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/kk.pt154.io.kbd,v 1.1 2004/01/29 16:28:22 ache Exp $
 # KST KazSSR 903-90 with CYRILLIC LETTER IO
 # Birsh T <birsh@mail.kz>, 2003-12-02
 #                                                         alt
diff --git a/share/syscons/keymaps/kk.pt154.kst.kbd b/share/syscons/keymaps/kk.pt154.kst.kbd
index 6bc6ca0cd54a9..5f3c13d849d93 100644
--- a/share/syscons/keymaps/kk.pt154.kst.kbd
+++ b/share/syscons/keymaps/kk.pt154.kst.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/kk.pt154.kst.kbd,v 1.1 2004/01/29 16:28:22 ache Exp $
 # KST KazSSR 903-90 keyboard implementation
 # Birsh T <birsh@mail.kz>, 2003-12-02
 #                                                         alt
diff --git a/share/syscons/keymaps/latinamerican.iso.acc.kbd b/share/syscons/keymaps/latinamerican.iso.acc.kbd
index aa4f16c987f76..cb94e704d9630 100644
--- a/share/syscons/keymaps/latinamerican.iso.acc.kbd
+++ b/share/syscons/keymaps/latinamerican.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/latinamerican.iso.acc.kbd,v 1.1 2003/06/23 21:01:57 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/latinamerican.kbd b/share/syscons/keymaps/latinamerican.kbd
index 0663b69b825b0..845290e48bd2a 100644
--- a/share/syscons/keymaps/latinamerican.kbd
+++ b/share/syscons/keymaps/latinamerican.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/latinamerican.kbd,v 1.1 2003/06/23 21:01:57 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/lt.iso4.kbd b/share/syscons/keymaps/lt.iso4.kbd
index dbc6c36a4ad7a..d8d6dbf08152c 100644
--- a/share/syscons/keymaps/lt.iso4.kbd
+++ b/share/syscons/keymaps/lt.iso4.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/lt.iso4.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/norwegian.dvorak.kbd b/share/syscons/keymaps/norwegian.dvorak.kbd
index 83e8d46765125..d7a21e03d5a9c 100644
--- a/share/syscons/keymaps/norwegian.dvorak.kbd
+++ b/share/syscons/keymaps/norwegian.dvorak.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/norwegian.dvorak.kbd,v 1.2 2003/05/16 03:34:23 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/norwegian.iso.kbd b/share/syscons/keymaps/norwegian.iso.kbd
index bf112e5d954e9..b5ca2637c68d9 100644
--- a/share/syscons/keymaps/norwegian.iso.kbd
+++ b/share/syscons/keymaps/norwegian.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/norwegian.iso.kbd,v 1.8 2003/07/06 03:09:40 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/pl_PL.ISO8859-2.kbd b/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
index ee7adaa7a1574..95371ae33e1b3 100644
--- a/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
+++ b/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
@@ -1,6 +1,6 @@
 # Polish ISO-8859-2 keymap by Krzysztof Mlynarski (17:46 27-04-1996 MET DST)
 #                             (krzysio@hydra.mimuw.edu.pl)
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/pl_PL.ISO8859-2.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/pt.iso.acc.kbd b/share/syscons/keymaps/pt.iso.acc.kbd
index 8d77f0b6b5537..96702a78a173e 100644
--- a/share/syscons/keymaps/pt.iso.acc.kbd
+++ b/share/syscons/keymaps/pt.iso.acc.kbd
@@ -1,6 +1,6 @@
 #pt.iso.acc.kbd
 #by: pm@dee.uc.pt
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/pt.iso.acc.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/pt.iso.kbd b/share/syscons/keymaps/pt.iso.kbd
index fda53334af8f8..f92e29b3285b1 100644
--- a/share/syscons/keymaps/pt.iso.kbd
+++ b/share/syscons/keymaps/pt.iso.kbd
@@ -1,6 +1,6 @@
 #pt.iso.kbd
 #by: pm@dee.uc.pt
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/pt.iso.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.cp866.kbd b/share/syscons/keymaps/ru.cp866.kbd
index 84fbb68be8b1d..49427400eefa4 100644
--- a/share/syscons/keymaps/ru.cp866.kbd
+++ b/share/syscons/keymaps/ru.cp866.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.cp866.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.iso5.kbd b/share/syscons/keymaps/ru.iso5.kbd
index fec878f106fde..6f714fa3f7e2e 100644
--- a/share/syscons/keymaps/ru.iso5.kbd
+++ b/share/syscons/keymaps/ru.iso5.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.iso5.kbd,v 1.1 2002/01/01 06:51:22 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.koi8-r.kbd b/share/syscons/keymaps/ru.koi8-r.kbd
index 3f15711c8290e..9db859228670e 100644
--- a/share/syscons/keymaps/ru.koi8-r.kbd
+++ b/share/syscons/keymaps/ru.koi8-r.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.koi8-r.kbd,v 1.15 2001/04/09 16:36:48 sobomax Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.koi8-r.shift.kbd b/share/syscons/keymaps/ru.koi8-r.shift.kbd
index 0d67778fc0c1a..3ec2eb9c61017 100644
--- a/share/syscons/keymaps/ru.koi8-r.shift.kbd
+++ b/share/syscons/keymaps/ru.koi8-r.shift.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.koi8-r.shift.kbd,v 1.14 2001/04/09 16:36:48 sobomax Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ru.koi8-r.win.kbd b/share/syscons/keymaps/ru.koi8-r.win.kbd
index e5c862241d55e..5bdb6ad3daa75 100644
--- a/share/syscons/keymaps/ru.koi8-r.win.kbd
+++ b/share/syscons/keymaps/ru.koi8-r.win.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ru.koi8-r.win.kbd,v 1.1 2004/03/15 20:34:18 fjoe Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/si.iso.kbd b/share/syscons/keymaps/si.iso.kbd
index 1353027c1d300..f2139b2831cdc 100644
--- a/share/syscons/keymaps/si.iso.kbd
+++ b/share/syscons/keymaps/si.iso.kbd
@@ -1,6 +1,6 @@
 # Slovenian keyboard
 # Blaz Zupan <blaz@amis.net>
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/si.iso.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/sk.iso2.kbd b/share/syscons/keymaps/sk.iso2.kbd
index 14466e80371f1..4e9dec27e06d9 100644
--- a/share/syscons/keymaps/sk.iso2.kbd
+++ b/share/syscons/keymaps/sk.iso2.kbd
@@ -3,7 +3,7 @@
 #
 # Version 1.1 - 1999-03-21
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/sk.iso2.kbd,v 1.3 2001/03/11 23:41:19 ache Exp $
 #
 # This map is derived from my Central European map
 # (ce.iso2.kbd). The description of the CE map is next.
diff --git a/share/syscons/keymaps/spanish.iso.acc.kbd b/share/syscons/keymaps/spanish.iso.acc.kbd
index ae1fd42cd1046..a75be58421a4a 100644
--- a/share/syscons/keymaps/spanish.iso.acc.kbd
+++ b/share/syscons/keymaps/spanish.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/spanish.iso.acc.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/spanish.iso.kbd b/share/syscons/keymaps/spanish.iso.kbd
index 9c08898bb1d29..c69080325c3a3 100644
--- a/share/syscons/keymaps/spanish.iso.kbd
+++ b/share/syscons/keymaps/spanish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/spanish.iso.kbd,v 1.8 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/spanish.iso15.acc.kbd b/share/syscons/keymaps/spanish.iso15.acc.kbd
index e3fc3cb9b4b2b..53746418ccbb0 100644
--- a/share/syscons/keymaps/spanish.iso15.acc.kbd
+++ b/share/syscons/keymaps/spanish.iso15.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/spanish.iso15.acc.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swedish.cp850.kbd b/share/syscons/keymaps/swedish.cp850.kbd
index 11b42eef17dab..30569796be842 100644
--- a/share/syscons/keymaps/swedish.cp850.kbd
+++ b/share/syscons/keymaps/swedish.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swedish.cp850.kbd,v 1.14 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swedish.iso.kbd b/share/syscons/keymaps/swedish.iso.kbd
index 07a448787d198..e424cc908998c 100644
--- a/share/syscons/keymaps/swedish.iso.kbd
+++ b/share/syscons/keymaps/swedish.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swedish.iso.kbd,v 1.17 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/swissfrench.cp850.kbd b/share/syscons/keymaps/swissfrench.cp850.kbd
index 8ca6d5e5cef4e..feb7813de9f6e 100644
--- a/share/syscons/keymaps/swissfrench.cp850.kbd
+++ b/share/syscons/keymaps/swissfrench.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.cp850.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #
 # swiss-french cp850 keymap
 # original 13.06.1998 by Francois Tamone <tamone@eig.unige.ch>
diff --git a/share/syscons/keymaps/swissfrench.iso.acc.kbd b/share/syscons/keymaps/swissfrench.iso.acc.kbd
index 212308d393528..21a7ce97007cd 100644
--- a/share/syscons/keymaps/swissfrench.iso.acc.kbd
+++ b/share/syscons/keymaps/swissfrench.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.iso.acc.kbd,v 1.3 2001/03/11 23:41:19 ache Exp $
 #
 # swissfrench ISO 8859-1 keymap, accent keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissfrench.iso.kbd b/share/syscons/keymaps/swissfrench.iso.kbd
index 1241c3bd6edee..d9914ed77ffe0 100644
--- a/share/syscons/keymaps/swissfrench.iso.kbd
+++ b/share/syscons/keymaps/swissfrench.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissfrench.iso.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #
 # swissfrench ISO 8859-1 keymap, no dead keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissgerman.cp850.kbd b/share/syscons/keymaps/swissgerman.cp850.kbd
index f50be73651ed0..293c6a03ba9ce 100644
--- a/share/syscons/keymaps/swissgerman.cp850.kbd
+++ b/share/syscons/keymaps/swissgerman.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.cp850.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #
 # swiss-german cp850 keymap
 # original 21.10.1996 by Adrian Steinmann <ast@marabu.ch>
diff --git a/share/syscons/keymaps/swissgerman.iso.acc.kbd b/share/syscons/keymaps/swissgerman.iso.acc.kbd
index 9ca34bd7318b4..37c7d6a1ca529 100644
--- a/share/syscons/keymaps/swissgerman.iso.acc.kbd
+++ b/share/syscons/keymaps/swissgerman.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.iso.acc.kbd,v 1.3 2001/03/11 23:41:19 ache Exp $
 #
 # swissgerman ISO 8859-1 keymap, accent keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/swissgerman.iso.kbd b/share/syscons/keymaps/swissgerman.iso.kbd
index 091a6281e386f..f484c744e294b 100644
--- a/share/syscons/keymaps/swissgerman.iso.kbd
+++ b/share/syscons/keymaps/swissgerman.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/swissgerman.iso.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #
 # swissgerman ISO 8859-1 keymap, no dead keys
 # created 14.11.1999 by Martin Blapp <mb@imp.ch>
diff --git a/share/syscons/keymaps/tr.iso9.q.kbd b/share/syscons/keymaps/tr.iso9.q.kbd
index 665171368a0c8..16b2e642149c7 100644
--- a/share/syscons/keymaps/tr.iso9.q.kbd
+++ b/share/syscons/keymaps/tr.iso9.q.kbd
@@ -1,6 +1,6 @@
 # Turkish ISO-8859-9 keymap by Evren Yurtesen (09-12-1999)
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/tr.iso9.q.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #
 # For suggestions and corrections please contact with me.
 #
diff --git a/share/syscons/keymaps/ua.iso5.kbd b/share/syscons/keymaps/ua.iso5.kbd
index a96d89fe3cd7e..4a9948f472531 100644
--- a/share/syscons/keymaps/ua.iso5.kbd
+++ b/share/syscons/keymaps/ua.iso5.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ua.iso5.kbd,v 1.1 2002/01/01 06:51:22 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ua.koi8-u.kbd b/share/syscons/keymaps/ua.koi8-u.kbd
index 112a45bf6f273..a5220a8e69868 100644
--- a/share/syscons/keymaps/ua.koi8-u.kbd
+++ b/share/syscons/keymaps/ua.koi8-u.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ua.koi8-u.kbd,v 1.5 2001/11/14 21:28:10 sobomax Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd b/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
index 82cd95f32d98a..20b6506434d98 100644
--- a/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
+++ b/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd,v 1.2 2001/11/14 21:14:39 sobomax Exp $
 #
 # keyboard mapping for both Ukrainian and Russian languages, koi8-u charset.
 #   by sia@lot.cs.kiev.ua
diff --git a/share/syscons/keymaps/uk.cp850-ctrl.kbd b/share/syscons/keymaps/uk.cp850-ctrl.kbd
index a60410e5db9f3..ffee31305a30d 100644
--- a/share/syscons/keymaps/uk.cp850-ctrl.kbd
+++ b/share/syscons/keymaps/uk.cp850-ctrl.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.cp850-ctrl.kbd,v 1.15 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/uk.cp850.kbd b/share/syscons/keymaps/uk.cp850.kbd
index 5cbbb4f089c03..a5161d7a33910 100644
--- a/share/syscons/keymaps/uk.cp850.kbd
+++ b/share/syscons/keymaps/uk.cp850.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.cp850.kbd,v 1.14 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/uk.iso-ctrl.kbd b/share/syscons/keymaps/uk.iso-ctrl.kbd
index 986ec754c60a1..f8bae4954569a 100644
--- a/share/syscons/keymaps/uk.iso-ctrl.kbd
+++ b/share/syscons/keymaps/uk.iso-ctrl.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.iso-ctrl.kbd,v 1.17 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/uk.iso.kbd b/share/syscons/keymaps/uk.iso.kbd
index adaf9d068d6ad..9f99c447d1f93 100644
--- a/share/syscons/keymaps/uk.iso.kbd
+++ b/share/syscons/keymaps/uk.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/uk.iso.kbd,v 1.17 2002/04/08 19:16:01 asmodai Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorak.kbd b/share/syscons/keymaps/us.dvorak.kbd
index bc475b25d4d89..c760d431701a4 100644
--- a/share/syscons/keymaps/us.dvorak.kbd
+++ b/share/syscons/keymaps/us.dvorak.kbd
@@ -7,7 +7,7 @@
 #
 #   -Satoshi
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorak.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakl.kbd b/share/syscons/keymaps/us.dvorakl.kbd
index bc44397d32404..17ebbe23b0325 100644
--- a/share/syscons/keymaps/us.dvorakl.kbd
+++ b/share/syscons/keymaps/us.dvorakl.kbd
@@ -1,6 +1,6 @@
 # A left handed Dvorak keyboard for US English
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorakl.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakr.kbd b/share/syscons/keymaps/us.dvorakr.kbd
index 94abba89d76c8..e507a5b672888 100644
--- a/share/syscons/keymaps/us.dvorakr.kbd
+++ b/share/syscons/keymaps/us.dvorakr.kbd
@@ -1,6 +1,6 @@
 # A right handed Dvorak keyboard for US English
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorakr.kbd,v 1.5 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakx.kbd b/share/syscons/keymaps/us.dvorakx.kbd
index 18f05fe0cbfbd..0f48e33098dd2 100644
--- a/share/syscons/keymaps/us.dvorakx.kbd
+++ b/share/syscons/keymaps/us.dvorakx.kbd
@@ -5,7 +5,7 @@
 #
 #   -Satoshi
 #
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.dvorakx.kbd,v 1.7 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.emacs.kbd b/share/syscons/keymaps/us.emacs.kbd
index 553a617338eb0..6a3d759a07889 100644
--- a/share/syscons/keymaps/us.emacs.kbd
+++ b/share/syscons/keymaps/us.emacs.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.emacs.kbd,v 1.3 2000/05/06 18:31:10 obrien Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.iso.acc.kbd b/share/syscons/keymaps/us.iso.acc.kbd
index a7faa514fc967..e57df7579491a 100644
--- a/share/syscons/keymaps/us.iso.acc.kbd
+++ b/share/syscons/keymaps/us.iso.acc.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.iso.acc.kbd,v 1.1 2003/06/19 08:08:17 murray Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.iso.kbd b/share/syscons/keymaps/us.iso.kbd
index e213392e6ae0d..c7ac998a8626f 100644
--- a/share/syscons/keymaps/us.iso.kbd
+++ b/share/syscons/keymaps/us.iso.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.iso.kbd,v 1.16 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.pc-ctrl.kbd b/share/syscons/keymaps/us.pc-ctrl.kbd
index 58b66f3e2ee58..c128b1564d602 100644
--- a/share/syscons/keymaps/us.pc-ctrl.kbd
+++ b/share/syscons/keymaps/us.pc-ctrl.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.pc-ctrl.kbd,v 1.2 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.unix.kbd b/share/syscons/keymaps/us.unix.kbd
index b883eaba21695..7a2e682aa421f 100644
--- a/share/syscons/keymaps/us.unix.kbd
+++ b/share/syscons/keymaps/us.unix.kbd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/keymaps/us.unix.kbd,v 1.6 2001/03/11 23:41:19 ache Exp $
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index 1c5dc88382a17..dd5bff78fd9ca 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/syscons/scrnmaps/Makefile,v 1.23 2004/02/26 07:50:56 bde Exp $
 
 SCRMAPS = armscii8-2haik8.scm \
 	  iso-8859-1_to_cp437.scm iso-8859-4_for_vga9.scm \
diff --git a/share/syscons/scrnmaps/armscii8-2haik8 b/share/syscons/scrnmaps/armscii8-2haik8
index f6bc35d74701d..351b0386e9e56 100644
--- a/share/syscons/scrnmaps/armscii8-2haik8
+++ b/share/syscons/scrnmaps/armscii8-2haik8
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/armscii8-2haik8,v 1.1 2003/07/05 12:38:18 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/iso-8859-1_to_cp437 b/share/syscons/scrnmaps/iso-8859-1_to_cp437
index c18e62f046675..9e337a975be96 100644
--- a/share/syscons/scrnmaps/iso-8859-1_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-1_to_cp437
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/iso-8859-1_to_cp437,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/iso-8859-4_for_vga9 b/share/syscons/scrnmaps/iso-8859-4_for_vga9
index e096bdcd771ec..e06d715a68fea 100644
--- a/share/syscons/scrnmaps/iso-8859-4_for_vga9
+++ b/share/syscons/scrnmaps/iso-8859-4_for_vga9
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/iso-8859-4_for_vga9,v 1.1 2001/11/23 01:39:42 ache Exp $
  */
 
 /* exchange 0x80-0x9F and 0xC0-0xDF due to VGA hardware limitation
diff --git a/share/syscons/scrnmaps/iso-8859-7_to_cp437 b/share/syscons/scrnmaps/iso-8859-7_to_cp437
index 12c467a360f2c..1d15e784906ae 100644
--- a/share/syscons/scrnmaps/iso-8859-7_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-7_to_cp437
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/iso-8859-7_to_cp437,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/koi8-r2cp866 b/share/syscons/scrnmaps/koi8-r2cp866
index 15f2847fa9b3d..6f39eaee7cc6a 100644
--- a/share/syscons/scrnmaps/koi8-r2cp866
+++ b/share/syscons/scrnmaps/koi8-r2cp866
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/koi8-r2cp866,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/koi8-u2cp866u b/share/syscons/scrnmaps/koi8-u2cp866u
index 7fd86ad51bb7c..6ea207a833e36 100644
--- a/share/syscons/scrnmaps/koi8-u2cp866u
+++ b/share/syscons/scrnmaps/koi8-u2cp866u
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/koi8-u2cp866u,v 1.3 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/mkscrfil.c b/share/syscons/scrnmaps/mkscrfil.c
index c981b23bf57bc..9a76fc987d19d 100644
--- a/share/syscons/scrnmaps/mkscrfil.c
+++ b/share/syscons/scrnmaps/mkscrfil.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/mkscrfil.c,v 1.2 2000/10/08 21:33:52 phk Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/share/syscons/scrnmaps/us-ascii_to_cp437 b/share/syscons/scrnmaps/us-ascii_to_cp437
index e1155aa137c42..12473d2f28978 100644
--- a/share/syscons/scrnmaps/us-ascii_to_cp437
+++ b/share/syscons/scrnmaps/us-ascii_to_cp437
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/share/syscons/scrnmaps/us-ascii_to_cp437,v 1.2 2002/01/21 21:52:02 ache Exp $
  */
 
 scrmap_t scrmap = {
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index 846ef461afdac..ec4c3ff2a2672 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/tabset/Makefile,v 1.10 2001/12/17 13:59:33 ru Exp $
 
 FILES=	3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
 	stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 9f6e7189297d7..ba1bd9a0adbfb 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/share/termcap/Makefile,v 1.19 2005/08/05 09:52:25 phk Exp $
 
 # reorder gives an editor command for most common terminals
 # (in reverse order from n'th to 1'st most commonly used)
diff --git a/share/termcap/reorder b/share/termcap/reorder
index 8fc94a755db3a..61e3cd5385e01 100644
--- a/share/termcap/reorder
+++ b/share/termcap/reorder
@@ -1,4 +1,4 @@
-" $FreeBSD$
+" $FreeBSD: src/share/termcap/reorder,v 1.6 2002/09/08 12:47:22 ache Exp $
 /# << EOH -/k a
 /^adm12|/;.,/^[^	]/-m'a
 /^pcplot/;.,/^[^	]/-m'a
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index bb5b5123c34e0..f24a84fc17bfd 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/termcap/termcap.5,v 1.25 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd April 16, 1994
 .Dt TERMCAP 5
diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index c5df916dede71..c2a465f64329f 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)termcap.src	8.2 (Berkeley) 11/17/93
-# $FreeBSD$
+# $FreeBSD: src/share/termcap/termcap.src,v 1.148 2006/04/30 09:05:56 matteo Exp $
 
 #	Termcap source file
 #	John Kunze, Berkeley
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 8285f2168f6bb..d33a0f2abec75 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/Makefile,v 1.50 2006/11/09 18:10:34 des Exp $
 
 LOCALES=	am_ET.UTF-8 \
 		be_BY.CP1131 \
diff --git a/share/timedef/am_ET.UTF-8.src b/share/timedef/am_ET.UTF-8.src
index ed0e148954582..82a553e1ba763 100644
--- a/share/timedef/am_ET.UTF-8.src
+++ b/share/timedef/am_ET.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/am_ET.UTF-8.src,v 1.2 2003/08/20 22:35:55 mtm Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/be_BY.CP1131.src b/share/timedef/be_BY.CP1131.src
index e8907d34f0371..8834d4c08e255 100644
--- a/share/timedef/be_BY.CP1131.src
+++ b/share/timedef/be_BY.CP1131.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/be_BY.CP1251.src b/share/timedef/be_BY.CP1251.src
index 1738592fc6397..cf164391eb82b 100644
--- a/share/timedef/be_BY.CP1251.src
+++ b/share/timedef/be_BY.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.CP1251.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/be_BY.ISO8859-5.src b/share/timedef/be_BY.ISO8859-5.src
index e8a4ad2a87a59..b44bf4074ab6b 100644
--- a/share/timedef/be_BY.ISO8859-5.src
+++ b/share/timedef/be_BY.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.ISO8859-5.src,v 1.1 2003/12/20 11:18:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/be_BY.UTF-8.src b/share/timedef/be_BY.UTF-8.src
index 33ec00a90cfe0..cb1ae7ca0bae2 100644
--- a/share/timedef/be_BY.UTF-8.src
+++ b/share/timedef/be_BY.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/be_BY.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/bg_BG.CP1251.src b/share/timedef/bg_BG.CP1251.src
index eb6299a70cac5..6f379e7a1e178 100644
--- a/share/timedef/bg_BG.CP1251.src
+++ b/share/timedef/bg_BG.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/bg_BG.CP1251.src,v 1.1 2001/11/05 07:21:03 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/bg_BG.UTF-8.src b/share/timedef/bg_BG.UTF-8.src
index ded92409b277c..b3769a81c4bd6 100644
--- a/share/timedef/bg_BG.UTF-8.src
+++ b/share/timedef/bg_BG.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/bg_BG.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ca_ES.ISO8859-1.src b/share/timedef/ca_ES.ISO8859-1.src
index 26e319dd3e01c..3405d099897dc 100644
--- a/share/timedef/ca_ES.ISO8859-1.src
+++ b/share/timedef/ca_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ca_ES.ISO8859-1.src,v 1.1 2002/12/30 09:09:58 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ca_ES.UTF-8.src b/share/timedef/ca_ES.UTF-8.src
index 2a3f85b4aaaeb..7bc526ad00155 100644
--- a/share/timedef/ca_ES.UTF-8.src
+++ b/share/timedef/ca_ES.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ca_ES.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/cs_CZ.ISO8859-2.src b/share/timedef/cs_CZ.ISO8859-2.src
index 62a9c98e46ab2..ebba9a1053bae 100644
--- a/share/timedef/cs_CZ.ISO8859-2.src
+++ b/share/timedef/cs_CZ.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Czech month and day names
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/cs_CZ.ISO8859-2.src,v 1.5 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/cs_CZ.UTF-8.src b/share/timedef/cs_CZ.UTF-8.src
index a34501a507ded..074507dffdbfa 100644
--- a/share/timedef/cs_CZ.UTF-8.src
+++ b/share/timedef/cs_CZ.UTF-8.src
@@ -1,7 +1,7 @@
 # Czech month and day names
 # by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/cs_CZ.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/da_DK.ISO8859-1.src b/share/timedef/da_DK.ISO8859-1.src
index e7cdf7dcb4b47..98a52b1484547 100644
--- a/share/timedef/da_DK.ISO8859-1.src
+++ b/share/timedef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/da_DK.ISO8859-1.src,v 1.11 2006/10/07 17:04:23 flz Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/da_DK.UTF-8.src b/share/timedef/da_DK.UTF-8.src
index 804f8ee67a586..c2003fe47c2eb 100644
--- a/share/timedef/da_DK.UTF-8.src
+++ b/share/timedef/da_DK.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/da_DK.UTF-8.src,v 1.2 2006/10/07 17:04:23 flz Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_AT.ISO8859-1.src b/share/timedef/de_AT.ISO8859-1.src
index a07193dd61989..aae6c50f80e2c 100644
--- a/share/timedef/de_AT.ISO8859-1.src
+++ b/share/timedef/de_AT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_AT.ISO8859-1.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_AT.UTF-8.src b/share/timedef/de_AT.UTF-8.src
index 4b78c046771f2..e458fa0bf17e1 100644
--- a/share/timedef/de_AT.UTF-8.src
+++ b/share/timedef/de_AT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_AT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_DE.ISO8859-1.src b/share/timedef/de_DE.ISO8859-1.src
index 64085022b4203..55df66c3c0032 100644
--- a/share/timedef/de_DE.ISO8859-1.src
+++ b/share/timedef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_DE.ISO8859-1.src,v 1.13 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_DE.UTF-8.src b/share/timedef/de_DE.UTF-8.src
index 535d8dd088ddb..ec87ce9eef2d1 100644
--- a/share/timedef/de_DE.UTF-8.src
+++ b/share/timedef/de_DE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/de_DE.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/el_GR.ISO8859-7.src b/share/timedef/el_GR.ISO8859-7.src
index c608672e5f7b3..6ac2ebdacd6d7 100644
--- a/share/timedef/el_GR.ISO8859-7.src
+++ b/share/timedef/el_GR.ISO8859-7.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/el_GR.ISO8859-7.src,v 1.4 2001/11/20 18:10:08 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/el_GR.UTF-8.src b/share/timedef/el_GR.UTF-8.src
index 3125320bd5ac1..3e3978011f328 100644
--- a/share/timedef/el_GR.UTF-8.src
+++ b/share/timedef/el_GR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/el_GR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/en_GB.ISO8859-1.src b/share/timedef/en_GB.ISO8859-1.src
index 8c10578cdcbae..41729858ccb3b 100644
--- a/share/timedef/en_GB.ISO8859-1.src
+++ b/share/timedef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/en_GB.ISO8859-1.src,v 1.9 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/en_US.ISO8859-1.src b/share/timedef/en_US.ISO8859-1.src
index 7fee051b5fcd1..f7ec05c382cf6 100644
--- a/share/timedef/en_US.ISO8859-1.src
+++ b/share/timedef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/en_US.ISO8859-1.src,v 1.9 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/es_ES.ISO8859-1.src b/share/timedef/es_ES.ISO8859-1.src
index 78d2cb848838e..dfd4bd7ecd5ba 100644
--- a/share/timedef/es_ES.ISO8859-1.src
+++ b/share/timedef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/es_ES.ISO8859-1.src,v 1.8 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/es_ES.UTF-8.src b/share/timedef/es_ES.UTF-8.src
index fb7d7f750209d..3ed80d85608f8 100644
--- a/share/timedef/es_ES.UTF-8.src
+++ b/share/timedef/es_ES.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/es_ES.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/et_EE.ISO8859-15.src b/share/timedef/et_EE.ISO8859-15.src
index 82595e877c93a..020eb4d3252bf 100644
--- a/share/timedef/et_EE.ISO8859-15.src
+++ b/share/timedef/et_EE.ISO8859-15.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/et_EE.ISO8859-15.src,v 1.5 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/et_EE.UTF-8.src b/share/timedef/et_EE.UTF-8.src
index d0a97e6733842..2cc66b22b7790 100644
--- a/share/timedef/et_EE.UTF-8.src
+++ b/share/timedef/et_EE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/et_EE.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/eu_ES.ISO8859-1.src b/share/timedef/eu_ES.ISO8859-1.src
index 6361cbc329418..a8dda96691d5d 100644
--- a/share/timedef/eu_ES.ISO8859-1.src
+++ b/share/timedef/eu_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/eu_ES.ISO8859-1.src,v 1.1 2004/08/28 12:52:31 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/fi_FI.ISO8859-1.src b/share/timedef/fi_FI.ISO8859-1.src
index fffed1848a960..38c99d2ed9d67 100644
--- a/share/timedef/fi_FI.ISO8859-1.src
+++ b/share/timedef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fi_FI.ISO8859-1.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/fi_FI.UTF-8.src b/share/timedef/fi_FI.UTF-8.src
index bd16a0971739f..bc9853d5c027e 100644
--- a/share/timedef/fi_FI.UTF-8.src
+++ b/share/timedef/fi_FI.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fi_FI.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/fr_FR.ISO8859-1.src b/share/timedef/fr_FR.ISO8859-1.src
index d905c99429b46..c4dbc547e3d12 100644
--- a/share/timedef/fr_FR.ISO8859-1.src
+++ b/share/timedef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fr_FR.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/fr_FR.UTF-8.src b/share/timedef/fr_FR.UTF-8.src
index 4a98ab4e34158..7f56d910455c2 100644
--- a/share/timedef/fr_FR.UTF-8.src
+++ b/share/timedef/fr_FR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/fr_FR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/he_IL.UTF-8.src b/share/timedef/he_IL.UTF-8.src
index 5194c8bf40d5e..2c15738fb0a9b 100644
--- a/share/timedef/he_IL.UTF-8.src
+++ b/share/timedef/he_IL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/he_IL.UTF-8.src,v 1.1 2004/04/21 15:28:23 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hi_IN.ISCII-DEV.src b/share/timedef/hi_IN.ISCII-DEV.src
index c1f3904b025d4..bf49c806d0284 100644
--- a/share/timedef/hi_IN.ISCII-DEV.src
+++ b/share/timedef/hi_IN.ISCII-DEV.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hi_IN.ISCII-DEV.src,v 1.1 2001/11/28 07:23:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hr_HR.ISO8859-2.src b/share/timedef/hr_HR.ISO8859-2.src
index 2b8d2cca1cf31..0a56a17a703e3 100644
--- a/share/timedef/hr_HR.ISO8859-2.src
+++ b/share/timedef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hr_HR.ISO8859-2.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hr_HR.UTF-8.src b/share/timedef/hr_HR.UTF-8.src
index 1d952a7437642..b573f1df7b874 100644
--- a/share/timedef/hr_HR.UTF-8.src
+++ b/share/timedef/hr_HR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hr_HR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hu_HU.ISO8859-2.src b/share/timedef/hu_HU.ISO8859-2.src
index 724e24ad1df7b..3e0896696056d 100644
--- a/share/timedef/hu_HU.ISO8859-2.src
+++ b/share/timedef/hu_HU.ISO8859-2.src
@@ -1,6 +1,6 @@
 # This is a Hungarian LC_TIME file for ISO 8859-2 code-table
 # Made by Gabor Zahemszky <zgabor@CoDe.hu>
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hu_HU.ISO8859-2.src,v 1.6 2001/03/21 22:54:44 ache Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/hu_HU.UTF-8.src b/share/timedef/hu_HU.UTF-8.src
index 62d891c240c79..9a6ebf4265448 100644
--- a/share/timedef/hu_HU.UTF-8.src
+++ b/share/timedef/hu_HU.UTF-8.src
@@ -1,6 +1,6 @@
 # This is a Hungarian LC_TIME file for ISO 8859-2 code-table
 # Made by Gabor Zahemszky <zgabor@CoDe.hu>
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hu_HU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/hy_AM.ARMSCII-8.src b/share/timedef/hy_AM.ARMSCII-8.src
index 35c1ec677ecfc..9c5355b120cac 100644
--- a/share/timedef/hy_AM.ARMSCII-8.src
+++ b/share/timedef/hy_AM.ARMSCII-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hy_AM.ARMSCII-8.src,v 1.1 2003/07/05 12:03:15 ache Exp $
 #
 # LC_TIME source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/timedef/hy_AM.UTF-8.src b/share/timedef/hy_AM.UTF-8.src
index b8ec9461dccb2..70f36da553429 100644
--- a/share/timedef/hy_AM.UTF-8.src
+++ b/share/timedef/hy_AM.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/hy_AM.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # LC_TIME source for ARMSCII-8 locale for FreeBSD
 # Made available by Vahe Khachikyan <vahe@khachikyan.de>
diff --git a/share/timedef/is_IS.ISO8859-1.src b/share/timedef/is_IS.ISO8859-1.src
index 9da9efcd66b60..d4ae648c8b6fa 100644
--- a/share/timedef/is_IS.ISO8859-1.src
+++ b/share/timedef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/is_IS.ISO8859-1.src,v 1.9 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/is_IS.UTF-8.src b/share/timedef/is_IS.UTF-8.src
index be04488fddbc8..0826bae830556 100644
--- a/share/timedef/is_IS.UTF-8.src
+++ b/share/timedef/is_IS.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/is_IS.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/it_IT.ISO8859-1.src b/share/timedef/it_IT.ISO8859-1.src
index 27e5aae4fe8a5..4b8e29784e888 100644
--- a/share/timedef/it_IT.ISO8859-1.src
+++ b/share/timedef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/it_IT.ISO8859-1.src,v 1.11 2003/04/05 14:43:05 trhodes Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/it_IT.UTF-8.src b/share/timedef/it_IT.UTF-8.src
index 3ffe0308347e3..3da21bf681134 100644
--- a/share/timedef/it_IT.UTF-8.src
+++ b/share/timedef/it_IT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/it_IT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.SJIS.src b/share/timedef/ja_JP.SJIS.src
index e5b44d7386aef..d0906cb1427ad 100644
--- a/share/timedef/ja_JP.SJIS.src
+++ b/share/timedef/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.12 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.UTF-8.src b/share/timedef/ja_JP.UTF-8.src
index b3431da4214b8..ad2854655bc69 100644
--- a/share/timedef/ja_JP.UTF-8.src
+++ b/share/timedef/ja_JP.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.eucJP.src b/share/timedef/ja_JP.eucJP.src
index c73c47d572439..43eea27d87dfd 100644
--- a/share/timedef/ja_JP.eucJP.src
+++ b/share/timedef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.10 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/kk_KZ.PT154.src b/share/timedef/kk_KZ.PT154.src
index 5bed53e245d3f..5213054c0d946 100644
--- a/share/timedef/kk_KZ.PT154.src
+++ b/share/timedef/kk_KZ.PT154.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/kk_KZ.PT154.src,v 1.1 2004/01/29 16:28:22 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/kk_KZ.UTF-8.src b/share/timedef/kk_KZ.UTF-8.src
index 5c1f59febae16..2f46126a18957 100644
--- a/share/timedef/kk_KZ.UTF-8.src
+++ b/share/timedef/kk_KZ.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/kk_KZ.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ko_KR.UTF-8.src b/share/timedef/ko_KR.UTF-8.src
index e7bf058f268b6..c8af3af663283 100644
--- a/share/timedef/ko_KR.UTF-8.src
+++ b/share/timedef/ko_KR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ko_KR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # Originally by CHOI Junho <cjh@FreeBSD.org>
 # 27 Mar 1997
diff --git a/share/timedef/ko_KR.eucKR.src b/share/timedef/ko_KR.eucKR.src
index 59c24244b89c4..2b00481fda4bf 100644
--- a/share/timedef/ko_KR.eucKR.src
+++ b/share/timedef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ko_KR.eucKR.src,v 1.12 2001/03/21 23:24:41 ache Exp $
 #
 # Originally by CHOI Junho <cjh@FreeBSD.org>
 # 27 Mar 1997
diff --git a/share/timedef/la_LN.ISO8859-1.src b/share/timedef/la_LN.ISO8859-1.src
index 30038445e1180..ceb765fcac8e8 100644
--- a/share/timedef/la_LN.ISO8859-1.src
+++ b/share/timedef/la_LN.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/la_LN.ISO8859-1.src,v 1.7 2001/03/21 13:52:11 ache Exp $
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/lt_LT.ISO8859-13.src b/share/timedef/lt_LT.ISO8859-13.src
index 2d45e3ebddacc..9caa2f377431e 100644
--- a/share/timedef/lt_LT.ISO8859-13.src
+++ b/share/timedef/lt_LT.ISO8859-13.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/lt_LT.ISO8859-13.src,v 1.1 2002/10/25 22:02:10 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/lt_LT.ISO8859-4.src b/share/timedef/lt_LT.ISO8859-4.src
index 157597c016c41..d7a5d012a9257 100644
--- a/share/timedef/lt_LT.ISO8859-4.src
+++ b/share/timedef/lt_LT.ISO8859-4.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/lt_LT.ISO8859-4.src,v 1.5 2001/03/21 22:54:44 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/lt_LT.UTF-8.src b/share/timedef/lt_LT.UTF-8.src
index cc332de766562..7458d1309b0f9 100644
--- a/share/timedef/lt_LT.UTF-8.src
+++ b/share/timedef/lt_LT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/lt_LT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/mn_MN.UTF-8.src b/share/timedef/mn_MN.UTF-8.src
index 39fedba1a3931..347099ab58abc 100644
--- a/share/timedef/mn_MN.UTF-8.src
+++ b/share/timedef/mn_MN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/mn_MN.UTF-8.src,v 1.1 2006/10/02 00:36:52 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/nl_NL.ISO8859-1.src b/share/timedef/nl_NL.ISO8859-1.src
index f94f212718277..1f860ff5b29b0 100644
--- a/share/timedef/nl_NL.ISO8859-1.src
+++ b/share/timedef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/nl_NL.ISO8859-1.src,v 1.7 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/nn_NO.ISO8859-1.src b/share/timedef/nn_NO.ISO8859-1.src
index a05162380ae81..1a0740d86498c 100644
--- a/share/timedef/nn_NO.ISO8859-1.src
+++ b/share/timedef/nn_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/nn_NO.ISO8859-1.src,v 1.1 2006/11/09 18:10:34 des Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/nn_NO.UTF-8.src b/share/timedef/nn_NO.UTF-8.src
index 8e2fbf3c9ce72..48d0a03db9852 100644
--- a/share/timedef/nn_NO.UTF-8.src
+++ b/share/timedef/nn_NO.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/nn_NO.UTF-8.src,v 1.1 2006/11/09 18:10:34 des Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/no_NO.ISO8859-1.src b/share/timedef/no_NO.ISO8859-1.src
index 04c7a950b631a..fad46330a6647 100644
--- a/share/timedef/no_NO.ISO8859-1.src
+++ b/share/timedef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/no_NO.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/no_NO.UTF-8.src b/share/timedef/no_NO.UTF-8.src
index f352023792bce..69d46c640c7ca 100644
--- a/share/timedef/no_NO.UTF-8.src
+++ b/share/timedef/no_NO.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/no_NO.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pl_PL.ISO8859-2.src b/share/timedef/pl_PL.ISO8859-2.src
index 73ba016e9b1d4..acac9d698c3e9 100644
--- a/share/timedef/pl_PL.ISO8859-2.src
+++ b/share/timedef/pl_PL.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pl_PL.ISO8859-2.src,v 1.8 2004/09/20 23:56:43 pjd Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/pl_PL.UTF-8.src b/share/timedef/pl_PL.UTF-8.src
index 181fd78aaa103..62f0e31a787e9 100644
--- a/share/timedef/pl_PL.UTF-8.src
+++ b/share/timedef/pl_PL.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pl_PL.UTF-8.src,v 1.2 2004/09/20 23:56:43 pjd Exp $
 #
 # Short month names
 #
diff --git a/share/timedef/pt_BR.ISO8859-1.src b/share/timedef/pt_BR.ISO8859-1.src
index fde08a1a68a0e..a8f530704508b 100644
--- a/share/timedef/pt_BR.ISO8859-1.src
+++ b/share/timedef/pt_BR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_BR.ISO8859-1.src,v 1.1 2002/04/05 15:03:13 phantom Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_BR.UTF-8.src b/share/timedef/pt_BR.UTF-8.src
index 66c49a39204cf..8906f9ca6a26b 100644
--- a/share/timedef/pt_BR.UTF-8.src
+++ b/share/timedef/pt_BR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_BR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_PT.ISO8859-1.src b/share/timedef/pt_PT.ISO8859-1.src
index 452834d1349ff..45ffd2b9da75e 100644
--- a/share/timedef/pt_PT.ISO8859-1.src
+++ b/share/timedef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_PT.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_PT.UTF-8.src b/share/timedef/pt_PT.UTF-8.src
index b24d9cb5eca5a..e32db54ce7aab 100644
--- a/share/timedef/pt_PT.UTF-8.src
+++ b/share/timedef/pt_PT.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/pt_PT.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ro_RO.ISO8859-2.src b/share/timedef/ro_RO.ISO8859-2.src
index 515066c46a3fb..a09836be1439e 100644
--- a/share/timedef/ro_RO.ISO8859-2.src
+++ b/share/timedef/ro_RO.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ro_RO.ISO8859-2.src,v 1.1 2002/01/08 15:20:13 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ro_RO.UTF-8.src b/share/timedef/ro_RO.UTF-8.src
index 5f7db7a701367..e701925febda0 100644
--- a/share/timedef/ro_RO.UTF-8.src
+++ b/share/timedef/ro_RO.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ro_RO.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.CP1251.src b/share/timedef/ru_RU.CP1251.src
index f121786c9e03c..3a8284a604dbc 100644
--- a/share/timedef/ru_RU.CP1251.src
+++ b/share/timedef/ru_RU.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.CP1251.src,v 1.1 2003/06/07 00:12:12 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.CP866.src b/share/timedef/ru_RU.CP866.src
index db15000322ee3..19f235f1258d0 100644
--- a/share/timedef/ru_RU.CP866.src
+++ b/share/timedef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.CP866.src,v 1.18 2001/03/22 11:39:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.ISO8859-5.src b/share/timedef/ru_RU.ISO8859-5.src
index 750bd189f4581..eebcd59babf8a 100644
--- a/share/timedef/ru_RU.ISO8859-5.src
+++ b/share/timedef/ru_RU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.ISO8859-5.src,v 1.9 2001/03/22 11:39:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.KOI8-R.src b/share/timedef/ru_RU.KOI8-R.src
index f5a250f62186a..bcd992ca28be5 100644
--- a/share/timedef/ru_RU.KOI8-R.src
+++ b/share/timedef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.KOI8-R.src,v 1.18 2001/03/22 11:39:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_RU.UTF-8.src b/share/timedef/ru_RU.UTF-8.src
index 4660c22272154..02a52db0a261a 100644
--- a/share/timedef/ru_RU.UTF-8.src
+++ b/share/timedef/ru_RU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/ru_RU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sk_SK.ISO8859-2.src b/share/timedef/sk_SK.ISO8859-2.src
index a10c861f4dd61..d1fa670d45464 100644
--- a/share/timedef/sk_SK.ISO8859-2.src
+++ b/share/timedef/sk_SK.ISO8859-2.src
@@ -1,7 +1,7 @@
 # Slovak month and day names
 # by Juraj Bednar <juraj@bednar.sk>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sk_SK.ISO8859-2.src,v 1.1 2001/05/13 16:28:38 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sk_SK.UTF-8.src b/share/timedef/sk_SK.UTF-8.src
index 652b3b2b9907e..045a94088c29b 100644
--- a/share/timedef/sk_SK.UTF-8.src
+++ b/share/timedef/sk_SK.UTF-8.src
@@ -1,7 +1,7 @@
 # Slovak month and day names
 # by Juraj Bednar <juraj@bednar.sk>
 #
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sk_SK.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sl_SI.ISO8859-2.src b/share/timedef/sl_SI.ISO8859-2.src
index ea9306ea7349d..643840b650c18 100644
--- a/share/timedef/sl_SI.ISO8859-2.src
+++ b/share/timedef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sl_SI.ISO8859-2.src,v 1.8 2004/08/26 08:15:48 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sl_SI.UTF-8.src b/share/timedef/sl_SI.UTF-8.src
index d0fab378acbf2..2797b35852cf5 100644
--- a/share/timedef/sl_SI.UTF-8.src
+++ b/share/timedef/sl_SI.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sl_SI.UTF-8.src,v 1.2 2004/08/26 08:18:56 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sr_YU.ISO8859-2.src b/share/timedef/sr_YU.ISO8859-2.src
index f3840503c7e27..9458dc75173a2 100644
--- a/share/timedef/sr_YU.ISO8859-2.src
+++ b/share/timedef/sr_YU.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sr_YU.ISO8859-2.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sr_YU.ISO8859-5.src b/share/timedef/sr_YU.ISO8859-5.src
index c7b962aa698ac..7e5929c10406c 100644
--- a/share/timedef/sr_YU.ISO8859-5.src
+++ b/share/timedef/sr_YU.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sr_YU.ISO8859-5.src,v 1.1 2002/10/19 13:04:05 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sr_YU.UTF-8.src b/share/timedef/sr_YU.UTF-8.src
index 845b37291751d..2668bb02819e4 100644
--- a/share/timedef/sr_YU.UTF-8.src
+++ b/share/timedef/sr_YU.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sr_YU.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sv_SE.ISO8859-1.src b/share/timedef/sv_SE.ISO8859-1.src
index 416b110edfc07..4ecbdf99f197d 100644
--- a/share/timedef/sv_SE.ISO8859-1.src
+++ b/share/timedef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sv_SE.ISO8859-1.src,v 1.9 2002/10/09 21:02:43 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/sv_SE.UTF-8.src b/share/timedef/sv_SE.UTF-8.src
index 921cc477eaa4a..757ecef4a8480 100644
--- a/share/timedef/sv_SE.UTF-8.src
+++ b/share/timedef/sv_SE.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/sv_SE.UTF-8.src,v 1.2 2006/04/20 11:00:52 ache Exp $
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/tr_TR.ISO8859-9.src b/share/timedef/tr_TR.ISO8859-9.src
index 7a32eb80ef09a..441d752e7240c 100644
--- a/share/timedef/tr_TR.ISO8859-9.src
+++ b/share/timedef/tr_TR.ISO8859-9.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/tr_TR.ISO8859-9.src,v 1.4 2001/03/21 13:52:11 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/tr_TR.UTF-8.src b/share/timedef/tr_TR.UTF-8.src
index 0a1eff9848697..8d89af9f1cc3d 100644
--- a/share/timedef/tr_TR.UTF-8.src
+++ b/share/timedef/tr_TR.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/tr_TR.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.CP1251.src b/share/timedef/uk_UA.CP1251.src
index 52d45d9c18d93..35a4e6decb1ee 100644
--- a/share/timedef/uk_UA.CP1251.src
+++ b/share/timedef/uk_UA.CP1251.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.CP1251.src,v 1.1 2005/03/04 14:24:30 ru Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.ISO8859-5.src b/share/timedef/uk_UA.ISO8859-5.src
index f4be516312e01..e5b4c977a0295 100644
--- a/share/timedef/uk_UA.ISO8859-5.src
+++ b/share/timedef/uk_UA.ISO8859-5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.ISO8859-5.src,v 1.1 2001/12/20 20:48:30 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.KOI8-U.src b/share/timedef/uk_UA.KOI8-U.src
index 647a5f363ed93..30c4660988c77 100644
--- a/share/timedef/uk_UA.KOI8-U.src
+++ b/share/timedef/uk_UA.KOI8-U.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.KOI8-U.src,v 1.8 2001/03/21 22:54:44 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/uk_UA.UTF-8.src b/share/timedef/uk_UA.UTF-8.src
index 1962c133fdabe..d7a1f505507e9 100644
--- a/share/timedef/uk_UA.UTF-8.src
+++ b/share/timedef/uk_UA.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/uk_UA.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.GB18030.src b/share/timedef/zh_CN.GB18030.src
index ff7bba4f083c9..edfb9da2b4e55 100644
--- a/share/timedef/zh_CN.GB18030.src
+++ b/share/timedef/zh_CN.GB18030.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.GB18030.src,v 1.2 2003/08/23 20:46:23 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src
index ff7bba4f083c9..4b8b0b54f6efd 100644
--- a/share/timedef/zh_CN.GB2312.src
+++ b/share/timedef/zh_CN.GB2312.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.GB2312.src,v 1.1 2003/11/05 22:59:02 davidxu Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src
index b1527b2970e1b..691cd86651a23 100644
--- a/share/timedef/zh_CN.UTF-8.src
+++ b/share/timedef/zh_CN.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src
index ff7bba4f083c9..d46496c4bd2a6 100644
--- a/share/timedef/zh_CN.eucCN.src
+++ b/share/timedef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_CN.eucCN.src,v 1.12 2003/08/23 20:46:23 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_TW.Big5.src b/share/timedef/zh_TW.Big5.src
index d8c28a51f58f0..785c3495f73d3 100644
--- a/share/timedef/zh_TW.Big5.src
+++ b/share/timedef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_TW.Big5.src,v 1.10 2001/03/21 23:24:41 ache Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src
index 27b74ddc2b1de..4780850904053 100644
--- a/share/timedef/zh_TW.UTF-8.src
+++ b/share/timedef/zh_TW.UTF-8.src
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/timedef/zh_TW.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 0a0b5a5e89b91..c24880b3cf83b 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/zoneinfo/Makefile,v 1.22 2007/10/08 21:16:38 edwin Exp $
 
 #
 # HOW TO UPDATE THE ZONEINFO DATA
diff --git a/sys/Makefile b/sys/Makefile
index 68bbef6e0c6d8..9e3c678b99a4f 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index b7d021a7d3d1e..1cf099312a620 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index 6928f2167870a..40d4d0447af2e 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $");
 
 /*
  * 6.1 : Environmental support
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 5201ad7c45cd3..70d0a89f4a802 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.17 2005/09/11 18:39:00 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index 53868e40a85ab..0ef2f573db85f 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c
index fcd40c8ad70b5..70cefb1122764 100644
--- a/sys/amd64/acpica/madt.c
+++ b/sys/amd64/acpica/madt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index 9264a2b2a81cb..2c1336cb0fd70 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 14a6f87576a17..a70b8f3313314 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $
  */
 
 /*
diff --git a/sys/amd64/amd64/atomic.c b/sys/amd64/amd64/atomic.c
index 1b4ff7eaa6937..b112258b93b1a 100644
--- a/sys/amd64/amd64/atomic.c
+++ b/sys/amd64/amd64/atomic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $");
 
 /* This file creates publically callable functions to perform various
  * simple arithmetic on memory which is atomic in the presence of
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index ee32740403907..c5e0a270e5841 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.182 2005/05/29 23:44:22 marcel Exp $");
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index c8985c1f773ad..fb8c3781ca955 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bios.c,v 1.73 2005/07/21 09:48:36 phk Exp $");
 
 /*
  * Subset of the i386 bios support code.  We cannot make bios16 nor bios32
diff --git a/sys/amd64/amd64/bpf_jit_machdep.c b/sys/amd64/amd64/bpf_jit_machdep.c
index b8c51909b2233..ff9d7150ac9e9 100644
--- a/sys/amd64/amd64/bpf_jit_machdep.c
+++ b/sys/amd64/amd64/bpf_jit_machdep.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $");
 
 #include "opt_bpf.h"
 
diff --git a/sys/amd64/amd64/bpf_jit_machdep.h b/sys/amd64/amd64/bpf_jit_machdep.h
index b6a12f114da9c..9ec9cf41ad9b4 100644
--- a/sys/amd64/amd64/bpf_jit_machdep.h
+++ b/sys/amd64/amd64/bpf_jit_machdep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.3 2005/12/06 20:11:07 jkim Exp $
  */
 
 #ifndef _BPF_JIT_MACHDEP_H_
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index b726fbbda271e..38cf4c99a1e04 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index d584004d2abf6..f2a96714e8711 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index ab7aa49f20bfe..8ffabcfa4d09d 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $");
 
 /*
  * Instruction disassembler.
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index b2976167bd6b0..a6a0c54ca4351 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.81 2005/01/05 20:17:20 imp Exp $");
 
 /*
  * Interface to new debugger.
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 548c36c87e12c..e3ff82749fdda 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80.2.1 2007/11/21 16:38:54 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/dump_machdep.c b/sys/amd64/amd64/dump_machdep.c
index 9130139049a84..c178c2e452154 100644
--- a/sys/amd64/amd64/dump_machdep.c
+++ b/sys/amd64/amd64/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12.4.1 2008/01/30 21:21:50 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index fdef5e3b315ed..b32ca8875f4ad 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index da4918a4131a3..3495774b7733d 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129.2.1 2007/11/21 16:38:54 jhb Exp $
  */
 
 #include "opt_atpic.h"
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 513b36b7d0b06..6e5cd7569b9aa 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c
index 5775c8f215781..9e3240ef279fa 100644
--- a/sys/amd64/amd64/gdb_machdep.c
+++ b/sys/amd64/amd64/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.6 2006/04/04 03:00:20 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 6a5056fa496fd..6a9bbd577ddb8 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $");
 
 #include "opt_compat.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 9e6f5deb1036d..5d97ac570ab7a 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/in_cksum.c b/sys/amd64/amd64/in_cksum.c
index ae02e91d92039..966449f90fdcd 100644
--- a/sys/amd64/amd64/in_cksum.c
+++ b/sys/amd64/amd64/in_cksum.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.5 2005/01/05 20:17:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index e6e94d65349e0..296cbae5d5804 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/amd64/intr_machdep.c b/sys/amd64/amd64/intr_machdep.c
index 9e151ff9ed335..36d19071a0380 100644
--- a/sys/amd64/amd64/intr_machdep.c
+++ b/sys/amd64/amd64/intr_machdep.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.34.2.1 2007/11/26 15:06:49 scottl Exp $
  */
 
 /*
diff --git a/sys/amd64/amd64/io.c b/sys/amd64/amd64/io.c
index 02d9c8dab230d..91f58dc57f006 100644
--- a/sys/amd64/amd64/io.c
+++ b/sys/amd64/amd64/io.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/amd64/amd64/io_apic.c b/sys/amd64/amd64/io_apic.c
index 79796dbea53c5..74da334c3fa43 100644
--- a/sys/amd64/amd64/io_apic.c
+++ b/sys/amd64/amd64/io_apic.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.31 2007/06/05 18:57:48 jhb Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index f719611cfef22..f99ea0b0d7409 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c
index d201310cfa3ba..0b5824290e92e 100644
--- a/sys/amd64/amd64/local_apic.c
+++ b/sys/amd64/amd64/local_apic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42.2.1 2007/11/08 20:09:15 jhb Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 55cda3ab18636..50827fc7ecf1c 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.175 2003/05/31 06:54:28 peter Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 160ba6db6ab6e..ff758e11737e5 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675.2.2.2.1 2008/01/19 18:15:01 kib Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index f3280d0dfc750..adf2df61d4a6d 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.121 2004/08/07 06:21:37 scottl Exp $");
 
 /*
  * Memory special file
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 943c5e66a5571..e29d76cb3c239 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2.4.1 2008/01/30 21:21:50 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index a827137719bed..d9f231ce72f00 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287.2.2 2007/11/28 23:24:06 cperciva Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/amd64/amd64/mp_watchdog.c b/sys/amd64/amd64/mp_watchdog.c
index b6ac777316643..52dc48cd03b0f 100644
--- a/sys/amd64/amd64/mp_watchdog.c
+++ b/sys/amd64/amd64/mp_watchdog.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $
  */
 
 #include "opt_mp_watchdog.h"
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index ec30c72ecb9ba..33921960a7f67 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.26 2004/06/08 01:02:52 peter Exp $
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index c57fa2d7b3d89..444f5423a3890 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.240 2007/05/08 22:01:02 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/mptable_pci.c b/sys/amd64/amd64/mptable_pci.c
index 89c701ce8e2ae..34d046453a443 100644
--- a/sys/amd64/amd64/mptable_pci.c
+++ b/sys/amd64/amd64/mptable_pci.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.8 2007/05/02 17:50:34 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/msi.c b/sys/amd64/amd64/msi.c
index 554f571598085..c1252786802a2 100644
--- a/sys/amd64/amd64/msi.c
+++ b/sys/amd64/amd64/msi.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.6.2.1 2007/10/30 18:00:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index b5498b7d1e181..2a911239837bb 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.77 2007/05/08 21:29:13 jhb Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 849feaa32675f..968887cd87ec1 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590.2.3.2.1 2008/01/19 18:15:01 kib Exp $");
 
 /*
  *	Manages physical address maps.
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index 844c0679d7967..36c7f66fa581c 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.29 2007/03/26 18:03:29 njl Exp $");
 
 #ifdef GUPROF
 #if 0
diff --git a/sys/amd64/amd64/sigtramp.S b/sys/amd64/amd64/sigtramp.S
index a05ea8587b56a..0ce6d87a1b2a9 100644
--- a/sys/amd64/amd64/sigtramp.S
+++ b/sys/amd64/amd64/sigtramp.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/sigtramp.S,v 1.1 2003/05/01 01:05:21 peter Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 2f2a3f1b8cc04..5da2841dd9071 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 7f022d00bcce9..87f27b1216f3c 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.90 2005/07/10 23:31:10 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index f7a2d1ac63e4a..44e6327835147 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319.2.2 2007/12/06 14:20:25 kib Exp $");
 
 /*
  * AMD64 Trap and System call handling
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 3c66a3355da4a..808f0f6895de2 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $");
 
 #include "opt_clock.h"
 
diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c
index d3897cf14d9a5..ee21abc03201b 100644
--- a/sys/amd64/amd64/uio_machdep.c
+++ b/sys/amd64/amd64/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.6 2005/01/05 20:17:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/amd64/uma_machdep.c b/sys/amd64/amd64/uma_machdep.c
index 1329668015332..baa5ace69c48c 100644
--- a/sys/amd64/amd64/uma_machdep.c
+++ b/sys/amd64/amd64/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index c3c5283c86a9e..364f9ecf4e497 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255 2007/06/04 23:57:29 jeff Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
diff --git a/sys/amd64/compile/.cvsignore b/sys/amd64/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/amd64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/amd64/conf/.cvsignore b/sys/amd64/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/amd64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index e98b16998b627..9620aeb235811 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.10 2007/06/11 00:38:05 marcel Exp $
 
 machine		amd64
 
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index e065f425ea47e..129785776dcde 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.2.2.1 2008/02/06 03:24:28 scottl Exp $
 
 cpu		HAMMER
 ident		GENERIC
diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints
index 940034397dec8..71a5a0cc7ea71 100644
--- a/sys/amd64/conf/GENERIC.hints
+++ b/sys/amd64/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/sys/amd64/conf/MAC b/sys/amd64/conf/MAC
index 306f36f6b3f85..e50f75d4b8313 100644
--- a/sys/amd64/conf/MAC
+++ b/sys/amd64/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/MAC,v 1.1 2005/09/18 03:15:35 csjp Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/amd64/conf/Makefile b/sys/amd64/conf/Makefile
index 2c006e9c2c80d..b4888a02a6dd1 100644
--- a/sys/amd64/conf/Makefile
+++ b/sys/amd64/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index aaf9a42657b86..c700fbd8d3f85 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.3.2.1 2008/02/06 03:24:29 scottl Exp $
 #
 
 #
diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S
index 4820f5399628e..c1aac16696af6 100644
--- a/sys/amd64/ia32/ia32_exception.S
+++ b/sys/amd64/ia32/ia32_exception.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.5 2006/12/17 06:48:39 kmacy Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/amd64/ia32/ia32_reg.c b/sys/amd64/ia32/ia32_reg.c
index 8abc6fc6d42aa..61770da9089ee 100644
--- a/sys/amd64/ia32/ia32_reg.c
+++ b/sys/amd64/ia32/ia32_reg.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.3 2005/10/24 00:00:00 ps Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.3 2005/10/24 00:00:00 ps Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c
index 1d693b4c47e26..148e7bec5a73a 100644
--- a/sys/amd64/ia32/ia32_signal.c
+++ b/sys/amd64/ia32/ia32_signal.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/amd64/ia32/ia32_sigtramp.S b/sys/amd64/ia32/ia32_sigtramp.S
index 7b20bc42e01c9..e67598fb4d01e 100644
--- a/sys/amd64/ia32/ia32_sigtramp.S
+++ b/sys/amd64/ia32/ia32_sigtramp.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_sigtramp.S,v 1.3 2006/09/23 13:42:09 davidxu Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 480724864062f..fcd5ba7ab102a 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.19 2007/06/10 21:59:12 attilio Exp $");
 
 /*
  * 386 Trap and System call handling
diff --git a/sys/amd64/include/_bus.h b/sys/amd64/include/_bus.h
index a8cbf4810c755..aa2a1970494d9 100644
--- a/sys/amd64/include/_bus.h
+++ b/sys/amd64/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef AMD64_INCLUDE__BUS_H
diff --git a/sys/amd64/include/_inttypes.h b/sys/amd64/include/_inttypes.h
index e6b2536ff379b..849e6501a05ba 100644
--- a/sys/amd64/include/_inttypes.h
+++ b/sys/amd64/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.3 2003/05/01 01:05:23 peter Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index bd0f2efe2254f..afbf51c2aebcf 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.11 2005/08/20 16:44:40 stefanf Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/amd64/include/_stdint.h b/sys/amd64/include/_stdint.h
index 0c56c6d4e1faa..b72eade0fdda5 100644
--- a/sys/amd64/include/_stdint.h
+++ b/sys/amd64/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.3 2004/05/18 16:04:56 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/amd64/include/_types.h b/sys/amd64/include/_types.h
index 4217c82b060b9..90bafcc339020 100644
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/amd64/include/acpica_machdep.h b/sys/amd64/include/acpica_machdep.h
index 76cc69ef5681e..a1c3227be9464 100644
--- a/sys/amd64/include/acpica_machdep.h
+++ b/sys/amd64/include/acpica_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.7 2007/03/22 18:16:39 jkim Exp $
  */
 
 /******************************************************************************
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index d5d5dc39ac67d..70762b8da0925 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.28 2005/01/21 06:01:20 peter Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_
diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h
index d36a4f4e3a02f..97ba9071b64bd 100644
--- a/sys/amd64/include/apicvar.h
+++ b/sys/amd64/include/apicvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.25 2007/05/08 22:01:03 jhb Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index 7efd6426731de..102ad900994ed 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 788f39f44bc59..a4a758888c4b8 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index dc12d4da063f0..b8f07c236143d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.44 2006/12/29 15:29:49 bde Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index e25f427e3abf5..1d1bff13fce21 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/bus.h,v 1.17 2006/03/14 00:01:56 peter Exp $
  */
 
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index bc8bdf4881e26..2374c0a74187b 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.30 2005/07/22 04:03:25 obrien Exp $
  */
 
 #ifndef _AMD64_BUS_DMA_H_
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 9a6876e9e8df0..97fce99467ff7 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54.2.1 2007/10/29 22:26:33 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index d7a3203c1a3d3..d3bd196f2eb76 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.76 2006/05/11 17:29:24 phk Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 2c5fcb2acda18..6ffb9933af9ab 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.148 2005/05/13 00:05:55 nectar Exp $
  */
 
 /*
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index 6b0e8fda4681c..6978159ad7764 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.19 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index 29e385e3af0c1..ffd6193881b2e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.22 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
index 0a386beafffbb..ce89edf42a8e5 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/amd64/include/endian.h b/sys/amd64/include/endian.h
index 24e59e42889f5..5455cbe0387ae 100644
--- a/sys/amd64/include/endian.h
+++ b/sys/amd64/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 8d07887be252b..7c4a2bb8e91fa 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/exec.h,v 1.10 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index 52b899f6e4ce1..001dedc097321 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.15 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index cda9e46230cab..80f14ca3c9fa6 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/floatingpoint.h,v 1.14 2005/04/02 17:31:42 netchild Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 88932ed391354..04b205b15ec68 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.33 2004/04/05 21:25:51 imp Exp $
  */
 
 /*
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index 26c9dd06d33d8..661aa16a4c2a3 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/frame.h,v 1.30 2005/12/22 22:16:05 jhb Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/amd64/include/gdb_machdep.h b/sys/amd64/include/gdb_machdep.h
index d8c25b90fea64..3e8f14265f8f2 100644
--- a/sys/amd64/include/gdb_machdep.h
+++ b/sys/amd64/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.6 2007/02/05 21:48:32 jhb Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index 196f79f12116d..096cabd3a548a 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.14 2005/04/12 23:12:00 jhb Exp $
  */
 
 /*
diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h
index adfde8f22d1b3..dd01b40e2a44d 100644
--- a/sys/amd64/include/in_cksum.h
+++ b/sys/amd64/include/in_cksum.h
@@ -29,7 +29,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
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.5 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h
index 8b16c5e2fabc0..f5a4a9581c3ea 100644
--- a/sys/amd64/include/intr_machdep.h
+++ b/sys/amd64/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.18 2007/05/08 21:29:13 jhb Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
diff --git a/sys/amd64/include/iodev.h b/sys/amd64/include/iodev.h
index 2273620ccba43..cf51165a7f6e9 100644
--- a/sys/amd64/include/iodev.h
+++ b/sys/amd64/include/iodev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/iodev.h,v 1.1 2004/08/01 11:40:51 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/amd64/include/kdb.h b/sys/amd64/include/kdb.h
index 56d20184bd343..fc325a6a5fcee 100644
--- a/sys/amd64/include/kdb.h
+++ b/sys/amd64/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/kdb.h,v 1.4 2007/06/09 21:55:16 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/amd64/include/legacyvar.h b/sys/amd64/include/legacyvar.h
index 5ab7b35672383..a0535b8c3d538 100644
--- a/sys/amd64/include/legacyvar.h
+++ b/sys/amd64/include/legacyvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index 35eea1f619dee..95a146c568071 100644
--- a/sys/amd64/include/limits.h
+++ b/sys/amd64/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/limits.h,v 1.10 2005/03/02 21:33:21 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 348cb31468b55..44acbbcabf7b0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/amd64/include/memdev.h b/sys/amd64/include/memdev.h
index b6d31220cb934..50f556a87d8fe 100644
--- a/sys/amd64/include/memdev.h
+++ b/sys/amd64/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/memdev.h,v 1.1 2004/08/01 11:40:51 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/amd64/include/metadata.h b/sys/amd64/include/metadata.h
index 84e6f87399704..09d78e7c9fffa 100644
--- a/sys/amd64/include/metadata.h
+++ b/sys/amd64/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.2 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/amd64/include/minidump.h b/sys/amd64/include/minidump.h
index 1ea92b773213f..e7348e96bd500 100644
--- a/sys/amd64/include/minidump.h
+++ b/sys/amd64/include/minidump.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/minidump.h,v 1.1 2006/04/21 04:24:50 peter Exp $
  */
 
 #ifndef	_MACHINE_MINIDUMP_H_
diff --git a/sys/amd64/include/mp_watchdog.h b/sys/amd64/include/mp_watchdog.h
index bcec051a942fd..78c2889e660f6 100644
--- a/sys/amd64/include/mp_watchdog.h
+++ b/sys/amd64/include/mp_watchdog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/mp_watchdog.h,v 1.1 2004/08/15 18:02:09 rwatson Exp $
  */
 
 #ifndef	_MACHINE_MP_WATCHDOG_H_
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 451d9ce14d556..5f25230ea9c8c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.223 2006/03/01 05:59:56 sam Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__
diff --git a/sys/amd64/include/mutex.h b/sys/amd64/include/mutex.h
index a2edadd366b6a..f045bdf767a05 100644
--- a/sys/amd64/include/mutex.h
+++ b/sys/amd64/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.39 2006/05/19 18:53:50 sobomax Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index b1b90f467658e..feb807db45793 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.20 2006/01/09 06:05:56 imp Exp $
  */
 
 /*
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index ffad3695f7547..2f003a2839afa 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.19 2005/07/21 09:48:36 phk Exp $
  */
 
 #ifndef _MACHINE_PC_BIOS_H_
diff --git a/sys/amd64/include/pc/display.h b/sys/amd64/include/pc/display.h
index cd2d5ff35b73f..f8173c317b2a0 100644
--- a/sys/amd64/include/pc/display.h
+++ b/sys/amd64/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pc/display.h,v 1.7 2005/01/05 20:11:13 imp Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 30516e99fb90f..7e3c3c442b92f 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.63 2007/03/30 00:06:21 jkim Exp $
  */
 
 #ifndef _AMD64_PCB_H_
diff --git a/sys/amd64/include/pcb_ext.h b/sys/amd64/include/pcb_ext.h
index 6d1bde2d5f845..34f530a0a0b16 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pcb_ext.h,v 1.10 2003/05/01 01:05:23 peter Exp $
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index e97b367c6a10f..831df7ca29fe5 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.13.10.1 2007/12/06 08:25:43 jhb Exp $
  *
  */
 
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index 9245bbebbcbbe..f37443a36f2eb 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 9b147f768fb29..e3b652b63837e 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -39,7 +39,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h
index 4a676587fcbe7..7a55250611af4 100644
--- a/sys/amd64/include/pmc_mdep.h
+++ b/sys/amd64/include/pmc_mdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.3 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/amd64/include/ppireg.h b/sys/amd64/include/ppireg.h
index 5774757ce67a7..846069827f83e 100644
--- a/sys/amd64/include/ppireg.h
+++ b/sys/amd64/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ppireg.h,v 1.1 2005/05/14 09:10:00 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index ba6354b68dce8..a44a440d8d7ef 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24 2005/04/04 21:53:52 jhb Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index 0083091daf2c2..900020a8cd070 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/profile.h,v 1.48 2006/10/28 13:12:06 bde Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 07c21ea6e8e8e..a57c9c0d5b7fe 100644
--- a/sys/amd64/include/psl.h
+++ b/sys/amd64/include/psl.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/psl.h,v 1.13 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index eef24f829b481..0b35522bf5e42 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ptrace.h,v 1.13 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index 9ca092fea1043..5eed6c198218e 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/include/reg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/reg.h,v 1.38 2006/11/17 20:27:01 jhb Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index 1883193233997..b2a15c090b9d0 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/reloc.h,v 1.8 2004/04/05 21:25:51 imp Exp $
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/amd64/include/resource.h b/sys/amd64/include/resource.h
index edde5eb299085..96d8f182c12d5 100644
--- a/sys/amd64/include/resource.h
+++ b/sys/amd64/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/amd64/include/resource.h,v 1.4 2005/01/05 20:17:20 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/amd64/include/runq.h b/sys/amd64/include/runq.h
index 855e315b6847a..79af4b1826ec4 100644
--- a/sys/amd64/include/runq.h
+++ b/sys/amd64/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/runq.h,v 1.4 2005/01/05 20:17:20 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 891404c9e63bb..a91ac0e4a4c70 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/amd64/include/setjmp.h b/sys/amd64/include/setjmp.h
index c33f9a5baed53..7c85bc8c23446 100644
--- a/sys/amd64/include/setjmp.h
+++ b/sys/amd64/include/setjmp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.10 2007/01/12 07:24:06 imp Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/amd64/include/sf_buf.h b/sys/amd64/include/sf_buf.h
index b5245e63d2105..44ca3a3b9f8d1 100644
--- a/sys/amd64/include/sf_buf.h
+++ b/sys/amd64/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.3 2005/02/28 23:38:15 peter Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/amd64/include/sigframe.h b/sys/amd64/include/sigframe.h
index d104507d52f8c..fdca8cd73b664 100644
--- a/sys/amd64/include/sigframe.h
+++ b/sys/amd64/include/sigframe.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/sigframe.h,v 1.9 2003/05/01 01:05:23 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 7a4c2a79e9ea2..c319991b1ffc2 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/signal.h,v 1.29 2005/08/20 16:44:40 stefanf Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index d85c55e04fb73..88ac35ff5e6e5 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.91 2007/09/20 20:38:43 attilio Exp $
  *
  */
 
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index 76297be3ff73a..b7e96c603006d 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.40 2007/08/15 19:26:01 des Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/amd64/include/stdarg.h b/sys/amd64/include/stdarg.h
index c315dfcee135a..6c0fdb2430632 100644
--- a/sys/amd64/include/stdarg.h
+++ b/sys/amd64/include/stdarg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.9 2006/09/21 01:37:01 kan Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index 67c8a4ae99b58..bf170747bfdf9 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.24 2005/04/14 16:57:58 peter Exp $
  */
 
 /*
diff --git a/sys/amd64/include/timerreg.h b/sys/amd64/include/timerreg.h
index 0ab7d40510a74..fdb016ee6efb6 100644
--- a/sys/amd64/include/timerreg.h
+++ b/sys/amd64/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/timerreg.h,v 1.2 2005/05/28 13:40:26 nyan Exp $
  */
 
 /*
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index f0176b2c97e7d..96ebce143d4bc 100644
--- a/sys/amd64/include/trap.h
+++ b/sys/amd64/include/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/trap.h,v 1.15 2006/03/14 00:01:22 peter Exp $
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index fbbe3aff41899..da80fa4f1d3a8 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/tss.h,v 1.18 2005/04/15 18:39:31 peter Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h
index 5c1380336321d..0d2d3db136e33 100644
--- a/sys/amd64/include/ucontext.h
+++ b/sys/amd64/include/ucontext.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.18 2003/11/08 04:39:22 peter Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 93faac6a84ddd..659236e5762a5 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.14 2005/03/11 22:16:09 peter Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 50962e5d0385b..b3d207ee41ea8 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $
  */
 
 
diff --git a/sys/amd64/isa/atpic.c b/sys/amd64/isa/atpic.c
index d9792eb8fcde1..7100c216e8a8c 100644
--- a/sys/amd64/isa/atpic.c
+++ b/sys/amd64/isa/atpic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.22 2007/05/08 21:29:13 jhb Exp $");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
diff --git a/sys/amd64/isa/atpic_vector.S b/sys/amd64/isa/atpic_vector.S
index e7dcbc36a19fd..152803136c882 100644
--- a/sys/amd64/isa/atpic_vector.S
+++ b/sys/amd64/isa/atpic_vector.S
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.48 2006/12/17 06:48:40 kmacy Exp $
  */
 
 /*
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 2809828150bea..1ed538e1741f6 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234.2.1 2007/10/29 22:26:34 peter Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/amd64/isa/elcr.c b/sys/amd64/isa/elcr.c
index 266d78396db96..9dcee88b6bb86 100644
--- a/sys/amd64/isa/elcr.c
+++ b/sys/amd64/isa/elcr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/elcr.c,v 1.2 2005/01/21 06:01:20 peter Exp $");
 
 /*
  * The ELCR is a register that controls the trigger mode and polarity of
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h
index c484eccdfc3e3..011ebd068846d 100644
--- a/sys/amd64/isa/icu.h
+++ b/sys/amd64/isa/icu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.36 2006/12/17 21:51:44 kmacy Exp $
  */
 
 /*
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 1f202262528c1..78df6c4e462d7 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.149 2007/02/23 12:18:26 piso Exp $");
 
 /*-
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 3c58e6c600ca6..63d06b05348ed 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.29 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index ffd3baaddbaec..a41e6917872d9 100644
--- a/sys/amd64/isa/isa_dma.c
+++ b/sys/amd64/isa/isa_dma.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.22 2005/05/14 10:14:56 nyan Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 887879a319981..1b1dd951ad0ba 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/nmi.c,v 1.80 2004/05/16 20:30:47 peter Exp $");
 
 #include "opt_mca.h"
 
diff --git a/sys/amd64/linux32/Makefile b/sys/amd64/linux32/Makefile
index ae4f1078a2adf..3b9c9144f2e41 100644
--- a/sys/amd64/linux32/Makefile
+++ b/sys/amd64/linux32/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/linux32/Makefile,v 1.1 2004/08/16 07:55:06 tjr Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h
index a904afc2da860..17543bdbe81ee 100644
--- a/sys/amd64/linux32/linux.h
+++ b/sys/amd64/linux32/linux.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.16 2007/09/18 19:50:32 dwmalone Exp $
  */
 
 #ifndef _AMD64_LINUX_H_
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c
index 43d4573be9c7d..6ac97a3f4c890 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.9 2007/04/18 18:08:12 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/amd64/linux32/linux32_genassym.c b/sys/amd64/linux32/linux32_genassym.c
index de7726d19c886..41fa0580cbac8 100644
--- a/sys/amd64/linux32/linux32_genassym.c
+++ b/sys/amd64/linux32/linux32_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.1 2004/08/16 07:55:06 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/amd64/linux32/linux32_ipc64.h b/sys/amd64/linux32/linux32_ipc64.h
index f8c92c4803ec0..81ebba872eddd 100644
--- a/sys/amd64/linux32/linux32_ipc64.h
+++ b/sys/amd64/linux32/linux32_ipc64.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_ipc64.h,v 1.1 2004/08/16 07:55:06 tjr Exp $
  */
 
 #ifndef _AMD64_LINUX_LINUX_IPC64_H_
diff --git a/sys/amd64/linux32/linux32_locore.s b/sys/amd64/linux32/linux32_locore.s
index 8055e566cbdc5..d7f8ae3b0fdb2 100644
--- a/sys/amd64/linux32/linux32_locore.s
+++ b/sys/amd64/linux32/linux32_locore.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */
 
 #include "linux32_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index 7a7ce08010407..4b67f870ec40d 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index ca04c30ac1520..a71f7bccad002 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.s
index 42375c3f9bfff..e81c6ca40c04c 100644
--- a/sys/amd64/linux32/linux32_support.s
+++ b/sys/amd64/linux32/linux32_support.s
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_support.s,v 1.1 2007/05/23 08:33:05 kib Exp $
  */
 
 #include "linux32_assym.h"		/* system definitions */
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index f50a14f67519b..44df44465515c 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index 0b2441657dca0..99372d057a064 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.33 2007/09/18 19:50:32 dwmalone Exp $
  * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp 
  */
 
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 2f9fd9f2fb60d..2473d9c60362e 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.31 2007/09/20 13:46:26 kib Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
diff --git a/sys/amd64/linux32/syscalls.conf b/sys/amd64/linux32/syscalls.conf
index b9dfc9340e268..11f1bc1949023 100644
--- a/sys/amd64/linux32/syscalls.conf
+++ b/sys/amd64/linux32/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/amd64/linux32/syscalls.conf,v 1.2 2006/08/15 17:25:54 jhb Exp $
 sysnames="/dev/null"
 sysproto="linux32_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index 1dd6e9c964b02..eab7db1314d92 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.30 2007/09/18 19:50:32 dwmalone Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 4a514f4ddfad7..62c5010b07052 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index eceaf5ee06191..0f42857895738 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.109.2.1 2007/12/06 08:25:43 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c
index 417639894bff9..9802dd60a293c 100644
--- a/sys/arm/arm/autoconf.c
+++ b/sys/arm/arm/autoconf.c
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/autoconf.c,v 1.3 2005/05/29 23:44:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/bcopy_page.S b/sys/arm/arm/bcopy_page.S
index 0af7c112eee0d..317a9c56d59c5 100644
--- a/sys/arm/arm/bcopy_page.S
+++ b/sys/arm/arm/bcopy_page.S
@@ -40,7 +40,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.4 2005/10/06 11:26:37 cognet Exp $");
 
 #include "assym.s"
 
diff --git a/sys/arm/arm/bcopyinout.S b/sys/arm/arm/bcopyinout.S
index b88cec60265c7..fa1c538f6278a 100644
--- a/sys/arm/arm/bcopyinout.S
+++ b/sys/arm/arm/bcopyinout.S
@@ -45,7 +45,7 @@
 .L_min_memcpy_size:
 	.word	_C_LABEL(_min_memcpy_size)
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.8 2005/10/23 23:09:14 cognet Exp $");
 #ifdef __XSCALE__
 #include <arm/arm/bcopyinout_xscale.S>
 #else
diff --git a/sys/arm/arm/bcopyinout_xscale.S b/sys/arm/arm/bcopyinout_xscale.S
index d1017c3eb8c11..982612a3e04d8 100644
--- a/sys/arm/arm/bcopyinout_xscale.S
+++ b/sys/arm/arm/bcopyinout_xscale.S
@@ -36,7 +36,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout_xscale.S,v 1.6 2005/12/09 15:31:02 cognet Exp $");
 
 	.text
 	.align	0
diff --git a/sys/arm/arm/blockio.S b/sys/arm/arm/blockio.S
index 7e750b45e1323..8f697a141789f 100644
--- a/sys/arm/arm/blockio.S
+++ b/sys/arm/arm/blockio.S
@@ -48,7 +48,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/blockio.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Read bytes from an I/O address into a block of memory
diff --git a/sys/arm/arm/bootconfig.c b/sys/arm/arm/bootconfig.c
index 0a5d3057a2c05..4ee582a388d65 100644
--- a/sys/arm/arm/bootconfig.c
+++ b/sys/arm/arm/bootconfig.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bootconfig.c,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/arm/arm/bus_space_asm_generic.S b/sys/arm/arm/bus_space_asm_generic.S
index 37c1808cc43d6..a63dae66c8627 100644
--- a/sys/arm/arm/bus_space_asm_generic.S
+++ b/sys/arm/arm/bus_space_asm_generic.S
@@ -37,7 +37,7 @@
 
 #include <machine/asm.h>
 #include <machine/cpuconf.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/bus_space_asm_generic.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Generic bus_space functions.
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index 2044e2a1deceb..142f6c1eb54eb 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.35 2007/08/18 16:47:28 cognet Exp $");
 
 /*
  * ARM bus dma support routines
diff --git a/sys/arm/arm/copystr.S b/sys/arm/arm/copystr.S
index 13bbf01d52381..4401605619715 100644
--- a/sys/arm/arm/copystr.S
+++ b/sys/arm/arm/copystr.S
@@ -43,7 +43,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/copystr.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/errno.h>
 
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index ab196ed1079d9..6c85244a05e6b 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/cpufunc_asm.S b/sys/arm/arm/cpufunc_asm.S
index d9cc70d5495ff..b64d8e9eb7124 100644
--- a/sys/arm/arm/cpufunc_asm.S
+++ b/sys/arm/arm/cpufunc_asm.S
@@ -43,7 +43,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm.S,v 1.6 2005/02/26 18:59:01 cognet Exp $");
 
 	.text
 	.align	0
diff --git a/sys/arm/arm/cpufunc_asm_arm10.S b/sys/arm/arm/cpufunc_asm_arm10.S
index d1d55ff254aa1..eb6459aae15a5 100644
--- a/sys/arm/arm/cpufunc_asm_arm10.S
+++ b/sys/arm/arm/cpufunc_asm_arm10.S
@@ -33,7 +33,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm10.S,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Functions to set the MMU Translation Table Base register
diff --git a/sys/arm/arm/cpufunc_asm_arm7tdmi.S b/sys/arm/arm/cpufunc_asm_arm7tdmi.S
index d301efc1f7f08..fa768e8095c6e 100644
--- a/sys/arm/arm/cpufunc_asm_arm7tdmi.S
+++ b/sys/arm/arm/cpufunc_asm_arm7tdmi.S
@@ -36,7 +36,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm7tdmi.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * Functions to set the MMU Translation Table Base register
diff --git a/sys/arm/arm/cpufunc_asm_arm8.S b/sys/arm/arm/cpufunc_asm_arm8.S
index febe8f0a545e2..7f37b841eb64b 100644
--- a/sys/arm/arm/cpufunc_asm_arm8.S
+++ b/sys/arm/arm/cpufunc_asm_arm8.S
@@ -37,7 +37,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm8.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 ENTRY(arm8_clock_config)
 	mrc	p15, 0, r3, c15, c0, 0	/* Read the clock register */
diff --git a/sys/arm/arm/cpufunc_asm_arm9.S b/sys/arm/arm/cpufunc_asm_arm9.S
index 0734b03ee68a2..50f0501029a51 100644
--- a/sys/arm/arm/cpufunc_asm_arm9.S
+++ b/sys/arm/arm/cpufunc_asm_arm9.S
@@ -32,7 +32,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm9.S,v 1.5 2007/03/21 07:49:56 kevlo Exp $");
 
 /*
  * Functions to set the MMU Translation Table Base register
diff --git a/sys/arm/arm/cpufunc_asm_armv4.S b/sys/arm/arm/cpufunc_asm_armv4.S
index ccdcce213c89d..49e40f18ab8ad 100644
--- a/sys/arm/arm/cpufunc_asm_armv4.S
+++ b/sys/arm/arm/cpufunc_asm_armv4.S
@@ -38,7 +38,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_armv4.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * TLB functions
diff --git a/sys/arm/arm/cpufunc_asm_ixp12x0.S b/sys/arm/arm/cpufunc_asm_ixp12x0.S
index efc59500a7a4f..0859d4d5bfa04 100644
--- a/sys/arm/arm/cpufunc_asm_ixp12x0.S
+++ b/sys/arm/arm/cpufunc_asm_ixp12x0.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_ixp12x0.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * This function is the same as sa110_context_switch for now, the plan
diff --git a/sys/arm/arm/cpufunc_asm_sa1.S b/sys/arm/arm/cpufunc_asm_sa1.S
index 7279e65077e7c..cacf1cc93bd9e 100644
--- a/sys/arm/arm/cpufunc_asm_sa1.S
+++ b/sys/arm/arm/cpufunc_asm_sa1.S
@@ -37,7 +37,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sa1.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 .Lblock_userspace_access:
 	.word	_C_LABEL(block_userspace_access)
diff --git a/sys/arm/arm/cpufunc_asm_sa11x0.S b/sys/arm/arm/cpufunc_asm_sa11x0.S
index ca167c8fee707..44428fe5cf758 100644
--- a/sys/arm/arm/cpufunc_asm_sa11x0.S
+++ b/sys/arm/arm/cpufunc_asm_sa11x0.S
@@ -37,7 +37,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_sa11x0.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 	.data
 	.global	_C_LABEL(sa11x0_idle_mem)
diff --git a/sys/arm/arm/cpufunc_asm_xscale.S b/sys/arm/arm/cpufunc_asm_xscale.S
index b4700e4a48106..b08b1758a4725 100644
--- a/sys/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arm/arm/cpufunc_asm_xscale.S
@@ -73,7 +73,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_xscale.S,v 1.4 2005/01/10 22:41:08 cognet Exp $");
 
 /*
  * Size of the XScale core D-cache.
diff --git a/sys/arm/arm/cpufunc_asm_xscale_c3.S b/sys/arm/arm/cpufunc_asm_xscale_c3.S
index 8975fb5c06c30..63ecc993a8921 100644
--- a/sys/arm/arm/cpufunc_asm_xscale_c3.S
+++ b/sys/arm/arm/cpufunc_asm_xscale_c3.S
@@ -74,7 +74,7 @@
  */
  
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_xscale_c3.S,v 1.1 2007/07/27 14:28:15 cognet Exp $");
 
 /*
  * Size of the XScale core D-cache.
diff --git a/sys/arm/arm/db_disasm.c b/sys/arm/arm/db_disasm.c
index 52ff7d700235a..3bfd2c52c1171 100644
--- a/sys/arm/arm/db_disasm.c
+++ b/sys/arm/arm/db_disasm.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_disasm.c,v 1.2 2005/01/05 21:58:47 imp Exp $");
 #include <sys/param.h>
 #include <machine/db_machdep.h>
 #include <ddb/ddb.h>
diff --git a/sys/arm/arm/db_interface.c b/sys/arm/arm/db_interface.c
index 7bc2772b27f96..ff8737266645b 100644
--- a/sys/arm/arm/db_interface.c
+++ b/sys/arm/arm/db_interface.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
 #include "opt_ddb.h"
 
 #include <sys/param.h>
diff --git a/sys/arm/arm/db_trace.c b/sys/arm/arm/db_trace.c
index e9ce3286c1177..dcd7fcf5e71f3 100644
--- a/sys/arm/arm/db_trace.c
+++ b/sys/arm/arm/db_trace.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.13 2006/07/12 21:22:42 jhb Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c
index 9aa63d886eb8b..b13b36b791553 100644
--- a/sys/arm/arm/disassem.c
+++ b/sys/arm/arm/disassem.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/disassem.c,v 1.2 2005/01/05 21:58:47 imp Exp $");
 #include <sys/param.h>
 
 
diff --git a/sys/arm/arm/dump_machdep.c b/sys/arm/arm/dump_machdep.c
index 50c92b5e46e1b..6528e7843d84b 100644
--- a/sys/arm/arm/dump_machdep.c
+++ b/sys/arm/arm/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.2.4.1 2008/01/30 21:21:50 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index 6143049e76a71..c6406706e4a2c 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/arm/elf_trampoline.c b/sys/arm/arm/elf_trampoline.c
index b01d44c9aa160..c576d8ba676ea 100644
--- a/sys/arm/arm/elf_trampoline.c
+++ b/sys/arm/arm/elf_trampoline.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.18 2007/07/27 14:42:25 cognet Exp $");
 #include <machine/asm.h>
 #include <sys/param.h>
 #include <sys/elf32.h>
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
index 0d21fb4fb4e58..5554e42d91a55 100644
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -51,7 +51,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/exception.S,v 1.5 2005/01/05 21:58:47 imp Exp $");
 
 	.text	
 	.align	0
diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c
index f990812b5760c..28bb00fb7d16a 100644
--- a/sys/arm/arm/fiq.c
+++ b/sys/arm/arm/fiq.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fiq.c,v 1.3 2005/03/16 07:56:21 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/fiq_subr.S b/sys/arm/arm/fiq_subr.S
index 4cde665229e24..c78e8fd5a598f 100644
--- a/sys/arm/arm/fiq_subr.S
+++ b/sys/arm/arm/fiq_subr.S
@@ -39,7 +39,7 @@
 
 #include <machine/armreg.h>
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fiq_subr.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * MODE_CHANGE_NOP should be inserted between a mode change and a
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S
index 02e4870839060..41699e4ea4adc 100644
--- a/sys/arm/arm/fusu.S
+++ b/sys/arm/arm/fusu.S
@@ -37,7 +37,7 @@
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
 #include "assym.s"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.11 2006/10/17 02:24:46 davidxu Exp $");
 
 #ifdef MULTIPROCESSOR
 .Lcpu_info:
diff --git a/sys/arm/arm/gdb_machdep.c b/sys/arm/arm/gdb_machdep.c
index a6fa7675e3068..b972ad7b6a396 100644
--- a/sys/arm/arm/gdb_machdep.c
+++ b/sys/arm/arm/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/gdb_machdep.c,v 1.1 2006/07/14 00:50:51 cognet Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index 5583cabedf8d9..58a81b3fa2642 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.10 2007/08/08 09:27:52 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/assym.h>
diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c
index e84c54f876aa9..7d6a049b364fd 100644
--- a/sys/arm/arm/identcpu.c
+++ b/sys/arm/arm/identcpu.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $");
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/arm/arm/in_cksum.c b/sys/arm/arm/in_cksum.c
index 4222bc893c3b1..e211284a43c8d 100644
--- a/sys/arm/arm/in_cksum.c
+++ b/sys/arm/arm/in_cksum.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum.c,v 1.7 2006/07/18 00:07:05 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/arm/arm/in_cksum_arm.S b/sys/arm/arm/in_cksum_arm.S
index f9c9f9b0998cf..5fa244571569a 100644
--- a/sys/arm/arm/in_cksum_arm.S
+++ b/sys/arm/arm/in_cksum_arm.S
@@ -44,7 +44,7 @@
 
 #include <machine/asm.h>
 #include "assym.s"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum_arm.S,v 1.6 2005/10/03 14:07:09 cognet Exp $");
 
 /*
  * int in_cksum(struct mbuf *m, int len)
diff --git a/sys/arm/arm/inckern.S b/sys/arm/arm/inckern.S
index bb0ec75e08f7f..6e99ca5fdc83f 100644
--- a/sys/arm/arm/inckern.S
+++ b/sys/arm/arm/inckern.S
@@ -25,7 +25,7 @@
 #include "opt_kernname.h"
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/sys/arm/arm/inckern.S,v 1.3 2006/06/12 22:58:50 cognet Exp $")
 ENTRY(do_call)
 	mov	r6, r0
 	mov	r0, r1
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index c9912206c5ec2..51f8b242f7318 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.17 2007/07/27 14:26:42 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h> 
diff --git a/sys/arm/arm/irq_dispatch.S b/sys/arm/arm/irq_dispatch.S
index 862471761b4d8..05530361463a3 100644
--- a/sys/arm/arm/irq_dispatch.S
+++ b/sys/arm/arm/irq_dispatch.S
@@ -72,7 +72,7 @@
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.4 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * irq_entry:
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index 7a2ae1e45891b..77448afc368a5 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -37,7 +37,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/pte.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.17 2007/09/27 20:52:17 cognet Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 110d7a6d78dc1..b8b06b6f32104 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -44,7 +44,7 @@
 
 #include "opt_compat.h"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.28 2007/05/31 22:52:10 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c
index 8a6df6ed1213c..ce01be5184242 100644
--- a/sys/arm/arm/mem.c
+++ b/sys/arm/arm/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.5 2007/02/13 15:35:57 cognet Exp $");
 
 /*
  * Memory special file
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 0d9c3884922c9..8103df1998a6d 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.11 2007/02/23 12:18:27 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/nexus_io.c b/sys/arm/arm/nexus_io.c
index e5b431782b866..37fad025a9297 100644
--- a/sys/arm/arm/nexus_io.c
+++ b/sys/arm/arm/nexus_io.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.7 2006/11/19 23:46:50 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/nexus_io_asm.S b/sys/arm/arm/nexus_io_asm.S
index db9caf66bb387..bbf7eb782f0bc 100644
--- a/sys/arm/arm/nexus_io_asm.S
+++ b/sys/arm/arm/nexus_io_asm.S
@@ -34,7 +34,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io_asm.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * bus_space I/O functions for nexus
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index 375ef50103026..84aa95d335674 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86.2.1.2.1 2008/01/19 18:15:01 kib Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/arm/setcpsr.S b/sys/arm/arm/setcpsr.S
index 4597d53df0994..6434007cec14f 100644
--- a/sys/arm/arm/setcpsr.S
+++ b/sys/arm/arm/setcpsr.S
@@ -49,7 +49,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/setcpsr.S,v 1.3 2005/01/05 21:58:47 imp Exp $");
 
 /* Sets and clears bits in the CPSR register
  *
diff --git a/sys/arm/arm/setstack.s b/sys/arm/arm/setstack.s
index f6d412ebf13aa..9a80d3c159e18 100644
--- a/sys/arm/arm/setstack.s
+++ b/sys/arm/arm/setstack.s
@@ -50,7 +50,7 @@
 
 #include <machine/armreg.h>
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/setstack.s,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 /* To set the stack pointer for a particular mode we must switch
  * to that mode update the banked r13 and then switch back.
diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S
index 987b26998ae64..475d77d8f2be7 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -95,7 +95,7 @@
 
 #include <machine/asm.h>
 #include <machine/asmacros.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.12.4.1 2008/01/16 22:44:23 cognet Exp $");
 
 #include "assym.s"
 
diff --git a/sys/arm/arm/swtch.S b/sys/arm/arm/swtch.S
index ab3dcaaeca285..e888d96acbaf2 100644
--- a/sys/arm/arm/swtch.S
+++ b/sys/arm/arm/swtch.S
@@ -83,7 +83,7 @@
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.20 2007/08/07 18:20:55 cognet Exp $");
 
 
 /*
diff --git a/sys/arm/arm/sys_machdep.c b/sys/arm/arm/sys_machdep.c
index b7b528503427d..d2e990f879961 100644
--- a/sys/arm/arm/sys_machdep.c
+++ b/sys/arm/arm/sys_machdep.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.5 2007/02/14 01:25:41 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 6e6d43d7d4cf6..3416c1ea38f76 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -82,7 +82,7 @@
 #include "opt_ktrace.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.35 2007/07/31 17:09:05 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c
index ef6fa428c7564..b111ad2619f42 100644
--- a/sys/arm/arm/uio_machdep.c
+++ b/sys/arm/arm/uio_machdep.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.5 2005/01/05 21:58:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c
index 133134ef33cbe..6c546cbc90709 100644
--- a/sys/arm/arm/undefined.c
+++ b/sys/arm/arm/undefined.c
@@ -48,7 +48,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/arm/arm/vectors.S b/sys/arm/arm/vectors.S
index c91b437e8b813..9302eabf71034 100644
--- a/sys/arm/arm/vectors.S
+++ b/sys/arm/arm/vectors.S
@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vectors.S,v 1.2 2005/01/05 21:58:47 imp Exp $");
 
 /*
  * These are the exception vectors copied down to page 0.
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index 2e87030d1090d..cb2a00d01b626 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.34 2007/09/15 18:47:01 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c
index 0f6a8d5caa6ec..c0a98c513a984 100644
--- a/sys/arm/at91/at91.c
+++ b/sys/arm/at91/at91.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.13 2007/03/06 10:55:57 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_mci.c b/sys/arm/at91/at91_mci.c
index f82cd1684cf68..3d7bfabb8bee2 100644
--- a/sys/arm/at91/at91_mci.c
+++ b/sys/arm/at91/at91_mci.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.4 2007/09/16 07:48:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_mcireg.h b/sys/arm/at91/at91_mcireg.h
index 458dfbc956014..0544ccb9fafeb 100644
--- a/sys/arm/at91/at91_mcireg.h
+++ b/sys/arm/at91/at91_mcireg.h
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.1 2006/10/20 06:44:04 imp Exp $ */
 
 #ifndef ARM_AT91_AT91QDMMCREG_H
 #define ARM_AT91_AT91QDMMCREG_H
diff --git a/sys/arm/at91/at91_pdcreg.h b/sys/arm/at91/at91_pdcreg.h
index aa754af046f31..1ae9f8b7e44fb 100644
--- a/sys/arm/at91/at91_pdcreg.h
+++ b/sys/arm/at91/at91_pdcreg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pdcreg.h,v 1.1 2006/05/11 14:30:28 cognet Exp $ */
 
 #ifndef ARM_AT91_AT91_PDCREG_H
 #define ARM_AT91_AT91_PDCREG_H
diff --git a/sys/arm/at91/at91_pio.c b/sys/arm/at91/at91_pio.c
index f8c1863b5d6dc..6e43882f9685e 100644
--- a/sys/arm/at91/at91_pio.c
+++ b/sys/arm/at91/at91_pio.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_pio_rm9200.h b/sys/arm/at91/at91_pio_rm9200.h
index 16d1ccb65f03f..fa4e5e9774fa5 100644
--- a/sys/arm/at91/at91_pio_rm9200.h
+++ b/sys/arm/at91/at91_pio_rm9200.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pio_rm9200.h,v 1.1 2006/07/02 03:50:44 imp Exp $ */
 
 /*
  * These defines come from an atmel file that says specifically that it
diff --git a/sys/arm/at91/at91_pioreg.h b/sys/arm/at91/at91_pioreg.h
index 622541060b1dc..e0c7acb61d49a 100644
--- a/sys/arm/at91/at91_pioreg.h
+++ b/sys/arm/at91/at91_pioreg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.2 2007/01/01 00:46:54 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_PIOREG_H
 #define ARM_AT91_AT91_PIOREG_H
diff --git a/sys/arm/at91/at91_piovar.h b/sys/arm/at91/at91_piovar.h
index 6cfd6d571c6a8..927e8e8d1e56c 100644
--- a/sys/arm/at91/at91_piovar.h
+++ b/sys/arm/at91/at91_piovar.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_PIOVAR_H
 #define ARM_AT91_AT91_PIOVAR_H
diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index 0bc27d808f2b6..c0f3f77118e18 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -25,7 +25,7 @@
 #include "opt_at91.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.5 2007/09/16 07:51:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_pmcreg.h b/sys/arm/at91/at91_pmcreg.h
index 39e7e0c925e3d..cfb32a0ab8284 100644
--- a/sys/arm/at91/at91_pmcreg.h
+++ b/sys/arm/at91/at91_pmcreg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_PMCREG_H
 #define ARM_AT91_AT91_PMCREG_H
diff --git a/sys/arm/at91/at91_pmcvar.h b/sys/arm/at91/at91_pmcvar.h
index ba85cda8a1344..20df8b2c64609 100644
--- a/sys/arm/at91/at91_pmcvar.h
+++ b/sys/arm/at91/at91_pmcvar.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_PMCVAR_H
 #define ARM_AT91_AT91_PMCVAR_H
diff --git a/sys/arm/at91/at91_rtc.c b/sys/arm/at91/at91_rtc.c
index bc76d22aa0c22..347190d85b4d7 100644
--- a/sys/arm/at91/at91_rtc.c
+++ b/sys/arm/at91/at91_rtc.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.4 2007/02/27 13:39:34 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_rtcreg.h b/sys/arm/at91/at91_rtcreg.h
index 7726d17bfc884..b49ba927642c1 100644
--- a/sys/arm/at91/at91_rtcreg.h
+++ b/sys/arm/at91/at91_rtcreg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.2 2006/07/14 22:06:01 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_RTCREG_H
 #define ARM_AT91_AT91_RTCREG_H
diff --git a/sys/arm/at91/at91_spi.c b/sys/arm/at91/at91_spi.c
index 2dfbc8e33a8db..54e9567441b6e 100644
--- a/sys/arm/at91/at91_spi.c
+++ b/sys/arm/at91/at91_spi.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.6 2007/02/27 17:15:39 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_spireg.h b/sys/arm/at91/at91_spireg.h
index 1fa038f4c8330..9dac01b2973c2 100644
--- a/sys/arm/at91/at91_spireg.h
+++ b/sys/arm/at91/at91_spireg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.3 2007/01/01 00:50:25 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_SPIREG_H
 #define ARM_AT91_AT91_SPIREG_H
diff --git a/sys/arm/at91/at91_ssc.c b/sys/arm/at91/at91_ssc.c
index 3e084318f69c6..ab1009583a70b 100644
--- a/sys/arm/at91/at91_ssc.c
+++ b/sys/arm/at91/at91_ssc.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_sscreg.h b/sys/arm/at91/at91_sscreg.h
index 7ed95caf51e4c..5409b15cf7dc2 100644
--- a/sys/arm/at91/at91_sscreg.h
+++ b/sys/arm/at91/at91_sscreg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.3 2006/10/25 07:58:18 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_SSCREG_H
 #define ARM_AT91_AT91_SSCREG_H
diff --git a/sys/arm/at91/at91_st.c b/sys/arm/at91/at91_st.c
index 9905113397aac..b2e580f6f6a82 100644
--- a/sys/arm/at91/at91_st.c
+++ b/sys/arm/at91/at91_st.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.9 2007/03/27 21:03:35 n_hibma Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_streg.h b/sys/arm/at91/at91_streg.h
index cdf3f3054e735..c12888b6056fa 100644
--- a/sys/arm/at91/at91_streg.h
+++ b/sys/arm/at91/at91_streg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_streg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */
 
 #ifndef ARM_AT91_AT91STREG_H
 #define ARM_AT91_AT91STREG_H
diff --git a/sys/arm/at91/at91_twi.c b/sys/arm/at91/at91_twi.c
index 565df58d42cf6..9c5243824776d 100644
--- a/sys/arm/at91/at91_twi.c
+++ b/sys/arm/at91/at91_twi.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.10 2007/03/23 22:57:24 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/at91_twiio.h b/sys/arm/at91/at91_twiio.h
index 2e24439720bd6..0aa1b945b0bf2 100644
--- a/sys/arm/at91/at91_twiio.h
+++ b/sys/arm/at91/at91_twiio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/at91/at91_twiio.h,v 1.1 2006/02/04 23:32:13 imp Exp $
  */
 
 #ifndef _ARM_AT91_AT91_TWIIO_H
diff --git a/sys/arm/at91/at91_twireg.h b/sys/arm/at91/at91_twireg.h
index 5030262f22678..25800434c2900 100644
--- a/sys/arm/at91/at91_twireg.h
+++ b/sys/arm/at91/at91_twireg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.2 2007/03/23 22:57:24 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_TWIREG_H
 #define ARM_AT91_AT91_TWIREG_H
diff --git a/sys/arm/at91/at91_usartreg.h b/sys/arm/at91/at91_usartreg.h
index 1bb032121be3a..8ac5e58fd6023 100644
--- a/sys/arm/at91/at91_usartreg.h
+++ b/sys/arm/at91/at91_usartreg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.2 2006/04/06 04:29:24 imp Exp $ */
 
 #ifndef AT91USARTREG_H_
 #define AT91USARTREG_H_
diff --git a/sys/arm/at91/at91rm92reg.h b/sys/arm/at91/at91rm92reg.h
index 2e0299ad88fd9..3922b8488103b 100644
--- a/sys/arm/at91/at91rm92reg.h
+++ b/sys/arm/at91/at91rm92reg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.5.2.1 2007/12/02 14:19:37 cognet Exp $ */
 
 #ifndef AT91RM92REG_H_
 #define AT91RM92REG_H_
diff --git a/sys/arm/at91/at91var.h b/sys/arm/at91/at91var.h
index 6294f1c788f97..cc15df10a7174 100644
--- a/sys/arm/at91/at91var.h
+++ b/sys/arm/at91/at91var.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */
 
 #ifndef _AT91VAR_H_
 #define _AT91VAR_H_
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index f385ea6a522bc..ec7e37f0a8be9 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/at91/files.at91,v 1.7 2007/01/05 02:06:53 ticso Exp $
 arm/arm/cpufunc_asm_arm9.S	standard
 arm/arm/irq_dispatch.S		standard
 arm/at91/at91.c			standard
diff --git a/sys/arm/at91/files.kb920x b/sys/arm/at91/files.kb920x
index a35a5cdf1c6d5..ae31841592aba 100644
--- a/sys/arm/at91/files.kb920x
+++ b/sys/arm/at91/files.kb920x
@@ -1,2 +1,2 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/at91/files.kb920x,v 1.1 2006/02/04 23:32:13 imp Exp $
 arm/at91/kb920x_machdep.c	standard
diff --git a/sys/arm/at91/hints.at91rm9200 b/sys/arm/at91/hints.at91rm9200
index 4fb861f65437b..e74cd392af7c5 100644
--- a/sys/arm/at91/hints.at91rm9200
+++ b/sys/arm/at91/hints.at91rm9200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/at91/hints.at91rm9200,v 1.1 2006/02/04 23:32:13 imp Exp $
 #
 
 # These are the wiring for the at91rm9200.  These are the built-in devices
diff --git a/sys/arm/at91/hints.at91sam9261 b/sys/arm/at91/hints.at91sam9261
index b60c60eca8173..bfe9ba5ae3b5b 100644
--- a/sys/arm/at91/hints.at91sam9261
+++ b/sys/arm/at91/hints.at91sam9261
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/at91/hints.at91sam9261,v 1.1 2006/02/04 23:32:13 imp Exp $
 #
 
 # These are the wiring for the at91sam9261.  These are the built-in devices
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 5a9c19cbf016b..fd355c0a10dca 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.20.2.1 2007/12/02 14:19:37 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/if_atereg.h b/sys/arm/at91/if_atereg.h
index 5c9086a6589b2..46e51d2a96016 100644
--- a/sys/arm/at91/if_atereg.h
+++ b/sys/arm/at91/if_atereg.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.2 2006/09/07 21:50:01 imp Exp $ */
 
 #ifndef ARM_AT91_IF_ATEREG_H
 #define ARM_AT91_IF_ATEREG_H
diff --git a/sys/arm/at91/kb920x_machdep.c b/sys/arm/at91/kb920x_machdep.c
index f58a3277aaf83..9187f81f8f7b2 100644
--- a/sys/arm/at91/kb920x_machdep.c
+++ b/sys/arm/at91/kb920x_machdep.c
@@ -48,7 +48,7 @@
 #include "opt_at91.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.23.2.1.2.1 2008/01/19 18:15:02 kib Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/at91/ohci_atmelarm.c b/sys/arm/at91/ohci_atmelarm.c
index 139bfc25e3663..8b5fa8d5a8abf 100644
--- a/sys/arm/at91/ohci_atmelarm.c
+++ b/sys/arm/at91/ohci_atmelarm.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.3 2007/07/31 17:43:18 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/std.at91 b/sys/arm/at91/std.at91
index b3086484fc422..cee617a06a1c4 100644
--- a/sys/arm/at91/std.at91
+++ b/sys/arm/at91/std.at91
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/at91/std.at91,v 1.3.2.1 2007/12/02 14:19:37 cognet Exp $
 
 files	"../at91/files.at91"
 cpu	CPU_ARM9
diff --git a/sys/arm/at91/std.kb920x b/sys/arm/at91/std.kb920x
index 14c96cf76d041..ad8a8cd5e233a 100644
--- a/sys/arm/at91/std.kb920x
+++ b/sys/arm/at91/std.kb920x
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.4.2.1 2007/12/02 14:19:37 cognet Exp $
 include "../at91/std.at91"
 files	"../at91/files.kb920x"
 
diff --git a/sys/arm/at91/uart_bus_at91usart.c b/sys/arm/at91/uart_bus_at91usart.c
index af1773bc4faae..4deeed7b55d5c 100644
--- a/sys/arm/at91/uart_bus_at91usart.c
+++ b/sys/arm/at91/uart_bus_at91usart.c
@@ -25,7 +25,7 @@
 #include "opt_uart.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.3 2006/05/13 23:41:16 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/uart_cpu_at91rm9200usart.c b/sys/arm/at91/uart_cpu_at91rm9200usart.c
index 45254af6b7836..2dc3e2c92cf97 100644
--- a/sys/arm/at91/uart_cpu_at91rm9200usart.c
+++ b/sys/arm/at91/uart_cpu_at91rm9200usart.c
@@ -27,7 +27,7 @@
 #include "opt_uart.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.4 2007/06/04 17:53:42 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/at91/uart_dev_at91usart.c b/sys/arm/at91/uart_dev_at91usart.c
index 88625899f1970..a1641eb2c19b4 100644
--- a/sys/arm/at91/uart_dev_at91usart.c
+++ b/sys/arm/at91/uart_dev_at91usart.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.12 2007/04/02 22:00:21 marcel Exp $");
 
 #include "opt_comconsole.h"
 
diff --git a/sys/arm/compile/.cvsignore b/sys/arm/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/arm/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/arm/conf/.cvsignore b/sys/arm/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/arm/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index c07a00c986234..d37d67b612acb 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.6 2007/09/27 22:39:49 cognet Exp $
 
 machine		arm
 ident		AVILA
diff --git a/sys/arm/conf/AVILA.hints b/sys/arm/conf/AVILA.hints
index 86ed3fcd92cd9..bfd7029a0ede2 100644
--- a/sys/arm/conf/AVILA.hints
+++ b/sys/arm/conf/AVILA.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $
 
 #
 # Device wiring for the Gateworks Avila 2384.
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index db20864ae5bad..1ad60a7463dc5 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.2 2007/01/05 10:30:51 ticso Exp $
 
 machine		arm
 ident		BWCT
diff --git a/sys/arm/conf/BWCT.hints b/sys/arm/conf/BWCT.hints
index d127778aac32e..4c77def17f6b4 100644
--- a/sys/arm/conf/BWCT.hints
+++ b/sys/arm/conf/BWCT.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.1 2007/01/05 02:08:35 ticso Exp $
 
 # Dallas Semiconductor DS1672 RTC sitting on the I2C bus
 hint.ds1672.0.at="iicbus0"
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index 6180a2dff9fa9..4f66544775e43 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.2 2007/09/22 16:25:42 cognet Exp $
 
 machine		arm
 ident		CRB
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index c756c6fc5630c..4bd600e0ab7ae 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.5 2007/02/19 00:37:25 cognet Exp $
 
 machine	arm
 ident		EP80219
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index 9f45c0c26fd1f..a42fa3218202b 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.2.2.1 2007/12/02 14:19:37 cognet Exp $
 
 machine		arm
 ident		HL200
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 154d86a2d7112..c05d54925abb4 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.19 2007/02/19 01:03:08 cognet Exp $
 
 machine		arm
 ident		IQ31244
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 0baae87a3c3e9..74c8a2dcb7342 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.13 2007/07/31 17:45:54 imp Exp $
 
 machine		arm
 ident		KB920X
diff --git a/sys/arm/conf/KB920X.hints b/sys/arm/conf/KB920X.hints
index 67927c3b74743..4f4379474cd63 100644
--- a/sys/arm/conf/KB920X.hints
+++ b/sys/arm/conf/KB920X.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/KB920X.hints,v 1.1 2007/03/23 23:47:59 imp Exp $
 #
 # Kwikbyte KB9202A description (will also work for 9202 and might work with
 # a boot loader tweak on the KB9202B).  For the moment, all we list is the
diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS
index 016d6e8daab9b..b55d5fe3c2b5c 100644
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@@ -15,7 +15,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.13 2007/02/19 00:37:25 cognet Exp $
 
 machine		arm
 ident		SIMICS
diff --git a/sys/arm/conf/SKYEYE b/sys/arm/conf/SKYEYE
index 8a52f94241b2a..a083cdf000b09 100644
--- a/sys/arm/conf/SKYEYE
+++ b/sys/arm/conf/SKYEYE
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.7 2006/10/26 22:11:35 jb Exp $
 
 machine		arm
 ident		KB920X
diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h
index 30dd3fb01ae30..6313f0ec0ca78 100644
--- a/sys/arm/include/_bus.h
+++ b/sys/arm/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef ARM_INCLUDE__BUS_H
diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h
index 7da589d8a7710..66f888644f940 100644
--- a/sys/arm/include/_inttypes.h
+++ b/sys/arm/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_inttypes.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index 0d9e492044396..3be4957a39815 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_limits.h,v 1.9 2005/08/20 16:44:40 stefanf Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h
index 0d8aedfff5d68..7e91b508d7a82 100644
--- a/sys/arm/include/_stdint.h
+++ b/sys/arm/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_stdint.h,v 1.2 2004/05/18 16:04:56 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index 2b96d2ebf086d..eaf914f876e6b 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.9 2006/05/15 00:17:27 cognet Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index f655194a21a55..a7c51ac16ed80 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/armreg.h,v 1.6 2007/07/27 14:54:27 cognet Exp $
  */
 
 #ifndef MACHINE_ARMREG_H
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index 347a78e7c2f9c..22a3d8ef4aa0a 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -33,7 +33,7 @@
  *
  *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/arm/include/asmacros.h b/sys/arm/include/asmacros.h
index 91887cad42b04..a44222b969079 100644
--- a/sys/arm/include/asmacros.h
+++ b/sys/arm/include/asmacros.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.6.2.1 2007/12/07 22:07:19 cognet Exp $
  */
 
 #ifndef	_MACHINE_ASMACROS_H_
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index bed5a7265f31c..4701178879b60 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/atomic.h,v 1.21.2.1 2007/12/07 22:07:19 cognet Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
diff --git a/sys/arm/include/blockio.h b/sys/arm/include/blockio.h
index 05c35ae0e84b1..53a8854e58107 100644
--- a/sys/arm/include/blockio.h
+++ b/sys/arm/include/blockio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/blockio.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  *
  */
 /*
diff --git a/sys/arm/include/bootconfig.h b/sys/arm/include/bootconfig.h
index 43d8ac3850ef2..d5ed357775986 100644
--- a/sys/arm/include/bootconfig.h
+++ b/sys/arm/include/bootconfig.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/bootconfig.h,v 1.3 2007/03/21 03:28:16 kevlo Exp $
  */
 
 #ifndef _MACHINE_BOOTCONFIG_H_
diff --git a/sys/arm/include/bus.h b/sys/arm/include/bus.h
index e9963a6cb0866..0addcf3e6f4f4 100644
--- a/sys/arm/include/bus.h
+++ b/sys/arm/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/bus.h,v 1.9 2006/11/19 23:46:49 sam Exp $
  */
 
 #ifndef _MACHINE_BUS_H_
diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h
index 55edee9feebbb..7676bd900457a 100644
--- a/sys/arm/include/bus_dma.h
+++ b/sys/arm/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/bus_dma.h,v 1.2 2007/01/17 00:53:05 cognet Exp $
  */
 
 #ifndef _ARM_BUS_DMA_H
diff --git a/sys/arm/include/clock.h b/sys/arm/include/clock.h
index 61922f4daa93a..0c68c7640e6a7 100644
--- a/sys/arm/include/clock.h
+++ b/sys/arm/include/clock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index 455332467d9a2..570407e22be25 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -1,5 +1,5 @@
 /* $NetBSD: cpu.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.6 2006/05/11 17:29:24 phk Exp $ */
 
 #ifndef MACHINE_CPU_H
 #define MACHINE_CPU_H
diff --git a/sys/arm/include/cpuconf.h b/sys/arm/include/cpuconf.h
index b3258e4cd7b4b..f9bbed691ed17 100644
--- a/sys/arm/include/cpuconf.h
+++ b/sys/arm/include/cpuconf.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.10 2006/11/30 23:30:40 cognet Exp $
  *
  */
 
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index a926a621a88f9..1a70cd2bc791c 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -38,7 +38,7 @@
  *
  * Prototypes for cpu, mmu and tlb related functions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.12 2007/07/27 14:39:41 cognet Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/arm/include/db_machdep.h b/sys/arm/include/db_machdep.h
index 8ccb0a051762f..d15e798cdca1a 100644
--- a/sys/arm/include/db_machdep.h
+++ b/sys/arm/include/db_machdep.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.6 2006/07/27 11:41:37 cognet Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/arm/include/disassem.h b/sys/arm/include/disassem.h
index 526875527b3f8..6b800d95eef7c 100644
--- a/sys/arm/include/disassem.h
+++ b/sys/arm/include/disassem.h
@@ -35,7 +35,7 @@
  *
  * Define the interface structure required by the disassembler.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/disassem.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_DISASSEM_H_
diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h
index 353be7c533a96..8bce42ba26bcb 100644
--- a/sys/arm/include/elf.h
+++ b/sys/arm/include/elf.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/arm/include/endian.h b/sys/arm/include/endian.h
index 715a94569fcbf..bc1de0fc2e6ab 100644
--- a/sys/arm/include/endian.h
+++ b/sys/arm/include/endian.h
@@ -27,7 +27,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $
  */
 
 #ifndef _ENDIAN_H_
diff --git a/sys/arm/include/exec.h b/sys/arm/include/exec.h
index f5a2bb26f61f2..9c4e2e9c6f4d6 100644
--- a/sys/arm/include/exec.h
+++ b/sys/arm/include/exec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/exec.h,v 1.3 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/arm/include/fiq.h b/sys/arm/include/fiq.h
index ccb29a8d7b5ff..704ea50e62f17 100644
--- a/sys/arm/include/fiq.h
+++ b/sys/arm/include/fiq.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/fiq.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  *
  */
 
diff --git a/sys/arm/include/float.h b/sys/arm/include/float.h
index ac5ceb92b27b7..7c6f4e1f4593a 100644
--- a/sys/arm/include/float.h
+++ b/sys/arm/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/float.h,v 1.5 2005/03/20 00:34:24 cognet Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/arm/include/floatingpoint.h b/sys/arm/include/floatingpoint.h
index fd328a9d739b7..c239d6b379842 100644
--- a/sys/arm/include/floatingpoint.h
+++ b/sys/arm/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/floatingpoint.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/arm/include/fp.h b/sys/arm/include/fp.h
index ada720303c7d2..202936ff2d562 100644
--- a/sys/arm/include/fp.h
+++ b/sys/arm/include/fp.h
@@ -42,7 +42,7 @@
  *
  * Created      : 10/10/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/fp.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_FP_H
diff --git a/sys/arm/include/frame.h b/sys/arm/include/frame.h
index 0a038293eebfc..8b08cfbfffca4 100644
--- a/sys/arm/include/frame.h
+++ b/sys/arm/include/frame.h
@@ -42,7 +42,7 @@
  *
  * Created      : 30/09/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/frame.h,v 1.4 2005/12/22 22:16:06 jhb Exp $
  *
  */
 
diff --git a/sys/arm/include/gdb_machdep.h b/sys/arm/include/gdb_machdep.h
index 0b38f60d77456..d47c77903a2a6 100644
--- a/sys/arm/include/gdb_machdep.h
+++ b/sys/arm/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/gdb_machdep.h,v 1.1 2006/07/14 00:50:51 cognet Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/arm/include/ieee.h b/sys/arm/include/ieee.h
index a7411dd2332ae..46fae8f8c116f 100644
--- a/sys/arm/include/ieee.h
+++ b/sys/arm/include/ieee.h
@@ -39,7 +39,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/ieee.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  *
  */
 
diff --git a/sys/arm/include/ieeefp.h b/sys/arm/include/ieeefp.h
index 8fc9811ce60f4..851f20df80522 100644
--- a/sys/arm/include/ieeefp.h
+++ b/sys/arm/include/ieeefp.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ieeefp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/ieeefp.h,v 1.2 2005/01/05 21:58:48 imp Exp $ */
 /*-
  * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
  * Public domain.
diff --git a/sys/arm/include/in_cksum.h b/sys/arm/include/in_cksum.h
index 8862f282f0a6e..a127c633f5102 100644
--- a/sys/arm/include/in_cksum.h
+++ b/sys/arm/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
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/in_cksum.h,v 1.4 2006/03/09 23:33:59 cognet Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index 2edb428cbd7d3..df71d2a0dc9f6 100644
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $
  *
  */
 
diff --git a/sys/arm/include/katelib.h b/sys/arm/include/katelib.h
index ef69fe37238fa..2f6a8ff7a08ca 100644
--- a/sys/arm/include/katelib.h
+++ b/sys/arm/include/katelib.h
@@ -49,7 +49,7 @@
  *
  * Based on kate/katelib/prototypes.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/katelib.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 /*
diff --git a/sys/arm/include/kdb.h b/sys/arm/include/kdb.h
index 7452922703638..0ded8c788a64c 100644
--- a/sys/arm/include/kdb.h
+++ b/sys/arm/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/kdb.h,v 1.4 2007/06/09 21:55:16 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/arm/include/limits.h b/sys/arm/include/limits.h
index 35eea1f619dee..f1837e2046d6e 100644
--- a/sys/arm/include/limits.h
+++ b/sys/arm/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/limits.h,v 1.8 2005/03/02 21:33:22 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/arm/include/machdep.h b/sys/arm/include/machdep.h
index b26f38642f5b5..3777dd7314639 100644
--- a/sys/arm/include/machdep.h
+++ b/sys/arm/include/machdep.h
@@ -1,5 +1,5 @@
 /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/machdep.h,v 1.2 2005/02/26 18:59:01 cognet Exp $ */
 
 #ifndef _MACHDEP_BOOT_MACHDEP_H_
 #define _MACHDEP_BOOT_MACHDEP_H_
diff --git a/sys/arm/include/md_var.h b/sys/arm/include/md_var.h
index 32718038535c4..1ff6260f3fdb7 100644
--- a/sys/arm/include/md_var.h
+++ b/sys/arm/include/md_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/md_var.h,v 1.4 2007/01/17 00:53:05 cognet Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/arm/include/memdev.h b/sys/arm/include/memdev.h
index 9cf0b4ae7e264..6415c37849f61 100644
--- a/sys/arm/include/memdev.h
+++ b/sys/arm/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/memdev.h,v 1.1 2004/11/07 23:01:36 cognet Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/arm/include/metadata.h b/sys/arm/include/metadata.h
index 84e6f87399704..8f3c16739d1a1 100644
--- a/sys/arm/include/metadata.h
+++ b/sys/arm/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/metadata.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/arm/include/mutex.h b/sys/arm/include/mutex.h
index c9b2e1ddde073..d5ce2a5385444 100644
--- a/sys/arm/include/mutex.h
+++ b/sys/arm/include/mutex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/mutex.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef	_MACHINE_MUTEX_H_
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 4c59eee53c6d5..e13fda46db3e4 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.11 2006/01/09 06:05:56 imp Exp $
  */
 
 /*
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index 4a5f330b8a53e..1da8eb8254b6e 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pcb.h,v 1.5 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef	_MACHINE_PCB_H_
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index 8388ba6fdd1bd..a91de2d80983c 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 906b03f3be376..9c7fa8c9bd998 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -44,7 +44,7 @@
  *      from: @(#)pmap.h        7.4 (Berkeley) 5/12/91
  * 	from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.27 2007/07/27 14:45:04 cognet Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/arm/include/pmc_mdep.h b/sys/arm/include/pmc_mdep.h
index 4e02fc6f1358b..614a5815f6244 100644
--- a/sys/arm/include/pmc_mdep.h
+++ b/sys/arm/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:06 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index 597c75ceaed65..0e11947d646bc 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -32,7 +32,7 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/proc.h,v 1.5 2005/04/04 21:53:52 jhb Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index b640bf7761463..abdf36cd59a17 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/arm/include/psl.h b/sys/arm/include/psl.h
index c86ddb8675c68..b9ee82a501421 100644
--- a/sys/arm/include/psl.h
+++ b/sys/arm/include/psl.h
@@ -41,7 +41,7 @@
  *
  * Created      : 21/07/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/psl.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/arm/include/pte.h b/sys/arm/include/pte.h
index 292983a9cd0c7..cc071e2bb1e47 100644
--- a/sys/arm/include/pte.h
+++ b/sys/arm/include/pte.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/pte.h,v 1.5 2007/07/27 14:45:33 cognet Exp $
  */
 
 #ifndef _MACHINE_PTE_H_
diff --git a/sys/arm/include/ptrace.h b/sys/arm/include/ptrace.h
index d98aa14f3ef76..18cec91ab7636 100644
--- a/sys/arm/include/ptrace.h
+++ b/sys/arm/include/ptrace.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ptrace.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/ptrace.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */
 
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
diff --git a/sys/arm/include/reg.h b/sys/arm/include/reg.h
index 2f8c2ede7d21b..fa420f7b469bc 100644
--- a/sys/arm/include/reg.h
+++ b/sys/arm/include/reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: reg.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/reg.h,v 1.2 2004/11/04 19:20:54 cognet Exp $ */
 #ifndef MACHINE_REG_H
 #define MACHINE_REG_H
 
diff --git a/sys/arm/include/reloc.h b/sys/arm/include/reloc.h
index df4a126eb1a96..13f102c23f7cc 100644
--- a/sys/arm/include/reloc.h
+++ b/sys/arm/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/reloc.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_RELOC_H_
diff --git a/sys/arm/include/resource.h b/sys/arm/include/resource.h
index 229d14f253b0f..27588d68e8a2c 100644
--- a/sys/arm/include/resource.h
+++ b/sys/arm/include/resource.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/resource.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/arm/include/runq.h b/sys/arm/include/runq.h
index e906fa192c6c1..3b118cfbfe6de 100644
--- a/sys/arm/include/runq.h
+++ b/sys/arm/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/runq.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/arm/include/setjmp.h b/sys/arm/include/setjmp.h
index 638dc3e98ab9b..f2f5aec995432 100644
--- a/sys/arm/include/setjmp.h
+++ b/sys/arm/include/setjmp.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: setjmp.h,v 1.2 2001/08/25 14:45:59 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/setjmp.h,v 1.2 2004/07/12 21:23:58 cognet Exp $ */
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
diff --git a/sys/arm/include/sf_buf.h b/sys/arm/include/sf_buf.h
index 2225d58249390..f0e821de3b457 100644
--- a/sys/arm/include/sf_buf.h
+++ b/sys/arm/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/sf_buf.h,v 1.2 2006/08/08 20:59:38 cognet Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/arm/include/sigframe.h b/sys/arm/include/sigframe.h
index 9787f579d563c..d221c109d6ecd 100644
--- a/sys/arm/include/sigframe.h
+++ b/sys/arm/include/sigframe.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/sigframe.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */
 #include <machine/frame.h>
diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h
index 2170082169559..016e62eb32296 100644
--- a/sys/arm/include/signal.h
+++ b/sys/arm/include/signal.h
@@ -29,7 +29,7 @@
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  *	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
  *	from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/signal.h,v 1.7 2005/08/20 16:44:40 stefanf Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/arm/include/smp.h b/sys/arm/include/smp.h
index ca707e3bab83d..6096fbf60f675 100644
--- a/sys/arm/include/smp.h
+++ b/sys/arm/include/smp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/smp.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */
 
 #ifndef _MACHINE_SMP_H_
 #define _MACHINE_SMP_H_
diff --git a/sys/arm/include/stdarg.h b/sys/arm/include/stdarg.h
index 8020d8d140c24..1810fbc9dce10 100644
--- a/sys/arm/include/stdarg.h
+++ b/sys/arm/include/stdarg.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/stdarg.h,v 1.4 2006/09/21 01:37:02 kan Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/arm/include/swi.h b/sys/arm/include/swi.h
index 858ed2368b0d1..8ed4992d8cfad 100644
--- a/sys/arm/include/swi.h
+++ b/sys/arm/include/swi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: swi.h,v 1.1 2002/01/13 15:03:06 bjh21 Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/swi.h,v 1.2 2005/01/05 21:58:48 imp Exp $ */
 
 /*-
  * This file is in the Public Domain.
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index 4d6234b447e06..d27b5631f7d73 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/sysarch.h,v 1.4 2005/02/26 18:59:01 cognet Exp $ */
 
 #ifndef _ARM_SYSARCH_H_
 #define _ARM_SYSARCH_H_
diff --git a/sys/arm/include/trap.h b/sys/arm/include/trap.h
index a9f42e3c78382..a4e69c57b8750 100644
--- a/sys/arm/include/trap.h
+++ b/sys/arm/include/trap.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: trap.h,v 1.1 2001/02/23 03:48:19 ichiro Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/include/trap.h,v 1.2 2005/01/10 22:43:16 cognet Exp $ */
 
 #ifndef _MACHINE_TRAP_H_
 #define _MACHINE_TRAP_H_
diff --git a/sys/arm/include/ucontext.h b/sys/arm/include/ucontext.h
index b1f1d63e56c8e..f88294ecd7b2a 100644
--- a/sys/arm/include/ucontext.h
+++ b/sys/arm/include/ucontext.h
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/ucontext.h,v 1.2 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef _MACHINE_MCONTEXT_H_
diff --git a/sys/arm/include/undefined.h b/sys/arm/include/undefined.h
index 6b64d1d2fe23a..b54a7a6c813b9 100644
--- a/sys/arm/include/undefined.h
+++ b/sys/arm/include/undefined.h
@@ -42,7 +42,7 @@
  *
  * Created      : 08/02/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/undefined.h,v 1.3 2007/03/21 03:28:16 kevlo Exp $
  */
 
 
diff --git a/sys/arm/include/utrap.h b/sys/arm/include/utrap.h
index 38a40b0166e56..67c408e4a1c0f 100644
--- a/sys/arm/include/utrap.h
+++ b/sys/arm/include/utrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/utrap.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
  */
 
 #ifndef	_MACHINE_UTRAP_H_
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index 35b8d41954c5f..40adb0fb39c76 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.11 2007/09/25 06:25:04 alc Exp $
  */
 
 #ifndef	_MACHINE_VMPARAM_H_
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c
index 195a4fb623bbe..3b200bfe26111 100644
--- a/sys/arm/sa11x0/assabet_machdep.c
+++ b/sys/arm/sa11x0/assabet_machdep.c
@@ -47,7 +47,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21.4.1 2008/01/19 18:15:02 kib Exp $");
 
 #include "opt_md.h"
 
diff --git a/sys/arm/sa11x0/files.sa11x0 b/sys/arm/sa11x0/files.sa11x0
index 44c1f41e401b5..4f0af5369de09 100644
--- a/sys/arm/sa11x0/files.sa11x0
+++ b/sys/arm/sa11x0/files.sa11x0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/sa11x0/files.sa11x0,v 1.2 2004/05/14 13:26:52 cognet Exp $
 arm/sa11x0/assabet_machdep.c	optional	assabet
 arm/sa11x0/sa11x0.c		optional	saip
 arm/sa11x0/sa11x0_ost.c		optional	saip
diff --git a/sys/arm/sa11x0/sa11x0.c b/sys/arm/sa11x0/sa11x0.c
index 90ed918c10db8..a087c26e2fdad 100644
--- a/sys/arm/sa11x0/sa11x0.c
+++ b/sys/arm/sa11x0/sa11x0.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.9 2007/03/06 10:56:54 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/sa11x0_dmacreg.h b/sys/arm/sa11x0/sa11x0_dmacreg.h
index 9112e2104f38e..6e361a711c5ae 100644
--- a/sys/arm/sa11x0/sa11x0_dmacreg.h
+++ b/sys/arm/sa11x0/sa11x0_dmacreg.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_dmacreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_gpioreg.h b/sys/arm/sa11x0/sa11x0_gpioreg.h
index 9f46e9d18d81e..95ba734a34c6d 100644
--- a/sys/arm/sa11x0/sa11x0_gpioreg.h
+++ b/sys/arm/sa11x0/sa11x0_gpioreg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_gpioreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_io.c b/sys/arm/sa11x0/sa11x0_io.c
index 6e78729930904..bf5c1994e05c1 100644
--- a/sys/arm/sa11x0/sa11x0_io.c
+++ b/sys/arm/sa11x0/sa11x0_io.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.10 2006/11/20 13:21:02 kevlo Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
diff --git a/sys/arm/sa11x0/sa11x0_io_asm.S b/sys/arm/sa11x0/sa11x0_io_asm.S
index 7a821f3e06536..ad4d222306978 100644
--- a/sys/arm/sa11x0/sa11x0_io_asm.S
+++ b/sys/arm/sa11x0/sa11x0_io_asm.S
@@ -35,7 +35,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io_asm.S,v 1.2 2005/01/05 21:58:48 imp Exp $");
 
 /*
  * bus_space I/O functions for sa11x0
diff --git a/sys/arm/sa11x0/sa11x0_irq.S b/sys/arm/sa11x0/sa11x0_irq.S
index 3b6d23ea91a4b..a0121b3e06db4 100644
--- a/sys/arm/sa11x0/sa11x0_irq.S
+++ b/sys/arm/sa11x0/sa11x0_irq.S
@@ -43,7 +43,7 @@
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
 #include <arm/sa11x0/sa11x0_reg.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.3 2005/01/05 21:58:48 imp Exp $");
 Lcurrent_intr_depth:
 	.word	_C_LABEL(current_intr_depth)
 
diff --git a/sys/arm/sa11x0/sa11x0_irqhandler.c b/sys/arm/sa11x0/sa11x0_irqhandler.c
index 1935418867bb1..0568035e7c0d8 100644
--- a/sys/arm/sa11x0/sa11x0_irqhandler.c
+++ b/sys/arm/sa11x0/sa11x0_irqhandler.c
@@ -76,7 +76,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/sa11x0/sa11x0_ost.c b/sys/arm/sa11x0/sa11x0_ost.c
index 6dd4cf34b0a82..358eff74d613f 100644
--- a/sys/arm/sa11x0/sa11x0_ost.c
+++ b/sys/arm/sa11x0/sa11x0_ost.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/sa11x0_ostreg.h b/sys/arm/sa11x0/sa11x0_ostreg.h
index c03aea1827fe8..200f7d5c25fa6 100644
--- a/sys/arm/sa11x0/sa11x0_ostreg.h
+++ b/sys/arm/sa11x0/sa11x0_ostreg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_ostreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_ppcreg.h b/sys/arm/sa11x0/sa11x0_ppcreg.h
index 52c129a3a29d5..b023a18c4065b 100644
--- a/sys/arm/sa11x0/sa11x0_ppcreg.h
+++ b/sys/arm/sa11x0/sa11x0_ppcreg.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_ppcreg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_reg.h b/sys/arm/sa11x0/sa11x0_reg.h
index 2bd065aff7cde..f217f1b6d3784 100644
--- a/sys/arm/sa11x0/sa11x0_reg.h
+++ b/sys/arm/sa11x0/sa11x0_reg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_reg.h,v 1.3 2006/05/23 12:14:14 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/sa11x0_var.h b/sys/arm/sa11x0/sa11x0_var.h
index 8a566d84fe820..ae8b5bee5ada9 100644
--- a/sys/arm/sa11x0/sa11x0_var.h
+++ b/sys/arm/sa11x0/sa11x0_var.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/sa11x0_var.h,v 1.3 2006/05/29 19:32:32 cognet Exp $
  *
  */
 
diff --git a/sys/arm/sa11x0/std.sa11x0 b/sys/arm/sa11x0/std.sa11x0
index 3cf84655c97d7..3f51f7b276c88 100644
--- a/sys/arm/sa11x0/std.sa11x0
+++ b/sys/arm/sa11x0/std.sa11x0
@@ -1,5 +1,5 @@
 #StrongARM SA11x0 common options
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/sa11x0/std.sa11x0,v 1.2 2004/09/23 22:33:38 cognet Exp $
 files		"../sa11x0/files.sa11x0"
 cpu		CPU_SA1100
 cpu		CPU_SA1110
diff --git a/sys/arm/sa11x0/uart_bus_sa1110.c b/sys/arm/sa11x0/uart_bus_sa1110.c
index fb8b0d6a8ae3e..a7f499188505c 100644
--- a/sys/arm/sa11x0/uart_bus_sa1110.c
+++ b/sys/arm/sa11x0/uart_bus_sa1110.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_bus_sa1110.c,v 1.3 2005/01/05 21:58:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/uart_cpu_sa1110.c b/sys/arm/sa11x0/uart_cpu_sa1110.c
index 5d6a3c3bfe721..ca7a4ee668137 100644
--- a/sys/arm/sa11x0/uart_cpu_sa1110.c
+++ b/sys/arm/sa11x0/uart_cpu_sa1110.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.7 2007/04/02 22:00:21 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.c b/sys/arm/sa11x0/uart_dev_sa1110.c
index f057453b01977..be158b61e164f 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.c
+++ b/sys/arm/sa11x0/uart_dev_sa1110.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.9 2007/09/12 18:28:09 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.h b/sys/arm/sa11x0/uart_dev_sa1110.h
index 29610b28d102b..1a79be5057408 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.h
+++ b/sys/arm/sa11x0/uart_dev_sa1110.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.h,v 1.2 2005/01/05 21:58:48 imp Exp $
  */
 
 #ifndef _DEV_UART_DEV_SA1110_H_
diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c
index c0dda4955f03f..31570846e9bb5 100644
--- a/sys/arm/xscale/i80321/ep80219_machdep.c
+++ b/sys/arm/xscale/i80321/ep80219_machdep.c
@@ -49,7 +49,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.7.4.1 2008/01/19 18:15:02 kib Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/i80321/files.ep80219 b/sys/arm/xscale/i80321/files.ep80219
index cbf2e39ed5a8b..5ce1bfa875c66 100644
--- a/sys/arm/xscale/i80321/files.ep80219
+++ b/sys/arm/xscale/i80321/files.ep80219
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/files.ep80219,v 1.1 2006/08/24 23:51:28 cognet Exp $
 #
 #
 # EP80219 Board Specific
diff --git a/sys/arm/xscale/i80321/files.i80219 b/sys/arm/xscale/i80321/files.i80219
index 87e961c7d313e..d7a67c6468e3e 100644
--- a/sys/arm/xscale/i80321/files.i80219
+++ b/sys/arm/xscale/i80321/files.i80219
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/files.i80219,v 1.1 2006/08/24 23:51:28 cognet Exp $
 #
 # IOP Specific
 # 
diff --git a/sys/arm/xscale/i80321/files.i80321 b/sys/arm/xscale/i80321/files.i80321
index d3acccd9c5e7f..4fcd7af97a18d 100644
--- a/sys/arm/xscale/i80321/files.i80321
+++ b/sys/arm/xscale/i80321/files.i80321
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/files.i80321,v 1.3 2005/10/03 14:19:55 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
 arm/xscale/i80321/i80321.c		standard
diff --git a/sys/arm/xscale/i80321/files.iq31244 b/sys/arm/xscale/i80321/files.iq31244
index 66d89b3db6306..7b00b81501083 100644
--- a/sys/arm/xscale/i80321/files.iq31244
+++ b/sys/arm/xscale/i80321/files.iq31244
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/files.iq31244,v 1.2 2005/01/15 18:55:22 cognet Exp $
 arm/xscale/i80321/iq80321.c		standard
 arm/xscale/i80321/iq31244_machdep.c	standard
 arm/xscale/i80321/iq31244_7seg.c	optional	iq31244_7seg
diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c
index c7b6ee6ea6bb2..aa51b5935d99b 100644
--- a/sys/arm/xscale/i80321/i80321.c
+++ b/sys/arm/xscale/i80321/i80321.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.7 2007/09/04 18:45:27 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_aau.c b/sys/arm/xscale/i80321/i80321_aau.c
index f72a7c903cb01..bd1de4af6414f 100644
--- a/sys/arm/xscale/i80321/i80321_aau.c
+++ b/sys/arm/xscale/i80321/i80321_aau.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_aau.c,v 1.4 2006/03/02 14:06:38 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_dma.c b/sys/arm/xscale/i80321/i80321_dma.c
index 4ec6d1642eed7..d450811f3f9ab 100644
--- a/sys/arm/xscale/i80321/i80321_dma.c
+++ b/sys/arm/xscale/i80321/i80321_dma.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_dma.c,v 1.3 2006/03/02 14:06:38 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/arm/xscale/i80321/i80321_intr.h b/sys/arm/xscale/i80321/i80321_intr.h
index 4e432dad1e395..430130e8016d4 100644
--- a/sys/arm/xscale/i80321/i80321_intr.h
+++ b/sys/arm/xscale/i80321/i80321_intr.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/i80321_intr.h,v 1.3 2006/08/24 23:51:28 cognet Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/i80321_mcu.c b/sys/arm/xscale/i80321/i80321_mcu.c
index a51a433486188..c7abde90e4393 100644
--- a/sys/arm/xscale/i80321/i80321_mcu.c
+++ b/sys/arm/xscale/i80321/i80321_mcu.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_mcu.c,v 1.2 2005/01/05 21:58:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index 24b21db5eb33c..b738103b20381 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_space.c b/sys/arm/xscale/i80321/i80321_space.c
index f741e895ea132..d73e0a002eef4 100644
--- a/sys/arm/xscale/i80321/i80321_space.c
+++ b/sys/arm/xscale/i80321/i80321_space.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.7 2006/12/02 13:37:29 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c
index 7b2fdcb5d0496..3b72b1850ec8f 100644
--- a/sys/arm/xscale/i80321/i80321_timer.c
+++ b/sys/arm/xscale/i80321/i80321_timer.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.13 2007/07/27 14:52:04 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321_wdog.c b/sys/arm/xscale/i80321/i80321_wdog.c
index 9be98d2f7e259..796cd95ba993a 100644
--- a/sys/arm/xscale/i80321/i80321_wdog.c
+++ b/sys/arm/xscale/i80321/i80321_wdog.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.5 2007/07/27 14:52:04 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/i80321reg.h b/sys/arm/xscale/i80321/i80321reg.h
index 5804e990dd492..df7757ecf6cdd 100644
--- a/sys/arm/xscale/i80321/i80321reg.h
+++ b/sys/arm/xscale/i80321/i80321reg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/i80321reg.h,v 1.3 2006/08/24 23:51:28 cognet Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/i80321var.h b/sys/arm/xscale/i80321/i80321var.h
index 0fead2577a2ef..520fdfc864913 100644
--- a/sys/arm/xscale/i80321/i80321var.h
+++ b/sys/arm/xscale/i80321/i80321var.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/i80321var.h,v 1.5 2007/07/27 14:53:06 cognet Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/iq31244_7seg.c b/sys/arm/xscale/i80321/iq31244_7seg.c
index 7cd1bc30da370..7406e8651b216 100644
--- a/sys/arm/xscale/i80321/iq31244_7seg.c
+++ b/sys/arm/xscale/i80321/iq31244_7seg.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_7seg.c,v 1.3 2005/05/25 13:44:55 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index ef8d0eb987bd5..7fe6e08ed108a 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -49,7 +49,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.28.4.1 2008/01/19 18:15:02 kib Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index 7f9487946df45..82bb07e90b983 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.15 2007/02/23 12:18:28 piso Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/i80321/iq80321reg.h b/sys/arm/xscale/i80321/iq80321reg.h
index d887fcd92663d..980f2f3fc5087 100644
--- a/sys/arm/xscale/i80321/iq80321reg.h
+++ b/sys/arm/xscale/i80321/iq80321reg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/iq80321reg.h,v 1.3 2006/08/24 23:51:28 cognet Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/iq80321var.h b/sys/arm/xscale/i80321/iq80321var.h
index 4a035001bdf55..e5027d22da064 100644
--- a/sys/arm/xscale/i80321/iq80321var.h
+++ b/sys/arm/xscale/i80321/iq80321var.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/iq80321var.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/obio.c b/sys/arm/xscale/i80321/obio.c
index f6ed79143b677..105f5e272cf82 100644
--- a/sys/arm/xscale/i80321/obio.c
+++ b/sys/arm/xscale/i80321/obio.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio.c,v 1.5 2007/07/27 14:53:42 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/obio_space.c b/sys/arm/xscale/i80321/obio_space.c
index 252f2c6a17f4e..6a3ca8b7068fb 100644
--- a/sys/arm/xscale/i80321/obio_space.c
+++ b/sys/arm/xscale/i80321/obio_space.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio_space.c,v 1.4 2006/11/20 13:21:02 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/obiovar.h b/sys/arm/xscale/i80321/obiovar.h
index 8e0c1459d7087..e22b0a574c8de 100644
--- a/sys/arm/xscale/i80321/obiovar.h
+++ b/sys/arm/xscale/i80321/obiovar.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i80321/obiovar.h,v 1.3 2005/09/25 21:06:50 cognet Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i80321/std.ep80219 b/sys/arm/xscale/i80321/std.ep80219
index 9f5cbb7555194..1e6cd20795712 100644
--- a/sys/arm/xscale/i80321/std.ep80219
+++ b/sys/arm/xscale/i80321/std.ep80219
@@ -1,5 +1,5 @@
 #EP80219 board configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/std.ep80219,v 1.1 2006/08/24 23:51:28 cognet Exp $
 include	"../xscale/i80321/std.i80219"
 files		"../xscale/i80321/files.ep80219"
 makeoptions	KERNPHYSADDR=0xa0200000
diff --git a/sys/arm/xscale/i80321/std.i80219 b/sys/arm/xscale/i80321/std.i80219
index 8ff075cf71b43..b6f700c42546e 100644
--- a/sys/arm/xscale/i80321/std.i80219
+++ b/sys/arm/xscale/i80321/std.i80219
@@ -1,5 +1,5 @@
 #XScale i80219 generic configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/std.i80219,v 1.1 2006/08/24 23:51:28 cognet Exp $
 files		"../xscale/i80321/files.i80219"
 include		"../xscale/std.xscale"
 cpu 		CPU_XSCALE_80219
diff --git a/sys/arm/xscale/i80321/std.i80321 b/sys/arm/xscale/i80321/std.i80321
index 3d8b8f9600164..dfa4f35603457 100644
--- a/sys/arm/xscale/i80321/std.i80321
+++ b/sys/arm/xscale/i80321/std.i80321
@@ -1,5 +1,5 @@
 #XScale i80321 generic configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/std.i80321,v 1.3 2005/02/26 18:59:01 cognet Exp $
 files		"../xscale/i80321/files.i80321"
 include		"../xscale/std.xscale"
 cpu 		CPU_XSCALE_80321
diff --git a/sys/arm/xscale/i80321/std.iq31244 b/sys/arm/xscale/i80321/std.iq31244
index c4c23bf7d6200..39cf8c527009e 100644
--- a/sys/arm/xscale/i80321/std.iq31244
+++ b/sys/arm/xscale/i80321/std.iq31244
@@ -1,5 +1,5 @@
 #IQ31244 board configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.3 2005/12/09 23:52:51 cognet Exp $
 include		"../xscale/i80321/std.i80321"
 files		"../xscale/i80321/files.iq31244"
 makeoptions	KERNPHYSADDR=0xa0200000
diff --git a/sys/arm/xscale/i80321/uart_bus_i80321.c b/sys/arm/xscale/i80321/uart_bus_i80321.c
index 5bb903df64cda..30913803ac4b3 100644
--- a/sys/arm/xscale/i80321/uart_bus_i80321.c
+++ b/sys/arm/xscale/i80321/uart_bus_i80321.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_bus_i80321.c,v 1.3 2005/01/05 21:58:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i80321/uart_cpu_i80321.c b/sys/arm/xscale/i80321/uart_cpu_i80321.c
index 32dd463cfb47d..aba6381902a85 100644
--- a/sys/arm/xscale/i80321/uart_cpu_i80321.c
+++ b/sys/arm/xscale/i80321/uart_cpu_i80321.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.5 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c
index 0c6475a8684c4..c1c8c4b7ece41 100644
--- a/sys/arm/xscale/i8134x/crb_machdep.c
+++ b/sys/arm/xscale/i8134x/crb_machdep.c
@@ -49,7 +49,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.2.4.1 2008/01/19 18:15:02 kib Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/i8134x/files.crb b/sys/arm/xscale/i8134x/files.crb
index 25398af60f95a..1ad1b89780cbf 100644
--- a/sys/arm/xscale/i8134x/files.crb
+++ b/sys/arm/xscale/i8134x/files.crb
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/xscale/i8134x/files.crb,v 1.2 2007/09/22 16:25:43 cognet Exp $
 arm/xscale/i8134x/crb_machdep.c		standard
 arm/xscale/i8134x/iq81342_7seg.c	optional	7seg
diff --git a/sys/arm/xscale/i8134x/files.i81342 b/sys/arm/xscale/i8134x/files.i81342
index c5d5df19130f8..3737c7a26c0fc 100644
--- a/sys/arm/xscale/i8134x/files.i81342
+++ b/sys/arm/xscale/i8134x/files.i81342
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/xscale/i8134x/files.i81342,v 1.1 2007/07/27 14:50:57 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/cpufunc_asm_xscale_c3.S		standard
 arm/arm/irq_dispatch.S			standard
diff --git a/sys/arm/xscale/i8134x/i81342.c b/sys/arm/xscale/i8134x/i81342.c
index 072685bec3ddd..c01beec6ab80d 100644
--- a/sys/arm/xscale/i8134x/i81342.c
+++ b/sys/arm/xscale/i8134x/i81342.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.2 2007/09/22 16:25:43 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/i81342_mcu.c b/sys/arm/xscale/i8134x/i81342_mcu.c
index 40afe9824b395..0057b87337ea4 100644
--- a/sys/arm/xscale/i8134x/i81342_mcu.c
+++ b/sys/arm/xscale/i8134x/i81342_mcu.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_mcu.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/i81342_pci.c b/sys/arm/xscale/i8134x/i81342_pci.c
index 754cb07323c3c..51005558f101b 100644
--- a/sys/arm/xscale/i8134x/i81342_pci.c
+++ b/sys/arm/xscale/i8134x/i81342_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/i81342_space.c b/sys/arm/xscale/i8134x/i81342_space.c
index 50865f17e645b..889e25a43e63b 100644
--- a/sys/arm/xscale/i8134x/i81342_space.c
+++ b/sys/arm/xscale/i8134x/i81342_space.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_space.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/i81342reg.h b/sys/arm/xscale/i8134x/i81342reg.h
index 5001d9628c67d..9fd3d97f64e1c 100644
--- a/sys/arm/xscale/i8134x/i81342reg.h
+++ b/sys/arm/xscale/i8134x/i81342reg.h
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342reg.h,v 1.3 2007/09/22 22:25:24 cognet Exp $ */
 
 #ifndef I83142_REG_H_
 #define I83142_REG_H_
diff --git a/sys/arm/xscale/i8134x/i81342var.h b/sys/arm/xscale/i8134x/i81342var.h
index c7fde4b138e7f..5156d8765d81f 100644
--- a/sys/arm/xscale/i8134x/i81342var.h
+++ b/sys/arm/xscale/i8134x/i81342var.h
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342var.h,v 1.1 2007/07/27 14:50:57 cognet Exp $ */
 #ifndef I81342VAR_H_
 #define I81342VAR_H_
 
diff --git a/sys/arm/xscale/i8134x/iq81342_7seg.c b/sys/arm/xscale/i8134x/iq81342_7seg.c
index eeecd41255901..c80e8ff204770 100644
--- a/sys/arm/xscale/i8134x/iq81342_7seg.c
+++ b/sys/arm/xscale/i8134x/iq81342_7seg.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/iq81342_7seg.c,v 1.1 2007/09/22 16:25:43 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/iq81342reg.h b/sys/arm/xscale/i8134x/iq81342reg.h
index b1e2516faf443..0507cced78db5 100644
--- a/sys/arm/xscale/i8134x/iq81342reg.h
+++ b/sys/arm/xscale/i8134x/iq81342reg.h
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/xscale/i8134x/iq81342reg.h,v 1.1 2007/09/22 16:25:43 cognet Exp $ */
 
 #ifndef _IQ81342REG_H_
 #define _IQ81342REG_H_
diff --git a/sys/arm/xscale/i8134x/iq81342var.h b/sys/arm/xscale/i8134x/iq81342var.h
index af30b169260cd..7c0b9777b9074 100644
--- a/sys/arm/xscale/i8134x/iq81342var.h
+++ b/sys/arm/xscale/i8134x/iq81342var.h
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/xscale/i8134x/iq81342var.h,v 1.1 2007/09/22 16:25:43 cognet Exp $ */
 
 #ifndef _IQ81342VAR_H_
 #define _IQ81342VAR_H_
diff --git a/sys/arm/xscale/i8134x/obio.c b/sys/arm/xscale/i8134x/obio.c
index 534f0e7a54dfb..58508732fd58a 100644
--- a/sys/arm/xscale/i8134x/obio.c
+++ b/sys/arm/xscale/i8134x/obio.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/obio.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/obio_space.c b/sys/arm/xscale/i8134x/obio_space.c
index 252f2c6a17f4e..699bd713f285d 100644
--- a/sys/arm/xscale/i8134x/obio_space.c
+++ b/sys/arm/xscale/i8134x/obio_space.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/obio_space.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/obiovar.h b/sys/arm/xscale/i8134x/obiovar.h
index 7350d0ade1bb9..a4e5be31b4988 100644
--- a/sys/arm/xscale/i8134x/obiovar.h
+++ b/sys/arm/xscale/i8134x/obiovar.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/i8134x/obiovar.h,v 1.1 2007/07/27 14:50:57 cognet Exp $
  *
  */
 
diff --git a/sys/arm/xscale/i8134x/std.crb b/sys/arm/xscale/i8134x/std.crb
index fe80ffb1c02e5..24cc7e67c58f2 100644
--- a/sys/arm/xscale/i8134x/std.crb
+++ b/sys/arm/xscale/i8134x/std.crb
@@ -1,5 +1,5 @@
 #CRB board configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i8134x/std.crb,v 1.1 2007/07/27 14:50:57 cognet Exp $
 include		"../xscale/i8134x/std.i81342"
 files		"../xscale/i8134x/files.crb"
 makeoptions	KERNPHYSADDR=0x00200000
diff --git a/sys/arm/xscale/i8134x/std.i81342 b/sys/arm/xscale/i8134x/std.i81342
index e95af9d87bd05..e48f05e0ebe31 100644
--- a/sys/arm/xscale/i8134x/std.i81342
+++ b/sys/arm/xscale/i8134x/std.i81342
@@ -1,5 +1,5 @@
 #XScale i81342 generic configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/i8134x/std.i81342,v 1.1 2007/07/27 14:50:57 cognet Exp $
 files		"../xscale/i8134x/files.i81342"
 include		"../xscale/std.xscale"
 cpu 		CPU_XSCALE_81342
diff --git a/sys/arm/xscale/i8134x/uart_bus_i81342.c b/sys/arm/xscale/i8134x/uart_bus_i81342.c
index fc99d07cf6e8c..86afa4ed33fba 100644
--- a/sys/arm/xscale/i8134x/uart_bus_i81342.c
+++ b/sys/arm/xscale/i8134x/uart_bus_i81342.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/uart_bus_i81342.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/i8134x/uart_cpu_i81342.c b/sys/arm/xscale/i8134x/uart_cpu_i81342.c
index 02e7050f78fc2..3f3f285732b31 100644
--- a/sys/arm/xscale/i8134x/uart_cpu_i81342.c
+++ b/sys/arm/xscale/i8134x/uart_cpu_i81342.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/uart_cpu_i81342.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/avila_ata.c b/sys/arm/xscale/ixp425/avila_ata.c
index 31e3a85a16728..a8c4189784b76 100644
--- a/sys/arm/xscale/ixp425/avila_ata.c
+++ b/sys/arm/xscale/ixp425/avila_ata.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $");
 
 /*
  * Compact Flash Support for the Avila Gateworks XScale boards.
diff --git a/sys/arm/xscale/ixp425/avila_led.c b/sys/arm/xscale/ixp425/avila_led.c
index 24930769a2522..3352921ee2cd1 100644
--- a/sys/arm/xscale/ixp425/avila_led.c
+++ b/sys/arm/xscale/ixp425/avila_led.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_led.c,v 1.1 2006/11/22 12:57:17 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c
index 71d7f714c730e..78d371cadffb1 100644
--- a/sys/arm/xscale/ixp425/avila_machdep.c
+++ b/sys/arm/xscale/ixp425/avila_machdep.c
@@ -49,7 +49,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.5.4.1 2008/01/19 18:15:03 kib Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/ixp425/files.avila b/sys/arm/xscale/ixp425/files.avila
index 50910ce6ab21c..05d6e975d5840 100644
--- a/sys/arm/xscale/ixp425/files.avila
+++ b/sys/arm/xscale/ixp425/files.avila
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.avila,v 1.2 2006/11/22 12:57:17 kevlo Exp $
 arm/xscale/ixp425/avila_machdep.c	standard
 arm/xscale/ixp425/avila_ata.c		optional avila_ata
 arm/xscale/ixp425/avila_led.c		optional avila_led
diff --git a/sys/arm/xscale/ixp425/files.ixp425 b/sys/arm/xscale/ixp425/files.ixp425
index c187832112b7b..3c675674d450b 100644
--- a/sys/arm/xscale/ixp425/files.ixp425
+++ b/sys/arm/xscale/ixp425/files.ixp425
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.4 2007/09/27 22:39:49 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
 arm/xscale/ixp425/ixp425.c		standard
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index 3b797df02891b..447def69b0ed8 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
diff --git a/sys/arm/xscale/ixp425/if_npereg.h b/sys/arm/xscale/ixp425/if_npereg.h
index d41905d8840b4..31f4b8ef7f5c4 100644
--- a/sys/arm/xscale/ixp425/if_npereg.h
+++ b/sys/arm/xscale/ixp425/if_npereg.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/if_npereg.h,v 1.1 2006/11/19 23:55:23 sam Exp $
  */
 
 /*
diff --git a/sys/arm/xscale/ixp425/ixdp425_pci.c b/sys/arm/xscale/ixp425/ixdp425_pci.c
index 7504baa59fea0..a81e84da3786d 100644
--- a/sys/arm/xscale/ixp425/ixdp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixdp425_pci.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixdp425_pci.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/ixp425/ixdp425reg.h b/sys/arm/xscale/ixp425/ixdp425reg.h
index d9f29bfec337a..0cb0f3d28b2ce 100644
--- a/sys/arm/xscale/ixp425/ixdp425reg.h
+++ b/sys/arm/xscale/ixp425/ixdp425reg.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/xscale/ixp425/ixdp425reg.h,v 1.2 2006/11/30 06:30:01 kevlo Exp $ */
 #ifndef	_IXDP425REG_H_
 #define	_IXDP425REG_H_
 /* GPIOs */
diff --git a/sys/arm/xscale/ixp425/ixp425.c b/sys/arm/xscale/ixp425/ixp425.c
index afac2285bc521..8d74765b9b418 100644
--- a/sys/arm/xscale/ixp425/ixp425.c
+++ b/sys/arm/xscale/ixp425/ixp425.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_a4x_io.S b/sys/arm/xscale/ixp425/ixp425_a4x_io.S
index 22ab1b3479b42..cf1f752c630f2 100644
--- a/sys/arm/xscale/ixp425/ixp425_a4x_io.S
+++ b/sys/arm/xscale/ixp425/ixp425_a4x_io.S
@@ -43,7 +43,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_a4x_io.S,v 1.1 2006/11/19 23:55:23 sam Exp $");
 
 /*
  * bus_space I/O functions with offset*4
diff --git a/sys/arm/xscale/ixp425/ixp425_a4x_space.c b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
index 1a6e28fd50eab..aef514ab788fa 100644
--- a/sys/arm/xscale/ixp425/ixp425_a4x_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_a4x_space.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_iic.c b/sys/arm/xscale/ixp425/ixp425_iic.c
index 9f8e35dd07d62..c15be640d4e50 100644
--- a/sys/arm/xscale/ixp425/ixp425_iic.c
+++ b/sys/arm/xscale/ixp425/ixp425_iic.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_intr.h b/sys/arm/xscale/ixp425/ixp425_intr.h
index 27217f4675024..147789bdb1c4a 100644
--- a/sys/arm/xscale/ixp425/ixp425_intr.h
+++ b/sys/arm/xscale/ixp425/ixp425_intr.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_intr.h,v 1.1 2006/11/19 23:55:23 sam Exp $
  *
  */
 
diff --git a/sys/arm/xscale/ixp425/ixp425_mem.c b/sys/arm/xscale/ixp425/ixp425_mem.c
index 7312d0fcb4c3b..db5fd529ddfe7 100644
--- a/sys/arm/xscale/ixp425/ixp425_mem.c
+++ b/sys/arm/xscale/ixp425/ixp425_mem.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_mem.c,v 1.2 2007/01/26 01:37:32 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_npe.c b/sys/arm/xscale/ixp425/ixp425_npe.c
index a35a4ad2bcbfc..acb0c1ae44f35 100644
--- a/sys/arm/xscale/ixp425/ixp425_npe.c
+++ b/sys/arm/xscale/ixp425/ixp425_npe.c
@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.8 2007/09/27 22:39:49 cognet Exp $");
 
 /*
  * Intel XScale Network Processing Engine (NPE) support.
diff --git a/sys/arm/xscale/ixp425/ixp425_npereg.h b/sys/arm/xscale/ixp425/ixp425_npereg.h
index b3e684cbbe082..2ac370681532a 100644
--- a/sys/arm/xscale/ixp425/ixp425_npereg.h
+++ b/sys/arm/xscale/ixp425/ixp425_npereg.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npereg.h,v 1.1 2006/11/19 23:55:23 sam Exp $
  */
 
 /*-
diff --git a/sys/arm/xscale/ixp425/ixp425_npevar.h b/sys/arm/xscale/ixp425/ixp425_npevar.h
index 6d365fcb10014..ebeab15bc0d7b 100644
--- a/sys/arm/xscale/ixp425/ixp425_npevar.h
+++ b/sys/arm/xscale/ixp425/ixp425_npevar.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.4 2007/09/27 22:39:49 cognet Exp $
  */
 
 #ifndef _IXP425_NPEVAR_H_
diff --git a/sys/arm/xscale/ixp425/ixp425_pci.c b/sys/arm/xscale/ixp425/ixp425_pci.c
index aa40b90bc1e4d..b3e065a327305 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_pci_asm.S b/sys/arm/xscale/ixp425/ixp425_pci_asm.S
index f686d6577f09b..cf49277109952 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci_asm.S
+++ b/sys/arm/xscale/ixp425/ixp425_pci_asm.S
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci_asm.S,v 1.1 2006/11/19 23:55:23 sam Exp $
  *
  */
 
diff --git a/sys/arm/xscale/ixp425/ixp425_pci_space.c b/sys/arm/xscale/ixp425/ixp425_pci_space.c
index 6ee2a1d331800..720c08d2515cb 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci_space.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci_space.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 
 /*
  * bus_space PCI functions for ixp425
diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.c b/sys/arm/xscale/ixp425/ixp425_qmgr.c
index 655acd95d4d84..394b83285900d 100644
--- a/sys/arm/xscale/ixp425/ixp425_qmgr.c
+++ b/sys/arm/xscale/ixp425/ixp425_qmgr.c
@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.2 2007/02/25 22:17:54 cognet Exp $");
 
 /*
  * Intel XScale Queue Manager support.
diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.h b/sys/arm/xscale/ixp425/ixp425_qmgr.h
index af021d553990d..654013053f9b0 100644
--- a/sys/arm/xscale/ixp425/ixp425_qmgr.h
+++ b/sys/arm/xscale/ixp425/ixp425_qmgr.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $
  */
 
 /*-
diff --git a/sys/arm/xscale/ixp425/ixp425_space.c b/sys/arm/xscale/ixp425/ixp425_space.c
index 816ff50556809..11759f494fc75 100644
--- a/sys/arm/xscale/ixp425/ixp425_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_space.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_space.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 
 /*
  * bus_space I/O functions for ixp425
diff --git a/sys/arm/xscale/ixp425/ixp425_timer.c b/sys/arm/xscale/ixp425/ixp425_timer.c
index e7717d0077fd5..693c55d6cb333 100644
--- a/sys/arm/xscale/ixp425/ixp425_timer.c
+++ b/sys/arm/xscale/ixp425/ixp425_timer.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_timer.c,v 1.2 2007/02/23 12:18:28 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_wdog.c b/sys/arm/xscale/ixp425/ixp425_wdog.c
index 9db9cce625bd5..84d6996e460ef 100644
--- a/sys/arm/xscale/ixp425/ixp425_wdog.c
+++ b/sys/arm/xscale/ixp425/ixp425_wdog.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.2 2007/03/27 21:03:36 n_hibma Exp $");
 
 /*
  * IXP425 Watchdog Timer Support.
diff --git a/sys/arm/xscale/ixp425/ixp425reg.h b/sys/arm/xscale/ixp425/ixp425reg.h
index c7b72064863c5..01e68fefaee36 100644
--- a/sys/arm/xscale/ixp425/ixp425reg.h
+++ b/sys/arm/xscale/ixp425/ixp425reg.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.2 2007/03/14 19:03:07 jhay Exp $
  *
  */
 
diff --git a/sys/arm/xscale/ixp425/ixp425var.h b/sys/arm/xscale/ixp425/ixp425var.h
index 7503741a3fcb7..011bc30663ea7 100644
--- a/sys/arm/xscale/ixp425/ixp425var.h
+++ b/sys/arm/xscale/ixp425/ixp425var.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $
  *
  */
 
diff --git a/sys/arm/xscale/ixp425/std.avila b/sys/arm/xscale/ixp425/std.avila
index b69a65ebfa49e..f52425cc6e4c4 100644
--- a/sys/arm/xscale/ixp425/std.avila
+++ b/sys/arm/xscale/ixp425/std.avila
@@ -1,5 +1,5 @@
 #GW2348-4 board configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/std.avila,v 1.1 2006/11/19 23:55:23 sam Exp $
 include		"../xscale/ixp425/std.ixp425"
 files		"../xscale/ixp425/files.avila"
 makeoptions	KERNPHYSADDR=0x10200000
diff --git a/sys/arm/xscale/ixp425/std.ixp425 b/sys/arm/xscale/ixp425/std.ixp425
index 69cc2a148965e..4079460fea3f3 100644
--- a/sys/arm/xscale/ixp425/std.ixp425
+++ b/sys/arm/xscale/ixp425/std.ixp425
@@ -1,5 +1,5 @@
 #XScale IXP425 generic configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/std.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $
 files		"../xscale/ixp425/files.ixp425"
 include		"../xscale/std.xscale"
 cpu 		CPU_XSCALE_IXP425
diff --git a/sys/arm/xscale/ixp425/uart_bus_ixp425.c b/sys/arm/xscale/ixp425/uart_bus_ixp425.c
index 2204f4437c31a..5e459cd97f30a 100644
--- a/sys/arm/xscale/ixp425/uart_bus_ixp425.c
+++ b/sys/arm/xscale/ixp425/uart_bus_ixp425.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/ixp425/uart_cpu_ixp425.c b/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
index a375d5615b8d0..d803bf76a11df 100644
--- a/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
+++ b/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arm/xscale/std.xscale b/sys/arm/xscale/std.xscale
index 48c588f8833f2..a9b26e347d237 100644
--- a/sys/arm/xscale/std.xscale
+++ b/sys/arm/xscale/std.xscale
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/arm/xscale/std.xscale,v 1.1 2005/02/26 18:59:01 cognet Exp $
 options		ARM_CACHE_LOCK_ENABLE
diff --git a/sys/arm/xscale/xscalereg.h b/sys/arm/xscale/xscalereg.h
index 85e64d194cdcf..8e1480de06265 100644
--- a/sys/arm/xscale/xscalereg.h
+++ b/sys/arm/xscale/xscalereg.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/xscalereg.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  */
 
 #ifndef _ARM_XSCALE_XSCALEREG_H_ 
diff --git a/sys/arm/xscale/xscalevar.h b/sys/arm/xscale/xscalevar.h
index 32a510ff458fb..e1c03b728ffaa 100644
--- a/sys/arm/xscale/xscalevar.h
+++ b/sys/arm/xscale/xscalevar.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/xscalevar.h,v 1.2 2005/01/05 21:58:49 imp Exp $
  *
  */
 
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 8d8ffeda6a4c5..b72f6d7c82652 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/boot/README b/sys/boot/README
index 22faea26b80c8..95ae40c23c104 100644
--- a/sys/boot/README
+++ b/sys/boot/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/README,v 1.4 2005/01/05 22:16:10 imp Exp $
 
        README file, for the boot config file setup.  This is meant
        to explain how to manage the loader configuration process.
diff --git a/sys/boot/arm/Makefile b/sys/boot/arm/Makefile
index 4dfb082ac3516..acd6c350b452c 100644
--- a/sys/boot/arm/Makefile
+++ b/sys/boot/arm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $
 
 SUBDIR=
 
diff --git a/sys/boot/arm/at91/Makefile b/sys/boot/arm/at91/Makefile
index 266c0ad567ea2..6e85ea0c48773 100644
--- a/sys/boot/arm/at91/Makefile
+++ b/sys/boot/arm/at91/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.3 2006/11/09 20:45:21 imp Exp $
 
 SUBDIR=		libat91 boot0 boot0iic boot0spi boot2 bootiic bootspi
 
diff --git a/sys/boot/arm/at91/Makefile.inc b/sys/boot/arm/at91/Makefile.inc
index 403fad0eb708f..d0fafab6ca2e2 100644
--- a/sys/boot/arm/at91/Makefile.inc
+++ b/sys/boot/arm/at91/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.7 2007/07/13 14:27:04 imp Exp $
 
 .if !target(__at91_boot_Makefile.inc__)
 .PATH:	${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm
diff --git a/sys/boot/arm/at91/boot0/Makefile b/sys/boot/arm/at91/boot0/Makefile
index a13a620bba49d..4775835d83b8a 100644
--- a/sys/boot/arm/at91/boot0/Makefile
+++ b/sys/boot/arm/at91/boot0/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.5 2006/11/16 00:53:27 imp Exp $
 
 .PATH:	${.CURDIR}/../libat91
 
diff --git a/sys/boot/arm/at91/boot0/README b/sys/boot/arm/at91/boot0/README
index 1d617d6fd8123..a56fedc0f188a 100644
--- a/sys/boot/arm/at91/boot0/README
+++ b/sys/boot/arm/at91/boot0/README
@@ -4,4 +4,4 @@ of the booting process (or the recovery program) and jump to it.  It loads
 the program at a 1MB offset into SDRAM.  Programs are expected to be
 smaller than this and copy themselves to the right location.
 
-$FreeBSD$
+$FreeBSD: src/sys/boot/arm/at91/boot0/README,v 1.1 2006/04/12 21:22:44 imp Exp $
diff --git a/sys/boot/arm/at91/boot0/linker.cfg b/sys/boot/arm/at91/boot0/linker.cfg
index 8e2c96be1a81e..1cfffa6fb9893 100644
--- a/sys/boot/arm/at91/boot0/linker.cfg
+++ b/sys/boot/arm/at91/boot0/linker.cfg
@@ -18,7 +18,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/boot0/linker.cfg,v 1.1 2006/04/12 21:22:44 imp Exp $
  ******************************************************************************/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
 	      "elf32-littlearm")
diff --git a/sys/boot/arm/at91/boot0/main.c b/sys/boot/arm/at91/boot0/main.c
index 4bc7fc6ea90ac..84d3ebe63d253 100644
--- a/sys/boot/arm/at91/boot0/main.c
+++ b/sys/boot/arm/at91/boot0/main.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.4 2006/04/21 07:45:57 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/boot0iic/Makefile b/sys/boot/arm/at91/boot0iic/Makefile
index 44f447088398f..f7cb447072586 100644
--- a/sys/boot/arm/at91/boot0iic/Makefile
+++ b/sys/boot/arm/at91/boot0iic/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.3 2006/11/16 00:53:27 imp Exp $
 
 .PATH:	${.CURDIR}/../libat91
 
diff --git a/sys/boot/arm/at91/boot0iic/main.c b/sys/boot/arm/at91/boot0iic/main.c
index 7d0e9d319e78d..08097385237ba 100644
--- a/sys/boot/arm/at91/boot0iic/main.c
+++ b/sys/boot/arm/at91/boot0iic/main.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.4 2006/11/16 00:49:50 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/boot0spi/Makefile b/sys/boot/arm/at91/boot0spi/Makefile
index eb6c5b52f5931..bdc8bbdc6209e 100644
--- a/sys/boot/arm/at91/boot0spi/Makefile
+++ b/sys/boot/arm/at91/boot0spi/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.3 2006/11/16 00:53:27 imp Exp $
 
 .PATH:	${.CURDIR}/../libat91
 
diff --git a/sys/boot/arm/at91/boot0spi/main.c b/sys/boot/arm/at91/boot0spi/main.c
index 9f1a2729beff6..17b7cff7e52f3 100644
--- a/sys/boot/arm/at91/boot0spi/main.c
+++ b/sys/boot/arm/at91/boot0spi/main.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.5 2006/12/20 17:50:02 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/boot2/Makefile b/sys/boot/arm/at91/boot2/Makefile
index 82054259baecc..a4962d96b9f0f 100644
--- a/sys/boot/arm/at91/boot2/Makefile
+++ b/sys/boot/arm/at91/boot2/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/boot2/Makefile,v 1.3 2006/11/16 00:48:04 imp Exp $
 
 .PATH: ${.CURDIR}/../libat91 ${.CURDIR}/../bootspi
 
diff --git a/sys/boot/arm/at91/boot2/board.h b/sys/boot/arm/at91/boot2/board.h
index 823d871f9e71f..7e982fe9325d8 100644
--- a/sys/boot/arm/at91/boot2/board.h
+++ b/sys/boot/arm/at91/boot2/board.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.2 2007/07/13 14:27:04 imp Exp $
  */
 
 void Update(void);
diff --git a/sys/boot/arm/at91/boot2/boot2.c b/sys/boot/arm/at91/boot2/boot2.c
index fb2bcfe395000..dfd9508fb4167 100644
--- a/sys/boot/arm/at91/boot2/boot2.c
+++ b/sys/boot/arm/at91/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.7.2.1 2007/11/08 21:31:38 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sys/boot/arm/at91/boot2/bwct_board.c b/sys/boot/arm/at91/boot2/bwct_board.c
index 2a7940e1e2fcc..92459497fb4de 100644
--- a/sys/boot/arm/at91/boot2/bwct_board.c
+++ b/sys/boot/arm/at91/boot2/bwct_board.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/bwct_board.c,v 1.1 2007/07/13 14:27:04 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/boot/arm/at91/boot2/centipad_board.c b/sys/boot/arm/at91/boot2/centipad_board.c
index 17b46b5a9e2c8..9d7cd7fa15f58 100644
--- a/sys/boot/arm/at91/boot2/centipad_board.c
+++ b/sys/boot/arm/at91/boot2/centipad_board.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/centipad_board.c,v 1.1 2007/07/13 14:27:04 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/boot/arm/at91/boot2/kb920x_board.c b/sys/boot/arm/at91/boot2/kb920x_board.c
index b097215d8827e..ca13d027fba8e 100644
--- a/sys/boot/arm/at91/boot2/kb920x_board.c
+++ b/sys/boot/arm/at91/boot2/kb920x_board.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/boot/arm/at91/bootiic/Makefile b/sys/boot/arm/at91/bootiic/Makefile
index 3983d2ba45b5d..18e1b9c16d6d7 100644
--- a/sys/boot/arm/at91/bootiic/Makefile
+++ b/sys/boot/arm/at91/bootiic/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/bootiic/Makefile,v 1.5 2006/11/16 00:53:27 imp Exp $
 
 .PATH:	${.CURDIR}/../libat91
 
diff --git a/sys/boot/arm/at91/bootiic/README b/sys/boot/arm/at91/bootiic/README
index 1489d7c09c94f..a9fb4d9d4b99c 100644
--- a/sys/boot/arm/at91/bootiic/README
+++ b/sys/boot/arm/at91/bootiic/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/arm/at91/bootiic/README,v 1.1 2006/04/19 17:16:48 imp Exp $
 
 This image is intended to be programmed into boot EEPROM.  The image is nearly
 0x4000 so it will not fit in KB9200's 0x2000.  It is intended for KB9201 or
diff --git a/sys/boot/arm/at91/bootiic/env_vars.c b/sys/boot/arm/at91/bootiic/env_vars.c
index f402a43f2aaae..89d62d6a2e301 100644
--- a/sys/boot/arm/at91/bootiic/env_vars.c
+++ b/sys/boot/arm/at91/bootiic/env_vars.c
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootiic/env_vars.c,v 1.2 2006/10/21 22:43:39 imp Exp $
  *****************************************************************************/
 
 #include "env_vars.h"
diff --git a/sys/boot/arm/at91/bootiic/env_vars.h b/sys/boot/arm/at91/bootiic/env_vars.h
index c6e46b4e43324..fb74880977637 100644
--- a/sys/boot/arm/at91/bootiic/env_vars.h
+++ b/sys/boot/arm/at91/bootiic/env_vars.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootiic/env_vars.h,v 1.1 2006/08/10 19:55:52 imp Exp $
  *****************************************************************************/
 
 #ifndef _ENV_VARS_H_
diff --git a/sys/boot/arm/at91/bootiic/loader_prompt.c b/sys/boot/arm/at91/bootiic/loader_prompt.c
index 29413b8e6ce08..dead6919972f9 100644
--- a/sys/boot/arm/at91/bootiic/loader_prompt.c
+++ b/sys/boot/arm/at91/bootiic/loader_prompt.c
@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.3 2006/10/21 22:43:39 imp Exp $
  *****************************************************************************/
 
 #include "at91rm9200_lowlevel.h"
diff --git a/sys/boot/arm/at91/bootiic/loader_prompt.h b/sys/boot/arm/at91/bootiic/loader_prompt.h
index 02233405f96aa..5a53ce2e933fd 100644
--- a/sys/boot/arm/at91/bootiic/loader_prompt.h
+++ b/sys/boot/arm/at91/bootiic/loader_prompt.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.h,v 1.1 2006/08/10 19:55:52 imp Exp $
  *****************************************************************************/
 
 #ifndef _LOADER_PROMPT_H_
diff --git a/sys/boot/arm/at91/bootiic/main.c b/sys/boot/arm/at91/bootiic/main.c
index b2b6e39041e50..1bc66fe847aff 100644
--- a/sys/boot/arm/at91/bootiic/main.c
+++ b/sys/boot/arm/at91/bootiic/main.c
@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootiic/main.c,v 1.3 2006/08/10 19:55:52 imp Exp $
  ******************************************************************************/
 
 #include "env_vars.h"
diff --git a/sys/boot/arm/at91/bootspi/Makefile b/sys/boot/arm/at91/bootspi/Makefile
index bd7217dd8ec66..0397dba5ce669 100644
--- a/sys/boot/arm/at91/bootspi/Makefile
+++ b/sys/boot/arm/at91/bootspi/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.6 2006/11/16 00:53:27 imp Exp $
 
 .PATH:	${.CURDIR}/../libat91
 
diff --git a/sys/boot/arm/at91/bootspi/README b/sys/boot/arm/at91/bootspi/README
index 9a4ffa882440f..c766ca7a54c85 100644
--- a/sys/boot/arm/at91/bootspi/README
+++ b/sys/boot/arm/at91/bootspi/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/arm/at91/bootspi/README,v 1.1 2006/04/19 17:16:48 imp Exp $
 
 This image is intended to be programmed into boot EEPROM.  The image is nearly
 0x4000 so it will not fit in KB9200's 0x2000.  It is intended for KB9201 or
diff --git a/sys/boot/arm/at91/bootspi/ee.c b/sys/boot/arm/at91/bootspi/ee.c
index 62a02d98edfdd..ee844120cb5ba 100644
--- a/sys/boot/arm/at91/bootspi/ee.c
+++ b/sys/boot/arm/at91/bootspi/ee.c
@@ -18,7 +18,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/ee.c,v 1.1 2006/10/21 22:51:21 imp Exp $
  *****************************************************************************/
 
 #include "at91rm9200_lowlevel.h"
diff --git a/sys/boot/arm/at91/bootspi/ee.h b/sys/boot/arm/at91/bootspi/ee.h
index d4d8b8dc6f896..2d2eb289767df 100644
--- a/sys/boot/arm/at91/bootspi/ee.h
+++ b/sys/boot/arm/at91/bootspi/ee.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/arm/at91/bootspi/ee.h,v 1.1 2006/10/21 22:51:21 imp Exp $ */
 
 void EEInit(void);
 void EERead(unsigned ee_off, char *data_addr, unsigned size);
diff --git a/sys/boot/arm/at91/bootspi/env_vars.c b/sys/boot/arm/at91/bootspi/env_vars.c
index 7ab250e5d7053..e68ce6df07c14 100644
--- a/sys/boot/arm/at91/bootspi/env_vars.c
+++ b/sys/boot/arm/at91/bootspi/env_vars.c
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/env_vars.c,v 1.2 2006/10/21 22:44:26 imp Exp $
  *****************************************************************************/
 
 #include "env_vars.h"
diff --git a/sys/boot/arm/at91/bootspi/env_vars.h b/sys/boot/arm/at91/bootspi/env_vars.h
index c6e46b4e43324..499be38387780 100644
--- a/sys/boot/arm/at91/bootspi/env_vars.h
+++ b/sys/boot/arm/at91/bootspi/env_vars.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/env_vars.h,v 1.1 2006/08/16 23:39:58 imp Exp $
  *****************************************************************************/
 
 #ifndef _ENV_VARS_H_
diff --git a/sys/boot/arm/at91/bootspi/loader_prompt.c b/sys/boot/arm/at91/bootspi/loader_prompt.c
index 63bc50e536ec3..4790dbbbb518c 100644
--- a/sys/boot/arm/at91/bootspi/loader_prompt.c
+++ b/sys/boot/arm/at91/bootspi/loader_prompt.c
@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.c,v 1.4 2007/03/15 03:31:48 imp Exp $
  *****************************************************************************/
 
 #include "at91rm9200_lowlevel.h"
diff --git a/sys/boot/arm/at91/bootspi/loader_prompt.h b/sys/boot/arm/at91/bootspi/loader_prompt.h
index 70d7514391e5c..6f6382906ee98 100644
--- a/sys/boot/arm/at91/bootspi/loader_prompt.h
+++ b/sys/boot/arm/at91/bootspi/loader_prompt.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.h,v 1.1 2006/08/16 23:39:58 imp Exp $
  *****************************************************************************/
 
 #ifndef _LOADER_PROMPT_H_
diff --git a/sys/boot/arm/at91/bootspi/main.c b/sys/boot/arm/at91/bootspi/main.c
index c15dabc636f56..22a95ab98bdde 100644
--- a/sys/boot/arm/at91/bootspi/main.c
+++ b/sys/boot/arm/at91/bootspi/main.c
@@ -31,7 +31,7 @@
  * owners.  This software is not copyrighted and is intended for reference
  * only.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.3 2006/10/21 22:44:26 imp Exp $
  */
 
 #include "env_vars.h"
diff --git a/sys/boot/arm/at91/libat91/Makefile b/sys/boot/arm/at91/libat91/Makefile
index 08585fd578029..092fa13416376 100644
--- a/sys/boot/arm/at91/libat91/Makefile
+++ b/sys/boot/arm/at91/libat91/Makefile
@@ -1,4 +1,4 @@
-#  $FreeBSD$
+#  $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.10 2007/08/09 05:16:55 imp Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/sys/boot/arm/at91/libat91/arm_init.S b/sys/boot/arm/at91/libat91/arm_init.S
index a15fb540e9cc4..77cc1884693d8 100644
--- a/sys/boot/arm/at91/libat91/arm_init.S
+++ b/sys/boot/arm/at91/libat91/arm_init.S
@@ -20,7 +20,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/arm_init.S,v 1.2 2006/12/20 18:16:49 imp Exp $
  ******************************************************************************/
 
 	.equ	TWI_EEPROM_SIZE,	0x3000
diff --git a/sys/boot/arm/at91/libat91/at91rm9200.h b/sys/boot/arm/at91/libat91/at91rm9200.h
index 4de14f28fdcab..f3c20226f0098 100644
--- a/sys/boot/arm/at91/libat91/at91rm9200.h
+++ b/sys/boot/arm/at91/libat91/at91rm9200.h
@@ -7,7 +7,7 @@
 //  fitness for any particular purpose, or against the infringements of
 //  intellectual property rights of others.
 // ----------------------------------------------------------------------------
-// $FreeBSD$
+// $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200.h,v 1.3 2006/10/20 09:12:05 imp Exp $
 //
 // File Name           : AT91RM9200.h
 // Object              : AT91RM9200 definitions
diff --git a/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c b/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c
index 77c11242b73c0..7df570fdac2a7 100644
--- a/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c
+++ b/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.6 2007/07/13 14:27:04 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h b/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h
index 9d9b12736f9cf..28674aaa1d86f 100644
--- a/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h
+++ b/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.6 2007/07/13 14:27:04 imp Exp $
  */
 
 #ifndef _AT91RM9200_LOWLEVEL_H_
diff --git a/sys/boot/arm/at91/libat91/delay.c b/sys/boot/arm/at91/libat91/delay.c
index 390e06790c3c7..84cb2f9b6db5f 100644
--- a/sys/boot/arm/at91/libat91/delay.c
+++ b/sys/boot/arm/at91/libat91/delay.c
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/delay.c,v 1.1 2006/08/16 23:39:58 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/eeprom.c b/sys/boot/arm/at91/libat91/eeprom.c
index 8af411ba31fe6..6169471391572 100644
--- a/sys/boot/arm/at91/libat91/eeprom.c
+++ b/sys/boot/arm/at91/libat91/eeprom.c
@@ -18,7 +18,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/eeprom.c,v 1.3 2006/12/20 18:19:52 imp Exp $
  *****************************************************************************/
 
 #include "at91rm9200_lowlevel.h"
diff --git a/sys/boot/arm/at91/libat91/emac.c b/sys/boot/arm/at91/libat91/emac.c
index b72e5c1f64666..73338134af329 100644
--- a/sys/boot/arm/at91/libat91/emac.c
+++ b/sys/boot/arm/at91/libat91/emac.c
@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.8 2007/07/13 14:27:04 imp Exp $
  ******************************************************************************/
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/emac.h b/sys/boot/arm/at91/libat91/emac.h
index fea08f8efc564..2e7f20b307380 100644
--- a/sys/boot/arm/at91/libat91/emac.h
+++ b/sys/boot/arm/at91/libat91/emac.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.6 2007/07/13 14:27:05 imp Exp $
  *****************************************************************************/
 
 
diff --git a/sys/boot/arm/at91/libat91/emac_init.c b/sys/boot/arm/at91/libat91/emac_init.c
index 32f45639c595f..07cf1232b7706 100644
--- a/sys/boot/arm/at91/libat91/emac_init.c
+++ b/sys/boot/arm/at91/libat91/emac_init.c
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/emac_init.c,v 1.4 2006/12/20 18:26:37 imp Exp $
  */
 
 /******************************************************************************
diff --git a/sys/boot/arm/at91/libat91/getc.c b/sys/boot/arm/at91/libat91/getc.c
index 59e27a40e8904..fc3b8e5999f7d 100644
--- a/sys/boot/arm/at91/libat91/getc.c
+++ b/sys/boot/arm/at91/libat91/getc.c
@@ -31,7 +31,7 @@
  * owners.  This software is not copyrighted and is intended for reference
  * only.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/getc.c,v 1.3 2007/03/28 22:40:37 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/lib.h b/sys/boot/arm/at91/libat91/lib.h
index a0ef8ecf332db..c859267fb0598 100644
--- a/sys/boot/arm/at91/libat91/lib.h
+++ b/sys/boot/arm/at91/libat91/lib.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/lib.h,v 1.4 2006/12/20 18:19:52 imp Exp $
  */
 
 #ifndef ARM_BOOT_LIB_H
diff --git a/sys/boot/arm/at91/libat91/lib_AT91RM9200.h b/sys/boot/arm/at91/libat91/lib_AT91RM9200.h
index d5a5b67255ab3..62c0d9f8ad15d 100644
--- a/sys/boot/arm/at91/libat91/lib_AT91RM9200.h
+++ b/sys/boot/arm/at91/libat91/lib_AT91RM9200.h
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h,v 1.2 2006/10/20 09:12:05 imp Exp $
  */
 
 #ifndef __LIBAT91RM9200_H
diff --git a/sys/boot/arm/at91/libat91/mci_device.h b/sys/boot/arm/at91/libat91/mci_device.h
index eeff0c9da2ed4..b7abea84282e8 100644
--- a/sys/boot/arm/at91/libat91/mci_device.h
+++ b/sys/boot/arm/at91/libat91/mci_device.h
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/mci_device.h,v 1.3 2006/11/09 20:32:36 imp Exp $
  */
 
 //*---------------------------------------------------------------------------
diff --git a/sys/boot/arm/at91/libat91/memcmp.c b/sys/boot/arm/at91/libat91/memcmp.c
index 322042f23cf29..1ec6b44989d40 100644
--- a/sys/boot/arm/at91/libat91/memcmp.c
+++ b/sys/boot/arm/at91/libat91/memcmp.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memcmp.c,v 1.3 2007/03/28 21:15:50 imp Exp $");
 
 #include "lib.h"
 
diff --git a/sys/boot/arm/at91/libat91/memcpy.c b/sys/boot/arm/at91/libat91/memcpy.c
index f7544fee64ad1..f3fc1137aef53 100644
--- a/sys/boot/arm/at91/libat91/memcpy.c
+++ b/sys/boot/arm/at91/libat91/memcpy.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memcpy.c,v 1.2 2006/11/09 20:32:36 imp Exp $");
 
 #include "lib.h"
 
diff --git a/sys/boot/arm/at91/libat91/memset.c b/sys/boot/arm/at91/libat91/memset.c
index 3432e640cd437..aa61fe92df60e 100644
--- a/sys/boot/arm/at91/libat91/memset.c
+++ b/sys/boot/arm/at91/libat91/memset.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/memset.c,v 1.2 2006/11/09 20:32:36 imp Exp $");
 
 #include "lib.h"
 
diff --git a/sys/boot/arm/at91/libat91/p_string.c b/sys/boot/arm/at91/libat91/p_string.c
index 8e7bbabb8c2c3..4a69c07da3f79 100644
--- a/sys/boot/arm/at91/libat91/p_string.c
+++ b/sys/boot/arm/at91/libat91/p_string.c
@@ -20,7 +20,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/p_string.c,v 1.3 2006/10/20 09:12:05 imp Exp $
  *****************************************************************************/
 
 #include "lib.h"
diff --git a/sys/boot/arm/at91/libat91/printf.c b/sys/boot/arm/at91/libat91/printf.c
index f2622b859057d..7bab16159aacc 100644
--- a/sys/boot/arm/at91/libat91/printf.c
+++ b/sys/boot/arm/at91/libat91/printf.c
@@ -14,7 +14,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/printf.c,v 1.2 2006/10/20 09:12:05 imp Exp $
  */
 
 #include <stdarg.h>
diff --git a/sys/boot/arm/at91/libat91/putchar.c b/sys/boot/arm/at91/libat91/putchar.c
index 2b805c98c29b9..a78b224b40223 100644
--- a/sys/boot/arm/at91/libat91/putchar.c
+++ b/sys/boot/arm/at91/libat91/putchar.c
@@ -31,7 +31,7 @@
  * owners.  This software is not copyrighted and is intended for reference
  * only.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/putchar.c,v 1.2 2006/10/20 09:12:05 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/reset.c b/sys/boot/arm/at91/libat91/reset.c
index b1f083a6e72cd..2d044c41aa92e 100644
--- a/sys/boot/arm/at91/libat91/reset.c
+++ b/sys/boot/arm/at91/libat91/reset.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/reset.c,v 1.1 2006/08/16 23:39:58 imp Exp $
  */
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/sd-card.c b/sys/boot/arm/at91/libat91/sd-card.c
index d0b7bebda9c57..feded1dd71527 100644
--- a/sys/boot/arm/at91/libat91/sd-card.c
+++ b/sys/boot/arm/at91/libat91/sd-card.c
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/sd-card.c,v 1.4 2007/03/28 22:31:32 imp Exp $
  */
 
 //*----------------------------------------------------------------------------
diff --git a/sys/boot/arm/at91/libat91/sd-card.h b/sys/boot/arm/at91/libat91/sd-card.h
index 0a3ce696925b2..63c95085e8050 100644
--- a/sys/boot/arm/at91/libat91/sd-card.h
+++ b/sys/boot/arm/at91/libat91/sd-card.h
@@ -24,7 +24,7 @@
  * This software is derived from software provide by Kwikbyte who specifically
  * disclaimed copyright on the code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/sd-card.h,v 1.1 2006/08/16 23:39:58 imp Exp $
  */
 
 #ifndef __SD_CARD_H
diff --git a/sys/boot/arm/at91/libat91/spi_flash.c b/sys/boot/arm/at91/libat91/spi_flash.c
index a35e79896fd19..171d45e01d902 100644
--- a/sys/boot/arm/at91/libat91/spi_flash.c
+++ b/sys/boot/arm/at91/libat91/spi_flash.c
@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/spi_flash.c,v 1.4 2007/03/28 22:38:01 imp Exp $
  *****************************************************************************/
 
 #include "at91rm9200.h"
diff --git a/sys/boot/arm/at91/libat91/spi_flash.h b/sys/boot/arm/at91/libat91/spi_flash.h
index 90247e1577b02..e7c7dc5043296 100644
--- a/sys/boot/arm/at91/libat91/spi_flash.h
+++ b/sys/boot/arm/at91/libat91/spi_flash.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/spi_flash.h,v 1.2 2006/12/20 18:25:16 imp Exp $
  ******************************************************************************/
 
 #ifndef _SPI_FLASH_H_
diff --git a/sys/boot/arm/at91/libat91/strcmp.c b/sys/boot/arm/at91/libat91/strcmp.c
index de1d9e0c1e0bc..8b17129224878 100644
--- a/sys/boot/arm/at91/libat91/strcmp.c
+++ b/sys/boot/arm/at91/libat91/strcmp.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strcmp.c,v 1.2 2006/11/09 20:32:36 imp Exp $");
 
 #include "lib.h"
 
diff --git a/sys/boot/arm/at91/libat91/strcpy.c b/sys/boot/arm/at91/libat91/strcpy.c
index 0bdd3a596dd49..afeb1d1994510 100644
--- a/sys/boot/arm/at91/libat91/strcpy.c
+++ b/sys/boot/arm/at91/libat91/strcpy.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strcpy.c,v 1.2 2006/11/09 20:32:36 imp Exp $");
 
 #include "lib.h"
 
diff --git a/sys/boot/arm/at91/libat91/strcvt.c b/sys/boot/arm/at91/libat91/strcvt.c
index 64442cc91bd36..6d93092829a28 100644
--- a/sys/boot/arm/at91/libat91/strcvt.c
+++ b/sys/boot/arm/at91/libat91/strcvt.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strcvt.c,v 1.2 2006/11/09 20:32:36 imp Exp $");
 
 /******************************************************************************
  *
diff --git a/sys/boot/arm/at91/libat91/strlen.c b/sys/boot/arm/at91/libat91/strlen.c
index 35de89262a517..0c126a7ed088d 100644
--- a/sys/boot/arm/at91/libat91/strlen.c
+++ b/sys/boot/arm/at91/libat91/strlen.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/arm/at91/libat91/strlen.c,v 1.3 2007/03/28 21:12:43 imp Exp $");
 
 /******************************************************************************
  *
diff --git a/sys/boot/arm/at91/libat91/tag_list.c b/sys/boot/arm/at91/libat91/tag_list.c
index c6a9bba823772..8e0e39a96dccb 100644
--- a/sys/boot/arm/at91/libat91/tag_list.c
+++ b/sys/boot/arm/at91/libat91/tag_list.c
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/tag_list.c,v 1.2 2006/04/21 07:19:22 imp Exp $
  *****************************************************************************/
 
 /******************************* GLOBALS *************************************/
diff --git a/sys/boot/arm/at91/libat91/tag_list.h b/sys/boot/arm/at91/libat91/tag_list.h
index f98016510d5e9..468e92a326da4 100644
--- a/sys/boot/arm/at91/libat91/tag_list.h
+++ b/sys/boot/arm/at91/libat91/tag_list.h
@@ -17,7 +17,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/tag_list.h,v 1.2 2006/04/21 07:12:12 imp Exp $
  ****************************************************************************/
 
 #ifndef _TAG_LIST_H_
diff --git a/sys/boot/arm/at91/libat91/xmodem.c b/sys/boot/arm/at91/libat91/xmodem.c
index 0c4b1387dcb28..912f313df22c0 100644
--- a/sys/boot/arm/at91/libat91/xmodem.c
+++ b/sys/boot/arm/at91/libat91/xmodem.c
@@ -25,7 +25,7 @@
  * disclaimed copyright on the code.  This version of xmodem has been nearly
  * completely rewritten, but the CRC is from the original.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/xmodem.c,v 1.2 2006/08/10 17:54:51 imp Exp $
  */
 
 #include "lib.h"
diff --git a/sys/boot/arm/at91/linker.cfg b/sys/boot/arm/at91/linker.cfg
index 40ae7bf270aff..7177457eb5e01 100644
--- a/sys/boot/arm/at91/linker.cfg
+++ b/sys/boot/arm/at91/linker.cfg
@@ -18,7 +18,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/linker.cfg,v 1.1 2006/04/19 17:16:48 imp Exp $
  ******************************************************************************/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
 	      "elf32-littlearm")
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index 753d11227516f..5c34fad9e0701 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.23 2006/11/02 00:26:44 marcel Exp $
 
 SRCS+=	boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index c88adca6230fc..654fe91f69ad1 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.13 2004/10/03 16:34:01 stefanf Exp $");
 
 /*
  * Simple LRU block cache
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 515d0fa1f4a06..ec60f8db47738 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.31 2005/05/19 23:03:01 sobomax Exp $");
 
 /*
  * Loading modules, booting the system
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 6ecd2355188ef..2213e9966500c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.44 2006/12/18 07:35:14 kmacy Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index 0559d1558c4d7..997aec1b917a1 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.22 2004/11/13 17:04:55 ru Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index d140a96b570bd..2f7a2808bbbeb 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.8 2005/07/29 12:47:42 brian Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index b7ccbca72ea71..5f13ef53acaab 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.15 2004/07/08 22:35:33 brian Exp $");
 
 /*-
  * This module implements a "raw device" interface suitable for
diff --git a/sys/boot/common/dev_net.h b/sys/boot/common/dev_net.h
index 3b3d10728a3d3..af3329735519c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/dev_net.h,v 1.2 1999/08/28 00:39:46 peter Exp $
  */
 
 extern struct devsw netdev;
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 7526141696dcb..ab15a804838bf 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.5 2006/11/02 00:02:22 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 33f48e65e0f56..82888cdfe07a1 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.29 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * Simple commandline interpreter, toplevel and misc.
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 3cbdd5b105ea5..6847b414aba2b 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.6 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index cc66c4d26e49a..b9595163a78f1 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_forth.c,v 1.23 2003/08/25 23:30:41 obrien Exp $");
 
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
 #include <string.h>
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index 32b01c8c7aec6..2ae6d45f46f98 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_parse.c,v 1.10 2003/08/25 23:30:41 obrien Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index a8efb28c7e1b3..c98f17654edf9 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/isapnp.c,v 1.7 2003/08/25 23:30:41 obrien Exp $");
 
 /*
  * Machine-independant ISA PnP enumerator implementing a subset of the
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index 0f9956c4f183c..923acb744c134 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/common/isapnp.h,v 1.7 2002/03/20 07:59:37 alfred Exp $
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index a4c665d72ff4e..9e912562aa64c 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load.c,v 1.5 2004/08/22 08:57:05 maxim Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index bb070fd9cf0bc..876eeafc6d9d4 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.37 2006/11/02 17:52:43 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/boot/common/load_elf32.c b/sys/boot/common/load_elf32.c
index 1de5dc1fb6947..c55b9fff643b6 100644
--- a/sys/boot/common/load_elf32.c
+++ b/sys/boot/common/load_elf32.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf32.c,v 1.2 2003/08/25 23:30:41 obrien Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/load_elf32_obj.c b/sys/boot/common/load_elf32_obj.c
index fed25efafc9f7..120f9f33a8257 100644
--- a/sys/boot/common/load_elf32_obj.c
+++ b/sys/boot/common/load_elf32_obj.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf32_obj.c,v 1.1 2004/08/29 00:48:41 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/load_elf64.c b/sys/boot/common/load_elf64.c
index c29e8e3596a79..dbf28fbadbf36 100644
--- a/sys/boot/common/load_elf64.c
+++ b/sys/boot/common/load_elf64.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf64.c,v 1.2 2003/08/25 23:30:41 obrien Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/load_elf64_obj.c b/sys/boot/common/load_elf64_obj.c
index 3c9371ba01303..72b7bb90a6f80 100644
--- a/sys/boot/common/load_elf64_obj.c
+++ b/sys/boot/common/load_elf64_obj.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf64_obj.c,v 1.1 2004/08/29 00:48:41 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/load_elf_obj.c b/sys/boot/common/load_elf_obj.c
index 4b3aaeae78654..fe8eff63eb68a 100644
--- a/sys/boot/common/load_elf_obj.c
+++ b/sys/boot/common/load_elf_obj.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf_obj.c,v 1.2 2005/12/18 04:52:35 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index d7d7568e6a81d..125726b6f9aa2 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.93 2007/05/09 02:37:58 sepotvin Exp $
 .\"
 .Dd May 8, 2007
 .Dt LOADER 8
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 86f83c39a9d84..3f0c4f4c3fe2b 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/ls.c,v 1.11 2003/08/25 23:30:41 obrien Exp $");
 
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 1070f73f1fe96..309c169f8bc6a 100644
--- a/sys/boot/common/merge_help.awk
+++ b/sys/boot/common/merge_help.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.6 2006/09/28 19:06:20 jhb Exp $
 #
 # 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 f1a049194cef7..50ec67e89c78c 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/misc.c,v 1.9 2004/08/28 14:57:34 iedowse Exp $");
 
 #include <string.h>
 #include <stand.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index 682329463176e..0fc47e9a85300 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.27 2007/10/04 18:29:52 obrien Exp $");
 
 /*
  * file/module function dispatcher, support, etc.
diff --git a/sys/boot/common/newvers.sh b/sys/boot/common/newvers.sh
index fd7b0b1685c47..e2b05e4aa9fd1 100755
--- a/sys/boot/common/newvers.sh
+++ b/sys/boot/common/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $
 #	$NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index 6e4c76d0e031a..a297de33a5afa 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.8 2006/09/29 20:57:38 ru Exp $");
 
 #include <stand.h>
 #include <machine/stdarg.h>
diff --git a/sys/boot/common/pnp.c b/sys/boot/common/pnp.c
index 589926b5909c2..b49d0cb043892 100644
--- a/sys/boot/common/pnp.c
+++ b/sys/boot/common/pnp.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/pnp.c,v 1.17 2007/01/07 22:25:45 marius Exp $");
 
 /*
  * "Plug and Play" functionality.
diff --git a/sys/boot/common/reloc_elf.c b/sys/boot/common/reloc_elf.c
index 43b7cbfd51bdc..b917c50930d1f 100644
--- a/sys/boot/common/reloc_elf.c
+++ b/sys/boot/common/reloc_elf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/reloc_elf.c,v 1.2 2005/12/18 04:52:35 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/elf.h>
diff --git a/sys/boot/common/reloc_elf32.c b/sys/boot/common/reloc_elf32.c
index 03d9d73bab7ff..b5a35d669df6f 100644
--- a/sys/boot/common/reloc_elf32.c
+++ b/sys/boot/common/reloc_elf32.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/reloc_elf32.c,v 1.1 2004/08/28 23:03:05 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 32
 
diff --git a/sys/boot/common/reloc_elf64.c b/sys/boot/common/reloc_elf64.c
index c8dcf2a36b0db..df7696ebc6c6a 100644
--- a/sys/boot/common/reloc_elf64.c
+++ b/sys/boot/common/reloc_elf64.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/reloc_elf64.c,v 1.1 2004/08/28 23:03:05 iedowse Exp $");
 
 #define __ELF_WORD_SIZE 64
 
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index 2b778bd15b465..61f5f520071fe 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.14.10.1 2007/11/08 21:31:38 jhb Exp $");
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
index ce5211393c226..c27ee3d1eb13f 100644
--- a/sys/boot/efi/Makefile
+++ b/sys/boot/efi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/Makefile,v 1.2 2004/11/23 06:04:51 marcel Exp $
 
 SUBDIR=		libefi
 
diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index 2668708befb56..9617bf498cb36 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.7 2004/02/12 08:10:33 ru Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/efi/include/README b/sys/boot/efi/include/README
index bf821fae7e600..353a41924090c 100644
--- a/sys/boot/efi/include/README
+++ b/sys/boot/efi/include/README
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/README,v 1.2 2005/01/05 22:16:57 imp Exp $ */
 /*-
 
 Files in this directory and subdirectories are subject to the following
diff --git a/sys/boot/efi/include/efi.h b/sys/boot/efi/include/efi.h
index 4869e383e67ec..de1c80b06fdbc 100644
--- a/sys/boot/efi/include/efi.h
+++ b/sys/boot/efi/include/efi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.4 2006/11/02 02:42:47 marcel Exp $ */
 /*++
 
 Copyright (c)  1999 - 2002 Intel Corporation. All rights reserved
diff --git a/sys/boot/efi/include/efi_nii.h b/sys/boot/efi/include/efi_nii.h
index 5222232216404..b145a7d1010d6 100644
--- a/sys/boot/efi/include/efi_nii.h
+++ b/sys/boot/efi/include/efi_nii.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efi_nii.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_NII_H
 #define _EFI_NII_H
 
diff --git a/sys/boot/efi/include/efiapi.h b/sys/boot/efi/include/efiapi.h
index 187fe294b58e2..107754fc1183a 100644
--- a/sys/boot/efi/include/efiapi.h
+++ b/sys/boot/efi/include/efiapi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.7 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_API_H
 #define _EFI_API_H
 
diff --git a/sys/boot/efi/include/eficon.h b/sys/boot/efi/include/eficon.h
index ef4af81f77e4e..310be7c53a6d4 100644
--- a/sys/boot/efi/include/eficon.h
+++ b/sys/boot/efi/include/eficon.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/eficon.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_CON_H
 #define _EFI_CON_H
 
diff --git a/sys/boot/efi/include/efidebug.h b/sys/boot/efi/include/efidebug.h
index 5576d5f4e48cc..b7d93a64afff5 100644
--- a/sys/boot/efi/include/efidebug.h
+++ b/sys/boot/efi/include/efidebug.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efidebug.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_DEBUG_H
 #define _EFI_DEBUG_H
 
diff --git a/sys/boot/efi/include/efidef.h b/sys/boot/efi/include/efidef.h
index 2d5d7ef90403d..4f8b390ef81e5 100644
--- a/sys/boot/efi/include/efidef.h
+++ b/sys/boot/efi/include/efidef.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efidef.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_DEF_H
 #define _EFI_DEF_H
 
diff --git a/sys/boot/efi/include/efidevp.h b/sys/boot/efi/include/efidevp.h
index a332af5b6694e..a38c6dde635de 100644
--- a/sys/boot/efi/include/efidevp.h
+++ b/sys/boot/efi/include/efidevp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efidevp.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _DEVPATH_H
 #define _DEVPATH_H
 
diff --git a/sys/boot/efi/include/efierr.h b/sys/boot/efi/include/efierr.h
index dc57f0ed4333a..6eeaaa4ab4f9b 100644
--- a/sys/boot/efi/include/efierr.h
+++ b/sys/boot/efi/include/efierr.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efierr.h,v 1.2 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_ERR_H
 #define _EFI_ERR_H
 
diff --git a/sys/boot/efi/include/efifpswa.h b/sys/boot/efi/include/efifpswa.h
index 3e039ef6a26d0..5280be5264ee7 100644
--- a/sys/boot/efi/include/efifpswa.h
+++ b/sys/boot/efi/include/efifpswa.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efifpswa.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
 #ifndef _EFI_FPSWA_H
 #define _EFI_FPSWA_H
 
diff --git a/sys/boot/efi/include/efifs.h b/sys/boot/efi/include/efifs.h
index 58febb66eb751..328b465012f4b 100644
--- a/sys/boot/efi/include/efifs.h
+++ b/sys/boot/efi/include/efifs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efifs.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_FS_H
 #define _EFI_FS_H
 
diff --git a/sys/boot/efi/include/efilib.h b/sys/boot/efi/include/efilib.h
index 220e01a689768..95e47c2e62e0c 100644
--- a/sys/boot/efi/include/efilib.h
+++ b/sys/boot/efi/include/efilib.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $
  */
 
 #include <stand.h>
diff --git a/sys/boot/efi/include/efinet.h b/sys/boot/efi/include/efinet.h
index b4996d9b5cc5b..d161feae8ebad 100644
--- a/sys/boot/efi/include/efinet.h
+++ b/sys/boot/efi/include/efinet.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efinet.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFINET_H
 #define _EFINET_H
 
diff --git a/sys/boot/efi/include/efipart.h b/sys/boot/efi/include/efipart.h
index ef1a8709d91b9..7d0050bbcb66f 100644
--- a/sys/boot/efi/include/efipart.h
+++ b/sys/boot/efi/include/efipart.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efipart.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_PART_H
 #define _EFI_PART_H
 
diff --git a/sys/boot/efi/include/efiprot.h b/sys/boot/efi/include/efiprot.h
index fac4568b5b321..6d9af5583ffc9 100644
--- a/sys/boot/efi/include/efiprot.h
+++ b/sys/boot/efi/include/efiprot.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efiprot.h,v 1.4 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_PROT_H
 #define _EFI_PROT_H
 
diff --git a/sys/boot/efi/include/efipxebc.h b/sys/boot/efi/include/efipxebc.h
index 3781a67601493..3514f793ea9a3 100644
--- a/sys/boot/efi/include/efipxebc.h
+++ b/sys/boot/efi/include/efipxebc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efipxebc.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFIPXEBC_H
 #define _EFIPXEBC_H
 
diff --git a/sys/boot/efi/include/efiser.h b/sys/boot/efi/include/efiser.h
index 1f3fe4a81ba31..3229587283b80 100644
--- a/sys/boot/efi/include/efiser.h
+++ b/sys/boot/efi/include/efiser.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efiser.h,v 1.3 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFI_SER_H
 #define _EFI_SER_H
 
diff --git a/sys/boot/efi/include/efistdarg.h b/sys/boot/efi/include/efistdarg.h
index 25f5569841122..1742a64e52f14 100644
--- a/sys/boot/efi/include/efistdarg.h
+++ b/sys/boot/efi/include/efistdarg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/efistdarg.h,v 1.2 2006/11/02 02:42:47 marcel Exp $ */
 #ifndef _EFISTDARG_H_
 #define _EFISTDARG_H_
 
diff --git a/sys/boot/efi/include/i386/efibind.h b/sys/boot/efi/include/i386/efibind.h
index f28057b479768..b57ac5b2fff8a 100644
--- a/sys/boot/efi/include/i386/efibind.h
+++ b/sys/boot/efi/include/i386/efibind.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/i386/efibind.h,v 1.4 2006/11/02 02:42:47 marcel Exp $ */
 /*++
 
 Copyright (c)  1999 - 2003 Intel Corporation. All rights reserved
diff --git a/sys/boot/efi/include/i386/pe.h b/sys/boot/efi/include/i386/pe.h
index 0381a44066de2..c83b59dfabd24 100644
--- a/sys/boot/efi/include/i386/pe.h
+++ b/sys/boot/efi/include/i386/pe.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/i386/pe.h,v 1.2 2006/11/02 02:42:48 marcel Exp $ */
 /* 
     PE32+ header file
  */
diff --git a/sys/boot/efi/include/ia64/efibind.h b/sys/boot/efi/include/ia64/efibind.h
index 21f0d25d70e7f..793601c7317d1 100644
--- a/sys/boot/efi/include/ia64/efibind.h
+++ b/sys/boot/efi/include/ia64/efibind.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/ia64/efibind.h,v 1.7 2006/11/02 02:42:48 marcel Exp $ */
 /*++
 
 Copyright (c)  1999 - 2003 Intel Corporation. All rights reserved
diff --git a/sys/boot/efi/include/ia64/pe.h b/sys/boot/efi/include/ia64/pe.h
index 24480a5b3ced3..ee3257a2976d7 100644
--- a/sys/boot/efi/include/ia64/pe.h
+++ b/sys/boot/efi/include/ia64/pe.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/efi/include/ia64/pe.h,v 1.2 2006/11/02 02:42:48 marcel Exp $ */
 /* 
     PE32+ header file
  */
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 5c504a3fac81b..fdbe7091fd46b 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $
 
 LIB=	efi
 INTERNALLIB=
diff --git a/sys/boot/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c
index 723f681c52864..5674760dd0287 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/sys/boot/efi/libefi/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/delay.c,v 1.3 2003/04/03 21:36:29 obrien Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/efi_console.c b/sys/boot/efi/libefi/efi_console.c
index 3538994ac104a..4e9da226441b4 100644
--- a/sys/boot/efi/libefi/efi_console.c
+++ b/sys/boot/efi/libefi/efi_console.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.5 2004/03/09 04:00:33 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/efifs.c b/sys/boot/efi/libefi/efifs.c
index 716102cf1d049..dd26c529400a5 100644
--- a/sys/boot/efi/libefi/efifs.c
+++ b/sys/boot/efi/libefi/efifs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.10 2006/11/05 22:03:03 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/efi/libefi/efinet.c b/sys/boot/efi/libefi/efinet.c
index 1eea8606fe15a..b1ad1cdca40e8 100644
--- a/sys/boot/efi/libefi/efinet.c
+++ b/sys/boot/efi/libefi/efinet.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.7 2006/11/05 22:03:03 marcel Exp $");
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/sys/boot/efi/libefi/errno.c b/sys/boot/efi/libefi/errno.c
index fac903faf27ac..bf2a69c371e26 100644
--- a/sys/boot/efi/libefi/errno.c
+++ b/sys/boot/efi/libefi/errno.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/errno.c,v 1.1 2006/11/05 22:03:03 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/handles.c b/sys/boot/efi/libefi/handles.c
index 7c78a15f7a62b..27d7abbbdb8e4 100644
--- a/sys/boot/efi/libefi/handles.c
+++ b/sys/boot/efi/libefi/handles.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/handles.c,v 1.1 2006/11/05 22:03:03 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index 20ea48c1e5be2..28ec183226085 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/sys/boot/efi/libefi/libefi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/libefi.c,v 1.7 2006/11/03 04:19:31 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/time.c b/sys/boot/efi/libefi/time.c
index 5c39415368d79..be2c2d2ae6b9b 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/sys/boot/efi/libefi/time.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/time.c,v 1.6 2006/11/05 22:03:03 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index f8f629298f7ee..a61243fa0d75c 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.44.2.1 2007/10/18 12:08:53 nyan Exp $
 #
 .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
 BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
diff --git a/sys/boot/ficl/arm/sysdep.c b/sys/boot/ficl/arm/sysdep.c
index 00b0d4acf0e3f..db9ea4d4ef78d 100644
--- a/sys/boot/ficl/arm/sysdep.c
+++ b/sys/boot/ficl/arm/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/arm/sysdep.c,v 1.1 2006/08/18 21:41:43 imp Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/arm/sysdep.h b/sys/boot/ficl/arm/sysdep.h
index 3ae748e259c75..955a38ccf6f9e 100644
--- a/sys/boot/ficl/arm/sysdep.h
+++ b/sys/boot/ficl/arm/sysdep.h
@@ -46,7 +46,7 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
+** $FreeBSD: src/sys/boot/ficl/arm/sysdep.h,v 1.1 2006/08/18 21:41:43 imp Exp $
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/sys/boot/ficl/dict.c b/sys/boot/ficl/dict.c
index b76d92559f8fc..56937c7316ab2 100644
--- a/sys/boot/ficl/dict.c
+++ b/sys/boot/ficl/dict.c
@@ -51,7 +51,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/ficl.c b/sys/boot/ficl/ficl.c
index d4370eb1a48ac..9f8b3472ae735 100644
--- a/sys/boot/ficl/ficl.c
+++ b/sys/boot/ficl/ficl.c
@@ -55,7 +55,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ficl.c,v 1.18 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/ficl.h b/sys/boot/ficl/ficl.h
index 7892ee963d7f1..a9c0b11efcfc9 100644
--- a/sys/boot/ficl/ficl.h
+++ b/sys/boot/ficl/ficl.h
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.22 2007/03/23 22:26:01 jkim Exp $ */
 
 #if !defined (__FICL_H__)
 #define __FICL_H__
diff --git a/sys/boot/ficl/fileaccess.c b/sys/boot/ficl/fileaccess.c
index 686c72153e027..7712c737bad8f 100644
--- a/sys/boot/ficl/fileaccess.c
+++ b/sys/boot/ficl/fileaccess.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/fileaccess.c,v 1.1 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/sys/boot/ficl/float.c b/sys/boot/ficl/float.c
index d757b23648bcb..143c7d92b72f6 100644
--- a/sys/boot/ficl/float.c
+++ b/sys/boot/ficl/float.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/float.c,v 1.2 2007/03/23 22:26:01 jkim Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/sys/boot/ficl/i386/sysdep.c b/sys/boot/ficl/i386/sysdep.c
index 2a5346aa7b43a..a7523604eacb1 100644
--- a/sys/boot/ficl/i386/sysdep.c
+++ b/sys/boot/ficl/i386/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/i386/sysdep.c,v 1.7 1999/09/29 04:43:07 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/i386/sysdep.h b/sys/boot/ficl/i386/sysdep.h
index e1900e2a46591..01b959e0935cb 100644
--- a/sys/boot/ficl/i386/sysdep.h
+++ b/sys/boot/ficl/i386/sysdep.h
@@ -46,7 +46,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/i386/sysdep.h,v 1.8 2002/05/16 21:21:52 trhodes Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/ia64/sysdep.c b/sys/boot/ficl/ia64/sysdep.c
index 00b0d4acf0e3f..b018a0bbc68be 100644
--- a/sys/boot/ficl/ia64/sysdep.c
+++ b/sys/boot/ficl/ia64/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ia64/sysdep.c,v 1.1 2001/09/04 08:50:23 dfr Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/ia64/sysdep.h b/sys/boot/ficl/ia64/sysdep.h
index 08bc0e1f4d0bc..5ce8074db580b 100644
--- a/sys/boot/ficl/ia64/sysdep.h
+++ b/sys/boot/ficl/ia64/sysdep.h
@@ -48,7 +48,7 @@
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/ia64/sysdep.h,v 1.3 2002/05/16 21:21:57 trhodes Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/loader.c b/sys/boot/ficl/loader.c
index e4ac390811dfb..6e887dceef2bb 100644
--- a/sys/boot/ficl/loader.c
+++ b/sys/boot/ficl/loader.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/boot/ficl/loader.c,v 1.12 2006/05/12 04:07:42 jhb Exp $
  */
 
 /*******************************************************************
diff --git a/sys/boot/ficl/math64.c b/sys/boot/ficl/math64.c
index 6e50458151bc0..1fd6b757c8cb0 100644
--- a/sys/boot/ficl/math64.c
+++ b/sys/boot/ficl/math64.c
@@ -42,7 +42,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/math64.c,v 1.4 2002/04/09 17:45:11 dcs Exp $ */
 
 #include "ficl.h"
 #include "math64.h"
diff --git a/sys/boot/ficl/math64.h b/sys/boot/ficl/math64.h
index a4e56369564f9..febc5bf13635d 100644
--- a/sys/boot/ficl/math64.h
+++ b/sys/boot/ficl/math64.h
@@ -40,7 +40,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/math64.h,v 1.4 2002/04/09 17:45:11 dcs Exp $ */
 
 #if !defined (__MATH64_H__)
 #define __MATH64_H__
diff --git a/sys/boot/ficl/powerpc/sysdep.c b/sys/boot/ficl/powerpc/sysdep.c
index 00b0d4acf0e3f..b8732f5784d86 100644
--- a/sys/boot/ficl/powerpc/sysdep.c
+++ b/sys/boot/ficl/powerpc/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/powerpc/sysdep.c,v 1.1 2003/12/10 09:05:08 grehan Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/powerpc/sysdep.h b/sys/boot/ficl/powerpc/sysdep.h
index 3ae748e259c75..4c00bc50df6b2 100644
--- a/sys/boot/ficl/powerpc/sysdep.h
+++ b/sys/boot/ficl/powerpc/sysdep.h
@@ -46,7 +46,7 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
+** $FreeBSD: src/sys/boot/ficl/powerpc/sysdep.h,v 1.1 2003/12/10 09:05:08 grehan Exp $
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/sys/boot/ficl/prefix.c b/sys/boot/ficl/prefix.c
index a34fc6c78240e..2e83d16d6dd32 100644
--- a/sys/boot/ficl/prefix.c
+++ b/sys/boot/ficl/prefix.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.3 2002/08/31 01:04:53 scottl Exp $ */
 
 #include <string.h>
 #include <ctype.h>
diff --git a/sys/boot/ficl/search.c b/sys/boot/ficl/search.c
index d445cb32d93ad..2f5cf98b80614 100644
--- a/sys/boot/ficl/search.c
+++ b/sys/boot/ficl/search.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/search.c,v 1.2 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <string.h>
 #include "ficl.h"
diff --git a/sys/boot/ficl/softwords/classes.fr b/sys/boot/ficl/softwords/classes.fr
index b56da378e9709..0b3d34446d23c 100644
--- a/sys/boot/ficl/softwords/classes.fr
+++ b/sys/boot/ficl/softwords/classes.fr
@@ -4,7 +4,7 @@
 \ john sadler  1 sep 98
 \ Needs oop.fr
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/classes.fr,v 1.4 2001/04/29 02:36:35 dcs Exp $
 
 also oop definitions
 
diff --git a/sys/boot/ficl/softwords/ficlclass.fr b/sys/boot/ficl/softwords/ficlclass.fr
index 6d75efb0d3c5c..7b8fbf705fefc 100644
--- a/sys/boot/ficl/softwords/ficlclass.fr
+++ b/sys/boot/ficl/softwords/ficlclass.fr
@@ -7,7 +7,7 @@
 \ ** C - W O R D
 \ Models a FICL_WORD
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/ficlclass.fr,v 1.1 2002/04/09 17:45:27 dcs Exp $
 
 object subclass c-word
     c-word     ref: .link
diff --git a/sys/boot/ficl/softwords/ficllocal.fr b/sys/boot/ficl/softwords/ficllocal.fr
index c916089696c13..4023076228bdf 100644
--- a/sys/boot/ficl/softwords/ficllocal.fr
+++ b/sys/boot/ficl/softwords/ficllocal.fr
@@ -7,7 +7,7 @@
 \ locstate: 0 = looking for -- or }}
 \           1 = found --
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/ficllocal.fr,v 1.1 1999/09/29 04:43:15 dcs Exp $
 
 hide
 0 constant zero
diff --git a/sys/boot/ficl/softwords/fileaccess.fr b/sys/boot/ficl/softwords/fileaccess.fr
index 7297df681cf30..009f51927ef8c 100644
--- a/sys/boot/ficl/softwords/fileaccess.fr
+++ b/sys/boot/ficl/softwords/fileaccess.fr
@@ -4,7 +4,7 @@
 \ ** submitted by Larry Hastings, larry@hastings.org
 \ **
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/fileaccess.fr,v 1.2 2007/03/23 22:26:01 jkim Exp $
 
 : r/o 1 ;
 : r/w 3 ; 
diff --git a/sys/boot/ficl/softwords/forml.fr b/sys/boot/ficl/softwords/forml.fr
index 1144ef536792f..3068ed39f6cb3 100644
--- a/sys/boot/ficl/softwords/forml.fr
+++ b/sys/boot/ficl/softwords/forml.fr
@@ -1,7 +1,7 @@
 \ examples from FORML conference paper Nov 98
 \ sadler
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/forml.fr,v 1.1 2002/04/09 17:45:27 dcs Exp $
 
 .( loading FORML examples ) cr
 object --> sub c-example
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr
index 96205c0808dd1..6bb7ededfb5b5 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.
 \ **
-\ ** $FreeBSD$
+\ ** $FreeBSD: src/sys/boot/ficl/softwords/freebsd.fr,v 1.4 1999/08/28 00:39:55 peter Exp $
 
 \ Words for use in scripts:
 \ % ignore errors here
diff --git a/sys/boot/ficl/softwords/ifbrack.fr b/sys/boot/ficl/softwords/ifbrack.fr
index a8c60626c4f84..aac9ea3467cef 100644
--- a/sys/boot/ficl/softwords/ifbrack.fr
+++ b/sys/boot/ficl/softwords/ifbrack.fr
@@ -2,7 +2,7 @@
 \ ** ANS conditional compile directives [if] [else] [then]
 \ ** Requires ficl 2.0 or greater...
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/ifbrack.fr,v 1.3 2002/04/09 17:45:27 dcs Exp $
 
 hide
 
diff --git a/sys/boot/ficl/softwords/jhlocal.fr b/sys/boot/ficl/softwords/jhlocal.fr
index 12ccb9fea7537..9ad81efb71322 100644
--- a/sys/boot/ficl/softwords/jhlocal.fr
+++ b/sys/boot/ficl/softwords/jhlocal.fr
@@ -14,7 +14,7 @@
 \
 \ revised 2 June 2000 - { | a -- } now works correctly
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/jhlocal.fr,v 1.5 2007/03/23 22:26:01 jkim Exp $
 
 hide
 
diff --git a/sys/boot/ficl/softwords/marker.fr b/sys/boot/ficl/softwords/marker.fr
index ee3c9bdf2f64a..714324602cb15 100644
--- a/sys/boot/ficl/softwords/marker.fr
+++ b/sys/boot/ficl/softwords/marker.fr
@@ -3,7 +3,7 @@
 \ John Sadler, 4 Oct 98
 \ Requires ficl 2.02 FORGET-WID !!
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/marker.fr,v 1.2 2002/04/09 17:45:27 dcs Exp $
 
 : marker   ( "name" -- )
     create  
diff --git a/sys/boot/ficl/softwords/oo.fr b/sys/boot/ficl/softwords/oo.fr
index b1c8e214e5bd3..0b48798fd3956 100644
--- a/sys/boot/ficl/softwords/oo.fr
+++ b/sys/boot/ficl/softwords/oo.fr
@@ -3,7 +3,7 @@
 \ ** F I C L   O - O   E X T E N S I O N S
 \ ** john sadler aug 1998
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/oo.fr,v 1.5 2007/03/23 22:26:01 jkim Exp $
 
 17 ficl-vocabulary oop
 also oop definitions
diff --git a/sys/boot/ficl/softwords/prefix.fr b/sys/boot/ficl/softwords/prefix.fr
index ae1727fc00bcd..0d702ab96bbcb 100644
--- a/sys/boot/ficl/softwords/prefix.fr
+++ b/sys/boot/ficl/softwords/prefix.fr
@@ -5,7 +5,7 @@
 \ (jws) To make a prefix, simply create a new definition in the <prefixes> 
 \ wordlist. start-prefixes and end-prefixes handle the bookkeeping
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/prefix.fr,v 1.3 2007/03/23 22:26:01 jkim Exp $
 
 variable save-current
 
diff --git a/sys/boot/ficl/softwords/softcore.awk b/sys/boot/ficl/softwords/softcore.awk
index 5a97999a98232..1455afe70fe77 100644
--- a/sys/boot/ficl/softwords/softcore.awk
+++ b/sys/boot/ficl/softwords/softcore.awk
@@ -10,7 +10,7 @@
 # Note! This script uses strftime() which is a gawk-ism, and the
 # POSIX [[:space:]] character class.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ficl/softwords/softcore.awk,v 1.9 2007/03/23 22:26:01 jkim Exp $
 
 BEGIN \
 {
diff --git a/sys/boot/ficl/softwords/softcore.fr b/sys/boot/ficl/softwords/softcore.fr
index a70ebaa634efb..434c03da9c5e0 100644
--- a/sys/boot/ficl/softwords/softcore.fr
+++ b/sys/boot/ficl/softwords/softcore.fr
@@ -3,7 +3,7 @@
 \ ** John Sadler (john_sadler@alum.mit.edu)
 \ ** September, 1998
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/softcore.fr,v 1.12 2002/04/09 17:45:28 dcs Exp $
 
 \ ** Ficl USER variables
 \ ** See words.c for primitive def'n of USER
diff --git a/sys/boot/ficl/softwords/string.fr b/sys/boot/ficl/softwords/string.fr
index dabb3900892fe..716fff8c8dd57 100644
--- a/sys/boot/ficl/softwords/string.fr
+++ b/sys/boot/ficl/softwords/string.fr
@@ -11,7 +11,7 @@
 \   s" woof woof woof " str --> cat
 \   str --> type  cr
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/ficl/softwords/string.fr,v 1.2 2001/04/29 02:36:36 dcs Exp $
 
 also oop definitions
 
diff --git a/sys/boot/ficl/sparc64/sysdep.c b/sys/boot/ficl/sparc64/sysdep.c
index 00b0d4acf0e3f..8f2cebc6fd9dc 100644
--- a/sys/boot/ficl/sparc64/sysdep.c
+++ b/sys/boot/ficl/sparc64/sysdep.c
@@ -7,7 +7,7 @@
 **
 *******************************************************************/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/sparc64/sysdep.c,v 1.1 2002/05/19 23:20:56 jake Exp $ */
 
 #ifdef TESTMAIN
 #include <stdio.h>
diff --git a/sys/boot/ficl/sparc64/sysdep.h b/sys/boot/ficl/sparc64/sysdep.h
index 0a6ca33363dda..152823beba1d6 100644
--- a/sys/boot/ficl/sparc64/sysdep.h
+++ b/sys/boot/ficl/sparc64/sysdep.h
@@ -48,7 +48,7 @@
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/sparc64/sysdep.h,v 1.1 2002/05/19 23:20:56 jake Exp $ */
 
 #if !defined (__SYSDEP_H__)
 #define __SYSDEP_H__ 
diff --git a/sys/boot/ficl/stack.c b/sys/boot/ficl/stack.c
index f98a3b61db7de..7a3f5b2bc32d7 100644
--- a/sys/boot/ficl/stack.c
+++ b/sys/boot/ficl/stack.c
@@ -40,7 +40,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/stack.c,v 1.5 2002/04/09 17:45:11 dcs Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/testmain.c b/sys/boot/ficl/testmain.c
index 7167f30a25613..cdd0f454cfded 100644
--- a/sys/boot/ficl/testmain.c
+++ b/sys/boot/ficl/testmain.c
@@ -37,7 +37,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/testmain.c,v 1.8 2002/04/09 17:45:11 dcs Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/sys/boot/ficl/tools.c b/sys/boot/ficl/tools.c
index 02f9acf3c66bd..53af5701f9c03 100644
--- a/sys/boot/ficl/tools.c
+++ b/sys/boot/ficl/tools.c
@@ -54,7 +54,7 @@
 ** Specify breakpoint default action
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/tools.c,v 1.3 2007/03/23 22:26:01 jkim Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/unix.c b/sys/boot/ficl/unix.c
index 5b5644079ba99..eca4e4bd03419 100644
--- a/sys/boot/ficl/unix.c
+++ b/sys/boot/ficl/unix.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/unix.c,v 1.2 2007/03/23 22:26:01 jkim Exp $ */
 
 #include <string.h>
 #include <netinet/in.h>
diff --git a/sys/boot/ficl/vm.c b/sys/boot/ficl/vm.c
index 97a4f04e3b3b9..e76216cc69cf6 100644
--- a/sys/boot/ficl/vm.c
+++ b/sys/boot/ficl/vm.c
@@ -47,7 +47,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/vm.c,v 1.10 2007/03/23 22:26:01 jkim Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/ficl/words.c b/sys/boot/ficl/words.c
index ddeb1af61c299..465b8afb6acf5 100644
--- a/sys/boot/ficl/words.c
+++ b/sys/boot/ficl/words.c
@@ -41,7 +41,7 @@
 ** SUCH DAMAGE.
 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ficl/words.c,v 1.40 2007/03/23 22:26:01 jkim Exp $ */
 
 #ifdef TESTMAIN
 #include <stdlib.h>
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index c726875907fa7..f8b41acbae4f5 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -23,7 +23,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.12 2006/03/31 21:36:17 scottl Exp $
 
 marker task-beastie.4th
 
diff --git a/sys/boot/forth/frames.4th b/sys/boot/forth/frames.4th
index 3b1f4046891fe..b10bd2983e4d1 100644
--- a/sys/boot/forth/frames.4th
+++ b/sys/boot/forth/frames.4th
@@ -1,6 +1,6 @@
 \ Words implementing frame drawing
 \ XXX Filled boxes are left as an exercise for the reader... ;-/
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/frames.4th,v 1.2 2004/01/18 04:13:27 nyan Exp $
 
 marker task-frames.4th
 
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 234453c6d8298..c28347af0c8ec 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.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.25 2006/05/12 04:09:53 jhb Exp $
 
 s" arch-i386" environment? [if] [if]
 	s" loader_version" environment?  [if]
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 568aa847a355f..ff60aba6efd50 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.16 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd September 30, 2004
 .Dt LOADER.4TH 8
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index abdc8d56a043a..0156b2cdfcb84 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 15583a37f0f7b..4e2b1e7378a8f 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.26 2005/11/18 10:34:24 ru Exp $
 .Dd November 15, 2005
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc
index 0f9d37eff0188..d293577486d60 100644
--- a/sys/boot/forth/loader.rc
+++ b/sys/boot/forth/loader.rc
@@ -1,5 +1,5 @@
 \ Loader.rc
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/loader.rc,v 1.3 2004/12/06 05:30:31 imp Exp $
 \
 \ Includes additional commands
 include /boot/loader.4th
diff --git a/sys/boot/forth/pnp.4th b/sys/boot/forth/pnp.4th
index 395164deadfc5..ced199ff918f8 100644
--- a/sys/boot/forth/pnp.4th
+++ b/sys/boot/forth/pnp.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/pnp.4th,v 1.2 2001/12/11 00:49:34 jhb Exp $
 
 pnpdevices drop
 
diff --git a/sys/boot/forth/screen.4th b/sys/boot/forth/screen.4th
index 3ea79e453d800..f7f3624677ae8 100644
--- a/sys/boot/forth/screen.4th
+++ b/sys/boot/forth/screen.4th
@@ -1,5 +1,5 @@
 \ Screen manipulation related words.
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/screen.4th,v 1.1 2003/05/30 09:29:23 scottl Exp $
 
 marker task-screen.4th
 
diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th
index a092bcfe89e32..f0a2835552737 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.
 \
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.16 2006/10/13 20:48:17 ru Exp $
 
 \ Loader.rc support functions:
 \
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index aaf94d26db27b..2192da250ff10 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $
 
 SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \
 		loader
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index 9b53cc95ff609..667446447a45c 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -1,6 +1,6 @@
 # Common defines for all of /sys/boot/i386/
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.12 2006/09/28 10:02:04 ru Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index e02b10286206f..36c9da6585dc6 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.32 2005/04/25 17:41:35 ru Exp $
 
 PROG?=	boot0
 STRIP=
diff --git a/sys/boot/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S
index 64be3dd6e9015..d7aa3d233dfd1 100644
--- a/sys/boot/i386/boot0/boot0.S
+++ b/sys/boot/i386/boot0/boot0.S
@@ -13,7 +13,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.16 2007/03/26 21:56:13 thomas Exp $
  */
 
 /* A 512-byte boot manager. */
diff --git a/sys/boot/i386/boot0/boot0ext.S b/sys/boot/i386/boot0/boot0ext.S
index a63de2532109e..de1c7e2ce62c7 100644
--- a/sys/boot/i386/boot0/boot0ext.S
+++ b/sys/boot/i386/boot0/boot0ext.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot0/boot0ext.S,v 1.7 2004/04/29 18:58:38 ru Exp $
  */
 
 /* A 1024-byte boot manager. */
diff --git a/sys/boot/i386/boot0ext/Makefile b/sys/boot/i386/boot0ext/Makefile
index e68e237a0c61e..d45934577943e 100644
--- a/sys/boot/i386/boot0ext/Makefile
+++ b/sys/boot/i386/boot0ext/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
 
 .PATH: ${.CURDIR}/../boot0
 
diff --git a/sys/boot/i386/boot0sio/Makefile b/sys/boot/i386/boot0sio/Makefile
index 1321dd330c4d5..cf359af79e2f6 100644
--- a/sys/boot/i386/boot0sio/Makefile
+++ b/sys/boot/i386/boot0sio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
 
 .PATH: ${.CURDIR}/../boot0
 
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 81e407d9af153..edd95dc57c759 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $
 
 FILES=		boot boot1 boot2
 
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index cd397302b9e1b..00c8f9f1259d7 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/sys/boot/i386/boot2/boot1.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.31 2006/04/11 20:09:42 jhb Exp $
  */
 
 /* Memory Locations */
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 364fe6d4cf7b3..9b74381984848 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.83.2.2 2007/11/08 21:31:38 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/sys/boot/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h
index 0459bc20e2f88..510f7b4b8e98c 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/sys/boot/i386/boot2/lib.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/lib.h,v 1.3 2005/08/18 00:42:45 iedowse Exp $
  */
 
 void sio_init(int);
diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S
index 7b8e9eb13b058..4164d2a7a473f 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/sys/boot/i386/boot2/sio.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.10 2005/08/18 00:42:45 iedowse Exp $
  */
 
 		.set SIO_PRT,SIOPRT		# Base port
diff --git a/sys/boot/i386/btx/Makefile b/sys/boot/i386/btx/Makefile
index 39f78ed639b9c..9a65f19def458 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/sys/boot/i386/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/Makefile,v 1.6 1999/08/28 00:40:03 peter Exp $
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/i386/btx/Makefile.inc b/sys/boot/i386/btx/Makefile.inc
index 265f86d1ed55a..23b27439117de 100644
--- a/sys/boot/i386/btx/Makefile.inc
+++ b/sys/boot/i386/btx/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/Makefile.inc,v 1.2 2004/02/06 21:58:31 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index bac945b3da27d..8e5a9127cd817 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $
 
 PROG=	btx
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index 8838ca13aeaab..7097688bf6f98 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $
  */
 
 /*
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index ba7a9938a82cb..18efa77ab4103 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.18 2004/12/21 08:47:13 ru Exp $
 
 PROG=	btxldr
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S
index aa531b8894295..3a0349534c354 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/sys/boot/i386/btx/btxldr/btxldr.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.17 2004/05/14 20:29:30 ru Exp $
  */
 
 /*
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index 8fab66a541af0..29b789179ab94 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
diff --git a/sys/boot/i386/btx/lib/btxcsu.s b/sys/boot/i386/btx/lib/btxcsu.s
index 6a006596295f5..5318a9bdd917c 100644
--- a/sys/boot/i386/btx/lib/btxcsu.s
+++ b/sys/boot/i386/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxcsu.s,v 1.4 2004/08/05 06:00:05 kan Exp $
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/sys/boot/i386/btx/lib/btxsys.s
index 9c77b4295e7cf..6bca7400e3abe 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/sys/boot/i386/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxsys.s,v 1.2 1999/08/28 00:40:07 peter Exp $
 
 #
 # BTX system calls.
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/sys/boot/i386/btx/lib/btxv86.h
index 1152f8b1d9635..1ef0712a3a13b 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/sys/boot/i386/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/btx/lib/btxv86.h,v 1.5 1999/08/28 00:40:08 peter Exp $
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/sys/boot/i386/btx/lib/btxv86.s
index 0d7d1116322d2..6d6af1929696a 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/sys/boot/i386/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/btx/lib/btxv86.s,v 1.3 1999/08/28 00:40:08 peter Exp $
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index 77c4b8e99306e..de3b6a8a5f400 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.13 2004/12/21 08:47:14 ru Exp $
 
 PROG=	cdboot
 STRIP=
diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.s
index 8115589da68c8..acde6ff4b0312 100644
--- a/sys/boot/i386/cdboot/cdboot.s
+++ b/sys/boot/i386/cdboot/cdboot.s
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.17.2.1 2007/11/21 16:22:04 jhb Exp $
 
 #
 # This program is a freestanding boot program to load an a.out binary
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index a124474da4e5f..a5a3af4204e8e 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.22 2004/12/21 09:59:44 ru Exp $
 
 PROG=	kgzldr.o
 STRIP=
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index 45ed2ee62e168..6b12e3632c003 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/sys/boot/i386/kgzldr/boot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/kgzldr/boot.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/reboot.h>
diff --git a/sys/boot/i386/kgzldr/crt.s b/sys/boot/i386/kgzldr/crt.s
index cfb479fd2d84f..5e2162abc168b 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
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/crt.s,v 1.4 2002/09/17 01:48:55 peter Exp $
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/sys/boot/i386/kgzldr/kgzldr.h
index 5cd5b44b60057..c8ed8cac32d5e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/kgzldr/kgzldr.h,v 1.2 1999/08/28 00:40:10 peter Exp $
  */
 
 #define KGZ_CRT	 0x1		/* Video console */
diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c
index 538875b510e59..bece56b848a63 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/sys/boot/i386/kgzldr/lib.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/kgzldr/lib.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/sys/boot/i386/kgzldr/sio.s b/sys/boot/i386/kgzldr/sio.s
index ff174eb0b71b3..bc9489d29d92e 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
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/sio.s,v 1.5 2002/09/30 20:37:57 peter Exp $
 #
 
 		.globl sio_putchr
diff --git a/sys/boot/i386/kgzldr/start.s b/sys/boot/i386/kgzldr/start.s
index 550fa526d946f..5f693582b0f02 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/kgzldr/start.s,v 1.4 2002/09/17 01:48:55 peter Exp $
 #
 
 		.set entry,0x10			# kgz.entry
diff --git a/sys/boot/i386/libfirewire/Makefile b/sys/boot/i386/libfirewire/Makefile
index 28f76307d8a01..c4b94c4d3f9e3 100644
--- a/sys/boot/i386/libfirewire/Makefile
+++ b/sys/boot/i386/libfirewire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/libfirewire/Makefile,v 1.1 2007/05/29 14:35:57 simokawa Exp $
 
 LIB=		firewire
 INTERNALLIB=
diff --git a/sys/boot/i386/libfirewire/dconsole.c b/sys/boot/i386/libfirewire/dconsole.c
index 16645e259cb01..42bcd3d2633a0 100644
--- a/sys/boot/i386/libfirewire/dconsole.c
+++ b/sys/boot/i386/libfirewire/dconsole.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libfirewire/dconsole.c,v 1.1 2007/05/29 14:35:57 simokawa Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/libfirewire/firewire.c b/sys/boot/i386/libfirewire/firewire.c
index 5d408e0959f27..70428f108dc64 100644
--- a/sys/boot/i386/libfirewire/firewire.c
+++ b/sys/boot/i386/libfirewire/firewire.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libfirewire/firewire.c,v 1.1 2007/05/29 14:35:57 simokawa Exp $");
 
 /*
  * FireWire disk device handling.
diff --git a/sys/boot/i386/libfirewire/fwohci.c b/sys/boot/i386/libfirewire/fwohci.c
index 326e44b2ecc6c..be6864bbcf24e 100644
--- a/sys/boot/i386/libfirewire/fwohci.c
+++ b/sys/boot/i386/libfirewire/fwohci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libfirewire/fwohci.c,v 1.1 2007/05/29 14:35:57 simokawa Exp $
  *
  */
 
diff --git a/sys/boot/i386/libfirewire/fwohci.h b/sys/boot/i386/libfirewire/fwohci.h
index fc20043d92747..b697a124d9442 100644
--- a/sys/boot/i386/libfirewire/fwohci.h
+++ b/sys/boot/i386/libfirewire/fwohci.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libfirewire/fwohci.h,v 1.1 2007/05/29 14:35:57 simokawa Exp $
  *
  */
 
diff --git a/sys/boot/i386/libfirewire/fwohcireg.h b/sys/boot/i386/libfirewire/fwohcireg.h
index 27786e8b9813a..b4f9d2130be84 100644
--- a/sys/boot/i386/libfirewire/fwohcireg.h
+++ b/sys/boot/i386/libfirewire/fwohcireg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libfirewire/fwohcireg.h,v 1.1 2007/05/29 14:35:57 simokawa Exp $
  *
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 4de6d02926188..98ac1be6e154b 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.42 2006/04/11 20:11:30 jhb Exp $
 #
 LIB=			i386
 INTERNALLIB=
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S
index ff12c661d94d8..2e95bd3dc0ce7 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/sys/boot/i386/libi386/amd64_tramp.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/amd64_tramp.S,v 1.4 2004/05/14 20:29:30 ru Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c
index 971e7c79f8841..f53dab99bd8ae 100644
--- a/sys/boot/i386/libi386/biosacpi.c
+++ b/sys/boot/i386/libi386/biosacpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.12 2007/03/22 18:16:39 jkim Exp $");
 
 #include <stand.h>
 #include <machine/stdarg.h>
diff --git a/sys/boot/i386/libi386/bioscd.c b/sys/boot/i386/libi386/bioscd.c
index 93de9586c31fa..91ea2359ad820 100644
--- a/sys/boot/i386/libi386/bioscd.c
+++ b/sys/boot/i386/libi386/bioscd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.9.2.1 2007/11/01 18:19:18 jhb Exp $");
 
 /*
  * BIOS CD device handling for CD's that have been booted off of via no
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index 0d76c975ec6b9..fe349463fee27 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.48.2.3 2007/11/08 20:19:57 jhb Exp $");
 
 /*
  * BIOS disk device handling.
diff --git a/sys/boot/i386/libi386/biosmem.c b/sys/boot/i386/libi386/biosmem.c
index 6d4f96602e954..d7025db46272e 100644
--- a/sys/boot/i386/libi386/biosmem.c
+++ b/sys/boot/i386/libi386/biosmem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.8 2005/12/21 02:17:58 sobomax Exp $");
 
 /*
  * Obtain memory configuration information from the BIOS
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index b69d8c5873ffe..99da29214851f 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.6 2006/09/29 20:27:41 ru Exp $");
 
 /*
  * PnP enumerator using the PCI BIOS.
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index 1dbcf2076685f..f17f29ffec566 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.10 2005/12/19 09:00:11 sobomax Exp $");
 
 /*
  * PnP BIOS enumerator.
diff --git a/sys/boot/i386/libi386/biossmap.c b/sys/boot/i386/libi386/biossmap.c
index 6f75b27a68ea2..cb81ca89b5054 100644
--- a/sys/boot/i386/libi386/biossmap.c
+++ b/sys/boot/i386/libi386/biossmap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.6 2006/09/29 20:07:16 jhb Exp $");
 
 /*
  * Obtain memory configuration information from the BIOS
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 8a67e39409ad8..559a9704c53ad 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.39 2005/09/22 15:14:12 ru Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index 6b517c5d37078..4cf85b9577f25 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo32.c,v 1.37 2006/11/02 01:23:17 marcel Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 17963cea4e0f9..a989b2bceebab 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.37 2006/09/29 20:27:41 ru Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index fa2b1b5074d63..e4f45d8d7b398 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.11 2005/08/18 01:39:43 iedowse Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index c906a5215b6d7..3b6d27bc4178e 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/devicename.c,v 1.8 2006/11/02 01:23:17 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c
index 5f66622add9d3..74fd4f5994d3c 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/sys/boot/i386/libi386/elf32_freebsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.17 2006/11/02 17:28:38 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index 8fb13b74a373d..d125133abd8c2 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.17 2006/10/26 20:04:22 ru Exp $");
 
 #define __ELF_WORD_SIZE 64
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/i386_copy.c b/sys/boot/i386/libi386/i386_copy.c
index 3c05241985c87..038b06e1bf7ca 100644
--- a/sys/boot/i386/libi386/i386_copy.c
+++ b/sys/boot/i386/libi386/i386_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/i386_copy.c,v 1.12 2005/12/21 02:17:58 sobomax Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 91993df96d768..d5daad73915ad 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.12 2003/08/25 23:28:31 obrien Exp $");
 
 /*
  * i386-specific module functionality.
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index ccae09957e718..adcbb0840b94b 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.27 2006/11/02 01:23:17 marcel Exp $
  */
 
 
diff --git a/sys/boot/i386/libi386/nullconsole.c b/sys/boot/i386/libi386/nullconsole.c
index ebb1e7edd2b63..d99e8d043fabd 100644
--- a/sys/boot/i386/libi386/nullconsole.c
+++ b/sys/boot/i386/libi386/nullconsole.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/nullconsole.c,v 1.2 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c
index 870e2540150f6..26c077116b947 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/sys/boot/i386/libi386/pread.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pread.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
 
 /* read into destination in flat addr space */
 
diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c
index cd5af3715f0bb..340db7a59748c 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/sys/boot/i386/libi386/pxe.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.22 2005/04/17 21:38:22 wollman Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/i386/libi386/pxe.h b/sys/boot/i386/libi386/pxe.h
index f1f22aac712f1..203979b34d8c0 100644
--- a/sys/boot/i386/libi386/pxe.h
+++ b/sys/boot/i386/libi386/pxe.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/libi386/pxe.h,v 1.6 2002/09/23 18:54:26 alfred Exp $
  */
 
 /*
diff --git a/sys/boot/i386/libi386/pxetramp.s b/sys/boot/i386/libi386/pxetramp.s
index dcf1441aeb244..644e061e5bb49 100644
--- a/sys/boot/i386/libi386/pxetramp.s
+++ b/sys/boot/i386/libi386/pxetramp.s
@@ -12,7 +12,7 @@
 # warranties of merchantability and fitness for a particular
 # purpose.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/libi386/pxetramp.s,v 1.3 2001/10/04 10:18:00 jhb Exp $
 
 # ph33r this
 
diff --git a/sys/boot/i386/libi386/smbios.c b/sys/boot/i386/libi386/smbios.c
index dd39cc284bc57..33fb011eeedb4 100644
--- a/sys/boot/i386/libi386/smbios.c
+++ b/sys/boot/i386/libi386/smbios.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.7 2007/05/21 18:48:18 jkim Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/libi386/time.c b/sys/boot/i386/libi386/time.c
index 1db9a4a60688f..9f72ed8211195 100644
--- a/sys/boot/i386/libi386/time.c
+++ b/sys/boot/i386/libi386/time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $");
 
 #include <stand.h>
 #include <btxv86.h>
diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c
index 1f411006e0a99..c66bcca897434 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/sys/boot/i386/libi386/vidconsole.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/vidconsole.c,v 1.20 2005/04/09 14:07:13 stefanf Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index fb8cc835a3158..1e641ee3eb750 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 245f960ed2101..e261c3649d19a 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/i386/loader/loader.rc b/sys/boot/i386/loader/loader.rc
index 6443f3fd79bc8..395231f3b38ba 100644
--- a/sys/boot/i386/loader/loader.rc
+++ b/sys/boot/i386/loader/loader.rc
@@ -1,5 +1,5 @@
 \ Loader.rc
-\ $FreeBSD$
+\ $FreeBSD: src/sys/boot/i386/loader/loader.rc,v 1.4 2005/10/30 05:41:42 scottl Exp $
 \
 \ Includes additional commands
 include /boot/loader.4th
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index 2083456bbbae6..e30deac6cc7e8 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40.2.1 2007/11/01 18:19:18 jhb Exp $");
 
 /*
  * MD bootstrap main() and assorted miscellaneous
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index 7a2acaf1859a6..03a6ab38241dd 100644
--- a/sys/boot/i386/loader/version
+++ b/sys/boot/i386/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/i386/loader/version,v 1.8 2001/12/11 00:49:33 jhb Exp $
 
 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 7acda10a55bc4..fd44ce779ec6f 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.15 2004/12/21 08:47:15 ru Exp $
 
 PROG=	mbr
 STRIP=
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index 3cfc20dd58e19..9912d676f9045 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/sys/boot/i386/mbr/mbr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/mbr/mbr.s,v 1.7 2004/08/28 08:39:35 yar Exp $
 
 # A 512 byte MBR boot manager that simply boots the active partition.
 
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile
index cc8902f165e0d..d058075084544 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/sys/boot/i386/pxeldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.16 2004/04/27 19:45:16 ru Exp $
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
diff --git a/sys/boot/i386/pxeldr/pxeboot.8 b/sys/boot/i386/pxeldr/pxeboot.8
index c3989f3fad89c..09b067ff9b85d 100644
--- a/sys/boot/i386/pxeldr/pxeboot.8
+++ b/sys/boot/i386/pxeldr/pxeboot.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.8 2006/10/07 10:39:34 pav Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S
index 897e8383b72b6..65bc1609ee0e4 100644
--- a/sys/boot/i386/pxeldr/pxeldr.S
+++ b/sys/boot/i386/pxeldr/pxeldr.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.15 2006/09/05 19:28:03 ru Exp $
  */
 
 /*
diff --git a/sys/boot/ia64/Makefile b/sys/boot/ia64/Makefile
index eb07ab81db2ac..d8806feeb593d 100644
--- a/sys/boot/ia64/Makefile
+++ b/sys/boot/ia64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/Makefile,v 1.5 2006/11/05 22:03:03 marcel Exp $
 
 SUBDIR= common efi ski
 
diff --git a/sys/boot/ia64/Makefile.inc b/sys/boot/ia64/Makefile.inc
index 2e9a113df3879..1dbdc9d04f2b0 100644
--- a/sys/boot/ia64/Makefile.inc
+++ b/sys/boot/ia64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/Makefile.inc,v 1.3 2004/02/12 08:10:33 ru Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/ia64/common/Makefile b/sys/boot/ia64/common/Makefile
index b410bd8242848..e7bd673dc9755 100644
--- a/sys/boot/ia64/common/Makefile
+++ b/sys/boot/ia64/common/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.1 2006/11/05 22:03:03 marcel Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/boot/ia64/common/autoload.c b/sys/boot/ia64/common/autoload.c
index ea334b97e4180..8e91346816e76 100644
--- a/sys/boot/ia64/common/autoload.c
+++ b/sys/boot/ia64/common/autoload.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/autoload.c,v 1.1 2006/11/05 22:03:03 marcel Exp $");
 
 int
 ia64_autoload(void)
diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c
index 6f892a91b536e..7f4feada79d85 100644
--- a/sys/boot/ia64/common/bootinfo.c
+++ b/sys/boot/ia64/common/bootinfo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/bootinfo.c,v 1.15 2006/11/05 22:03:03 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/common/copy.c b/sys/boot/ia64/common/copy.c
index 8d8dab65467a4..a981169a00e79 100644
--- a/sys/boot/ia64/common/copy.c
+++ b/sys/boot/ia64/common/copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/copy.c,v 1.9 2006/11/19 20:04:11 marcel Exp $");
 
 #include <stand.h>
 #include <ia64/include/vmparam.h>
diff --git a/sys/boot/ia64/common/devicename.c b/sys/boot/ia64/common/devicename.c
index 08d9b54c531be..883efe0480ff2 100644
--- a/sys/boot/ia64/common/devicename.c
+++ b/sys/boot/ia64/common/devicename.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/devicename.c,v 1.6 2006/11/05 22:03:03 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c
index 6b451f24cb353..e3c65db0ca92a 100644
--- a/sys/boot/ia64/common/exec.c
+++ b/sys/boot/ia64/common/exec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/exec.c,v 1.17 2007/05/27 19:02:46 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/common/libia64.h b/sys/boot/ia64/common/libia64.h
index a196002088b13..634313949c6c3 100644
--- a/sys/boot/ia64/common/libia64.h
+++ b/sys/boot/ia64/common/libia64.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ia64/common/libia64.h,v 1.2 2006/11/19 20:04:11 marcel Exp $
  */
 
 #ifndef _LIBIA64_H_
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 0c0761018fce5..c29d9f2ac64dd 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.28 2006/11/05 22:03:03 marcel Exp $
 
 NO_MAN=
 
diff --git a/sys/boot/ia64/efi/conf.c b/sys/boot/ia64/efi/conf.c
index a72f79fd8254b..b788b05bbf5ac 100644
--- a/sys/boot/ia64/efi/conf.c
+++ b/sys/boot/ia64/efi/conf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/conf.c,v 1.12 2006/11/05 22:03:04 marcel Exp $");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/ia64/efi/efimd.c b/sys/boot/ia64/efi/efimd.c
index 8a1e0c7f1531a..7c78dd9e64483 100644
--- a/sys/boot/ia64/efi/efimd.c
+++ b/sys/boot/ia64/efi/efimd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/efimd.c,v 1.3 2006/11/05 22:03:04 marcel Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64
index 0f79b670e0279..b08e18ff00e39 100644
--- a/sys/boot/ia64/efi/ldscript.ia64
+++ b/sys/boot/ia64/efi/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ia64/efi/ldscript.ia64,v 1.9 2004/11/23 05:38:30 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start_plabel)
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index 9419903e3337a..3792d6462557c 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/main.c,v 1.27 2006/11/05 22:03:04 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/efi/start.S b/sys/boot/ia64/efi/start.S
index 9d28a968993c3..33fc6a07041d6 100644
--- a/sys/boot/ia64/efi/start.S
+++ b/sys/boot/ia64/efi/start.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.10 2006/01/18 18:49:25 marcel Exp $
  */
 
 	.text
diff --git a/sys/boot/ia64/efi/version b/sys/boot/ia64/efi/version
index 7d7f56651601a..3f0d998dc7f7f 100644
--- a/sys/boot/ia64/efi/version
+++ b/sys/boot/ia64/efi/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/ia64/efi/version,v 1.7 2006/11/05 22:03:04 marcel Exp $
 
 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/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index 42d24d19a7ac8..2597efa7a3727 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.20 2006/11/05 22:03:04 marcel Exp $
 
 NO_MAN=
 
diff --git a/sys/boot/ia64/ski/acpi_stub.c b/sys/boot/ia64/ski/acpi_stub.c
index 8e08e527e3159..589bfb3e21b21 100644
--- a/sys/boot/ia64/ski/acpi_stub.c
+++ b/sys/boot/ia64/ski/acpi_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/acpi_stub.c,v 1.8 2007/03/22 18:16:39 jkim Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/boot/ia64/ski/conf.c b/sys/boot/ia64/ski/conf.c
index cf1e163af2319..c8fa528392a1d 100644
--- a/sys/boot/ia64/ski/conf.c
+++ b/sys/boot/ia64/ski/conf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/conf.c,v 1.7 2006/05/12 04:09:53 jhb Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/delay.c b/sys/boot/ia64/ski/delay.c
index 2389603edb4a5..1600dfc60559c 100644
--- a/sys/boot/ia64/ski/delay.c
+++ b/sys/boot/ia64/ski/delay.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/delay.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/ski/efi_stub.c b/sys/boot/ia64/ski/efi_stub.c
index 3c7a099bd437b..0193ae69b6d9b 100644
--- a/sys/boot/ia64/ski/efi_stub.c
+++ b/sys/boot/ia64/ski/efi_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/efi_stub.c,v 1.6 2006/11/05 22:03:04 marcel Exp $");
 
 #include <sys/types.h>
 #include <machine/efi.h>
diff --git a/sys/boot/ia64/ski/exit.c b/sys/boot/ia64/ski/exit.c
index aeac67c493410..de5377b265947 100644
--- a/sys/boot/ia64/ski/exit.c
+++ b/sys/boot/ia64/ski/exit.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/exit.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/ldscript.ia64 b/sys/boot/ia64/ski/ldscript.ia64
index e4e1dad0bd91e..253dcd0bfd764 100644
--- a/sys/boot/ia64/ski/ldscript.ia64
+++ b/sys/boot/ia64/ski/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/ia64/ski/ldscript.ia64,v 1.3 2004/09/24 03:51:06 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start)
diff --git a/sys/boot/ia64/ski/libski.h b/sys/boot/ia64/ski/libski.h
index 5bbc6dec599fa..a5c2273360bcc 100644
--- a/sys/boot/ia64/ski/libski.h
+++ b/sys/boot/ia64/ski/libski.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ia64/ski/libski.h,v 1.8 2006/11/05 22:03:04 marcel Exp $
  */
 
 #define	MAXDEV	31	/* maximum number of distinct devices */
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index 6cfa25b29a73b..4e1c06fe38f76 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/main.c,v 1.9 2006/11/05 22:03:04 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/pal_stub.S b/sys/boot/ia64/ski/pal_stub.S
index 81fbd080e3f45..e33572cbb2dbc 100644
--- a/sys/boot/ia64/ski/pal_stub.S
+++ b/sys/boot/ia64/ski/pal_stub.S
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ia64/ski/pal_stub.S,v 1.5 2005/01/05 22:16:58 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/boot/ia64/ski/sal_stub.c b/sys/boot/ia64/ski/sal_stub.c
index 1ebbb4cc24bd0..7ede2907c6737 100644
--- a/sys/boot/ia64/ski/sal_stub.c
+++ b/sys/boot/ia64/ski/sal_stub.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/sal_stub.c,v 1.4 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/types.h>
 #include <machine/md_var.h>
diff --git a/sys/boot/ia64/ski/skiconsole.c b/sys/boot/ia64/ski/skiconsole.c
index e5cea3dc99367..1356e681ca605 100644
--- a/sys/boot/ia64/ski/skiconsole.c
+++ b/sys/boot/ia64/ski/skiconsole.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skiconsole.c,v 1.3 2004/09/24 03:53:50 marcel Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/skifs.c b/sys/boot/ia64/ski/skifs.c
index 72276feba6cb9..56797fb95af79 100644
--- a/sys/boot/ia64/ski/skifs.c
+++ b/sys/boot/ia64/ski/skifs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skifs.c,v 1.4 2006/11/05 22:03:04 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/skiload.cmd b/sys/boot/ia64/ski/skiload.cmd
index 48b77e1e40bae..754e98f616e3f 100644
--- a/sys/boot/ia64/ski/skiload.cmd
+++ b/sys/boot/ia64/ski/skiload.cmd
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/ski/skiload.cmd,v 1.2 2004/09/24 03:51:06 marcel Exp $
 iar
 fr
 pa
diff --git a/sys/boot/ia64/ski/skimd.c b/sys/boot/ia64/ski/skimd.c
index bec2ec0f5e103..9a69779639bf1 100644
--- a/sys/boot/ia64/ski/skimd.c
+++ b/sys/boot/ia64/ski/skimd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skimd.c,v 1.1 2006/11/05 22:03:04 marcel Exp $");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/ssc.c b/sys/boot/ia64/ski/ssc.c
index e1f871c4d5c50..a533d3ee3dbc2 100644
--- a/sys/boot/ia64/ski/ssc.c
+++ b/sys/boot/ia64/ski/ssc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/ssc.c,v 1.5 2004/09/24 03:53:50 marcel Exp $");
 
 #include <stand.h>
 #include "libski.h"
diff --git a/sys/boot/ia64/ski/start.S b/sys/boot/ia64/ski/start.S
index 0bd10e928d047..93e5b23de1620 100644
--- a/sys/boot/ia64/ski/start.S
+++ b/sys/boot/ia64/ski/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ia64/ski/start.S,v 1.4 2005/01/05 22:16:58 imp Exp $
  */
 
 #define	STACKSIZE	16384
diff --git a/sys/boot/ia64/ski/time.c b/sys/boot/ia64/ski/time.c
index 7aa71202d10a7..1cb1123dd6a67 100644
--- a/sys/boot/ia64/ski/time.c
+++ b/sys/boot/ia64/ski/time.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/time.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/version b/sys/boot/ia64/ski/version
index afa69ea94bc52..f0d161928c12f 100644
--- a/sys/boot/ia64/ski/version
+++ b/sys/boot/ia64/ski/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/ia64/ski/version,v 1.4 2006/11/05 22:03:04 marcel Exp $
 
 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/ofw/Makefile b/sys/boot/ofw/Makefile
index 3b881b780e87a..5332c2ed4f353 100644
--- a/sys/boot/ofw/Makefile
+++ b/sys/boot/ofw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ofw/Makefile,v 1.1 2000/10/16 10:46:19 obrien Exp $
 
 SUBDIR=		libofw
 
diff --git a/sys/boot/ofw/common/Makefile.inc b/sys/boot/ofw/common/Makefile.inc
index 5d20372631e67..a1870f185762a 100644
--- a/sys/boot/ofw/common/Makefile.inc
+++ b/sys/boot/ofw/common/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ofw/common/Makefile.inc,v 1.1 2000/11/10 06:39:49 benno Exp $
 
 SRCS+=	main.c
diff --git a/sys/boot/ofw/common/main.c b/sys/boot/ofw/common/main.c
index 1a03e9be62a66..b6a889445cab1 100644
--- a/sys/boot/ofw/common/main.c
+++ b/sys/boot/ofw/common/main.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.9 2007/06/17 00:17:15 marius Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile
index 8a56a778f76f6..6e16a642f284a 100644
--- a/sys/boot/ofw/libofw/Makefile
+++ b/sys/boot/ofw/libofw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $
 
 LIB=		ofw
 INTERNALLIB=
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c
index 3cae23ce2024a..35ebd4b0ad377 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/sys/boot/ofw/libofw/devicename.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.16 2005/10/25 12:49:56 marius Exp $");
 
 #include <stand.h>
 #include "libofw.h"
diff --git a/sys/boot/ofw/libofw/elf_freebsd.c b/sys/boot/ofw/libofw/elf_freebsd.c
index 50fd8a66c58a3..d48b9b25c5c8f 100644
--- a/sys/boot/ofw/libofw/elf_freebsd.c
+++ b/sys/boot/ofw/libofw/elf_freebsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.10 2005/10/20 10:39:09 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/sys/boot/ofw/libofw/libofw.h b/sys/boot/ofw/libofw/libofw.h
index 748233e6fe9e6..47a07349022de 100644
--- a/sys/boot/ofw/libofw/libofw.h
+++ b/sys/boot/ofw/libofw/libofw.h
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ofw/libofw/libofw.h,v 1.12 2006/11/02 01:23:18 marcel Exp $
  */
 
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index 796ac974dce0b..67276ee170653 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.12 2007/06/17 00:17:15 marius Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index 93e7ec656d049..2ca580a65159c 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/sys/boot/ofw/libofw/ofw_copy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.16 2005/07/22 23:22:29 grehan Exp $");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ofw/libofw/ofw_disk.c b/sys/boot/ofw/libofw/ofw_disk.c
index e859c8fe09b02..48ee045579a23 100644
--- a/sys/boot/ofw/libofw/ofw_disk.c
+++ b/sys/boot/ofw/libofw/ofw_disk.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.13 2005/10/25 12:51:49 marius Exp $");
 
 /*
  * Disk I/O routines using Open Firmware
diff --git a/sys/boot/ofw/libofw/ofw_memory.c b/sys/boot/ofw/libofw/ofw_memory.c
index ebf01affaadaf..ea0b7532e5ffb 100644
--- a/sys/boot/ofw/libofw/ofw_memory.c
+++ b/sys/boot/ofw/libofw/ofw_memory.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.7 2005/10/20 10:39:09 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/sys/boot/ofw/libofw/ofw_module.c
index d39a34344556e..b37dd40a7e52b 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/sys/boot/ofw/libofw/ofw_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_module.c,v 1.7 2004/01/04 23:27:31 obrien Exp $");
 
 /*
  * ofw-specific module functionality.
diff --git a/sys/boot/ofw/libofw/ofw_net.c b/sys/boot/ofw/libofw/ofw_net.c
index 17e112596043a..bca4a14e3494c 100644
--- a/sys/boot/ofw/libofw/ofw_net.c
+++ b/sys/boot/ofw/libofw/ofw_net.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.11 2007/06/17 00:17:15 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/boot/ofw/libofw/ofw_reboot.c b/sys/boot/ofw/libofw/ofw_reboot.c
index bbb420ac1767e..4971b7ab0039c 100644
--- a/sys/boot/ofw/libofw/ofw_reboot.c
+++ b/sys/boot/ofw/libofw/ofw_reboot.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_reboot.c,v 1.3 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/ofw_time.c b/sys/boot/ofw/libofw/ofw_time.c
index f53997dc059f7..1f4288dd03981 100644
--- a/sys/boot/ofw/libofw/ofw_time.c
+++ b/sys/boot/ofw/libofw/ofw_time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_time.c,v 1.5 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include "openfirm.h"
diff --git a/sys/boot/ofw/libofw/openfirm.c b/sys/boot/ofw/libofw/openfirm.c
index 8786d5d59b9cd..ce69547f78a40 100644
--- a/sys/boot/ofw/libofw/openfirm.c
+++ b/sys/boot/ofw/libofw/openfirm.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.15 2007/06/17 00:17:15 marius Exp $");
 
 #include <machine/stdarg.h>
 
diff --git a/sys/boot/ofw/libofw/openfirm.h b/sys/boot/ofw/libofw/openfirm.h
index 6c7ffb2697dd1..1e6feef29c09b 100644
--- a/sys/boot/ofw/libofw/openfirm.h
+++ b/sys/boot/ofw/libofw/openfirm.h
@@ -54,7 +54,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.h,v 1.11 2007/06/17 00:17:15 marius Exp $
  */
 #ifndef _OPENFIRM_H_
 #define	_OPENFIRM_H_
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index ca89dbc242de6..fa64f8e6922af 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.9 2006/05/14 07:26:01 nyan Exp $
 
 SUBDIR=		btx boot0 boot0.5 boot2 cdboot kgzldr libpc98 loader
 
diff --git a/sys/boot/pc98/Makefile.inc b/sys/boot/pc98/Makefile.inc
index 5bdddeeaa5c10..0b29a448c1fa3 100644
--- a/sys/boot/pc98/Makefile.inc
+++ b/sys/boot/pc98/Makefile.inc
@@ -1,6 +1,6 @@
 # Common defines for all of /sys/boot/pc98/
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.6.2.1 2007/10/18 12:08:53 nyan Exp $
 
 BINDIR?=	/boot
 
diff --git a/sys/boot/pc98/boot0.5/Makefile b/sys/boot/pc98/boot0.5/Makefile
index 8df5219070ca9..9085b65b86a16 100644
--- a/sys/boot/pc98/boot0.5/Makefile
+++ b/sys/boot/pc98/boot0.5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/Makefile,v 1.6 2007/04/07 13:37:45 nyan Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
diff --git a/sys/boot/pc98/boot0.5/boot.s b/sys/boot/pc98/boot0.5/boot.s
index 9d11206a882bf..082321e99c9be 100644
--- a/sys/boot/pc98/boot0.5/boot.s
+++ b/sys/boot/pc98/boot0.5/boot.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/boot.s,v 1.3 2007/03/17 05:30:03 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/boot0.5.s b/sys/boot/pc98/boot0.5/boot0.5.s
index f878006567679..150320f00bf46 100644
--- a/sys/boot/pc98/boot0.5/boot0.5.s
+++ b/sys/boot/pc98/boot0.5/boot0.5.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/boot0.5.s,v 1.4 2007/04/07 08:37:04 kato Exp $
 #
 	.global	main
 	.code16
diff --git a/sys/boot/pc98/boot0.5/disk.s b/sys/boot/pc98/boot0.5/disk.s
index 162dce912c82f..c416e3457b686 100644
--- a/sys/boot/pc98/boot0.5/disk.s
+++ b/sys/boot/pc98/boot0.5/disk.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/disk.s,v 1.5 2007/03/17 05:30:03 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/ldscript b/sys/boot/pc98/boot0.5/ldscript
index 49044abfb1599..4ec2efc4d6e08 100644
--- a/sys/boot/pc98/boot0.5/ldscript
+++ b/sys/boot/pc98/boot0.5/ldscript
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot0.5/ldscript,v 1.1 2007/04/07 08:37:04 kato Exp $
  */
 
 SECTIONS
diff --git a/sys/boot/pc98/boot0.5/putssjis.s b/sys/boot/pc98/boot0.5/putssjis.s
index 4a75b97a082ad..fa96725457ff9 100644
--- a/sys/boot/pc98/boot0.5/putssjis.s
+++ b/sys/boot/pc98/boot0.5/putssjis.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/putssjis.s,v 1.1 2007/04/07 08:37:04 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/selector.s b/sys/boot/pc98/boot0.5/selector.s
index 26b5f93fdc662..907802bb0d56b 100644
--- a/sys/boot/pc98/boot0.5/selector.s
+++ b/sys/boot/pc98/boot0.5/selector.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/start.s b/sys/boot/pc98/boot0.5/start.s
index 008ae66b15e3d..37a48d74c0070 100644
--- a/sys/boot/pc98/boot0.5/start.s
+++ b/sys/boot/pc98/boot0.5/start.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/start.s,v 1.3 2007/04/07 08:37:04 kato Exp $
 #
 	.global	start
 	.code16
diff --git a/sys/boot/pc98/boot0.5/support.s b/sys/boot/pc98/boot0.5/support.s
index 65f5a9a632099..5af88e418a0d9 100644
--- a/sys/boot/pc98/boot0.5/support.s
+++ b/sys/boot/pc98/boot0.5/support.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/support.s,v 1.1 2000/08/02 08:46:08 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0.5/syscons.s b/sys/boot/pc98/boot0.5/syscons.s
index 150b835f795d6..11f4dd3e76e07 100644
--- a/sys/boot/pc98/boot0.5/syscons.s
+++ b/sys/boot/pc98/boot0.5/syscons.s
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0.5/syscons.s,v 1.1 2000/08/02 08:46:08 kato Exp $
 #
 
 	.code16
diff --git a/sys/boot/pc98/boot0/Makefile b/sys/boot/pc98/boot0/Makefile
index be4577c61ac97..4ae2c05ab3c67 100644
--- a/sys/boot/pc98/boot0/Makefile
+++ b/sys/boot/pc98/boot0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0/Makefile,v 1.4 2004/12/21 08:47:16 ru Exp $
 
 PROG=	${BOOT}.out
 INTERNALPROG=
diff --git a/sys/boot/pc98/boot0/boot0.s b/sys/boot/pc98/boot0/boot0.s
index 508e2521157a2..177817b0a079c 100644
--- a/sys/boot/pc98/boot0/boot0.s
+++ b/sys/boot/pc98/boot0/boot0.s
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot0/boot0.s,v 1.1 2000/08/02 08:46:08 kato Exp $
 
 	.globl start
 	.code16
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index 2bac1e495d0ee..6fe054cb5b28b 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.23 2005/05/08 14:17:27 nyan Exp $
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/README.serial.98 b/sys/boot/pc98/boot2/README.serial.98
index 97a4b32f5e6d7..4682e97e38e6c 100644
--- a/sys/boot/pc98/boot2/README.serial.98
+++ b/sys/boot/pc98/boot2/README.serial.98
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/pc98/boot2/README.serial.98,v 1.2 2000/05/01 20:26:24 peter Exp $
 
                             README.srieal.98
                        ¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ë¤Ä¤¤¤Æ
diff --git a/sys/boot/pc98/boot2/asm.S b/sys/boot/pc98/boot2/asm.S
index de51618f162e6..dba29892d42da 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.S,v 1.3 2001/05/24 11:18:32 nyan Exp $
  */
 
 
diff --git a/sys/boot/pc98/boot2/asm.h b/sys/boot/pc98/boot2/asm.h
index 914014dea7b89..fed5ced61ec0d 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/asm.h,v 1.5 2003/07/13 08:13:52 nyan Exp $
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/boot/pc98/boot2/bios.S b/sys/boot/pc98/boot2/bios.S
index 8a884d6342dcb..cedcc6e993b9b 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/bios.S,v 1.4 2003/01/06 13:43:13 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index 4bdfbef7b14e0..de843922dafe4 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -49,7 +49,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.17.2.1 2007/11/01 18:19:19 jhb Exp $");
 
 #include "boot.h"
 #include <a.out.h>
diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index e39fee53d1e8f..42c8045609296 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot.h,v 1.7 2005/05/08 14:17:27 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/boot2.S b/sys/boot/pc98/boot2/boot2.S
index be85030b0895d..152f636e5fcc9 100644
--- a/sys/boot/pc98/boot2/boot2.S
+++ b/sys/boot/pc98/boot2/boot2.S
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
  *	boot2.S,v 1.6 1995/01/25 21:37:40 bde Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/boot2.S,v 1.4 2005/05/08 14:17:27 nyan Exp $
  */
 /*
  * Ported to PC-9801 by Yoshio Kimura
diff --git a/sys/boot/pc98/boot2/dinode.h b/sys/boot/pc98/boot2/dinode.h
index 2a78f344d40cc..2eb3de34f0344 100644
--- a/sys/boot/pc98/boot2/dinode.h
+++ b/sys/boot/pc98/boot2/dinode.h
@@ -33,7 +33,7 @@
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
  * %FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.7 1999/08/28 00:52:27 peter Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/dinode.h,v 1.4 2004/06/16 18:21:22 phk Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index f9706cad3e00f..8eea7c75c6923 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.13 2005/05/08 14:17:27 nyan Exp $");
 
 #include "boot.h"
 #include <sys/disklabel.h>
diff --git a/sys/boot/pc98/boot2/fs.h b/sys/boot/pc98/boot2/fs.h
index 8ac77da6d0993..b13fb0af57b5a 100644
--- a/sys/boot/pc98/boot2/fs.h
+++ b/sys/boot/pc98/boot2/fs.h
@@ -28,7 +28,7 @@
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
  * %FreeBSD: src/sys/ufs/ffs/fs.h,v 1.14.2.3 2001/09/21 19:15:22 dillon Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/fs.h,v 1.2 2004/04/05 23:41:29 imp Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/boot/pc98/boot2/inode.h b/sys/boot/pc98/boot2/inode.h
index add9bb9f9abd6..862cd50087469 100644
--- a/sys/boot/pc98/boot2/inode.h
+++ b/sys/boot/pc98/boot2/inode.h
@@ -33,7 +33,7 @@
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
  * %FreeBSD: src/sys/ufs/ufs/inode.h,v 1.28.2.2 2001/09/29 12:52:52 iedowse Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/inode.h,v 1.5 2006/09/26 04:15:57 tegge Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index a6b9bdce697b5..fc4f19d8c7800 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.10 2006/05/09 14:20:17 nyan Exp $");
 
 #include "boot.h"
 #include <machine/cpufunc.h>
diff --git a/sys/boot/pc98/boot2/probe_keyboard.c b/sys/boot/pc98/boot2/probe_keyboard.c
index f10329683a8c8..0efda3ed86131 100644
--- a/sys/boot/pc98/boot2/probe_keyboard.c
+++ b/sys/boot/pc98/boot2/probe_keyboard.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/probe_keyboard.c,v 1.3 2003/09/08 09:11:20 obrien Exp $");
 
 #include "boot.h"
 
diff --git a/sys/boot/pc98/boot2/quota.h b/sys/boot/pc98/boot2/quota.h
index 324131acf5613..9444f734ebbdc 100644
--- a/sys/boot/pc98/boot2/quota.h
+++ b/sys/boot/pc98/boot2/quota.h
@@ -31,7 +31,7 @@
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
  * %FreeBSD: src/sys/ufs/ufs/quota.h,v 1.15 1999/12/29 04:55:05 peter Exp %
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/quota.h,v 1.2 2004/04/05 23:41:29 imp Exp $
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/boot/pc98/boot2/serial.S b/sys/boot/pc98/boot2/serial.S
index ea7b98aac4e3c..115559d986215 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial.S,v 1.4 2000/03/30 09:25:02 kato Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/serial_16550.S b/sys/boot/pc98/boot2/serial_16550.S
index 114a369c8c98d..149dc2ca97d8b 100644
--- a/sys/boot/pc98/boot2/serial_16550.S
+++ b/sys/boot/pc98/boot2/serial_16550.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial_16550.S,v 1.7 2004/05/20 20:48:29 markm Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/serial_8251.S b/sys/boot/pc98/boot2/serial_8251.S
index 217dbdb176987..21a4208e0a72a 100644
--- a/sys/boot/pc98/boot2/serial_8251.S
+++ b/sys/boot/pc98/boot2/serial_8251.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/serial_8251.S,v 1.4 2004/05/20 20:52:04 markm Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/start.S b/sys/boot/pc98/boot2/start.S
index 2a9bcbb7a1b2a..6b2ef35c4ad76 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/boot2/start.S,v 1.5 2002/05/14 12:34:03 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index 0ceb07e5aba36..664e39b9bd39f 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $");
 
 /*
  * Ported to PC-9801 by Yoshio Kimura
diff --git a/sys/boot/pc98/boot2/table.c b/sys/boot/pc98/boot2/table.c
index e8e6dea521b0c..67f1871f3d4d4 100644
--- a/sys/boot/pc98/boot2/table.c
+++ b/sys/boot/pc98/boot2/table.c
@@ -49,7 +49,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.5 2005/05/08 14:17:27 nyan Exp $");
 
 #include "boot.h"
 
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index 39f78ed639b9c..606b2c09525f0 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/sys/boot/pc98/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/Makefile,v 1.3 1999/08/28 00:40:28 peter Exp $
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/pc98/btx/Makefile.inc b/sys/boot/pc98/btx/Makefile.inc
index 265f86d1ed55a..6572d904a4efc 100644
--- a/sys/boot/pc98/btx/Makefile.inc
+++ b/sys/boot/pc98/btx/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/Makefile.inc,v 1.1 2004/02/07 12:19:43 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index ac9a64ebf6622..dfe423a388960 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btx/Makefile,v 1.12 2005/05/08 14:17:27 nyan Exp $
 
 PROG=	btx
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S
index 043166e7980de..4a07b678ae845 100644
--- a/sys/boot/pc98/btx/btx/btx.S
+++ b/sys/boot/pc98/btx/btx/btx.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.22 2006/11/09 08:05:51 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index ba7a9938a82cb..3a78809439b10 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/btxldr/Makefile,v 1.10 2005/05/08 14:17:27 nyan Exp $
 
 PROG=	btxldr
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/sys/boot/pc98/btx/btxldr/btxldr.S
index 2104605b74362..2ba9586dcf962 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.S
+++ b/sys/boot/pc98/btx/btxldr/btxldr.S
@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/btxldr/btxldr.S,v 1.12 2005/05/08 14:17:27 nyan Exp $
  */
 
 /*
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index 8fab66a541af0..fa7ed759c3daa 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/Makefile,v 1.10 2004/12/21 08:47:18 ru Exp $
 
 PROG=	crt0.o
 INTERNALPROG=
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index 6a006596295f5..34cce304abcef 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.s
+++ b/sys/boot/pc98/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxcsu.s,v 1.3 2004/10/24 12:16:18 nyan Exp $
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/sys/boot/pc98/btx/lib/btxsys.s
index 9c77b4295e7cf..e2d5477b26e84 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/sys/boot/pc98/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxsys.s,v 1.2 1999/08/28 00:40:32 peter Exp $
 
 #
 # BTX system calls.
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/sys/boot/pc98/btx/lib/btxv86.h
index 1152f8b1d9635..3452c00356b09 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/sys/boot/pc98/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/pc98/btx/lib/btxv86.h,v 1.2 1999/08/28 00:40:32 peter Exp $
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/sys/boot/pc98/btx/lib/btxv86.s
index 0d7d1116322d2..2dac463a19e45 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/sys/boot/pc98/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/btx/lib/btxv86.s,v 1.2 1999/08/28 00:40:33 peter Exp $
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/pc98/cdboot/Makefile b/sys/boot/pc98/cdboot/Makefile
index d9e3fb57914f9..d8dcf6b147af2 100644
--- a/sys/boot/pc98/cdboot/Makefile
+++ b/sys/boot/pc98/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/cdboot/Makefile,v 1.1 2006/05/14 07:26:02 nyan Exp $
 
 PROG=	cdboot
 STRIP=
diff --git a/sys/boot/pc98/cdboot/cdboot.s b/sys/boot/pc98/cdboot/cdboot.s
index 14af0a7f2b45d..e77f2aa30b728 100644
--- a/sys/boot/pc98/cdboot/cdboot.s
+++ b/sys/boot/pc98/cdboot/cdboot.s
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/cdboot/cdboot.s,v 1.2.2.1 2007/11/21 16:22:04 jhb Exp $
 
 #
 # Basically, we first create a set of boot arguments to pass to the loaded
diff --git a/sys/boot/pc98/kgzldr/Makefile b/sys/boot/pc98/kgzldr/Makefile
index 2303fd9663b45..7bca10d6a0f78 100644
--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/sys/boot/pc98/kgzldr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.17 2005/05/08 14:17:28 nyan Exp $
 
 PROG=	kgzldr.o
 STRIP=
diff --git a/sys/boot/pc98/kgzldr/crt.s b/sys/boot/pc98/kgzldr/crt.s
index e028bc8e67224..a431915f72a61 100644
--- a/sys/boot/pc98/kgzldr/crt.s
+++ b/sys/boot/pc98/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
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.5 2005/05/08 14:17:28 nyan Exp $
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index 6e61c93370831..0eb649ec28cc5 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.24 2006/04/11 20:11:30 jhb Exp $
 #
 LIB=			pc98
 INTERNALLIB=
diff --git a/sys/boot/pc98/libpc98/bioscd.c b/sys/boot/pc98/libpc98/bioscd.c
index 40d455b4a915d..fc128b1227382 100644
--- a/sys/boot/pc98/libpc98/bioscd.c
+++ b/sys/boot/pc98/libpc98/bioscd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/bioscd.c,v 1.2.2.1 2007/11/01 18:19:19 jhb Exp $");
 
 /*
  * BIOS CD device handling for CD's that have been booted off of via no
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 25cb9a76f8b6d..aff762c4dccb2 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.34.2.3 2007/11/08 20:19:58 jhb Exp $");
 
 /*
  * BIOS disk device handling.
diff --git a/sys/boot/pc98/libpc98/biosmem.c b/sys/boot/pc98/libpc98/biosmem.c
index b450922e3d2c7..09ee3f3b3c32a 100644
--- a/sys/boot/pc98/libpc98/biosmem.c
+++ b/sys/boot/pc98/libpc98/biosmem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosmem.c,v 1.8 2005/12/21 06:09:47 nyan Exp $");
 
 /*
  * Obtain memory configuration information from the BIOS
diff --git a/sys/boot/pc98/libpc98/biossmap.c b/sys/boot/pc98/libpc98/biossmap.c
index 5a7a89fd3efb7..573515aa1c2d9 100644
--- a/sys/boot/pc98/libpc98/biossmap.c
+++ b/sys/boot/pc98/libpc98/biossmap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biossmap.c,v 1.1 2006/11/09 08:28:02 nyan Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c
index e2ba06735c0d4..6ffaa3f3d9526 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/sys/boot/pc98/libpc98/comconsole.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/comconsole.c,v 1.7 2005/09/13 08:29:03 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/libpc98/i386_module.c b/sys/boot/pc98/libpc98/i386_module.c
index d988b27f00586..f04fb9c222822 100644
--- a/sys/boot/pc98/libpc98/i386_module.c
+++ b/sys/boot/pc98/libpc98/i386_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/i386_module.c,v 1.2 2003/09/08 09:11:20 obrien Exp $");
 
 int
 i386_autoload(void)
diff --git a/sys/boot/pc98/libpc98/time.c b/sys/boot/pc98/libpc98/time.c
index b8dbe0227e7c2..5c2fd13ffeee5 100644
--- a/sys/boot/pc98/libpc98/time.c
+++ b/sys/boot/pc98/libpc98/time.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/time.c,v 1.6 2005/05/08 14:17:28 nyan Exp $");
 
 #include <stand.h>
 #include <btxv86.h>
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index 19fb981aaa1c7..0d071674e3c1b 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/sys/boot/pc98/libpc98/vidconsole.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.14 2005/05/08 14:17:28 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 0ad93c1a8bb06..a58b2df320362 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.41 2006/11/02 00:26:45 marcel Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/boot/pc98/loader/conf.c b/sys/boot/pc98/loader/conf.c
index ce80cefd1aac4..7bb635a821bae 100644
--- a/sys/boot/pc98/loader/conf.c
+++ b/sys/boot/pc98/loader/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/conf.c,v 1.3 2004/10/24 12:14:05 nyan Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index eee463807b24b..aafde67c06b37 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.24.2.1 2007/11/01 18:19:19 jhb Exp $");
 
 /*
  * MD bootstrap main() and assorted miscellaneous
diff --git a/sys/boot/powerpc/Makefile b/sys/boot/powerpc/Makefile
index f805d119eb2b1..a371f749236b4 100644
--- a/sys/boot/powerpc/Makefile
+++ b/sys/boot/powerpc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/powerpc/Makefile,v 1.1 2000/10/16 10:46:10 obrien Exp $
 
 SUBDIR=		loader
 
diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile
index eccec937dd974..a58b716da9442 100644
--- a/sys/boot/powerpc/loader/Makefile
+++ b/sys/boot/powerpc/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.19 2006/03/17 18:54:36 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/boot/powerpc/loader/conf.c b/sys/boot/powerpc/loader/conf.c
index 8bfc72df39743..45ae9172e2a43 100644
--- a/sys/boot/powerpc/loader/conf.c
+++ b/sys/boot/powerpc/loader/conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.11 2006/05/12 04:09:53 jhb Exp $");
 
 #include <stand.h>
 #include "bootstrap.h"
diff --git a/sys/boot/powerpc/loader/help.ofw b/sys/boot/powerpc/loader/help.ofw
index 5873eb0512d2d..6b1f1c21b8252 100644
--- a/sys/boot/powerpc/loader/help.ofw
+++ b/sys/boot/powerpc/loader/help.ofw
@@ -1 +1 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/powerpc/loader/help.ofw,v 1.1 2000/10/16 10:46:16 obrien Exp $
diff --git a/sys/boot/powerpc/loader/ldscript.powerpc b/sys/boot/powerpc/loader/ldscript.powerpc
index ecf8129455aa2..10f484ba6d5b8 100644
--- a/sys/boot/powerpc/loader/ldscript.powerpc
+++ b/sys/boot/powerpc/loader/ldscript.powerpc
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/powerpc/loader/ldscript.powerpc,v 1.1 2004/07/08 12:52:35 grehan Exp $ */
 
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c
index 37c2bb7170008..2e8630f8f5e16 100644
--- a/sys/boot/powerpc/loader/metadata.c
+++ b/sys/boot/powerpc/loader/metadata.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/metadata.c,v 1.6 2005/09/22 15:06:58 ru Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/powerpc/loader/start.c b/sys/boot/powerpc/loader/start.c
index ff3fcd88c5a25..04064deabee63 100644
--- a/sys/boot/powerpc/loader/start.c
+++ b/sys/boot/powerpc/loader/start.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.6 2005/01/05 22:16:58 imp Exp $");
 
 #include <stand.h>
 #include "libofw.h"
diff --git a/sys/boot/powerpc/loader/version b/sys/boot/powerpc/loader/version
index cb0f6938f966c..d115d531acf8e 100644
--- a/sys/boot/powerpc/loader/version
+++ b/sys/boot/powerpc/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/powerpc/loader/version,v 1.1 2000/10/16 10:46:16 obrien Exp $
 
 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/sparc64/Makefile b/sys/boot/sparc64/Makefile
index fdc87fde92d5f..71b7999d07cad 100644
--- a/sys/boot/sparc64/Makefile
+++ b/sys/boot/sparc64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/Makefile,v 1.2 2002/03/28 01:41:23 obrien Exp $
 
 SUBDIR=	boot1 loader
 
diff --git a/sys/boot/sparc64/Makefile.inc b/sys/boot/sparc64/Makefile.inc
index f2170c83a8a7f..aa3ec51308e4f 100644
--- a/sys/boot/sparc64/Makefile.inc
+++ b/sys/boot/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/Makefile.inc,v 1.1 2004/02/09 14:17:02 ru Exp $
 
 BINDIR?=	/boot
 CFLAGS+=	-ffreestanding
diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile
index 9670678c20eb0..489cf4879b486 100644
--- a/sys/boot/sparc64/boot1/Makefile
+++ b/sys/boot/sparc64/boot1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.11 2004/12/21 08:47:18 ru Exp $
 
 PROG=	boot1.elf
 INTERNALPROG=
diff --git a/sys/boot/sparc64/boot1/_start.s b/sys/boot/sparc64/boot1/_start.s
index 30f8019cc863e..3fa176cf88381 100644
--- a/sys/boot/sparc64/boot1/_start.s
+++ b/sys/boot/sparc64/boot1/_start.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/boot/sparc64/boot1/_start.s,v 1.2 2004/02/11 21:17:04 ru Exp $ */
 
 	.text
 	.globl	_start
diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c
index 813da29f4ecf3..33af6d8dc9d5c 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/sys/boot/sparc64/boot1/boot1.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.19 2005/01/05 22:16:58 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index 784ab929c9fb7..d1d257ad0c7ef 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/sys/boot/sparc64/loader/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.20 2006/03/17 18:54:36 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/boot/sparc64/loader/locore.S b/sys/boot/sparc64/loader/locore.S
index 5eb69351815d1..eab8375e9774d 100644
--- a/sys/boot/sparc64/loader/locore.S
+++ b/sys/boot/sparc64/loader/locore.S
@@ -6,7 +6,7 @@
  * As long as the above copyright statement and this notice remain
  * unchanged, you can do what ever you want with this file. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.7 2005/01/05 22:16:58 imp Exp $
  */
 
 #define	LOCORE
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 39d9602c36935..5e43dd55b49c3 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.32 2007/06/17 00:17:15 marius Exp $");
 /*
  * FreeBSD/sparc64 kernel loader - machine dependent part
  *
diff --git a/sys/boot/sparc64/loader/metadata.c b/sys/boot/sparc64/loader/metadata.c
index 3f6af23abcaad..89c6bc70158bc 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/sys/boot/sparc64/loader/metadata.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.15 2005/09/22 15:06:58 ru Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
diff --git a/sys/boot/sparc64/loader/version b/sys/boot/sparc64/loader/version
index bef4091e58f67..4f5750d09dbee 100644
--- a/sys/boot/sparc64/loader/version
+++ b/sys/boot/sparc64/loader/version
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/boot/sparc64/loader/version,v 1.1 2002/07/07 18:23:10 jake Exp $
 
 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/bsm/audit.h b/sys/bsm/audit.h
index 0cb552c9e0549..e6956743073bf 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.h
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#40
- * $FreeBSD$
+ * $FreeBSD: src/sys/bsm/audit.h,v 1.9.2.1 2007/11/04 12:50:40 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_H
diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h
index 92ed01b33b82f..18f95344b9fcf 100644
--- a/sys/bsm/audit_internal.h
+++ b/sys/bsm/audit_internal.h
@@ -31,7 +31,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#18
- * $FreeBSD$
+ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.8 2007/07/22 12:28:12 rwatson Exp $
  */
 
 #ifndef _AUDIT_INTERNAL_H
diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h
index ec4b3d131a5d7..4fdd0f4c56822 100644
--- a/sys/bsm/audit_kevents.h
+++ b/sys/bsm/audit_kevents.h
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34
- * $FreeBSD$
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.12 2007/07/22 12:28:12 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_KEVENTS_H_
diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h
index 575d4466f97a1..3fd3ee54588ad 100644
--- a/sys/bsm/audit_record.h
+++ b/sys/bsm/audit_record.h
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#26
- * $FreeBSD$
+ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.10 2007/07/22 12:28:13 rwatson Exp $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
diff --git a/sys/cam/README.quirks b/sys/cam/README.quirks
index 707862b6a5983..85bd49ab0442e 100644
--- a/sys/cam/README.quirks
+++ b/sys/cam/README.quirks
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/cam/README.quirks,v 1.2 2007/06/10 04:31:55 mjacob Exp $ */
 
                      FreeBSD Quirk Guidelines
 
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index 47c5b07bf5a4a..2ebf0e54d0d1c 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11 2007/05/23 13:27:37 cognet Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 93e00b25f7767..88780809690b7 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_H
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 33799fb897c2d..0fec7ab35eee6 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.35 2007/04/15 08:49:09 scottl Exp $
  */
 
 #ifndef _CAM_CAM_CCB_H
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index 4b0fd245506aa..9e9351dc78f05 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_debug.h,v 1.9 2006/05/16 14:37:57 phk Exp $
  */
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 5fa74737c1e83..ad1a06cb37ced 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69 2007/05/14 21:48:52 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index e6073d96c0db4..934442b5945e1 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_periph.h,v 1.18 2007/04/19 22:46:26 scottl Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 1e756d2e89a88..6f9f631df14e7 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.9 2005/07/01 15:21:29 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index d2990ad26e94d..63fcc0604c21c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_queue.h,v 1.9 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _CAM_CAM_QUEUE_H
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index cfc20447c224e..e7afc956d0501 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11 2007/04/19 14:28:43 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index c2d3c5f2c2ee8..feb66b53a2a4d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_sim.h,v 1.8 2007/04/19 14:28:43 scottl Exp $
  */
 
 #ifndef _CAM_CAM_SIM_H
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 7bb6b8920b2c4..ab1fd9d341612 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.190.4.1 2008/01/31 14:19:06 brueffer Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 26ca65769d127..b72a314d7df44 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.9 2007/05/16 16:54:23 scottl Exp $
  */
 
 #ifndef _CAM_CAM_XPT_H
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index c6b8cc26748f7..66b947aa8b61a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.7 2007/04/18 04:58:52 scottl Exp $
  */
 
 #ifndef _CAM_CAM_XPT_PERIPH_H
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index d82409380689b..d9129a526c5ca 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.9 2007/06/17 05:55:53 scottl Exp $
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 7349709b60859..bb878132cb8da 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.51 2007/06/04 18:25:03 dwmalone Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index ae39e39beb8b7..fa3ccbdd9fcb8 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28.2.1 2007/11/15 16:27:59 scottl Exp $
  */
 
 /*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index f8fe11d99da4b..f97ed41676750 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.102 2007/07/21 18:07:45 kan Exp $");
 
 #include "opt_cd.h"
 
diff --git a/sys/cam/scsi/scsi_cd.h b/sys/cam/scsi/scsi_cd.h
index f502d664391a3..0d36247225c6d 100644
--- a/sys/cam/scsi/scsi_cd.h
+++ b/sys/cam/scsi/scsi_cd.h
@@ -41,7 +41,7 @@
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
  *	from: scsi_cd.h,v 1.10 1997/02/22 09:44:28 peter Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_cd.h,v 1.7 2003/02/21 06:19:38 ken Exp $
  */
 #ifndef	_SCSI_SCSI_CD_H
 #define _SCSI_SCSI_CD_H 1
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index ca4a365da7f87..53491ef7e1fb7 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.46 2007/05/16 16:54:23 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_ch.h b/sys/cam/scsi/scsi_ch.h
index 8490e567fc8a0..ddb9f7aad0f2c 100644
--- a/sys/cam/scsi/scsi_ch.h
+++ b/sys/cam/scsi/scsi_ch.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/cam/scsi/scsi_ch.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */
 /*	$NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $	*/
 
 /*-
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index b7b4568915b20..44c9b20772da0 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224 2007/07/01 17:42:07 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index da099f69cba91..96ba56e8f569d 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.8 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef	_SCSI_SCSI_DA_H
diff --git a/sys/cam/scsi/scsi_dvcfg.h b/sys/cam/scsi/scsi_dvcfg.h
index 229dec7821493..51df96d0656d9 100644
--- a/sys/cam/scsi/scsi_dvcfg.h
+++ b/sys/cam/scsi/scsi_dvcfg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/cam/scsi/scsi_dvcfg.h,v 1.2 2005/01/05 22:34:34 imp Exp $	*/
 /*	$NecBSD: scsi_dvcfg.h,v 1.4 1998/03/14 07:05:06 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/cam/scsi/scsi_iu.h b/sys/cam/scsi/scsi_iu.h
index 7e577715d5507..7d6b053253391 100644
--- a/sys/cam/scsi/scsi_iu.h
+++ b/sys/cam/scsi/scsi_iu.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_iu.h,v 1.3 2005/01/05 22:34:34 imp Exp $
  */
 #ifndef	_SCSI_SCSI_IU_H
 #define _SCSI_SCSI_IU_H 1
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index 0f4fe2713c881..87f4afa057009 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -2,7 +2,7 @@
 /*	$NetBSD$	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29 2007/06/17 05:55:54 scottl Exp $");
 
 #define	SCSI_LOW_STATICS
 #define	SCSI_LOW_DEBUG
diff --git a/sys/cam/scsi/scsi_low.h b/sys/cam/scsi/scsi_low.h
index 4dfa6021533d5..e584325dff954 100644
--- a/sys/cam/scsi/scsi_low.h
+++ b/sys/cam/scsi/scsi_low.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.8 2005/01/05 22:34:34 imp Exp $	*/
 /*	$NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/cam/scsi/scsi_low_pisa.c b/sys/cam/scsi/scsi_low_pisa.c
index 13020bb053133..737e265a5125e 100644
--- a/sys/cam/scsi/scsi_low_pisa.c
+++ b/sys/cam/scsi/scsi_low_pisa.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8 2005/01/05 22:34:34 imp Exp $");
 
 #ifdef	__NetBSD__
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_low_pisa.h b/sys/cam/scsi/scsi_low_pisa.h
index e0f1c7467326d..9581be12ecbd6 100644
--- a/sys/cam/scsi/scsi_low_pisa.h
+++ b/sys/cam/scsi/scsi_low_pisa.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.5 2005/01/05 22:34:34 imp Exp $	*/
 /*	$NecBSD: scsi_low_pisa.h,v 1.3.14.1 2001/06/08 06:27:49 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/cam/scsi/scsi_message.h b/sys/cam/scsi/scsi_message.h
index 53b7640ade4de..339eeffd12527 100644
--- a/sys/cam/scsi/scsi_message.h
+++ b/sys/cam/scsi/scsi_message.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.7 2005/01/05 22:34:34 imp Exp $
  */
 
 /* Messages (1 byte) */		     /* I/T (M)andatory or (O)ptional */
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 17084e6f8d715..ccb1fda8e4be8 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index ae0e0586b2f41..aec04d22c0936 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.5 2005/01/05 22:34:34 imp Exp $
  */
 
 #ifndef _SCSI_PASS_H
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index d70972e7771b8..006a24cba5ab5 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.47 2007/05/16 16:54:23 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index 0f96b5b58408e..098caa5535f2e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.4 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef	_SCSI_SCSI_PT_H
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 617535a33c053..0b3d3cd4ea905 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113 2007/06/16 18:20:29 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index b1cee795ac592..1c6589757b08c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.10 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef	_SCSI_SCSI_SA_H
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 0c3092b7cf85d..bd393e1a1190d 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.35 2007/05/16 16:54:23 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_ses.h b/sys/cam/scsi/scsi_ses.h
index 9925c1f91effe..c8bd548330b3f 100644
--- a/sys/cam/scsi/scsi_ses.h
+++ b/sys/cam/scsi/scsi_ses.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.4 2006/01/18 08:37:27 mjacob Exp $ */
 /*-
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index f636c7d25e52c..ef64cf4072178 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_sg.h b/sys/cam/scsi/scsi_sg.h
index 60dbbfe7c64fe..924c8fafb9967 100644
--- a/sys/cam/scsi/scsi_sg.h
+++ b/sys/cam/scsi/scsi_sg.h
@@ -1,7 +1,7 @@
 /*
  * Structures and definitions for SCSI commands to the SG passthrough device.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_sg.h,v 1.2 2007/04/10 20:03:42 scottl Exp $
  */
 
 #ifndef _SCSI_SG_H
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index e8ec51f41d596..27204c1f34dfa 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.25 2007/05/16 16:54:23 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index c6086f948eac6..3b7cba5c2d046 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73 2007/04/15 08:49:11 scottl Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index 0c868067c5f6c..8ffee5f4d9ca5 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.12 2005/01/05 22:34:35 imp Exp $
  */
 
 #ifndef _CAM_SCSI_SCSI_TARGETIO_H_
diff --git a/sys/compat/freebsd32/Makefile b/sys/compat/freebsd32/Makefile
index d9131f26435f3..4fdc3a61dcebc 100644
--- a/sys/compat/freebsd32/Makefile
+++ b/sys/compat/freebsd32/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/freebsd32/Makefile,v 1.4 2005/10/23 23:58:23 obrien Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 0c77bab0a6cbe..3bcf4bab12d55 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.6.2.1 2007/12/19 20:37:53 jhb Exp $
  */
 
 #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
diff --git a/sys/compat/freebsd32/freebsd32_ipc.h b/sys/compat/freebsd32/freebsd32_ipc.h
index 93b5409b1ecc6..a5af08d7fa8ea 100644
--- a/sys/compat/freebsd32/freebsd32_ipc.h
+++ b/sys/compat/freebsd32/freebsd32_ipc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_ipc.h,v 1.2.2.2 2007/12/19 20:43:41 jhb Exp $
  */
 
 #ifndef _COMPAT_FREEBSD32_FREEBSD32_IPC_H_
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 700a17205949f..f3316415defd4 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.67.2.3 2007/12/20 19:43:55 jhb Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 52e32c766950e..5071b692c73c9 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.78.2.1 2007/12/19 20:48:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91.2.2 2007/12/19 20:43:41 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_signal.h b/sys/compat/freebsd32/freebsd32_signal.h
index dab266ee426fd..0f53eb7949d87 100644
--- a/sys/compat/freebsd32/freebsd32_signal.h
+++ b/sys/compat/freebsd32/freebsd32_signal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.1 2006/10/05 01:58:08 davidxu Exp $
  */
 
 #ifndef _COMPAT_FREEBSD32_SIGNAL_H_
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index 9dd6f3a2744fd..37e101c29968a 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.76.2.1 2007/12/19 20:48:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91.2.2 2007/12/19 20:43:41 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index 00df58ccf0dc2..b23396a0bf042 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.67.2.1 2007/12/19 20:48:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91.2.2 2007/12/19 20:43:41 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index 1df91f2311fad..944d1e939790f 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.77.2.1 2007/12/19 20:48:53 jhb Exp $
  * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91.2.2 2007/12/19 20:43:41 jhb Exp 
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h
index fadbeb4dbed4c..dc82b3faad682 100644
--- a/sys/compat/freebsd32/freebsd32_util.h
+++ b/sys/compat/freebsd32/freebsd32_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf
index f163597becb82..59987cff7ebd4 100644
--- a/sys/compat/freebsd32/syscalls.conf
+++ b/sys/compat/freebsd32/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/freebsd32/syscalls.conf,v 1.5 2006/08/15 17:25:54 jhb Exp $
 sysnames="freebsd32_syscalls.c"
 sysproto="freebsd32_proto.h"
 sysproto_h=_FREEBSD32_SYSPROTO_H_
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index 04c86f7631584..197a6cdf4442b 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91.2.2 2007/12/19 20:43:41 jhb Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;	from: src/sys/kern/syscalls.master 1.107
 ;
diff --git a/sys/compat/ia32/ia32_genassym.c b/sys/compat/ia32/ia32_genassym.c
index 84fb648f90ed7..326d7db20bec9 100644
--- a/sys/compat/ia32/ia32_genassym.c
+++ b/sys/compat/ia32/ia32_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_genassym.c,v 1.5 2006/10/05 01:56:11 davidxu Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/ia32/ia32_reg.h b/sys/compat/ia32/ia32_reg.h
index 5a9cdf2eebf98..2cc08cfa736a1 100644
--- a/sys/compat/ia32/ia32_reg.h
+++ b/sys/compat/ia32/ia32_reg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ia32/ia32_reg.h,v 1.1 2005/06/30 07:49:21 peter Exp $
  */
 
 #ifndef _COMPAT_IA32_IA32_REG_H_
diff --git a/sys/compat/ia32/ia32_signal.h b/sys/compat/ia32/ia32_signal.h
index f2be96d5100b1..0abdafe48d525 100644
--- a/sys/compat/ia32/ia32_signal.h
+++ b/sys/compat/ia32/ia32_signal.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.10 2006/10/05 01:56:11 davidxu Exp $
  */
 
 struct ia32_mcontext {
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index 1c293522e33de..988328f6c67eb 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/ia32/ia32_util.h b/sys/compat/ia32/ia32_util.h
index a2b88cb4272eb..1bbe495ee6d23 100644
--- a/sys/compat/ia32/ia32_util.h
+++ b/sys/compat/ia32/ia32_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.9 2003/12/11 01:05:09 peter Exp $
  */
 
 #include <vm/vm.h>
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index e5cd300d6cba6..58f2f3e070e0c 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.115 2007/06/05 00:00:50 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c
index 2247d29b73f77..cc09eb20846cd 100644
--- a/sys/compat/linsysfs/linsysfs.c
+++ b/sys/compat/linsysfs/linsysfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.4 2007/03/12 12:16:52 des Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c
index 1a0d5a366b475..00757b3ebde74 100644
--- a/sys/compat/linux/linux_emul.c
+++ b/sys/compat/linux/linux_emul.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.20 2007/04/02 18:38:13 jkim Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h
index 0b9dd884ee8d9..8cf145c2ae511 100644
--- a/sys/compat/linux/linux_emul.h
+++ b/sys/compat/linux/linux_emul.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.7 2007/04/02 18:38:13 jkim Exp $
  */
 
 #ifndef _LINUX_EMUL_H_
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 745e18fde0f65..49fce39c6dfa6 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.105.4.1 2008/01/04 04:56:07 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index be719b8dbad2d..704278a90375b 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.10 2007/05/23 08:33:05 kib Exp $");
 #if 0
 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
 #endif
diff --git a/sys/compat/linux/linux_futex.h b/sys/compat/linux/linux_futex.h
index 1ba1ce2d5169e..bb7e056748eab 100644
--- a/sys/compat/linux/linux_futex.h
+++ b/sys/compat/linux/linux_futex.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.2 2007/02/25 12:40:35 netchild Exp $
  */
 
 #ifndef _LINUX_FUTEX_H
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index c244e5088abd1..3156b8a128ff4 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.27 2006/11/18 17:27:39 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 8e42ec1d2c0bd..bd674586d1ecb 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138.2.1 2007/11/15 10:38:06 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h
index 2302a8c11690e..d36561b0e8397 100644
--- a/sys/compat/linux/linux_ioctl.h
+++ b/sys/compat/linux/linux_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26.2.1 2007/11/15 10:38:06 kib Exp $
  */
 
 #ifndef _LINUX_IOCTL_H_
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index f1f4b1573e970..a5cbc9cd16644 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.54 2007/01/14 16:34:43 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h
index 4c013429253aa..2e9e4b575928f 100644
--- a/sys/compat/linux/linux_ipc.h
+++ b/sys/compat/linux/linux_ipc.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_ipc.h,v 1.11 2006/12/21 13:11:06 netchild Exp $
  */
 
 #ifndef _LINUX_IPC_H_
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 095b5ee671181..c5464a1bc4586 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.29 2007/01/14 16:07:01 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h
index 85f616352ad0d..b6771544b34a6 100644
--- a/sys/compat/linux/linux_mib.h
+++ b/sys/compat/linux/linux_mib.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_mib.h,v 1.10 2006/12/31 12:39:10 netchild Exp $
  */
 
 #ifndef _LINUX_MIB_H_
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 01f1ceea8779d..be98e84f48f22 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.214 2007/08/28 12:26:35 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h
index 32fa74a1cc469..964df85a07260 100644
--- a/sys/compat/linux/linux_misc.h
+++ b/sys/compat/linux/linux_misc.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_misc.h,v 1.2 2006/12/31 11:56:16 netchild Exp $
  */
 
 #ifndef _LINUX_MISC_H_
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index d40d9d7a8c980..6658dc1356b4e 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.65 2007/01/07 19:14:06 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h
index 5f6d5bdd45d23..c4af3dc33de4c 100644
--- a/sys/compat/linux/linux_signal.h
+++ b/sys/compat/linux/linux_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_signal.h,v 1.7 2006/10/15 12:51:43 netchild Exp $
  */
 
 #ifndef _LINUX_SIGNAL_H_
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index e6ac278060ddd..f433ad2eb2218 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.74 2007/08/06 14:25:59 rwatson Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h
index b6b9841ad197a..074e8e048b2e0 100644
--- a/sys/compat/linux/linux_socket.h
+++ b/sys/compat/linux/linux_socket.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $
  */
 
 #ifndef _LINUX_SOCKET_H_
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index 374ce39a0eb35..5dc9a788feefe 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.88.4.1 2008/01/09 16:03:02 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index 9111dbec78057..b311934635160 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_sysctl.c,v 1.17 2006/03/19 11:10:33 ru Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/linux/linux_sysproto.h b/sys/compat/linux/linux_sysproto.h
index 69f1577dc457d..2efab86b73f40 100644
--- a/sys/compat/linux/linux_sysproto.h
+++ b/sys/compat/linux/linux_sysproto.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_sysproto.h,v 1.1 2005/03/07 00:18:06 sobomax Exp $
  */
 
 #ifndef LINUX_SYSPROTO
diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c
index e9bc71b14528d..7e586fad60d27 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_time.c,v 1.2 2006/12/20 20:17:34 jkim Exp $");
 #if 0
 __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $");
 #endif
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index c4743822dd8a8..8df1439556eed 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.22 2007/06/12 00:11:57 rwatson Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 222197ccb4712..9b779da437897 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.32 2007/02/24 16:49:24 netchild Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 52647666898ba..a9e5bca755f63 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.29 2007/03/29 02:11:45 julian Exp $
  */
 
 /*
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
index 1fb44ce268a1f..56a02a37358da 100644
--- a/sys/compat/ndis/cfg_var.h
+++ b/sys/compat/ndis/cfg_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.3 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _CFG_VAR_H_
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
index 69950b30c06ca..6510a5c8b3711 100644
--- a/sys/compat/ndis/hal_var.h
+++ b/sys/compat/ndis/hal_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.8 2005/04/11 02:02:34 wpaul Exp $
  */
 
 #ifndef _HAL_VAR_H_
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index ba84c4fb81701..8102ecadd816b 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.96 2007/06/10 04:40:13 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
index 00d8e8d30da10..da5f29a8fb7bb 100644
--- a/sys/compat/ndis/kern_windrv.c
+++ b/sys/compat/ndis/kern_windrv.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.14 2007/05/20 22:03:57 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/ndis/ndis_var.h b/sys/compat/ndis/ndis_var.h
index c53b4295346b9..3e9b26b4ec0e1 100644
--- a/sys/compat/ndis/ndis_var.h
+++ b/sys/compat/ndis/ndis_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.47 2007/04/06 11:18:57 pjd Exp $
  */
 
 #ifndef _NDIS_VAR_H_
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
index 751f6aa37b158..108716fc6afb6 100644
--- a/sys/compat/ndis/ntoskrnl_var.h
+++ b/sys/compat/ndis/ntoskrnl_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.43 2006/08/17 22:50:32 imp Exp $
  */
 
 #ifndef _NTOSKRNL_VAR_H_
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index e778b5805532e..70eea1a0ca23c 100644
--- a/sys/compat/ndis/pe_var.h
+++ b/sys/compat/ndis/pe_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.14 2005/10/26 18:46:27 wpaul Exp $
  */
 
 #ifndef _PE_VAR_H_
diff --git a/sys/compat/ndis/resource_var.h b/sys/compat/ndis/resource_var.h
index 28f2d62920eed..aa4f40ebbcd07 100644
--- a/sys/compat/ndis/resource_var.h
+++ b/sys/compat/ndis/resource_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/resource_var.h,v 1.3 2005/02/16 05:41:17 wpaul Exp $
  */
 
 #ifndef _RESOURCE_VAR_H_
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
index 70ffb80c593b9..0e4c7adf55d69 100644
--- a/sys/compat/ndis/subr_hal.c
+++ b/sys/compat/ndis/subr_hal.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.28 2006/05/16 14:37:57 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index 02b034aeefe19..f2a3f34a2c1e9 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.108 2007/05/31 11:51:49 kib Exp $");
 
 /*
  * This file implements a translation layer between the BSD networking
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index 86d537b33ae4a..bb98436d9e285 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.90 2007/07/22 20:53:28 thompsa Exp $");
 
 #include <sys/ctype.h>
 #include <sys/unistd.h>
diff --git a/sys/compat/ndis/subr_pe.c b/sys/compat/ndis/subr_pe.c
index 1235ab0549af1..358566a22ef3c 100644
--- a/sys/compat/ndis/subr_pe.c
+++ b/sys/compat/ndis/subr_pe.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.13 2007/04/06 11:18:57 pjd Exp $");
 
 /*
  * This file contains routines for relocating and dynamically linking
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
index 3aa322e3a93c0..f65dc2de2a202 100644
--- a/sys/compat/ndis/subr_usbd.c
+++ b/sys/compat/ndis/subr_usbd.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.3 2005/05/05 03:56:09 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/ndis/usbd_var.h b/sys/compat/ndis/usbd_var.h
index 8c9f2b3a5854c..24aca41e9f471 100644
--- a/sys/compat/ndis/usbd_var.h
+++ b/sys/compat/ndis/usbd_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/usbd_var.h,v 1.1 2005/02/24 21:49:14 wpaul Exp $
  */
 
 #ifndef _USBD_VAR_H_
diff --git a/sys/compat/ndis/winx32_wrap.S b/sys/compat/ndis/winx32_wrap.S
index 065d409f0b529..e39337456daf2 100644
--- a/sys/compat/ndis/winx32_wrap.S
+++ b/sys/compat/ndis/winx32_wrap.S
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/winx32_wrap.S,v 1.5 2006/06/12 20:35:59 jhb Exp $
  */
 
 /* The 'ret' macro doesn't work in this file if GPROF is enabled. */
diff --git a/sys/compat/ndis/winx64_wrap.S b/sys/compat/ndis/winx64_wrap.S
index c44fe053c8c20..dcb0a98138594 100644
--- a/sys/compat/ndis/winx64_wrap.S
+++ b/sys/compat/ndis/winx64_wrap.S
@@ -32,7 +32,7 @@
  * The x86_64 callback routines were written and graciously submitted
  * by Ville-Pertti Keinonen <will@exomi.com>.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ndis/winx64_wrap.S,v 1.4 2005/04/16 04:47:15 wpaul Exp $
  */
 
 #include <machine/asmacros.h>
diff --git a/sys/compat/netbsd/dvcfg.h b/sys/compat/netbsd/dvcfg.h
index 817ab3d707b3a..f3497c57890f4 100644
--- a/sys/compat/netbsd/dvcfg.h
+++ b/sys/compat/netbsd/dvcfg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/compat/netbsd/dvcfg.h,v 1.6 2005/01/05 22:34:36 imp Exp $ */
 /*	$NetBSD$	*/
 /*-
  * [NetBSD for NEC PC98 series]
diff --git a/sys/compat/netbsd/physio_proc.h b/sys/compat/netbsd/physio_proc.h
index fde967367d29f..ef14efd5a06bd 100644
--- a/sys/compat/netbsd/physio_proc.h
+++ b/sys/compat/netbsd/physio_proc.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/compat/netbsd/physio_proc.h,v 1.7 2005/01/05 22:34:36 imp Exp $	*/
 /*	$NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/compat/opensolaris/kern/opensolaris_atomic.c b/sys/compat/opensolaris/kern/opensolaris_atomic.c
index fb6ef2e365658..fe8190f9e16ac 100644
--- a/sys/compat/opensolaris/kern/opensolaris_atomic.c
+++ b/sys/compat/opensolaris/kern/opensolaris_atomic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_atomic.c,v 1.1 2007/06/08 12:35:45 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_kmem.c b/sys/compat/opensolaris/kern/opensolaris_kmem.c
index a73349f583e7f..996856e9e091b 100644
--- a/sys/compat/opensolaris/kern/opensolaris_kmem.c
+++ b/sys/compat/opensolaris/kern/opensolaris_kmem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kmem.c,v 1.2 2007/04/10 02:35:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_kobj.c b/sys/compat/opensolaris/kern/opensolaris_kobj.c
index 248856bc8d542..34699e3e14125 100644
--- a/sys/compat/opensolaris/kern/opensolaris_kobj.c
+++ b/sys/compat/opensolaris/kern/opensolaris_kobj.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_kstat.c b/sys/compat/opensolaris/kern/opensolaris_kstat.c
index 6d0b7cf847deb..a4f20099237c7 100644
--- a/sys/compat/opensolaris/kern/opensolaris_kstat.c
+++ b/sys/compat/opensolaris/kern/opensolaris_kstat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kstat.c,v 1.2 2007/06/04 18:25:03 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_misc.c b/sys/compat/opensolaris/kern/opensolaris_misc.c
index a89d478d70e53..baf0294a46c65 100644
--- a/sys/compat/opensolaris/kern/opensolaris_misc.c
+++ b/sys/compat/opensolaris/kern/opensolaris_misc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_misc.c,v 1.2 2007/04/23 00:52:06 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_policy.c b/sys/compat/opensolaris/kern/opensolaris_policy.c
index a09c9ec1130a6..c11d3deeeb251 100644
--- a/sys/compat/opensolaris/kern/opensolaris_policy.c
+++ b/sys/compat/opensolaris/kern/opensolaris_policy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_policy.c,v 1.2 2007/06/12 00:11:57 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/priv.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_vfs.c b/sys/compat/opensolaris/kern/opensolaris_vfs.c
index 79a4c5bd162e5..259c0bfecaa7f 100644
--- a/sys/compat/opensolaris/kern/opensolaris_vfs.c
+++ b/sys/compat/opensolaris/kern/opensolaris_vfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.6 2007/06/04 11:31:45 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/opensolaris/kern/opensolaris_zone.c b/sys/compat/opensolaris/kern/opensolaris_zone.c
index 3059a787d98c5..f6514ebfaf4dc 100644
--- a/sys/compat/opensolaris/kern/opensolaris_zone.c
+++ b/sys/compat/opensolaris/kern/opensolaris_zone.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_zone.c,v 1.1 2007/04/06 01:09:06 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/opensolaris/machine/endian.h b/sys/compat/opensolaris/machine/endian.h
index 855189f64c96f..c7b65795ad20f 100644
--- a/sys/compat/opensolaris/machine/endian.h
+++ b/sys/compat/opensolaris/machine/endian.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/machine/endian.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef	_OPENSOLARIS_MACHINE_ENDIAN_H_
diff --git a/sys/compat/opensolaris/sys/atomic.h b/sys/compat/opensolaris/sys/atomic.h
index 2559415da3fa1..a8aecc877f4ca 100644
--- a/sys/compat/opensolaris/sys/atomic.h
+++ b/sys/compat/opensolaris/sys/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/atomic.h,v 1.1 2007/06/08 12:35:46 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_ATOMIC_H_
diff --git a/sys/compat/opensolaris/sys/cmn_err.h b/sys/compat/opensolaris/sys/cmn_err.h
index b9987e8c75a9e..6be3a05337a7a 100644
--- a/sys/compat/opensolaris/sys/cmn_err.h
+++ b/sys/compat/opensolaris/sys/cmn_err.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/cmn_err.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_CMN_ERR_H_
diff --git a/sys/compat/opensolaris/sys/cred.h b/sys/compat/opensolaris/sys/cred.h
index 85e79db81eda1..0d1bb9831f1f1 100644
--- a/sys/compat/opensolaris/sys/cred.h
+++ b/sys/compat/opensolaris/sys/cred.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/cred.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_CRED_H_
diff --git a/sys/compat/opensolaris/sys/debug.h b/sys/compat/opensolaris/sys/debug.h
index 34804624eeb1b..a69cdc1052668 100644
--- a/sys/compat/opensolaris/sys/debug.h
+++ b/sys/compat/opensolaris/sys/debug.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/debug.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_DEBUG_H_
diff --git a/sys/compat/opensolaris/sys/dirent.h b/sys/compat/opensolaris/sys/dirent.h
index c369b04a6956d..5edc5508da517 100644
--- a/sys/compat/opensolaris/sys/dirent.h
+++ b/sys/compat/opensolaris/sys/dirent.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/dirent.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_DIRENT_H_
diff --git a/sys/compat/opensolaris/sys/dnlc.h b/sys/compat/opensolaris/sys/dnlc.h
index a2d4f01263fc1..c92d8be8dc431 100644
--- a/sys/compat/opensolaris/sys/dnlc.h
+++ b/sys/compat/opensolaris/sys/dnlc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/dnlc.h,v 1.2 2007/05/24 13:44:45 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_DNLC_H_
diff --git a/sys/compat/opensolaris/sys/kcondvar.h b/sys/compat/opensolaris/sys/kcondvar.h
index 547d622b8dfd1..e93b7aa7b4cda 100644
--- a/sys/compat/opensolaris/sys/kcondvar.h
+++ b/sys/compat/opensolaris/sys/kcondvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/kcondvar.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_CONDVAR_H_
diff --git a/sys/compat/opensolaris/sys/kmem.h b/sys/compat/opensolaris/sys/kmem.h
index 89dfac9bf6348..b9d04f5b1b8e1 100644
--- a/sys/compat/opensolaris/sys/kmem.h
+++ b/sys/compat/opensolaris/sys/kmem.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/kmem.h,v 1.2 2007/04/10 02:35:56 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_KMEM_H_
diff --git a/sys/compat/opensolaris/sys/kobj.h b/sys/compat/opensolaris/sys/kobj.h
index e060ff04ce2fe..99fac437cbf00 100644
--- a/sys/compat/opensolaris/sys/kobj.h
+++ b/sys/compat/opensolaris/sys/kobj.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/kobj.h,v 1.2 2007/04/08 23:57:08 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_KOBJ_H_
diff --git a/sys/compat/opensolaris/sys/kstat.h b/sys/compat/opensolaris/sys/kstat.h
index 9df49654f39ad..caded921c8016 100644
--- a/sys/compat/opensolaris/sys/kstat.h
+++ b/sys/compat/opensolaris/sys/kstat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/kstat.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_KSTAT_H_
diff --git a/sys/compat/opensolaris/sys/lock.h b/sys/compat/opensolaris/sys/lock.h
index 51fcd67896840..ed2df0189f7a4 100644
--- a/sys/compat/opensolaris/sys/lock.h
+++ b/sys/compat/opensolaris/sys/lock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/lock.h,v 1.1 2007/04/09 01:05:31 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_LOCK_H_
diff --git a/sys/compat/opensolaris/sys/misc.h b/sys/compat/opensolaris/sys/misc.h
index a5a52b786eecd..17f47b7ab501d 100644
--- a/sys/compat/opensolaris/sys/misc.h
+++ b/sys/compat/opensolaris/sys/misc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/misc.h,v 1.2 2007/04/23 00:52:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_MISC_H_
diff --git a/sys/compat/opensolaris/sys/mnttab.h b/sys/compat/opensolaris/sys/mnttab.h
index 950a0741bca2a..a27502305f88f 100644
--- a/sys/compat/opensolaris/sys/mnttab.h
+++ b/sys/compat/opensolaris/sys/mnttab.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/mnttab.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_MNTTAB_H_
diff --git a/sys/compat/opensolaris/sys/mount.h b/sys/compat/opensolaris/sys/mount.h
index d4c40391c8df3..302340c1ad863 100644
--- a/sys/compat/opensolaris/sys/mount.h
+++ b/sys/compat/opensolaris/sys/mount.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/mount.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_MOUNT_H_
diff --git a/sys/compat/opensolaris/sys/mutex.h b/sys/compat/opensolaris/sys/mutex.h
index d7543af4363e6..75b641d914e57 100644
--- a/sys/compat/opensolaris/sys/mutex.h
+++ b/sys/compat/opensolaris/sys/mutex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.3 2007/05/26 21:37:14 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_MUTEX_H_
diff --git a/sys/compat/opensolaris/sys/policy.h b/sys/compat/opensolaris/sys/policy.h
index 50d3fd89d501b..e840f65031cb3 100644
--- a/sys/compat/opensolaris/sys/policy.h
+++ b/sys/compat/opensolaris/sys/policy.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- $ $FreeBSD$
+ $ $FreeBSD: src/sys/compat/opensolaris/sys/policy.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_POLICY_H_
diff --git a/sys/compat/opensolaris/sys/proc.h b/sys/compat/opensolaris/sys/proc.h
index 2532c57607046..80c85d9ab81ba 100644
--- a/sys/compat/opensolaris/sys/proc.h
+++ b/sys/compat/opensolaris/sys/proc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/proc.h,v 1.2 2007/08/16 20:33:20 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_PROC_H_
diff --git a/sys/compat/opensolaris/sys/random.h b/sys/compat/opensolaris/sys/random.h
index 0cdea34a93d78..17c018272314c 100644
--- a/sys/compat/opensolaris/sys/random.h
+++ b/sys/compat/opensolaris/sys/random.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/random.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_RANDOM_H_
diff --git a/sys/compat/opensolaris/sys/rwlock.h b/sys/compat/opensolaris/sys/rwlock.h
index e87717566c152..7d1c65e36ba7c 100644
--- a/sys/compat/opensolaris/sys/rwlock.h
+++ b/sys/compat/opensolaris/sys/rwlock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.3 2007/05/26 21:37:14 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_RWLOCK_H_
diff --git a/sys/compat/opensolaris/sys/sdt.h b/sys/compat/opensolaris/sys/sdt.h
index 6db45bb97aa75..e09aefd836353 100644
--- a/sys/compat/opensolaris/sys/sdt.h
+++ b/sys/compat/opensolaris/sys/sdt.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/sdt.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_SDT_H_
diff --git a/sys/compat/opensolaris/sys/string.h b/sys/compat/opensolaris/sys/string.h
index aeec929610eda..2163c0b696ce2 100644
--- a/sys/compat/opensolaris/sys/string.h
+++ b/sys/compat/opensolaris/sys/string.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/string.h,v 1.2 2007/04/10 21:42:12 wkoszek Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_STRING_H_
diff --git a/sys/compat/opensolaris/sys/sunddi.h b/sys/compat/opensolaris/sys/sunddi.h
index 192d5a992c34a..f96cdd344e7a1 100644
--- a/sys/compat/opensolaris/sys/sunddi.h
+++ b/sys/compat/opensolaris/sys/sunddi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/sunddi.h,v 1.1 2007/04/23 00:52:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_SUNDDI_H_
diff --git a/sys/compat/opensolaris/sys/systm.h b/sys/compat/opensolaris/sys/systm.h
index d4ef17c750feb..4373f39ea81cb 100644
--- a/sys/compat/opensolaris/sys/systm.h
+++ b/sys/compat/opensolaris/sys/systm.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/systm.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_SYSTM_H_
diff --git a/sys/compat/opensolaris/sys/time.h b/sys/compat/opensolaris/sys/time.h
index 94d24a52f6a98..6099b594091cb 100644
--- a/sys/compat/opensolaris/sys/time.h
+++ b/sys/compat/opensolaris/sys/time.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/time.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_TIME_H_
diff --git a/sys/compat/opensolaris/sys/types.h b/sys/compat/opensolaris/sys/types.h
index 4006aec84f8a6..e5829d6b3e790 100644
--- a/sys/compat/opensolaris/sys/types.h
+++ b/sys/compat/opensolaris/sys/types.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/types.h,v 1.2 2007/04/23 00:52:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_TYPES_H_
diff --git a/sys/compat/opensolaris/sys/uio.h b/sys/compat/opensolaris/sys/uio.h
index 02ee1d831d913..e62f0e7f1af0b 100644
--- a/sys/compat/opensolaris/sys/uio.h
+++ b/sys/compat/opensolaris/sys/uio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/uio.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_UIO_H_
diff --git a/sys/compat/opensolaris/sys/varargs.h b/sys/compat/opensolaris/sys/varargs.h
index 061edc15d1b9d..9b06f97d34aea 100644
--- a/sys/compat/opensolaris/sys/varargs.h
+++ b/sys/compat/opensolaris/sys/varargs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/varargs.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_VARARGS_H_
diff --git a/sys/compat/opensolaris/sys/vfs.h b/sys/compat/opensolaris/sys/vfs.h
index c2d8a6b71119a..746a1aea5d6fd 100644
--- a/sys/compat/opensolaris/sys/vfs.h
+++ b/sys/compat/opensolaris/sys/vfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/vfs.h,v 1.2 2007/06/04 11:31:45 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_VFS_H_
diff --git a/sys/compat/opensolaris/sys/vnode.h b/sys/compat/opensolaris/sys/vnode.h
index a4744613e62f7..0272585d24bce 100644
--- a/sys/compat/opensolaris/sys/vnode.h
+++ b/sys/compat/opensolaris/sys/vnode.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.3 2007/05/31 11:51:49 kib Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_VNODE_H_
diff --git a/sys/compat/opensolaris/sys/zone.h b/sys/compat/opensolaris/sys/zone.h
index 2e47eb17b44e4..181fb55c51b3d 100644
--- a/sys/compat/opensolaris/sys/zone.h
+++ b/sys/compat/opensolaris/sys/zone.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/opensolaris/sys/zone.h,v 1.1 2007/04/06 01:09:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_ZONE_H_
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index cf1212a2b1a85..488dfd146ba92 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.40.4.1 2008/01/19 18:15:03 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/pecoff/imgact_pecoff.h b/sys/compat/pecoff/imgact_pecoff.h
index a625a9b8e9f8f..f8d628f70729f 100644
--- a/sys/compat/pecoff/imgact_pecoff.h
+++ b/sys/compat/pecoff/imgact_pecoff.h
@@ -1,5 +1,5 @@
 /* $NetBSD$	 */
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.h,v 1.2 2005/01/05 22:34:36 imp Exp $	*/
 /*-
  * Copyright (c) 2000 Masaru OKI
  */
diff --git a/sys/compat/svr4/Makefile b/sys/compat/svr4/Makefile
index a90cd555dddbd..b6d097415fdd3 100644
--- a/sys/compat/svr4/Makefile
+++ b/sys/compat/svr4/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/svr4/Makefile,v 1.8 2006/07/01 10:51:54 markm Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index 64c2a844e9cc7..ee9da7c4b1ea2 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.25.14.1 2008/01/19 18:15:03 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index 84ee720597ffb..856b55fc16901 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4.h,v 1.9 2005/07/13 15:14:33 jhb Exp $
  */
 
 #include "opt_svr4.h"
diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h
index ef2da1a68a6a5..29290ee6d98e9 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_acl.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 #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 9ce7bf88e0e8d..8427d57eb84d6 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_dirent.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h
index b5fa2743365e8..721a32e5b10d9 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_errno.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index adab956ac84c7..8d44d9b11046f 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_exec.h,v 1.7 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 8735abb6dd674..e4885c7796a6a 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.40 2007/06/12 00:11:57 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 1a354a799457d..a6b998e6e08e1 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.h,v 1.5 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 701bf15690a79..ba03aa511d822 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.35 2007/04/04 09:11:31 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_filio.h b/sys/compat/svr4/svr4_filio.h
index baf81c7e228ef..16d7f9820cdf1 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_filio.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index df2db984bb582..8e1910c2a8002 100644
--- a/sys/compat/svr4/svr4_fuser.h
+++ b/sys/compat/svr4/svr4_fuser.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_fuser.h,v 1.5 2005/01/05 22:34:36 imp Exp $
  *	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 5a3bb67293942..3b6afd0ac39dd 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_hrt.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index b192a2c77ec85..9be8da012f595 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.24 2005/09/28 07:03:02 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h
index e0633a7e4e1f3..bfbe4cc86e1c8 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_ioctl.h,v 1.6 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index 317239c5dd8dc..6accda58579c4 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.23 2006/07/08 19:51:37 jhb Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h
index 36cf3ddceb3ec..f541345c9004a 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_ipc.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index e4c48c0a6d887..dc10fac0e10d6 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.97 2007/06/12 00:11:57 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h
index e30e4924661c1..bf5817ba9ac6c 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_mman.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h
index b089b9fa84d38..711b6eee6f498 100644
--- a/sys/compat/svr4/svr4_proto.h
+++ b/sys/compat/svr4/svr4_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.28 2006/11/11 21:49:08 ru Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 7b57c3f745c3b..1b3477af4fcde 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.18 2005/01/05 22:34:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_resource.h b/sys/compat/svr4/svr4_resource.h
index 4b93e9a229dc6..86830a501beea 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_resource.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 /*-
diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h
index 35e653bdf6c2a..30d3f98303c85 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_siginfo.h,v 1.5 2005/10/19 09:33:15 davidxu Exp $
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index c0a3a21f0c028..84c3eec0d0b08 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.35 2005/09/28 07:03:02 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index 218236d9880ca..5ffe1697f1695 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_signal.h,v 1.12 2005/10/14 12:43:44 davidxu Exp $
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index 1714bf1d3378c..b6ac101425abb 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.27 2006/07/21 20:40:13 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index cbe7401f56936..9c63600618802 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_socket.h,v 1.10 2006/07/21 20:40:13 jhb Exp $
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 7fd28853eb04e..fa827e5a228c2 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_sockio.h b/sys/compat/svr4/svr4_sockio.h
index 6160aa3daac5b..62abd46d89ddb 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_sockio.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h
index 622ff6f8b8038..207fcd8845e65 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_sockmod.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index 915175a91cfb0..a1668086cde05 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.23 2006/09/02 08:18:22 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_stat.h b/sys/compat/svr4/svr4_stat.h
index 03d6e3c6ed367..cbc82e9599da8 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_stat.h,v 1.5 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h
index 7db9655e5aa2a..b281b089e3705 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_statvfs.h,v 1.4 2005/01/05 22:34:36 imp Exp $
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 3a2e2750c3775..cf644f7a5b31e 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.62 2006/08/05 22:04:21 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index a96c24dacb6ec..0b77fa9adeda1 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_stropts.h,v 1.6 2006/07/28 16:56:17 jhb Exp $
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index 58b7cae05434f..eb658b98f2a17 100644
--- a/sys/compat/svr4/svr4_syscall.h
+++ b/sys/compat/svr4/svr4_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.26 2006/11/11 21:49:08 ru Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_syscallnames.c b/sys/compat/svr4/svr4_syscallnames.c
index 5f91f2429866e..eae3cdbcb2c7e 100644
--- a/sys/compat/svr4/svr4_syscallnames.c
+++ b/sys/compat/svr4/svr4_syscallnames.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.26 2006/11/11 21:49:08 ru Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h
index b88fe19fac18c..d3ba53ad186cb 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysconfig.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index ca5daf73e0fc7..f0ea82126f43b 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.27 2006/11/11 21:49:08 ru Exp $
  * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h
index 2d5288e0bf42c..d957bb6626445 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_systeminfo.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index c4a2d8c1825a1..83220e0103826 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.42 2006/07/21 20:40:13 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index 37a6783aff115..159ddbc4e2675 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_termios.c,v 1.14 2005/09/28 07:03:02 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/compat/svr4/svr4_termios.h b/sys/compat/svr4/svr4_termios.h
index c2b0c543e2a70..6be4ea681b7b1 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_termios.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h
index 0be98235dc77c..134a87db4bbb6 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_time.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h
index e295a4cc4e418..669e8438a54b6 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_timod.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 3575607faa950..eea54e4c9d27d 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.16 2005/09/28 07:03:02 rwatson Exp $");
 
 #ifndef BURN_BRIDGES
 
diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h
index aecde201c9235..e6820c6d623ac 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_ttold.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h
index af801d874322f..43ff7d3b2f92f 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_types.h,v 1.6 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index 24cb5a12793ef..d733014ac2961 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_ucontext.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h
index d636c01d46084..0bbed1edf8c4c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_ulimit.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index 3b9ade126fcdb..9bc78329cb0bb 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_ustat.h,v 1.5 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index 4cbf230cf526f..d4e07014aadb4 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_util.h,v 1.12 2006/07/10 21:38:17 jhb Exp $
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index 71795755129fd..6f304e8a7ed08 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_utsname.h,v 1.5 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h
index 0ce5db74c0075..c0c88ca1e8f3e 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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/svr4/svr4_wait.h,v 1.4 2005/01/05 22:34:37 imp Exp $
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/compat/svr4/syscalls.conf b/sys/compat/svr4/syscalls.conf
index 84e0783c0a9ea..1f89c384dd148 100644
--- a/sys/compat/svr4/syscalls.conf
+++ b/sys/compat/svr4/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/compat/svr4/syscalls.conf,v 1.4 2006/08/15 17:25:54 jhb Exp $
 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 0a88a45ae20a0..7b297cb40c310 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp $
 ;	from: @(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ;
 ; System call name/number master file (or rather, slave, from SVR4).
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 1032a51ac3340..ac6b8c42cf7e6 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -2,7 +2,7 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.24 2007/05/16 17:23:53 wkoszek Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 4ac4a07bb9439..e8e0612246e37 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -1,7 +1,7 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.34 2007/07/27 14:42:25 cognet Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index f8a8365c448e3..29ebf0b518bce 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
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.273 2007/05/16 17:23:53 wkoszek Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index f736866f14e74..49e42a82588f2 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -1,7 +1,7 @@
 # Makefile.ia64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.70 2007/06/02 21:30:39 marcel Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 18ee498bcf3a2..f94b4b91cf223 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
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.175 2007/05/16 17:23:53 wkoszek Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 81b1bb4833597..7fa68d3f69923 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.powerpc -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.285 2007/05/16 17:23:54 wkoszek Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 947ec87ace50d..76dec9979f066 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -1,7 +1,7 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.40 2007/05/16 17:23:54 wkoszek Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.sun4v b/sys/conf/Makefile.sun4v
index 947ec87ace50d..e7078665afbba 100644
--- a/sys/conf/Makefile.sun4v
+++ b/sys/conf/Makefile.sun4v
@@ -1,7 +1,7 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.3 2007/05/16 17:23:54 wkoszek Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index df17803f9ba77..ec2f3dafa3c4a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/NOTES,v 1.1454 2007/09/26 21:14:17 marius Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
diff --git a/sys/conf/files b/sys/conf/files
index b25f40edae953..82263e3baef4c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files,v 1.1243.2.2 2007/12/06 10:15:29 rwatson Exp $
 #
 # 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.amd64 b/sys/conf/files.amd64
index 7c580a7398e09..9b9b1e33bc9ca 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.4.2.1 2008/02/06 03:24:28 scottl Exp $
 #
 # 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.arm b/sys/conf/files.arm
index d0958894fb83b..c32b1e37496c1 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.arm,v 1.15 2007/07/03 12:13:42 gnn Exp $
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 arm/arm/autoconf.c	standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 46a5a003be3cc..4178e8c839d98 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.i386,v 1.580.2.4.2.1 2008/02/06 03:24:28 scottl Exp $
 #
 # 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.ia64 b/sys/conf/files.ia64
index 3452716051db2..02f058cb5099a 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.ia64,v 1.92 2007/07/03 12:13:42 gnn Exp $
 #
 # 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 af3765f0e4db2..67dfc1b578ec2 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801/PC-9821
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.pc98,v 1.356 2007/07/03 12:13:42 gnn Exp $
 #
 # 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.powerpc b/sys/conf/files.powerpc
index 2b614817b795e..b67cc9813ad7a 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.65 2007/07/03 12:13:42 gnn Exp $
 #
 # 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.sparc64 b/sys/conf/files.sparc64
index 5f2918005f901..3c45fa60108d0 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.92 2007/07/03 12:13:42 gnn Exp $
 #
 # 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.sun4v b/sys/conf/files.sun4v
index 250d848479601..074a498e2f74c 100644
--- a/sys/conf/files.sun4v
+++ b/sys/conf/files.sun4v
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.11 2007/07/03 12:13:42 gnn Exp $
 #
 # 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/kern.mk b/sys/conf/kern.mk
index eede8c70981de..07a17c8c61008 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 1eca596c16942..5b7181b6ddbeb 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.100 2007/03/23 21:55:59 imp Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index a5139f14afe4e..3d3600bbf4b09 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.92 2007/08/08 19:12:06 marcel Exp $
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 535502ac45687..9c0172e6c8b2e 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $
 #
 # The include file <bsd.kmod.mk> handles building and installing loadable
 # kernel modules.
diff --git a/sys/conf/kmod_syms.awk b/sys/conf/kmod_syms.awk
index 677d813507ee5..5a2650079930a 100644
--- a/sys/conf/kmod_syms.awk
+++ b/sys/conf/kmod_syms.awk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod_syms.awk,v 1.4 2002/08/06 19:31:04 iedowse Exp $
 
 # Read global symbols from object file.
 BEGIN {
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index 68ab1a2c7e4ed..ccc96f8d6fbac 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm
index 3ccf916b1d775..8cc2e4dc6d765 100644
--- a/sys/conf/ldscript.arm
+++ b/sys/conf/ldscript.arm
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.arm,v 1.3 2005/11/24 02:25:49 cognet Exp $ */
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index a94f32fdd4c2f..2008a851a07b9 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.9 2003/12/03 07:40:03 phk Exp $ */
 OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
 OUTPUT_ARCH(i386)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.ia64 b/sys/conf/ldscript.ia64
index 8dc0368c7522e..9c65fe03b70d0 100644
--- a/sys/conf/ldscript.ia64
+++ b/sys/conf/ldscript.ia64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.12 2004/08/25 07:43:28 marcel Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(__start)
diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc
index fac182df76331..74d94c31a4a20 100644
--- a/sys/conf/ldscript.powerpc
+++ b/sys/conf/ldscript.powerpc
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.powerpc,v 1.7 2001/10/08 10:43:34 mp Exp $ */
 
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
diff --git a/sys/conf/ldscript.sparc64 b/sys/conf/ldscript.sparc64
index 6f9c021ae1b30..7a3b01d3ee7f0 100644
--- a/sys/conf/ldscript.sparc64
+++ b/sys/conf/ldscript.sparc64
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4 2003/06/07 18:23:50 jake Exp $ */
 OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
 	      "elf64-sparc")
 OUTPUT_ARCH(sparc:v9)
diff --git a/sys/conf/makeLINT.mk b/sys/conf/makeLINT.mk
index 08947a91db059..bff4279a5ecb0 100644
--- a/sys/conf/makeLINT.mk
+++ b/sys/conf/makeLINT.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/makeLINT.mk,v 1.1 2003/02/26 23:36:58 ru Exp $
 
 all:
 	@echo "make LINT only"
diff --git a/sys/conf/makeLINT.sed b/sys/conf/makeLINT.sed
index 83445cfcb7058..6f68d4a05b462 100644
--- a/sys/conf/makeLINT.sed
+++ b/sys/conf/makeLINT.sed
@@ -1,5 +1,5 @@
 #!/usr/bin/sed -E -n -f
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/makeLINT.sed,v 1.3 2003/02/26 23:36:58 ru Exp $
 
 /^(machine|ident|device|nodevice|makeoptions|nomakeoption|options|option|nooption|profile|cpu|maxusers)[[:space:]]/ {
     s/[[:space:]]*#.*$//
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index dd27629e85230..4179f22db1075 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.72.2.5.2.4 2008/02/24 05:45:16 kensmith Exp $
 
 TYPE="FreeBSD"
 REVISION="7.0"
@@ -36,7 +36,7 @@ BRANCH="RELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-RELEASE="${REVISION}-${BRANCH}"
+RELEASE=7.0-RELEASE
 VERSION="${TYPE} ${RELEASE}"
 
 if [ "X${PARAMFILE}" != "X" ]; then
diff --git a/sys/conf/options b/sys/conf/options
index 96aedc1a1b929..49774323dbfe6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options,v 1.608 2007/09/23 07:34:23 pjd Exp $
 #
 #        On the handling of kernel options
 #
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 79bc8162369f7..0dafc87d71e4f 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.amd64,v 1.29 2007/07/04 00:18:38 bz Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 9135efe2ce4d1..f9d904ab75ec3 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/conf/options.arm,v 1.17.2.1 2007/12/02 14:19:38 cognet Exp $
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
 ARMFPE			opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 2325fd9b0f004..978d0eb23f264 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.i386,v 1.238 2007/07/04 00:18:38 bz Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
index 11f2285c713ce..400b4e9373e66 100644
--- a/sys/conf/options.ia64
+++ b/sys/conf/options.ia64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.ia64,v 1.28 2007/07/30 22:42:33 marcel Exp $
 # Options specific to the ia64 platform kernels
 
 ITANIUM			opt_global.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 605870a07a085..53064d31f6f1a 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.pc98,v 1.201 2007/07/04 00:18:38 bz Exp $
 # Options specific to the pc98 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc
index a6dc6da171360..851ed3bff7360 100644
--- a/sys/conf/options.powerpc
+++ b/sys/conf/options.powerpc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $
 # Options specific to the powerpc platform kernels
 
 OEA			opt_global.h
diff --git a/sys/conf/options.sparc64 b/sys/conf/options.sparc64
index 69efd033fee06..7ac0a1962fd5c 100644
--- a/sys/conf/options.sparc64
+++ b/sys/conf/options.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $
 
 SUN4U			opt_global.h
 
diff --git a/sys/conf/options.sun4v b/sys/conf/options.sun4v
index 54c0fe2d93a9e..84b98c8051162 100644
--- a/sys/conf/options.sun4v
+++ b/sys/conf/options.sun4v
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.sun4v,v 1.2 2007/01/19 12:22:50 marius Exp $
 
 SUN4V			opt_global.h
 
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index d393be8a27937..daa90c2745a69 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)systags.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/systags.sh,v 1.10 2005/12/03 21:37:54 ru Exp $
 #
 # systags.sh - construct a system tags file using dependence relations
 #	in a .depend file
diff --git a/sys/contrib/altq/altq/altq.h b/sys/contrib/altq/altq/altq.h
index c740ed359ad16..51f812de997ae 100644
--- a/sys/contrib/altq/altq/altq.h
+++ b/sys/contrib/altq/altq/altq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq.h,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/contrib/altq/altq/altq_cbq.c
index 7cdfb4085d244..08a9f886496b4 100644
--- a/sys/contrib/altq/altq/altq_cbq.c
+++ b/sys/contrib/altq/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.5 2007/07/03 12:46:05 mlaier Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_cdnr.c b/sys/contrib/altq/altq/altq_cdnr.c
index 3139d51d95b5d..236d800e06cef 100644
--- a/sys/contrib/altq/altq/altq_cdnr.c
+++ b/sys/contrib/altq/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.3 2006/11/06 13:41:50 rwatson Exp $	*/
 /*	$KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_hfsc.c b/sys/contrib/altq/altq/altq_hfsc.c
index bf7a4f09a1197..f4369516c5411 100644
--- a/sys/contrib/altq/altq/altq_hfsc.c
+++ b/sys/contrib/altq/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $	*/
 /*	$KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_priq.c b/sys/contrib/altq/altq/altq_priq.c
index ec789c5a926d9..ac758d6b0e373 100644
--- a/sys/contrib/altq/altq/altq_priq.c
+++ b/sys/contrib/altq/altq/altq_priq.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_priq.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $	*/
 /*	$KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $	*/
 /*
  * Copyright (C) 2000-2003
diff --git a/sys/contrib/altq/altq/altq_red.c b/sys/contrib/altq/altq/altq_red.c
index f6b7e3137e67a..c6e3d6f087db8 100644
--- a/sys/contrib/altq/altq/altq_red.c
+++ b/sys/contrib/altq/altq/altq_red.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_red.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $	*/
 /*	$KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_rio.c b/sys/contrib/altq/altq/altq_rio.c
index a05dba7125208..9af0cf65f9a4b 100644
--- a/sys/contrib/altq/altq/altq_rio.c
+++ b/sys/contrib/altq/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_rio.c,v 1.4 2006/11/06 13:41:50 rwatson Exp $	*/
 /*	$KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_rmclass.c b/sys/contrib/altq/altq/altq_rmclass.c
index 63194ee131693..665fac572df0b 100644
--- a/sys/contrib/altq/altq/altq_rmclass.c
+++ b/sys/contrib/altq/altq/altq_rmclass.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_rmclass.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $	*/
 /*	$KAME: altq_rmclass.c,v 1.18 2003/11/06 06:32:53 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c
index c7c2f4a9e7654..6d1fc101d242b 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.10 2007/07/12 17:00:51 njl Exp $	*/
 /*	$KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/altq_var.h b/sys/contrib/altq/altq/altq_var.h
index 4c4fc2909b6ad..99407fb71ebc0 100644
--- a/sys/contrib/altq/altq/altq_var.h
+++ b/sys/contrib/altq/altq/altq_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/altq_var.h,v 1.2 2005/02/21 17:11:09 mlaier Exp $	*/
 /*	$KAME: altq_var.h,v 1.16 2003/10/03 05:05:15 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/altq/altq/if_altq.h b/sys/contrib/altq/altq/if_altq.h
index 0676e401f0b26..2b4537eadd976 100644
--- a/sys/contrib/altq/altq/if_altq.h
+++ b/sys/contrib/altq/altq/if_altq.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/altq/altq/if_altq.h,v 1.3 2004/06/15 01:45:19 mlaier Exp $	*/
 /*	$KAME: if_altq.h,v 1.11 2003/07/10 12:07:50 kjc Exp $	*/
 
 /*
diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index 353975e413e10..669e3ff4588c4 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.10 2007/03/22 18:08:11 jkim Exp $
 #
 # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout
 #
diff --git a/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu b/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu
index c83422b912ad5..4986b9967e2fb 100644
--- a/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu
+++ b/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu,v 1.1 2007/09/27 22:39:49 cognet Exp $
 
 begin 644 IxNpeMicrocode.dat
 M_NWP#1"``@$```NL``````````L````!```%7@````$```MB`````0``"Z(`
diff --git a/sys/contrib/dev/npe/LICENSE b/sys/contrib/dev/npe/LICENSE
index 6bc537158168e..7e5ed92d9e624 100644
--- a/sys/contrib/dev/npe/LICENSE
+++ b/sys/contrib/dev/npe/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/npe/LICENSE,v 1.1 2007/09/27 22:39:49 cognet Exp $
 
 Copyright (c) 2007, Intel Corporation.
 All rights reserved.
diff --git a/sys/contrib/dev/nve/amd64/nvenetlib.README b/sys/contrib/dev/nve/amd64/nvenetlib.README
index fd4f6b86cda9a..a470919d2f14a 100644
--- a/sys/contrib/dev/nve/amd64/nvenetlib.README
+++ b/sys/contrib/dev/nve/amd64/nvenetlib.README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/nve/amd64/nvenetlib.README,v 1.1 2005/09/11 17:50:20 obrien Exp $
 
 The installation and use of this software is subject to the following license terms and conditions:
 
diff --git a/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu b/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu
index b4a44286004d0..f5b36beb8e3ef 100644
--- a/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu
+++ b/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu,v 1.1.1.2 2005/12/07 17:32:13 obrien Exp $
 begin-base64 644 nvenetlib.o.bz2
 QlpoOTFBWSZTWQrVCikAPRD////////////////////////////+////////////////4ETdfd7c
 d6MHt93wvffPbe6vXdzLa8cIHsyiSQRFGCttADntZTtnJu6fPePr3w68929yzVt2NRdTNU96tIc9
diff --git a/sys/contrib/dev/nve/i386/nvenetlib.README b/sys/contrib/dev/nve/i386/nvenetlib.README
index fd4f6b86cda9a..2bb90002589b7 100644
--- a/sys/contrib/dev/nve/i386/nvenetlib.README
+++ b/sys/contrib/dev/nve/i386/nvenetlib.README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/nve/i386/nvenetlib.README,v 1.1 2005/09/11 17:50:20 obrien Exp $
 
 The installation and use of this software is subject to the following license terms and conditions:
 
diff --git a/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu b/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu
index a10177b09a20f..1d760789d9bbf 100644
--- a/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu
+++ b/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu,v 1.1.1.2 2005/12/07 17:32:13 obrien Exp $
 begin-base64 644 nvenetlib.o.bz2
 QlpoOTFBWSZTWSDHheUAMsL/////////////////////////////////////////////4EQzTUNc
 bl2envbuoZ32+6l7UqAC3Z7vc94Or3e71IAA8D6+8zp9Pb2cpz25cy8899HK75hzz68d9fKfZ93z
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 1f62d41f02a07..ba0efe5352be7 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.43 2007/02/23 12:18:28 piso Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/if_oltr_isa.c b/sys/contrib/dev/oltr/if_oltr_isa.c
index e16d6c73e37d2..b627ad804071b 100644
--- a/sys/contrib/dev/oltr/if_oltr_isa.c
+++ b/sys/contrib/dev/oltr/if_oltr_isa.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr_isa.c,v 1.1 2005/02/03 23:01:01 mdodd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/if_oltr_pci.c b/sys/contrib/dev/oltr/if_oltr_pci.c
index 773e9b23af3ef..5cf95ebdb940c 100644
--- a/sys/contrib/dev/oltr/if_oltr_pci.c
+++ b/sys/contrib/dev/oltr/if_oltr_pci.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr_pci.c,v 1.3 2005/10/13 21:11:19 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/contrib/dev/oltr/if_oltrvar.h b/sys/contrib/dev/oltr/if_oltrvar.h
index 7b9994d026546..fd35f355060b6 100644
--- a/sys/contrib/dev/oltr/if_oltrvar.h
+++ b/sys/contrib/dev/oltr/if_oltrvar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltrvar.h,v 1.2 2005/06/10 16:49:03 brooks Exp $
  */
 
 /*#define DEBUG_MASK DEBUG_POLL*/
diff --git a/sys/contrib/dev/oltr/trlld.h b/sys/contrib/dev/oltr/trlld.h
index 988cf356df108..9e48f6afab2f7 100644
--- a/sys/contrib/dev/oltr/trlld.h
+++ b/sys/contrib/dev/oltr/trlld.h
@@ -14,7 +14,7 @@
  *---------------------------------------------------------------------------

  *

  * Description: PowerMACH Works header file

- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlld.h,v 1.4 2000/03/18 23:51:51 lile Exp $
  *

  *---------------------------------------------------------------------------

  * $Log:   J:/usr/project/trlld/libsrc/include/trlld.h_v  $

diff --git a/sys/contrib/dev/oltr/trlldbm.c b/sys/contrib/dev/oltr/trlldbm.c
index 944606da5a312..77c1aa5828f4f 100644
--- a/sys/contrib/dev/oltr/trlldbm.c
+++ b/sys/contrib/dev/oltr/trlldbm.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlldbm.c,v 1.4 2000/03/18 23:51:51 lile Exp $
  *
  *      Copyright (c) 1997
  *      OLICOM A/S
diff --git a/sys/contrib/dev/oltr/trlldhm.c b/sys/contrib/dev/oltr/trlldhm.c
index cdcb250c5a62e..22f88cb49d39c 100644
--- a/sys/contrib/dev/oltr/trlldhm.c
+++ b/sys/contrib/dev/oltr/trlldhm.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlldhm.c,v 1.4 2000/03/18 23:51:52 lile Exp $
  *
  *      Copyright (c) 1997
  *      OLICOM A/S
diff --git a/sys/contrib/dev/oltr/trlldmac.c b/sys/contrib/dev/oltr/trlldmac.c
index 63cfd3e3cf3bf..c0fbe847c6eb0 100644
--- a/sys/contrib/dev/oltr/trlldmac.c
+++ b/sys/contrib/dev/oltr/trlldmac.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/dev/oltr/trlldmac.c,v 1.4 2000/03/18 23:51:52 lile Exp $
  *
  *      Copyright (c) 1997
  *      OLICOM A/S
diff --git a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE b/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
index 1ee473da33f10..30fa68a7c0079 100644
--- a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
+++ b/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE,v 1.2 2002/04/25 03:31:38 darrenr Exp $
 
 Copyright (C) 1993-2002 by Darren Reed.
 
diff --git a/sys/contrib/ipfilter/netinet/QNX_OCL.txt b/sys/contrib/ipfilter/netinet/QNX_OCL.txt
index b62377679670a..4142b56db6211 100644
--- a/sys/contrib/ipfilter/netinet/QNX_OCL.txt
+++ b/sys/contrib/ipfilter/netinet/QNX_OCL.txt
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/ipfilter/netinet/QNX_OCL.txt,v 1.2 2002/04/25 03:31:39 darrenr Exp $
 
    End User License Certificate (EULA) End User License Certificate
    (EULA) 
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index 9abad630659be..ed70dbb598f82 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52.2.2 2007/12/01 00:53:41 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -155,7 +155,7 @@ struct file;
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52.2.2 2007/12/01 00:53:41 darrenr Exp $";
 /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c
index 6eb2f7e9cad53..9b7abecbf05fc 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.c
+++ b/sys/contrib/ipfilter/netinet/ip_auth.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.44.2.2 2007/12/01 00:53:41 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij.
@@ -120,7 +120,7 @@ extern struct ifqueue   ipintrq;		/* ip packet input queue */
 /* END OF INCLUDES */
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.44.2.2 2007/12/01 00:53:41 darrenr Exp $";
 /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/sys/contrib/ipfilter/netinet/ip_auth.h
index 36c4bacf8f938..6266a049f5f10 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.h
+++ b/sys/contrib/ipfilter/netinet/ip_auth.h
@@ -1,11 +1,11 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.16 2007/06/04 02:54:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2001 by Darren Reed & Guido Van Rooij.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.16 2007/06/04 02:54:35 darrenr Exp $
  * Id: ip_auth.h,v 2.16.2.2 2006/03/16 06:45:49 darrenr Exp $
  *
  */
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index b653007547615..ff020f94e0682 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -4,7 +4,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_compat.h	1.8 1/14/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.33.2.1 2007/10/31 05:00:37 darrenr Exp $
  * Id: ip_compat.h,v 2.142.2.57 2007/10/10 09:51:42 darrenr Exp $
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h
index 353328c7d0bee..0d4825292207f 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/sys/contrib/ipfilter/netinet/ip_fil.h
@@ -4,7 +4,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_fil.h	1.35 6/5/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.h,v 1.35.2.1 2007/10/31 05:00:37 darrenr Exp $
  * Id: ip_fil.h,v 2.170.2.51 2007/10/10 09:48:03 darrenr Exp $
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index 718eae3231bdd..e767cdb0cfa81 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.6.2.2 2007/12/01 00:53:41 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index fb21bd1d48465..afa2019a4c372 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.32.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -102,7 +102,7 @@ extern struct timeout fr_slowtimer_ch;
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_frag.c	1.11 3/24/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.32.2.1 2007/10/31 05:00:37 darrenr Exp $";
 /* static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.77.2.12 2007/09/20 12:51:51 darrenr Exp $"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/sys/contrib/ipfilter/netinet/ip_frag.h
index 227dbcd555356..235767af3b677 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.h
+++ b/sys/contrib/ipfilter/netinet/ip_frag.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.h,v 1.19 2007/06/04 02:54:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_frag.h	1.5 3/24/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.h,v 1.19 2007/06/04 02:54:35 darrenr Exp $
  * Id: ip_frag.h,v 2.23.2.1 2004/03/29 16:21:56 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
index f56a690443372..85f63bd23b7e4 100644
--- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.28 2007/06/04 02:54:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2003 by Darren Reed
@@ -8,7 +8,7 @@
  * Simple FTP transparent proxy for in-kernel use.  For use with the NAT
  * code.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.28 2007/06/04 02:54:35 darrenr Exp $
  * Id: ip_ftp_pxy.c,v 2.88.2.19 2006/04/01 10:14:53 darrenr Exp $
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_htable.c b/sys/contrib/ipfilter/netinet/ip_htable.c
index fc521d851a32f..dfa31e9d0e8c9 100644
--- a/sys/contrib/ipfilter/netinet/ip_htable.c
+++ b/sys/contrib/ipfilter/netinet/ip_htable.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_htable.c,v 1.4.2.1 2007/10/31 05:00:37 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c
index 583eb6399a0ff..41e7bb848bcf1 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/sys/contrib/ipfilter/netinet/ip_log.c
@@ -1,11 +1,11 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.33.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.33.2.1 2007/10/31 05:00:38 darrenr Exp $
  * Id: ip_log.c,v 2.75.2.19 2007/09/09 11:32:06 darrenr Exp $
  */
 #include <sys/param.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c
index 23cb57989b5b7..0a7d10a7f17a1 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/sys/contrib/ipfilter/netinet/ip_nat.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.42.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
@@ -117,7 +117,7 @@ extern struct ifnet vpnif;
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.42.2.1 2007/10/31 05:00:38 darrenr Exp $";
 /* static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.195.2.102 2007/10/16 10:08:10 darrenr Exp $"; */
 #endif
 
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/contrib/ipfilter/netinet/ip_nat.h
index 3020eb69ee12d..f13018b5161bc 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.h
+++ b/sys/contrib/ipfilter/netinet/ip_nat.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.h,v 1.26.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_nat.h	1.5 2/4/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.h,v 1.26.2.1 2007/10/31 05:00:38 darrenr Exp $
  * Id: ip_nat.h,v 2.90.2.20 2007/09/25 08:27:32 darrenr Exp $
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index b0490a1303e21..b2d80df54e02c 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.29.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/contrib/ipfilter/netinet/ip_proxy.h
index 1bcfc6069e3e8..9d5f31fd3679a 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.h
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.h
@@ -1,11 +1,11 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.h,v 1.17 2007/06/04 02:54:35 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1997-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.h,v 1.17 2007/06/04 02:54:35 darrenr Exp $
  * Id: ip_proxy.h,v 2.31.2.2 2005/03/12 19:33:48 darrenr Exp
  */
 
diff --git a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
index 2729dc6725b06..e374f90889d1d 100644
--- a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
@@ -1,7 +1,7 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c,v 1.13 2007/06/04 02:54:36 darrenr Exp $	*/
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c,v 1.13 2007/06/04 02:54:36 darrenr Exp $
  * Copyright (C) 1998-2003 by Darren Reed
  *
  * See the IPFILTER.LICENCE file for details on licencing.
diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
index dc92bf546845e..560ec1f81418e 100644
--- a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c,v 1.15 2007/06/04 02:54:36 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1998-2003 by Darren Reed
@@ -9,7 +9,7 @@
  *
  * Simple RCMD transparent proxy for in-kernel use.  For use with the NAT
  * code.
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c,v 1.15 2007/06/04 02:54:36 darrenr Exp $
  */
 
 #define	IPF_RCMD_PROXY
diff --git a/sys/contrib/ipfilter/netinet/ip_rules.c b/sys/contrib/ipfilter/netinet/ip_rules.c
index f080ec5b83245..edbfedc2d34b3 100644
--- a/sys/contrib/ipfilter/netinet/ip_rules.c
+++ b/sys/contrib/ipfilter/netinet/ip_rules.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rules.c,v 1.1.1.1 2005/04/25 18:15:34 darrenr Exp $	*/
 
 /*
 * Copyright (C) 1993-2000 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_rules.h b/sys/contrib/ipfilter/netinet/ip_rules.h
index 37e364613d500..aac1ade27fa76 100644
--- a/sys/contrib/ipfilter/netinet/ip_rules.h
+++ b/sys/contrib/ipfilter/netinet/ip_rules.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_rules.h,v 1.1.1.1 2005/04/25 18:15:34 darrenr Exp $	*/
 
 extern int ipfrule_add __P((void));
 extern int ipfrule_remove __P((void));
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index cfb79749ef95a..bc72a9d9682f0 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.39.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/contrib/ipfilter/netinet/ip_state.h
index 9c4e8149d7fc6..cab5bab624573 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.h
+++ b/sys/contrib/ipfilter/netinet/ip_state.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.h,v 1.19.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-2001 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.h,v 1.19.2.1 2007/10/31 05:00:38 darrenr Exp $
  * Id: ip_state.h,v 2.68.2.10 2007/10/16 09:33:24 darrenr Exp $
  */
 #ifndef	__IP_STATE_H__
diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/contrib/ipfilter/netinet/ip_sync.c
index a72f50f34bd4f..28b69abe643e6 100644
--- a/sys/contrib/ipfilter/netinet/ip_sync.c
+++ b/sys/contrib/ipfilter/netinet/ip_sync.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.c,v 1.5.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/sys/contrib/ipfilter/netinet/ipl.h
index 4f2f122821a44..4788152667b3f 100644
--- a/sys/contrib/ipfilter/netinet/ipl.h
+++ b/sys/contrib/ipfilter/netinet/ipl.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ipl.h,v 1.26.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ipl.h	1.21 6/5/96
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ipl.h,v 1.26.2.1 2007/10/31 05:00:38 darrenr Exp $
  * Id: ipl.h,v 2.52.2.30 2007/10/16 09:41:00 darrenr Exp $
  */
 
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
index 36048e4bb067b..3dcef3cb9265c 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
@@ -1,9 +1,9 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.19.2.1 2007/10/31 05:00:38 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000 by Darren Reed.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.19.2.1 2007/10/31 05:00:38 darrenr Exp $
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 
diff --git a/sys/contrib/ngatm/FREEBSD-Xlist b/sys/contrib/ngatm/FREEBSD-Xlist
index 0ead0cc6a5ce2..b506cfdecd883 100644
--- a/sys/contrib/ngatm/FREEBSD-Xlist
+++ b/sys/contrib/ngatm/FREEBSD-Xlist
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/contrib/ngatm/FREEBSD-Xlist,v 1.1 2004/08/11 12:25:09 harti Exp $
 */README
 */VERSION
 */Makefile.in
diff --git a/sys/contrib/ngatm/FREEBSD-upgrade b/sys/contrib/ngatm/FREEBSD-upgrade
index cb167acca87de..915030fb1b5e2 100644
--- a/sys/contrib/ngatm/FREEBSD-upgrade
+++ b/sys/contrib/ngatm/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/contrib/ngatm/FREEBSD-upgrade,v 1.2 2003/11/03 09:15:31 harti Exp $
 
 This is the part of the NgATM stuff that is shared by kernel and user.
 Be careful to feed changes back to the maintainer <harti@freebsd.org>,
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.h b/sys/contrib/ngatm/netnatm/msg/uni_ie.h
index f24c560fb8de0..924592ee2e180 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_ie.h
+++ b/sys/contrib/ngatm/netnatm/msg/uni_ie.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_ie.h,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 #ifndef _NETNATM_MSG_UNI_IE_H_
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ietab.h b/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
index 62cba33cd91d2..23511d87336f2 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
+++ b/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_ietab.h,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_msg.c b/sys/contrib/ngatm/netnatm/msg/uni_msg.c
index f9991858b418d..03b89842a7d85 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_msg.c
+++ b/sys/contrib/ngatm/netnatm/msg/uni_msg.c
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_msg.c,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_msg.h b/sys/contrib/ngatm/netnatm/msg/uni_msg.h
index ddb095b612c5b..fbb20447734e8 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_msg.h
+++ b/sys/contrib/ngatm/netnatm/msg/uni_msg.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/msg/uni_msg.h,v 1.1 2003/11/03 09:11:53 harti Exp $
  */
 
 #ifndef _NETNATM_MSG_UNI_MSG_H_
diff --git a/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk b/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
index be61925c977a9..a3415524e543a 100644
--- a/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
+++ b/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
@@ -36,7 +36,7 @@ function begin() {
 function first_entry() {
 	print "/* This file was created automatically"
 	print " * Source file: " id
-	print " * $FreeBSD$"
+	print " * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk,v 1.1.1.2 2004/07/08 16:39:00 harti Exp $"
 	print " */"
 	print ""
 	print "#include <netnatm/msg/unistruct.h>"
diff --git a/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk b/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
index f9b44f2b168d7..5dc5d5e1c1bbe 100644
--- a/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
+++ b/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
@@ -36,7 +36,7 @@ function begin() {
 function first_entry() {
 	print "/* This file was created automatically"
 	print " * Source file: " id
-	print " * $FreeBSD$"
+	print " * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk,v 1.1.1.2 2004/07/08 16:39:00 harti Exp $"
 	print " */"
 	print ""
 }
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c b/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
index 1653ba7438ec6..5456912839085 100644
--- a/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
+++ b/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c,v 1.1 2003/11/07 08:48:43 harti Exp $
  */
 
 #include <netnatm/msg/unistruct.h>
diff --git a/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h b/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
index 70e4e2eeb8b49..1512c320a5cf5 100644
--- a/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
+++ b/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
@@ -1,6 +1,6 @@
 /* This file was created automatically
  * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h,v 1.1 2003/11/07 08:48:43 harti Exp $
  */
 
 
diff --git a/sys/contrib/opensolaris/common/atomic/ia64/atomic.S b/sys/contrib/opensolaris/common/atomic/ia64/atomic.S
index 409d759b784f3..65008080299f3 100644
--- a/sys/contrib/opensolaris/common/atomic/ia64/atomic.S
+++ b/sys/contrib/opensolaris/common/atomic/ia64/atomic.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S,v 1.2 2007/06/08 16:20:03 marcel Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/contrib/pf/net/if_pflog.c
index 94084d13739c5..26e9a3cf6e418 100644
--- a/sys/contrib/pf/net/if_pflog.c
+++ b/sys/contrib/pf/net/if_pflog.c
@@ -40,7 +40,7 @@
 #include "opt_pf.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.21 2007/07/03 12:16:07 mlaier Exp $");
 
 #ifdef DEV_BPF
 #define	NBPFILTER	DEV_BPF
diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/contrib/pf/net/if_pflog.h
index a3c74d16258ff..ef40ea1b62077 100644
--- a/sys/contrib/pf/net/if_pflog.h
+++ b/sys/contrib/pf/net/if_pflog.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.h,v 1.9 2007/07/03 12:16:07 mlaier Exp $ */
 /* $OpenBSD: if_pflog.h,v 1.14 2006/10/25 11:27:01 henning Exp $ */
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c
index cd835405e806b..0eea2e4cb3700 100644
--- a/sys/contrib/pf/net/if_pfsync.c
+++ b/sys/contrib/pf/net/if_pfsync.c
@@ -34,7 +34,7 @@
 #include "opt_pf.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $");
 
 #ifdef DEV_BPF
 #define	NBPFILTER	DEV_BPF
diff --git a/sys/contrib/pf/net/if_pfsync.h b/sys/contrib/pf/net/if_pfsync.h
index f7edca3e40037..552fb5488ca58 100644
--- a/sys/contrib/pf/net/if_pfsync.h
+++ b/sys/contrib/pf/net/if_pfsync.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/if_pfsync.h,v 1.9 2007/07/03 12:16:07 mlaier Exp $	*/
 /*	$OpenBSD: if_pfsync.h,v 1.30 2006/10/31 14:49:01 henning Exp $	*/
 
 /*
diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c
index 2263437a88b8e..d4c3df2287b28 100644
--- a/sys/contrib/pf/net/pf.c
+++ b/sys/contrib/pf/net/pf.c
@@ -40,7 +40,7 @@
 #include "opt_inet6.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.46.2.1 2007/11/25 19:26:46 mlaier Exp $");
 #endif
 
 #ifdef __FreeBSD__
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c
index f62b4974a4772..0102973261fad 100644
--- a/sys/contrib/pf/net/pf_if.c
+++ b/sys/contrib/pf/net/pf_if.c
@@ -37,7 +37,7 @@
 #include "opt_inet6.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.11.2.2 2007/11/25 19:26:46 mlaier Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index e568e4bd364fe..a8626af5c2f37 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -40,7 +40,7 @@
 #include "opt_inet6.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.28.2.1 2007/11/25 19:26:46 mlaier Exp $");
 #endif
 
 #ifdef __FreeBSD__
diff --git a/sys/contrib/pf/net/pf_mtag.h b/sys/contrib/pf/net/pf_mtag.h
index a0ebf7efbd653..2cb97d1722f77 100644
--- a/sys/contrib/pf/net/pf_mtag.h
+++ b/sys/contrib/pf/net/pf_mtag.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pf_mtag.h,v 1.1 2007/07/03 12:46:06 mlaier Exp $	*/
 /*
  * Copyright (c) 2001 Daniel Hartmeier
  * All rights reserved.
diff --git a/sys/contrib/pf/net/pf_norm.c b/sys/contrib/pf/net/pf_norm.c
index 32ba9f418a470..adfbb6b315436 100644
--- a/sys/contrib/pf/net/pf_norm.c
+++ b/sys/contrib/pf/net/pf_norm.c
@@ -31,7 +31,7 @@
 #include "opt_pf.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.19 2007/07/03 12:16:07 mlaier Exp $");
 
 #ifdef DEV_PFLOG
 #define	NPFLOG DEV_PFLOG
diff --git a/sys/contrib/pf/net/pf_osfp.c b/sys/contrib/pf/net/pf_osfp.c
index b36b2575b6d02..9114b4f364ded 100644
--- a/sys/contrib/pf/net/pf_osfp.c
+++ b/sys/contrib/pf/net/pf_osfp.c
@@ -19,7 +19,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_osfp.c,v 1.6 2007/07/03 12:16:07 mlaier Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/contrib/pf/net/pf_ruleset.c b/sys/contrib/pf/net/pf_ruleset.c
index 7ff6a778f7513..198bf2ae8beed 100644
--- a/sys/contrib/pf/net/pf_ruleset.c
+++ b/sys/contrib/pf/net/pf_ruleset.c
@@ -37,7 +37,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ruleset.c,v 1.2 2007/07/03 12:16:07 mlaier Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/contrib/pf/net/pf_subr.c b/sys/contrib/pf/net/pf_subr.c
index 7d87833b96dfb..69c416a5aed14 100644
--- a/sys/contrib/pf/net/pf_subr.c
+++ b/sys/contrib/pf/net/pf_subr.c
@@ -32,7 +32,7 @@
 #include "opt_inet6.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.4 2007/07/05 15:28:59 mlaier Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/contrib/pf/net/pf_table.c b/sys/contrib/pf/net/pf_table.c
index 977f88c6a503d..d40f380124146 100644
--- a/sys/contrib/pf/net/pf_table.c
+++ b/sys/contrib/pf/net/pf_table.c
@@ -35,7 +35,7 @@
 #include "opt_inet6.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.8.2.1 2007/10/28 19:46:30 mlaier Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/contrib/pf/net/pfvar.h b/sys/contrib/pf/net/pfvar.h
index 6c5c23a8098d2..fbc87e3e826e4 100644
--- a/sys/contrib/pf/net/pfvar.h
+++ b/sys/contrib/pf/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.16 2007/07/03 12:58:33 mlaier Exp $	*/
 /*	$OpenBSD: pfvar.h,v 1.244 2007/02/23 21:31:51 deraadt Exp $ */
 
 /*
diff --git a/sys/contrib/pf/netinet/in4_cksum.c b/sys/contrib/pf/netinet/in4_cksum.c
index 24a04d0145621..d30757e0e0fdf 100644
--- a/sys/contrib/pf/netinet/in4_cksum.c
+++ b/sys/contrib/pf/netinet/in4_cksum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/contrib/pf/netinet/in4_cksum.c,v 1.4 2004/08/05 20:41:38 mlaier Exp $	*/
 /*	$OpenBSD: in4_cksum.c,v 1.7 2003/06/02 23:28:13 millert Exp $	*/
 /*	$KAME: in4_cksum.c,v 1.10 2001/11/30 10:06:15 itojun Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.13 1996/10/13 02:03:03 christos Exp $	*/
diff --git a/sys/crypto/blowfish/arch/i386/bf_enc.S b/sys/crypto/blowfish/arch/i386/bf_enc.S
index bcee9c5423546..8cc2b3430c748 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: bf_enc.S,v 1.1 2001/09/09 11:01:01 tls Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc.S,v 1.2 2004/11/16 20:42:30 jhb Exp $	*/
 
 /*
  * Written by Jason R. Thorpe <thorpej@zembu.com> and Thor Lancelot Simon
diff --git a/sys/crypto/blowfish/arch/i386/bf_enc_586.S b/sys/crypto/blowfish/arch/i386/bf_enc_586.S
index 680b2e5812e2a..b348079f1285c 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc_586.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc_586.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: bf_enc_586.S,v 1.1 2001/09/09 11:01:01 tls Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc_586.S,v 1.2 2003/04/21 16:30:12 obrien Exp $	*/
 
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/blowfish/arch/i386/bf_enc_686.S b/sys/crypto/blowfish/arch/i386/bf_enc_686.S
index e480e65790e54..41298e3f7eef4 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc_686.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc_686.S
@@ -1,5 +1,5 @@
 /*	$NetBSD: bf_enc_686.S,v 1.1 2001/09/09 11:01:02 tls Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/arch/i386/bf_enc_686.S,v 1.1 2002/03/05 09:19:02 ume Exp $	*/
 
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/blowfish/bf_ecb.c b/sys/crypto/blowfish/bf_ecb.c
index a40c06e0c60ff..5670d83ccd094 100644
--- a/sys/crypto/blowfish/bf_ecb.c
+++ b/sys/crypto/blowfish/bf_ecb.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/blowfish/bf_ecb.c,v 1.1 2003/10/13 19:26:08 ume Exp $");
 
 #include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
diff --git a/sys/crypto/blowfish/bf_enc.c b/sys/crypto/blowfish/bf_enc.c
index 5f26d408960a7..d520be615a48a 100644
--- a/sys/crypto/blowfish/bf_enc.c
+++ b/sys/crypto/blowfish/bf_enc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/blowfish/bf_enc.c,v 1.6 2003/06/10 21:38:38 obrien Exp $");
 
 #include <sys/types.h>
 #include <crypto/blowfish/blowfish.h>
diff --git a/sys/crypto/blowfish/bf_locl.h b/sys/crypto/blowfish/bf_locl.h
index 9314ff3c1459a..f65e3145a811b 100644
--- a/sys/crypto/blowfish/bf_locl.h
+++ b/sys/crypto/blowfish/bf_locl.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/bf_locl.h,v 1.5 2002/03/05 09:19:01 ume Exp $	*/
 /*	$KAME: bf_locl.h,v 1.6 2001/09/10 04:03:56 itojun Exp $	*/
 
 /* crypto/bf/bf_local.h */
diff --git a/sys/crypto/blowfish/bf_pi.h b/sys/crypto/blowfish/bf_pi.h
index fdd5a27e914e8..a2be6034d2fe4 100644
--- a/sys/crypto/blowfish/bf_pi.h
+++ b/sys/crypto/blowfish/bf_pi.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/bf_pi.h,v 1.4 2002/03/05 09:19:01 ume Exp $	*/
 /*	$KAME: bf_pi.h,v 1.4 2001/09/10 04:03:56 itojun Exp $	*/
 
 /* crypto/bf/bf_pi.h */
diff --git a/sys/crypto/blowfish/bf_skey.c b/sys/crypto/blowfish/bf_skey.c
index df8d1cf3d779a..9abd6c12caa54 100644
--- a/sys/crypto/blowfish/bf_skey.c
+++ b/sys/crypto/blowfish/bf_skey.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/blowfish/bf_skey.c,v 1.6 2003/06/10 21:38:38 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sys/crypto/blowfish/blowfish.h b/sys/crypto/blowfish/blowfish.h
index ecc140754bf9d..7964c391a5aea 100644
--- a/sys/crypto/blowfish/blowfish.h
+++ b/sys/crypto/blowfish/blowfish.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/blowfish/blowfish.h,v 1.7 2003/10/13 19:26:08 ume Exp $	*/
 /*	$KAME: blowfish.h,v 1.12 2002/02/27 01:33:59 itojun Exp $	*/
 
 /* crypto/bf/blowfish.h */
diff --git a/sys/crypto/camellia/camellia-api.c b/sys/crypto/camellia/camellia-api.c
index 3226e0018ee21..75f6eef87cbca 100644
--- a/sys/crypto/camellia/camellia-api.c
+++ b/sys/crypto/camellia/camellia-api.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/camellia/camellia-api.c,v 1.1 2007/05/09 19:37:01 gnn Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/crypto/camellia/camellia.c b/sys/crypto/camellia/camellia.c
index a48c83f73a801..e67550fd35a96 100644
--- a/sys/crypto/camellia/camellia.c
+++ b/sys/crypto/camellia/camellia.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/camellia/camellia.c,v 1.1 2007/05/09 19:37:01 gnn Exp $
  */
 
 /*
diff --git a/sys/crypto/camellia/camellia.h b/sys/crypto/camellia/camellia.h
index ab0ce57e88f19..7900387a2f415 100644
--- a/sys/crypto/camellia/camellia.h
+++ b/sys/crypto/camellia/camellia.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/camellia/camellia.h,v 1.1 2007/05/09 19:37:01 gnn Exp $
  */
 
 #ifndef _CAMELLIA_H
diff --git a/sys/crypto/des/arch/i386/des_enc.S b/sys/crypto/des/arch/i386/des_enc.S
index 7fc29e678a4cd..1c297d1beb8cf 100644
--- a/sys/crypto/des/arch/i386/des_enc.S
+++ b/sys/crypto/des/arch/i386/des_enc.S
@@ -1,5 +1,5 @@
 /* $NetBSD: des_enc.S,v 1.1 2001/09/09 11:01:02 tls Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/crypto/des/arch/i386/des_enc.S,v 1.2 2003/04/21 16:30:12 obrien Exp $ */
 
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/des/des.h b/sys/crypto/des/des.h
index 81c7bfbeef5e6..b5a94fa41f257 100644
--- a/sys/crypto/des/des.h
+++ b/sys/crypto/des/des.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/des.h,v 1.6 2002/03/20 05:13:51 alfred Exp $	*/
 /*	$KAME: des.h,v 1.8 2001/09/10 04:03:57 itojun Exp $	*/
 
 /* lib/des/des.h */
diff --git a/sys/crypto/des/des_ecb.c b/sys/crypto/des/des_ecb.c
index 87a004af4b4d6..39b7128acba9f 100644
--- a/sys/crypto/des/des_ecb.c
+++ b/sys/crypto/des/des_ecb.c
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/des/des_ecb.c,v 1.6 2004/06/14 00:38:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/des/des_enc.c b/sys/crypto/des/des_enc.c
index c8d484a0d48cb..5692c0b42305c 100644
--- a/sys/crypto/des/des_enc.c
+++ b/sys/crypto/des/des_enc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/des/des_enc.c,v 1.2 2004/06/14 00:38:54 obrien Exp $");
 
 #include <sys/types.h>
 #include <crypto/des/des_locl.h>
diff --git a/sys/crypto/des/des_locl.h b/sys/crypto/des/des_locl.h
index 2c3cacc1b4996..035697f10ca3f 100644
--- a/sys/crypto/des/des_locl.h
+++ b/sys/crypto/des/des_locl.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/des_locl.h,v 1.6 2002/03/05 09:19:02 ume Exp $	*/
 /*	$KAME: des_locl.h,v 1.7 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/des_locl.h */
diff --git a/sys/crypto/des/des_setkey.c b/sys/crypto/des/des_setkey.c
index 7d1fb506a22d4..d0dbb4ffdd3f8 100644
--- a/sys/crypto/des/des_setkey.c
+++ b/sys/crypto/des/des_setkey.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/des/des_setkey.c,v 1.7 2004/06/14 00:38:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/des/podd.h b/sys/crypto/des/podd.h
index 0528b9cecafc0..8d77aac4f702a 100644
--- a/sys/crypto/des/podd.h
+++ b/sys/crypto/des/podd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/podd.h,v 1.4 2002/04/19 04:46:21 suz Exp $	*/
 /*	$KAME: podd.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/podd.h */
diff --git a/sys/crypto/des/sk.h b/sys/crypto/des/sk.h
index d4aa375024d7a..209dca61448b0 100644
--- a/sys/crypto/des/sk.h
+++ b/sys/crypto/des/sk.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/sk.h,v 1.4 2002/04/19 04:46:21 suz Exp $	*/
 /*	$KAME: sk.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/sk.h */
diff --git a/sys/crypto/des/spr.h b/sys/crypto/des/spr.h
index 129b8277be3fa..4fd00b6179b02 100644
--- a/sys/crypto/des/spr.h
+++ b/sys/crypto/des/spr.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/des/spr.h,v 1.4 2002/03/05 09:19:02 ume Exp $	*/
 /*	$KAME: spr.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/spr.h */
diff --git a/sys/crypto/rc4/rc4.c b/sys/crypto/rc4/rc4.c
index f94a554b98d49..89cb86fde895c 100644
--- a/sys/crypto/rc4/rc4.c
+++ b/sys/crypto/rc4/rc4.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rc4/rc4.c,v 1.5 2003/06/10 21:43:12 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/crypto/rc4/rc4.h b/sys/crypto/rc4/rc4.h
index 670b1a005ba17..39cdcc8d92b0f 100644
--- a/sys/crypto/rc4/rc4.h
+++ b/sys/crypto/rc4/rc4.h
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/rc4/rc4.h,v 1.3 2000/07/16 05:53:14 peter Exp $
  */
 
 #ifndef _SYS_CRYPTO_RC4_RC4_H_
diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile
index d2dc35ea94bf5..9794b342485d8 100644
--- a/sys/crypto/rijndael/Makefile
+++ b/sys/crypto/rijndael/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/crypto/rijndael/Makefile,v 1.3 2004/12/21 08:47:18 ru Exp $
 
 PROG=test00
 NO_MAN=
diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c
index 5197e226a26e1..6ec9fcb867701 100644
--- a/sys/crypto/rijndael/rijndael-alg-fst.c
+++ b/sys/crypto/rijndael/rijndael-alg-fst.c
@@ -25,7 +25,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-alg-fst.c,v 1.11 2005/08/17 07:59:07 pjd Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c
index 187177b39fffe..fd783a20518a7 100644
--- a/sys/crypto/rijndael/rijndael-api-fst.c
+++ b/sys/crypto/rijndael/rijndael-api-fst.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-api-fst.c,v 1.12 2005/03/11 16:26:10 ume Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h
index 122bf52d6ce21..b9d2bbadc1afd 100644
--- a/sys/crypto/rijndael/rijndael-api-fst.h
+++ b/sys/crypto/rijndael/rijndael-api-fst.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael-api-fst.h,v 1.7 2005/03/11 16:26:10 ume Exp $	*/
 /*	$KAME: rijndael-api-fst.h,v 1.6 2001/05/27 00:23:23 itojun Exp $	*/
 
 /*
diff --git a/sys/crypto/rijndael/rijndael-api.c b/sys/crypto/rijndael/rijndael-api.c
index 9a7fda30af604..35ddbd96e2584 100644
--- a/sys/crypto/rijndael/rijndael-api.c
+++ b/sys/crypto/rijndael/rijndael-api.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-api.c,v 1.1 2003/11/12 04:22:37 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/rijndael/rijndael.h b/sys/crypto/rijndael/rijndael.h
index da855284dcc54..c9956476e265f 100644
--- a/sys/crypto/rijndael/rijndael.h
+++ b/sys/crypto/rijndael/rijndael.h
@@ -1,5 +1,5 @@
 /*	$KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael.h,v 1.6 2005/03/11 22:07:04 ume Exp $	*/
 
 /**
  * rijndael-alg-fst.h
diff --git a/sys/crypto/rijndael/rijndael_local.h b/sys/crypto/rijndael/rijndael_local.h
index 7c765a2b11f8d..7cdeecebef2eb 100644
--- a/sys/crypto/rijndael/rijndael_local.h
+++ b/sys/crypto/rijndael/rijndael_local.h
@@ -1,5 +1,5 @@
 /*	$KAME: rijndael_local.h,v 1.5 2003/08/28 08:37:24 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/rijndael/rijndael_local.h,v 1.4 2003/10/12 21:05:05 ume Exp $	*/
 
 /* the file should not be used from outside */
 typedef u_int8_t		u8;
diff --git a/sys/crypto/rijndael/test00.c b/sys/crypto/rijndael/test00.c
index f7a534a0cfa28..534b2c1199599 100644
--- a/sys/crypto/rijndael/test00.c
+++ b/sys/crypto/rijndael/test00.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/rijndael/test00.c,v 1.1 2003/10/19 22:12:23 phk Exp $
  *
  * This test checks for inplace decryption working.  This is the case
  * where the same buffer is passed as input and output to
diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c
index 208789ab13392..a553d5fb988eb 100644
--- a/sys/crypto/sha1.c
+++ b/sys/crypto/sha1.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/sha1.c,v 1.9 2003/06/10 21:36:57 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h
index 3686d7ddde519..0bd6cb1ebdaea 100644
--- a/sys/crypto/sha1.h
+++ b/sys/crypto/sha1.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/sha1.h,v 1.8 2002/03/20 05:13:50 alfred Exp $	*/
 /*	$KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $	*/
 
 /*
diff --git a/sys/crypto/sha2/sha2.c b/sys/crypto/sha2/sha2.c
index ed33b662db87d..e5d36bd186ec5 100644
--- a/sys/crypto/sha2/sha2.c
+++ b/sys/crypto/sha2/sha2.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.9 2006/10/22 02:19:33 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sys/crypto/sha2/sha2.h b/sys/crypto/sha2/sha2.h
index 12da95c92bdad..eb367e30e197b 100644
--- a/sys/crypto/sha2/sha2.h
+++ b/sys/crypto/sha2/sha2.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.2 2002/03/20 05:13:51 alfred Exp $	*/
 /*	$KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $	*/
 
 /*
diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c
index 36e08568cd6fb..ec18a9008f04d 100644
--- a/sys/crypto/via/padlock.c
+++ b/sys/crypto/via/padlock.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.13 2007/07/03 12:13:43 gnn Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/via/padlock.h b/sys/crypto/via/padlock.h
index 7d928ba1719c1..96707baaf1f58 100644
--- a/sys/crypto/via/padlock.h
+++ b/sys/crypto/via/padlock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/crypto/via/padlock.h,v 1.4 2006/07/28 14:46:19 pjd Exp $
  */
 
 #ifndef _PADLOCK_H_
diff --git a/sys/crypto/via/padlock_cipher.c b/sys/crypto/via/padlock_cipher.c
index 8195584c71e7b..079b505993ccc 100644
--- a/sys/crypto/via/padlock_cipher.c
+++ b/sys/crypto/via/padlock_cipher.c
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_cipher.c,v 1.5 2006/09/15 10:44:55 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c
index 6c421032ed991..1a1cd14a29d01 100644
--- a/sys/crypto/via/padlock_hash.c
+++ b/sys/crypto/via/padlock_hash.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_hash.c,v 1.2 2006/07/25 19:04:26 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 2f4d049ee6052..f6c6fe278678a 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_access.c,v 1.20 2005/12/04 02:12:39 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 44915e316d153..3d2e79ddbc223 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_access.h,v 1.11 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index ac0c874184875..cc80f014334bd 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_break.c,v 1.25 2005/01/06 01:34:41 imp Exp $");
 
 #include "opt_comconsole.h"
 
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index f30b9337c26c2..0bbd249f72d21 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_break.h,v 1.17 2005/01/06 01:34:41 imp Exp $
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 71ead7375c041..1a1c7d5590562 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.73 2007/01/17 15:05:51 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/linker_set.h>
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 1825b0e3c6fc8..c4c5a00c1cf83 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_command.h,v 1.13 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index eba6151926d76..194eb2724b524 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_examine.c,v 1.33.2.1 2007/11/08 20:25:47 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 0bf6c836e329e..14cd2033ff7f3 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_expr.c,v 1.17 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 27af2655c19b6..6b6cfed53a374 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_input.c,v 1.36 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index a04103b00deb8..9ee2aabb53b98 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_lex.c,v 1.22 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 07955e9dc5cd8..a94030c6d3fc4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_lex.h,v 1.14 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_main.c b/sys/ddb/db_main.c
index c196bf73dfb68..f416db11845f9 100644
--- a/sys/ddb/db_main.c
+++ b/sys/ddb/db_main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_main.c,v 1.5 2006/11/06 11:10:57 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 40f56ba95abcc..3ae50226be394 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.37 2006/10/10 06:36:01 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index cbf9f0e3d68cb..d5042e1426ea8 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_output.h,v 1.15 2006/10/08 18:15:08 bde Exp $
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 6cffd6d8b63ae..8d684da3b3665 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_print.c,v 1.30 2005/04/14 05:25:40 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 9efd87107bc90..539544e87406a 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/cons.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 18f9c0df7d26e..b72f9af7c7c46 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_run.c,v 1.27 2005/04/14 05:25:40 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 9d043b38dbbdd..60b7e7f873366 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.37 2006/06/16 16:17:52 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index f68ccbcaf7263..96dbbfe1b1786 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_sym.h,v 1.23 2005/01/06 01:34:41 imp Exp $
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_thread.c b/sys/ddb/db_thread.c
index e127eeae1b078..4cc78987793f9 100644
--- a/sys/ddb/db_thread.c
+++ b/sys/ddb/db_thread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.7 2007/01/17 15:05:51 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 706ebe60ec945..267b25fb007ca 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_variables.c,v 1.23 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 1ff0e4442d005..fa0edc445c40a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_variables.h,v 1.14 2005/01/06 01:34:41 imp Exp $
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index b2be970715ad6..545c9e2cfeb61 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_watch.c,v 1.28 2006/11/17 16:41:56 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 7c48ce8af1b1f..63d659074d0b9 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/db_watch.h,v 1.12 2005/01/06 01:34:41 imp Exp $
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 64d347364875c..ba22164906a0d 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ddb/db_write_cmd.c,v 1.15 2005/01/06 01:34:41 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 716740bfec408..6a3de91696c8e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ddb/ddb.h,v 1.43 2006/07/12 21:22:43 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 707a3c0d00f24..0ac5f8683a528 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.3 2007/12/10 20:18:19 emaste Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index a21517e6f653d..f45b10556a35d 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.28.2.2 2007/12/10 20:18:19 emaste Exp $");
 
 /*
  * CAM front-end for communicating with non-DASD devices
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index 8afcee5a10e38..8e3bf349820ff 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.22.2.1 2007/11/27 12:23:29 rwatson Exp $");
 
 /*
  * Debugging support.
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 12c5515ee1fda..98af72942d8bc 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43 2005/05/02 22:56:52 scottl Exp $");
 
 #include "opt_aac.h"
 
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
index f8852358adec9..336327496a6a1 100644
--- a/sys/dev/aac/aac_linux.c
+++ b/sys/dev/aac/aac_linux.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.4 2006/12/20 17:10:53 delphij Exp $");
 
 /*
  * Linux ioctl handler for the aac device driver
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 9fdad54f04ec7..f8f59b6af14ee 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.62.2.3 2007/12/10 20:18:19 emaste Exp $");
 
 /*
  * PCI bus interface and resource allocation.
diff --git a/sys/dev/aac/aac_tables.h b/sys/dev/aac/aac_tables.h
index 4a0d0e3dddd4c..178935f739424 100644
--- a/sys/dev/aac/aac_tables.h
+++ b/sys/dev/aac/aac_tables.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/aac/aac_tables.h,v 1.6 2005/10/08 15:55:09 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index dae21a48b5cfa..fc111f08c8571 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.23.2.1 2007/12/10 20:18:19 emaste Exp $
  */
 
 /*
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index cce57de85f2cd..274d16f55aa85 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.48.2.1 2007/12/10 20:18:19 emaste Exp $
  */
 
 #include <sys/bio.h>
diff --git a/sys/dev/acpi_support/acpi_aiboost.c b/sys/dev/acpi_support/acpi_aiboost.c
index 00bf9cb1a34d3..433ed59919727 100644
--- a/sys/dev/acpi_support/acpi_aiboost.c
+++ b/sys/dev/acpi_support/acpi_aiboost.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_aiboost.c,v 1.3 2006/11/06 12:14:27 takawata Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c
index 28d27cc1241bd..49cfb4176008b 100644
--- a/sys/dev/acpi_support/acpi_asus.c
+++ b/sys/dev/acpi_support/acpi_asus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30 2007/06/02 21:10:00 philip Exp $");
 
 /*
  * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
diff --git a/sys/dev/acpi_support/acpi_fujitsu.c b/sys/dev/acpi_support/acpi_fujitsu.c
index 7d509097aa503..63f1a79bf32ac 100644
--- a/sys/dev/acpi_support/acpi_fujitsu.c
+++ b/sys/dev/acpi_support/acpi_fujitsu.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.5 2007/03/22 18:16:39 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c
index 5d7036d079ff5..0a0f0e15b2123 100644
--- a/sys/dev/acpi_support/acpi_ibm.c
+++ b/sys/dev/acpi_support/acpi_ibm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.14.2.1 2007/11/02 18:54:09 jhb Exp $");
 
 /*
  * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops.
diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c
index 2807bafaff4cd..e0a4a22288c6e 100644
--- a/sys/dev/acpi_support/acpi_panasonic.c
+++ b/sys/dev/acpi_support/acpi_panasonic.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.13 2007/06/17 04:40:33 mjacob Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_sony.c b/sys/dev/acpi_support/acpi_sony.c
index 64b49a7c89a2d..b1b26159f04eb 100644
--- a/sys/dev/acpi_support/acpi_sony.c
+++ b/sys/dev/acpi_support/acpi_sony.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.10 2006/11/01 03:45:24 kevlo Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpi_support/acpi_toshiba.c b/sys/dev/acpi_support/acpi_toshiba.c
index d15fe7e4ae4a0..d74618b8d60d6 100644
--- a/sys/dev/acpi_support/acpi_toshiba.c
+++ b/sys/dev/acpi_support/acpi_toshiba.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.17 2005/09/11 18:39:01 obrien Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c
index b127181b1c0fa..0a38368f94700 100644
--- a/sys/dev/acpica/Osd/OsdDebug.c
+++ b/sys/dev/acpica/Osd/OsdDebug.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.13 2007/03/22 18:16:41 jkim Exp $");
 
 #include "opt_ddb.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c
index 6e3beea6a566f..d08c385e6c90c 100644
--- a/sys/dev/acpica/Osd/OsdHardware.c
+++ b/sys/dev/acpica/Osd/OsdHardware.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.22 2007/05/31 00:52:32 njl Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c
index c973124f50db8..f200a51c337e2 100644
--- a/sys/dev/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpica/Osd/OsdInterrupt.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.22 2007/02/23 12:18:29 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c
index 3804bb6642d0e..ab2c615236f4f 100644
--- a/sys/dev/acpica/Osd/OsdMemory.c
+++ b/sys/dev/acpica/Osd/OsdMemory.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.15 2007/03/22 18:16:41 jkim Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 48e4dfeeaf869..1036c6698bfa7 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.39.4.1 2008/01/16 01:22:15 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/Osd/OsdStream.c b/sys/dev/acpica/Osd/OsdStream.c
index 8d1291a568a72..ddbea0e891498 100644
--- a/sys/dev/acpica/Osd/OsdStream.c
+++ b/sys/dev/acpica/Osd/OsdStream.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdStream.c,v 1.6 2005/09/11 18:39:02 obrien Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c
index 210fb1b992ac8..dca0dc89bd726 100644
--- a/sys/dev/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpica/Osd/OsdSynch.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.32 2007/03/26 23:04:02 jkim Exp $");
 
 #include <contrib/dev/acpica/acpi.h>
 
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c
index d9b29ebc7ac96..71391b82f54c9 100644
--- a/sys/dev/acpica/Osd/OsdTable.c
+++ b/sys/dev/acpica/Osd/OsdTable.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.12 2007/03/22 18:16:41 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index dba4edd3f936e..534b2bc797f1d 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.243.4.1 2008/02/06 03:35:40 iwasaki Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 0ea69e849bba1..adf8d8a184a47 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.38 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c
index f289b2bd64d28..865a6c91ec97f 100644
--- a/sys/dev/acpica/acpi_battery.c
+++ b/sys/dev/acpica/acpi_battery.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.25.4.1 2008/01/23 00:15:22 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index 197af4f8cd867..0bbfce21741c4 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.32 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 24ab5f8aefe9f..4dde1a57de456 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.46 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index eb5ce530e0e7a..d8b58cff56cec 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.67.2.1 2007/11/06 20:13:33 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_dock.c b/sys/dev/acpica/acpi_dock.c
index fc59b53f5e4aa..47dda601fb3ad 100644
--- a/sys/dev/acpica/acpi_dock.c
+++ b/sys/dev/acpica/acpi_dock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.6 2007/05/31 08:49:51 takawata Exp $
  */
 
 #include "opt_acpi.h"
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index bb752236ae930..966f686f8f1a4 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.76.2.1 2007/11/08 21:21:27 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c
index 77c6a7d678f74..d98e0690e541c 100644
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.12.4.1 2008/01/24 18:52:26 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_hpet.h b/sys/dev/acpica/acpi_hpet.h
index 11372e17eb0bf..aa86350f49a99 100644
--- a/sys/dev/acpica/acpi_hpet.h
+++ b/sys/dev/acpica/acpi_hpet.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpi_hpet.h,v 1.1.6.1 2008/01/24 18:52:26 jhb Exp $
  */
 
 #ifndef __ACPI_HPET_H__
diff --git a/sys/dev/acpica/acpi_if.m b/sys/dev/acpica/acpi_if.m
index 2ae19f444e04e..13ae3c37eef42 100644
--- a/sys/dev/acpica/acpi_if.m
+++ b/sys/dev/acpica/acpi_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/acpica/acpi_if.m,v 1.8 2005/09/11 18:39:01 obrien Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c
index 382d1c6f77d79..a0c6121936541 100644
--- a/sys/dev/acpica/acpi_isab.c
+++ b/sys/dev/acpica/acpi_isab.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.10 2005/09/11 18:39:01 obrien Exp $");
 
 /*
  * ISA Bridge driver for Generic ISA Bus Devices.  See section 10.7 of the
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index 0bb4a9f13c09a..85b844b48d161 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.29 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c
index d7be2571d6e62..fcb4e6b23b2ba 100644
--- a/sys/dev/acpica/acpi_package.c
+++ b/sys/dev/acpica/acpi_package.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.9 2007/01/07 21:53:42 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 607691c7091bd..dadafed782f10 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31.2.1 2007/10/31 16:10:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index b39e8e2860b48..2f052fa0b3df2 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.56.2.1 2007/11/08 20:21:40 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index c5b4bcb001df5..894827ebc66cb 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.60 2005/12/03 21:17:17 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 2865deabdbd22..1e66c23dc2725 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c
index f0f2d76e4feac..413f077b4b240 100644
--- a/sys/dev/acpica/acpi_pcib_pci.c
+++ b/sys/dev/acpica/acpi_pcib_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.17 2007/05/02 17:50:35 jhb Exp $");
 
 #include "opt_acpi.h"
 
diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h
index 5514a262b82d4..3a8b7c33d364d 100644
--- a/sys/dev/acpica/acpi_pcibvar.h
+++ b/sys/dev/acpica/acpi_pcibvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpi_pcibvar.h,v 1.6 2005/02/28 05:39:34 njl Exp $
  */
 
 #ifndef	_ACPI_PCIBVAR_H_
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
index e517ad3f62459..9f03f71d9520b 100644
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.26 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index 3a64e3acd163c..19c59e7e064a0 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.30 2006/04/21 19:06:29 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_quirk.c b/sys/dev/acpica/acpi_quirk.c
index f68eb6320e1c1..ed3eb51c8e687 100644
--- a/sys/dev/acpica/acpi_quirk.c
+++ b/sys/dev/acpica/acpi_quirk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.4 2007/03/22 18:16:40 jkim Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_quirks b/sys/dev/acpica/acpi_quirks
index 4b2099d592567..39201529db6d7 100644
--- a/sys/dev/acpica/acpi_quirks
+++ b/sys/dev/acpica/acpi_quirks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/acpica/acpi_quirks,v 1.6 2005/06/26 18:19:14 dwmalone Exp $
 #
 # Quirks for ACPI tables can be added here.
 #
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index 2a81e54ec4c26..9fda0f56c79c0 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.40 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c
index 5e1c66e083d23..d4dd0e7c67208 100644
--- a/sys/dev/acpica/acpi_smbat.c
+++ b/sys/dev/acpica/acpi_smbat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.5 2006/02/21 03:16:58 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_smbus.h b/sys/dev/acpica/acpi_smbus.h
index dd0d9b250ccd3..6a2898cb81fc1 100644
--- a/sys/dev/acpica/acpi_smbus.h
+++ b/sys/dev/acpica/acpi_smbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/acpica/acpi_smbus.h,v 1.1 2005/10/23 00:20:13 njl Exp $
  */
 
 #ifndef _ACPI_SMBUS_H_
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 61eed29935454..7e0f25fb7c170 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.64.4.1 2008/01/07 21:26:38 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c
index d79d7ae2d736b..e216b96653bbb 100644
--- a/sys/dev/acpica/acpi_throttle.c
+++ b/sys/dev/acpica/acpi_throttle.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.11 2007/03/22 18:16:40 jkim Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index 73bd5ed09e4c7..703f26d01d393 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.42 2007/07/30 15:21:26 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index b9fccfc5ab5b9..aa812613422c0 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.13 2006/08/10 13:18:02 bruno Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/acpica/acpiio.h b/sys/dev/acpica/acpiio.h
index f0858385dba4d..da8bd3681696f 100644
--- a/sys/dev/acpica/acpiio.h
+++ b/sys/dev/acpica/acpiio.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.17 2007/06/21 22:50:37 njl Exp $
  */
 
 #ifndef _ACPIIO_H_
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 35bd66dc09266..4b55a41d7640b 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.108 2007/10/09 07:48:07 njl Exp $
  */
 
 #ifndef _ACPIVAR_H_
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c
index 3568e8f3858da..5206a5846dabb 100644
--- a/sys/dev/adlink/adlink.c
+++ b/sys/dev/adlink/adlink.c
@@ -43,7 +43,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.17 2007/08/04 17:43:11 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 6afdc5faf3e6d..c3e283ea39ae3 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.21 2007/02/23 12:18:29 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 182ca5437b605..dd7ba17e28720 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.31 2007/02/23 12:18:29 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 6a073ba68db0d..0987caf77e5bf 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.31 2007/02/23 12:18:29 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 7027bcf0842bb..6ebdcb89ebd19 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advansys.c,v 1.35 2007/06/17 05:55:46 scottl Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index a8c5604728605..4a1c755d0998a 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advansys.h,v 1.4 2005/01/06 01:42:24 imp Exp $
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 2d9d1641431f8..cededf715e32b 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advlib.c,v 1.26 2006/11/02 00:54:33 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index ac7da33d5c7ee..f44d5caa0497e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advlib.h,v 1.13 2007/06/17 05:55:46 scottl Exp $
  */
 /*-
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index d5e7bba9634a3..7a983a8bc07db 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/advmcode.c,v 1.9 2005/01/06 01:42:24 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index 60b4e03cdb1ad..aa6b786304b36 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/advmcode.h,v 1.8 2005/01/06 01:42:24 imp Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 8777a4428abc5..e00f98ce44026 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.25 2006/12/11 18:28:29 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 7e3b4f4baeba8..43b1c6cacb867 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.28 2007/06/17 05:55:46 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index b926bba2c159e..88b6c9fed7516 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.12 2005/05/29 04:42:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index a1d72ec7c383d..00f1e968332fa 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwlib.h,v 1.9 2005/02/14 01:10:50 obrien Exp $
  */
 /*-
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index a43720c423dd7..e7a6262ffe6a2 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwmcode.c,v 1.5 2005/01/06 01:42:24 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index e3ab3f47a0ec9..b6370b15fbefc 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwmcode.h,v 1.4 2005/01/06 01:42:24 imp Exp $
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index 0510ab0185c38..ee25626290d2e 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/advansys/adwvar.h,v 1.5 2005/01/06 01:42:24 imp Exp $
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 7dcf264e302e0..69b2575da2029 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha.c,v 1.64 2007/06/17 05:55:46 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index b29d370e0d3b1..0a3b70804edbc 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.39 2007/02/23 12:18:30 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c
index 75a930bdc407a..63c54ef0fa837 100644
--- a/sys/dev/aha/aha_mca.c
+++ b/sys/dev/aha/aha_mca.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.16 2007/02/23 15:55:37 piso Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index 5dc21a3c35fd3..a5c3d51785d17 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.20 2006/11/09 02:19:30 kevlo Exp $
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 10ecd6da5c583..441251ae379c8 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.43 2007/06/17 15:21:09 scottl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index da1e03e538a6d..0c5922e1c8b54 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ahb/ahbreg.h,v 1.6 2007/06/17 05:55:46 scottl Exp $
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index f2d3203fab15c..92c9213d57ab7 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic.c,v 1.27 2007/06/17 05:55:46 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index 53962aed9d35b..84a7bcac0ee50 100644
--- a/sys/dev/aic/aic6360reg.h
+++ b/sys/dev/aic/aic6360reg.h
@@ -29,7 +29,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aic6360reg.h,v 1.4 2005/01/06 01:42:25 imp Exp $
  */
 
 #define SCSISEQ		0x00	/* SCSI sequence control */
diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c
index c6419899d3425..ad008ba3cd59f 100644
--- a/sys/dev/aic/aic_cbus.c
+++ b/sys/dev/aic/aic_cbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.13 2007/06/17 05:55:46 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index b80b3873363b3..2f0f6f99dd291 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.14 2007/06/17 05:55:46 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 400038814082c..857748731c997 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.20 2007/06/17 05:55:46 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index 3bce66cb8508c..2faa1b74bbd21 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic/aicvar.h,v 1.9 2007/06/17 05:55:46 scottl Exp $
  */
 
 struct aic_transinfo {
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index 8c6e4df444d87..24d1a88f8c0b1 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.36 2006/09/03 00:27:40 jmg Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index 0bf0f537274e2..66c9d3500eba2 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.7 2006/09/03 00:27:40 jmg Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 50297269d1b7e..48e5a297129ff 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.65 2006/09/03 00:27:40 jmg Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 03b136349cf3c..e44bb38e48711 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.20 2006/09/03 00:27:40 jmg Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 
diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c
index a5efb0b9dbfe4..7733968b7a19e 100644
--- a/sys/dev/aic7xxx/aic7770.c
+++ b/sys/dev/aic7xxx/aic7770.c
@@ -46,7 +46,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.19 2007/04/17 06:26:24 scottl Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index aa771af927d74..6528a08620fe5 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -46,7 +46,7 @@
 #include "aicasm/aicasm_insformat.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.40 2007/04/19 18:53:52 scottl Exp $");
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index e9c8847905b3d..bc429427e1a4e 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/aic7xxx/aic79xx.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.27 2007/04/19 18:53:52 scottl Exp $
  */
 
 #ifndef _AIC79XX_H_
diff --git a/sys/dev/aic7xxx/aic79xx.reg b/sys/dev/aic7xxx/aic79xx.reg
index e856b6236eae8..545c27861d947 100644
--- a/sys/dev/aic7xxx/aic79xx.reg
+++ b/sys/dev/aic7xxx/aic79xx.reg
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.19 2005/01/06 01:42:26 imp Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $"
 
diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index 76be0892005af..0e1673fa5e2b5 100644
--- a/sys/dev/aic7xxx/aic79xx.seq
+++ b/sys/dev/aic7xxx/aic79xx.seq
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.19 2007/02/18 19:48:59 ceri Exp $
  */
 
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $"
diff --git a/sys/dev/aic7xxx/aic79xx_inline.h b/sys/dev/aic7xxx/aic79xx_inline.h
index 064a5e8ddd7f3..73a278a381d37 100644
--- a/sys/dev/aic7xxx/aic79xx_inline.h
+++ b/sys/dev/aic7xxx/aic79xx_inline.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#57 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_inline.h,v 1.17 2005/01/06 01:42:26 imp Exp $
  */
 
 #ifndef _AIC79XX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index f8c56627dac5f..af982e984079f 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.29.4.1 2008/02/19 17:08:34 gibbs Exp $");
 
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index 3c97a63d3e0a4..afc74fcfbfdee 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -32,7 +32,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#23 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.21 2007/04/17 06:26:24 scottl Exp $
  */
 
 #ifndef _AIC79XX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index d19313a96a728..7cfe8af9c3b52 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -46,7 +46,7 @@
 #include "aic79xx_inline.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.26 2007/04/17 06:26:24 scottl Exp $");
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #endif
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 8e889779043ed..e70890b59ebd8 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -46,7 +46,7 @@
 #include "aicasm/aicasm_insformat.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.112 2007/07/31 20:11:02 scottl Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 77acfe4d0a962..e88e4d9d62e57 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.56 2007/04/19 18:53:52 scottl Exp $
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 076c2ba49f926..b90d63a9b7433 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.reg,v 1.47 2005/01/06 01:42:26 imp Exp $
  */
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 227bcc7821664..144876caff633 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.129 2006/12/29 13:08:45 yar Exp $
  */
 
 VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $"
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c
index ab63f181901b4..c028c5695981f 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.c
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c
@@ -70,7 +70,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.c,v 1.21 2005/01/06 05:30:44 scottl Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 3827015edcbb8..34e4fc2584cf9 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.h#12 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.h,v 1.12 2005/01/06 01:42:26 imp Exp $
  */
 #ifndef _AIC7XXX_93CX6_H_
 #define _AIC7XXX_93CX6_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h
index c4a37b593676c..751b602a9a5dd 100644
--- a/sys/dev/aic7xxx/aic7xxx_inline.h
+++ b/sys/dev/aic7xxx/aic7xxx_inline.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#47 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_inline.h,v 1.25 2007/04/19 18:53:52 scottl Exp $
  */
 
 #ifndef _AIC7XXX_INLINE_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index eeb06af0c235e..8280baf3232cf 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.50 2007/06/17 05:55:47 scottl Exp $");
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index d1059714be0aa..6a6c1258fb491 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -31,7 +31,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.h#18 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.33 2007/04/17 06:26:25 scottl Exp $
  */
 
 #ifndef _AIC7XXX_FREEBSD_H_
diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c
index 2bf492764a32b..206699983a862 100644
--- a/sys/dev/aic7xxx/aic7xxx_pci.c
+++ b/sys/dev/aic7xxx/aic7xxx_pci.c
@@ -48,7 +48,7 @@
 #include "aic7xxx_93cx6.h"
 #else
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.36 2007/04/17 06:26:25 scottl Exp $");
 #include <dev/aic7xxx/aic7xxx_osm.h>
 #include <dev/aic7xxx/aic7xxx_inline.h>
 #include <dev/aic7xxx/aic7xxx_93cx6.h>
diff --git a/sys/dev/aic7xxx/aic_osm_lib.c b/sys/dev/aic7xxx/aic_osm_lib.c
index 78a7d56935587..713c38a6b72d3 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.c
+++ b/sys/dev/aic7xxx/aic_osm_lib.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.c,v 1.6 2007/07/31 20:11:03 scottl Exp $");
 
 static void	aic_recovery_thread(void *arg);
 
diff --git a/sys/dev/aic7xxx/aic_osm_lib.h b/sys/dev/aic7xxx/aic_osm_lib.h
index 434acf3e4bad6..159600a9a065c 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.h
+++ b/sys/dev/aic7xxx/aic_osm_lib.h
@@ -32,7 +32,7 @@
  *
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic_osm_lib.h#5 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aic_osm_lib.h,v 1.6 2007/04/17 06:26:25 scottl Exp $
  */
 
 /******************************** OS Includes *********************************/
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index 78701b0068e39..0dc73ac5acbed 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -1,7 +1,7 @@
 #
 # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.23 2005/11/21 14:41:10 ru Exp $
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index ad010649c8b55..41371f0818a29 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.38 2005/01/06 01:42:27 imp Exp $
  */
 #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 440cb495f9552..2b0c884b20fe0 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#14 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17 2005/01/06 01:42:27 imp Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index f60366c403f7e..0b196a815c2bb 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#29 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y,v 1.25 2006/12/29 13:08:46 yar Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
index 820310b469cd7..a987c66c2dee4 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#11 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h,v 1.9 2005/01/06 01:42:27 imp Exp $
  */
 
 struct ins_format1 {
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
index 0d0fffeb56b6b..02dc84b3f7704 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_gram.y#5 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y,v 1.4 2006/12/29 13:08:46 yar Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
index 49557a8837f84..480e97bf84731 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#8 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l,v 1.6 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index ced09dc2b12b6..b87f8cd2a4d2e 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -40,7 +40,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l,v 1.23 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index 9770a71b8d091..f895fd84b8c3f 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.c#24 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.24 2005/01/06 01:42:27 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index 1496c3768c815..507db5310e245 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -39,7 +39,7 @@
  *
  * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.h#17 $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
  */
 
 #ifdef __linux__
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index 53753994ec8d8..e21d174cd6ae9 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *********************************************************************
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/amd/amd.c,v 1.36 2007/06/17 05:55:47 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index d9b8cd209b342..1515324695eb6 100644
--- a/sys/dev/amd/amd.h
+++ b/sys/dev/amd/amd.h
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *********************************************************************
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/amd/amd.h,v 1.6 2005/01/06 01:42:27 imp Exp $
  */
 
 #ifndef AMD_H
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 3681bae53a36f..e76ee4350fb98 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.80 2006/10/31 21:19:25 pjd Exp $");
 
 /*
  * Driver for the AMI MegaRaid family of controllers.
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index 56b486fcec765..3bb697f48182f 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.22 2007/06/17 05:55:48 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 44e77c4e1ec19..d45fcf13813a6 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.39 2006/10/31 21:19:25 pjd Exp $");
 
 /*
  * Disk driver for AMI MegaRaid controllers
diff --git a/sys/dev/amr/amr_linux.c b/sys/dev/amr/amr_linux.c
index 0fe89d7f045eb..118ca304bfec0 100644
--- a/sys/dev/amr/amr_linux.c
+++ b/sys/dev/amr/amr_linux.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_linux.c,v 1.4 2006/05/03 16:45:15 ambrisko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 2c7e78a85d449..5aece64362a3a 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.38 2007/02/23 12:18:31 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/amr/amr_tables.h b/sys/dev/amr/amr_tables.h
index b1a4e441af426..914438ee9daf9 100644
--- a/sys/dev/amr/amr_tables.h
+++ b/sys/dev/amr/amr_tables.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/amr/amr_tables.h,v 1.3 2002/10/30 22:00:11 emoore Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index bc06a863268db..8849fe482c874 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.h
@@ -52,7 +52,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/amr/amrio.h,v 1.7 2005/12/14 03:26:49 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index cb9b83d9233e9..afa45ae6e833f 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/amr/amrreg.h,v 1.10 2006/01/13 23:50:21 jkim Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 1fd78fd977461..b8e61c2b997e9 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.33 2006/05/03 16:45:15 ambrisko Exp $
  */
 
 #include <geom/geom_disk.h>
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index 28e4f72148e96..41a6475c3b578 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_aironet_ieee.h,v 1.15 2005/01/06 01:42:28 imp Exp $
  */
 
 #ifndef _IF_AIRONET_IEEE_H
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index db88e0c9ed1d7..33389a675e8de 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.84.2.2 2007/12/01 07:01:45 avatar Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 80933b18ada1e..18446153d9e15 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.17 2007/02/23 12:18:31 piso Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index b475265d84b02..000e03358316f 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.31 2007/02/23 12:18:31 piso Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index a284c8a5787ad..af8afa92d55f5 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.28 2007/02/23 12:18:31 piso Exp $");
 
 /*
  * This is a PCI shim for the Aironet PC4500/4800 wireless network
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index 0a96ee30f3f05..4e5ca8fd94452 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/an/if_anreg.h,v 1.23.10.1 2007/11/21 06:37:40 avatar Exp $
  */
 
 #define AN_TIMEOUT	65536
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 35756e4f63951..82fc88c4be128 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.75 2007/03/21 03:38:34 nyan Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar.h b/sys/dev/ar/if_ar.h
index a6fc8cf088ec1..5c75a70c8a9bc 100644
--- a/sys/dev/ar/if_ar.h
+++ b/sys/dev/ar/if_ar.h
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ar/if_ar.h,v 1.4 2005/01/06 01:42:28 imp Exp $
  */
 
 #ifndef _I386_ISA_IF_AR_H_
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index afe36153d0d37..d97d4a21cb419 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.55 2005/05/29 04:42:17 nyan Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index 3715c8b8ee333..b98b63e8dc7a9 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.13 2005/05/29 04:42:18 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index d643cafee44cc..b1f07a70dd7fe 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ar/if_arregs.h,v 1.10 2005/01/06 01:42:28 imp Exp $
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 1c2318191b157..983fc6f5f965d 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -56,7 +56,7 @@
 **                                                       and cause g_vfs_done() read write error
 **     1.20.00.15   10/10/2007         Erich Chen        support new RAID adapter type ARC120x
 ******************************************************************************************
-* $FreeBSD$
+* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.24.2.2 2007/12/09 19:26:21 scottl Exp $
 */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index 0b573816a184e..97b40396e0790 100644
--- a/sys/dev/arcmsr/arcmsr.h
+++ b/sys/dev/arcmsr/arcmsr.h
@@ -35,7 +35,7 @@
 **(INCLUDING NEGLIGENCE OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF
 ** THIS SOFTWARE,EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **************************************************************************
-* $FreeBSD$
+* $FreeBSD: src/sys/dev/arcmsr/arcmsr.h,v 1.4.2.1 2007/12/08 21:39:06 scottl Exp $
 */
 #define ARCMSR_DRIVER_VERSION                        "Driver Version 1.20.00.15 2007-10-07"
 #define ARCMSR_SCSI_INITIATOR_ID                                              255
diff --git a/sys/dev/arl/if_arl.c b/sys/dev/arl/if_arl.c
index 8be9bdab67ebf..dc5b3984919be 100644
--- a/sys/dev/arl/if_arl.c
+++ b/sys/dev/arl/if_arl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.15 2006/12/29 13:59:47 jhb Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arl_isa.c b/sys/dev/arl/if_arl_isa.c
index 11cbf5fd8064a..3c283d8396fc7 100644
--- a/sys/dev/arl/if_arl_isa.c
+++ b/sys/dev/arl/if_arl_isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl_isa.c,v 1.8 2007/02/23 12:18:32 piso Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/dev/arl/if_arlreg.h b/sys/dev/arl/if_arlreg.h
index 161ee461a1dc0..492a85145c627 100644
--- a/sys/dev/arl/if_arlreg.h
+++ b/sys/dev/arl/if_arlreg.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.7 2006/08/17 22:50:32 imp Exp $
  */
 
 #ifndef _IF_ARLREG_H
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 2e3aae2b9e0e2..b4a2fb7cefb2b 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -163,7 +163,7 @@
 
 #include	<dev/asr/sys_info.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.85 2007/06/17 05:55:48 scottl Exp $");
 
 #define	ASR_VERSION	1
 #define	ASR_REVISION	'1'
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index 038dc6f4b5bb0..92cff261131a6 100644
--- a/sys/dev/asr/dptalign.h
+++ b/sys/dev/asr/dptalign.h
@@ -20,7 +20,7 @@
  *
  * DPT Alignment Description File
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/dptalign.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  */
 #if (!defined(__DPTALIGN_H))
 #define	      __DPTALIGN_H
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index e7b6d7d7802f8..ff66dd688827f 100644
--- a/sys/dev/asr/dptsig.h
+++ b/sys/dev/asr/dptsig.h
@@ -19,7 +19,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/dptsig.h,v 1.9 2005/12/04 10:06:03 ru Exp $
  */
 
 #ifndef __DPTSIG_H_
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index c189d8d658d99..ff8f09b7dc19c 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2oadptr.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index a6666feb661bb..1120a4e73fab6 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2obscsi.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index 79838cbe7ba06..299e35e15ae81 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -46,7 +46,7 @@
  * become a "Registered Developer" of the I2O SIG. This can be done by calling
  * 415-750-8352 in the US, or via http://www.i2osig.org.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odep.h,v 1.9 2006/02/04 08:01:49 scottl Exp $
  *
  **************************************************************************/
 
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 4c9a9d4623187..2151db958a5a5 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2000 Adaptec Corporation.
  * All rights reserved.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2odpt.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index ae4327a6cb801..70bd9f657ed95 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2oexec.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index 833bd9173d387..79a3bbe7ffe18 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2omsg.h,v 1.7 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index c85d92dd2c327..53eeeabce6717 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2otypes.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index c7e3061dbb282..3ba1ccf2f8cfe 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -77,7 +77,7 @@
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
  * (United States).
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/i2outil.h,v 1.6 2005/01/06 01:42:29 imp Exp $
  *
  ****************************************************************/
 
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index c954be9816b17..481df157a0a71 100644
--- a/sys/dev/asr/osd_defs.h
+++ b/sys/dev/asr/osd_defs.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_defs.h,v 1.7 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		_OSD_DEFS_H
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index 04f7a29b6969f..4bb99a60b5ac9 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_unix.h,v 1.9 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		__OSD_UNIX_H
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index baa233804a3f6..bf5842eb9448c 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/osd_util.h,v 1.10 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		__OSD_UTIL_H
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index b4c78fe819fd1..d220d0813047c 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -18,7 +18,7 @@
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/asr/sys_info.h,v 1.9 2005/01/06 01:42:29 imp Exp $
  */
 
 #ifndef		__SYS_INFO_H
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 963b2b506dcae..41948c6a91c30 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.280 2007/10/04 19:17:15 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index c8440d368e013..c7bb5c7e10058 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.124.2.1.2.1 2008/01/09 08:55:10 delphij Exp $
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index dcd43e7ef601f..bd85fd7371d82 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.40 2007/02/21 19:07:18 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/ata-cbus.c b/sys/dev/ata/ata-cbus.c
index c978dc34733a4..110c9ec1f8e3d 100644
--- a/sys/dev/ata/ata-cbus.c
+++ b/sys/dev/ata/ata-cbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.25 2007/02/23 12:18:32 piso Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index 178425960b87b..f88f0a260d910 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.202.2.5.2.1 2008/01/09 08:55:10 delphij Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 63a226c8172ee..60cff36bedaac 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.204.2.1 2007/12/09 19:26:56 delphij Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index 1ebd3e0d5b64d..64cf621a743f7 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.52 2007/02/21 19:07:18 sos Exp $
  */
 
 /* structure describing an ATA disk */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index e6cdff57fee8c..b799172d28c84 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.147.2.1.2.1 2008/01/09 08:55:10 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c
index 038e2d9dbaa2a..936a887726b77 100644
--- a/sys/dev/ata/ata-isa.c
+++ b/sys/dev/ata/ata-isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.31 2007/02/21 19:07:18 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c
index af08b1af1732b..85efc8642084d 100644
--- a/sys/dev/ata/ata-lowlevel.c
+++ b/sys/dev/ata/ata-lowlevel.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.79.4.1 2008/01/09 08:55:10 delphij Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 6d493e2b1cad3..9fe44fa173bd9 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.121.2.2 2007/11/21 21:15:00 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 42769eb873f94..409f616d3883f 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.81.2.1 2007/11/21 21:15:00 sos Exp $
  */
 
 /* structure holding chipset config info */
diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c
index 9849443219a73..3455e4d7fb36f 100644
--- a/sys/dev/ata/ata-queue.c
+++ b/sys/dev/ata/ata-queue.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.69 2007/03/13 20:31:56 thomas Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index 2356d233264d4..0bac00013589b 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.124 2007/08/13 18:46:31 jhb Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata-raid.h b/sys/dev/ata/ata-raid.h
index 17d38e49c22f2..f2775c6bd0405 100644
--- a/sys/dev/ata/ata-raid.h
+++ b/sys/dev/ata/ata-raid.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.46 2007/02/21 19:07:18 sos Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/ata/ata-usb.c b/sys/dev/ata/ata-usb.c
index cc449e023cefa..54743d32baccb 100644
--- a/sys/dev/ata/ata-usb.c
+++ b/sys/dev/ata/ata-usb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.7 2007/06/23 21:52:05 imp Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/ata_if.m b/sys/dev/ata/ata_if.m
index 2621fef7dfebd..42841c7af0daf 100644
--- a/sys/dev/ata/ata_if.m
+++ b/sys/dev/ata/ata_if.m
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.7 2007/04/06 16:18:59 sos Exp $
 
 #include <sys/bus.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index d8f0b86274d4b..cbdb49304e32e 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.55 2007/06/17 05:55:48 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index df63fe15dd6b9..be1984bb794a8 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.193.2.2 2007/11/21 21:15:00 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index 33588703ef399..8efc99aea6de2 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.46.2.1 2007/10/31 19:59:53 sos Exp $
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 0f989134276f3..585e476a6cac4 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.110.2.1 2007/11/21 21:15:00 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h
index fdad69ba039e4..e19764bf2b0d2 100644
--- a/sys/dev/ata/atapi-fd.h
+++ b/sys/dev/ata/atapi-fd.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.27 2007/02/21 19:07:19 sos Exp $
  */
 
 /* ATAPI Rewriteable drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index f12f4b43f5016..8b9fa102b409c 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.103.2.1 2007/11/21 21:15:00 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h
index af3ea23fa189c..1563430188f89 100644
--- a/sys/dev/ata/atapi-tape.h
+++ b/sys/dev/ata/atapi-tape.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ata/atapi-tape.h,v 1.25 2007/02/21 19:07:19 sos Exp $
  */
 
 /* ATAPI tape drive Capabilities and Mechanical Status Page */
diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c
index dcc57650752eb..71476c49a02f0 100644
--- a/sys/dev/ath/ah_osdep.c
+++ b/sys/dev/ath/ah_osdep.c
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.3 2007/06/06 15:49:15 sam Exp $
  */
 #include "opt_ah.h"
 
diff --git a/sys/dev/ath/ah_osdep.h b/sys/dev/ath/ah_osdep.h
index a82bd020cfb58..208fc40634c00 100644
--- a/sys/dev/ath/ah_osdep.h
+++ b/sys/dev/ath/ah_osdep.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.2 2007/06/06 15:49:15 sam Exp $
  */
 #ifndef _ATH_AH_OSDEP_H_
 #define _ATH_AH_OSDEP_H_
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.c b/sys/dev/ath/ath_rate/amrr/amrr.c
index 00ae5688a386a..6b50e094b0eda 100644
--- a/sys/dev/ath/ath_rate/amrr/amrr.c
+++ b/sys/dev/ath/ath_rate/amrr/amrr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.14 2007/07/27 11:59:55 rwatson Exp $");
 
 /*
  * AMRR rate control. See:
diff --git a/sys/dev/ath/ath_rate/amrr/amrr.h b/sys/dev/ath/ath_rate/amrr/amrr.h
index cb5d135975bf2..1c52df17d3cdc 100644
--- a/sys/dev/ath/ath_rate/amrr/amrr.h
+++ b/sys/dev/ath/ath_rate/amrr/amrr.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.h,v 1.2 2004/12/31 22:41:45 sam Exp $
  */
 
 #ifndef _DEV_ATH_RATE_AMRR_H
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.c b/sys/dev/ath/ath_rate/onoe/onoe.c
index eb5759e98b45e..af2a86502a4e4 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.c
+++ b/sys/dev/ath/ath_rate/onoe/onoe.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.15 2007/07/27 11:59:55 rwatson Exp $");
 
 /*
  * Atsushi Onoe's rate control algorithm.
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.h b/sys/dev/ath/ath_rate/onoe/onoe.h
index 4eef8620268d9..5d8e76a91d8f5 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.h
+++ b/sys/dev/ath/ath_rate/onoe/onoe.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.3 2007/06/06 15:49:16 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c
index 180ef82f851bf..56db5aa5b8f6d 100644
--- a/sys/dev/ath/ath_rate/sample/sample.c
+++ b/sys/dev/ath/ath_rate/sample/sample.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.18.2.1 2007/10/16 19:07:26 sam Exp $");
 
 /*
  * John Bicket's SampleRate control algorithm.
diff --git a/sys/dev/ath/ath_rate/sample/sample.h b/sys/dev/ath/ath_rate/sample/sample.h
index 1e9377e23b0f7..46c7f66b6195a 100644
--- a/sys/dev/ath/ath_rate/sample/sample.h
+++ b/sys/dev/ath/ath_rate/sample/sample.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.h,v 1.7 2007/01/15 01:17:44 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 3f74add351b4c..adc9e5792fb1d 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.177 2007/09/17 19:07:23 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index 277a74d702cc0..4f1bc6aab2b1b 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.19 2007/06/06 15:49:15 sam Exp $");
 
 /*
  * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
diff --git a/sys/dev/ath/if_athioctl.h b/sys/dev/ath/if_athioctl.h
index ccd7220bf19ff..52511648b5249 100644
--- a/sys/dev/ath/if_athioctl.h
+++ b/sys/dev/ath/if_athioctl.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.19 2007/06/11 03:36:49 sam Exp $
  */
 
 /*
diff --git a/sys/dev/ath/if_athrate.h b/sys/dev/ath/if_athrate.h
index a6aaf6f3ce625..97b85fbececb3 100644
--- a/sys/dev/ath/if_athrate.h
+++ b/sys/dev/ath/if_athrate.h
@@ -27,7 +27,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.6 2007/06/06 15:49:15 sam Exp $
  */
 #ifndef _ATH_RATECTRL_H_
 #define _ATH_RATECTRL_H_
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index af1045d10857b..e717130d2d23e 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.62 2007/06/11 03:36:49 sam Exp $
  */
 
 /*
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 778515eac0e78..ee8c0a19e582e 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.52 2006/10/25 13:35:42 ru Exp $");
 
 #include "opt_compat.h"
 #include "opt_kbd.h"
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index ec6555b1e0a9f..d6fd5e68fd5b4 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd_atkbdc.c,v 1.20 2007/02/23 12:18:33 piso Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index df1f28e497dd4..2e7945c282a15 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc.c,v 1.25 2006/09/04 00:19:31 dwhite Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_ebus.c b/sys/dev/atkbdc/atkbdc_ebus.c
index 639203d548bc2..0c59180cd001f 100644
--- a/sys/dev/atkbdc/atkbdc_ebus.c
+++ b/sys/dev/atkbdc/atkbdc_ebus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_ebus.c,v 1.1 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 4f535db55bdba..9df9ce0e649ce 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_isa.c,v 1.36 2006/07/03 23:40:58 jkim Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index b97b592bafa9a..a7e91fdefba45 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_subr.c,v 1.33 2005/06/10 20:56:37 marius Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h
index fa8f1f8000b87..a449ff8819330 100644
--- a/sys/dev/atkbdc/atkbdc_subr.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.31 2005/05/29 04:42:28 nyan Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/atkbdc_subr.h,v 1.1 2005/06/10 20:56:37 marius Exp $
  */
 
 #ifndef _DEV_ATKBDC_ATKBDC_SUBR_H_
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index 0715d9ece634b..4d4bfb9f08bb4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/atkbdcreg.h,v 1.12 2005/06/10 20:56:37 marius Exp $
  * 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 cf7ee6b31280b..594895a91bec3 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/atkbdreg.h,v 1.9 2005/06/10 20:56:37 marius Exp $
  */
 
 #ifndef _DEV_ATKBDC_ATKBDREG_H_
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index a8a3fcc26b2de..e78e5dc34b0c9 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.93 2007/06/17 04:32:18 mjacob Exp $");
 
 #include "opt_isa.h"
 #include "opt_psm.h"
diff --git a/sys/dev/atkbdc/psm.h b/sys/dev/atkbdc/psm.h
index e687728f56ebd..dd025f1f9d3bb 100644
--- a/sys/dev/atkbdc/psm.h
+++ b/sys/dev/atkbdc/psm.h
@@ -21,7 +21,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/isa/psm.c,v 1.84 2005/01/10 13:05:58 philip
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/atkbdc/psm.h,v 1.1 2005/06/10 20:56:37 marius Exp $
  */
 
 #ifndef _DEV_ATKBDC_PSM_H_
diff --git a/sys/dev/auxio/auxio.c b/sys/dev/auxio/auxio.c
index 9943a0afd600c..742903b30c52c 100644
--- a/sys/dev/auxio/auxio.c
+++ b/sys/dev/auxio/auxio.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.5 2006/01/26 19:04:18 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/auxio/auxioreg.h b/sys/dev/auxio/auxioreg.h
index 0c9ce8e9fa933..5dd1c388033d3 100644
--- a/sys/dev/auxio/auxioreg.h
+++ b/sys/dev/auxio/auxioreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/auxio/auxioreg.h,v 1.2 2005/01/06 01:42:30 imp Exp $ */
 /*	$NetBSD: auxioreg.h,v 1.4 2001/10/22 07:31:41 mrg Exp $	*/
 
 /*-
diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c
index a2eddd4bd7680..e7717c866edcf 100644
--- a/sys/dev/awi/am79c930.c
+++ b/sys/dev/awi/am79c930.c
@@ -65,7 +65,7 @@
 __KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.9 2004/01/15 09:33:48 onoe Exp $");
 #endif
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/am79c930.c,v 1.7 2005/05/29 04:42:18 nyan Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/awi/am79c930reg.h b/sys/dev/awi/am79c930reg.h
index 74d38bf38b37d..c31b4c75e127e 100644
--- a/sys/dev/awi/am79c930reg.h
+++ b/sys/dev/awi/am79c930reg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: am79c930reg.h,v 1.4 2003/11/02 11:07:45 wiz Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/am79c930reg.h,v 1.2 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/am79c930var.h b/sys/dev/awi/am79c930var.h
index 3836521f1e290..64e6964bfb9bb 100644
--- a/sys/dev/awi/am79c930var.h
+++ b/sys/dev/awi/am79c930var.h
@@ -1,5 +1,5 @@
 /* $NetBSD: am79c930var.h,v 1.3 2004/01/15 09:33:48 onoe Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/am79c930var.h,v 1.3 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 954a83175db21..042af2eb8087d 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -89,7 +89,7 @@
 __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $");
 #endif
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.45 2007/09/05 21:31:31 sam Exp $");
 #endif
 
 #include "opt_inet.h"
diff --git a/sys/dev/awi/awireg.h b/sys/dev/awi/awireg.h
index 555e058b3d146..133505be439af 100644
--- a/sys/dev/awi/awireg.h
+++ b/sys/dev/awi/awireg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: awireg.h,v 1.8 2003/01/20 05:30:06 simonb Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/awireg.h,v 1.2 2004/01/15 10:04:20 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index 762d1dad4d830..db67dddee8d7f 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -1,5 +1,5 @@
 /* $NetBSD: awivar.h,v 1.20 2004/01/15 09:39:15 onoe Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.14 2007/06/11 03:36:51 sam Exp $ */
 
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c
index 815b15bcbaed4..57b2d3dbe9379 100644
--- a/sys/dev/awi/if_awi_pccard.c
+++ b/sys/dev/awi/if_awi_pccard.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.25 2007/02/23 12:18:33 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index d9ebc6e0f9464..96e6bd59d7da1 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.34 2007/07/31 00:06:04 davidch Exp $");
 
 /*
  * The following controllers are supported by this driver:
diff --git a/sys/dev/bce/if_bcefw.h b/sys/dev/bce/if_bcefw.h
index 3cb134d5733ac..f765e9fd5bc8b 100644
--- a/sys/dev/bce/if_bcefw.h
+++ b/sys/dev/bce/if_bcefw.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bce/if_bcefw.h,v 1.4 2007/07/31 00:06:04 davidch Exp $
  */
 
 /*
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h
index 06d4b9d4b40cb..854c9696b7aac 100644
--- a/sys/dev/bce/if_bcereg.h
+++ b/sys/dev/bce/if_bcereg.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.16 2007/07/31 00:06:04 davidch Exp $
  */
 
 #ifndef	_BCE_H_DEFINED
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index b88a6bd3de3bf..3755f6b81426d 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -26,7 +26,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.42 2007/02/23 12:18:34 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index f5af78069b972..3f964708da24b 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bfe/if_bfereg.h,v 1.10 2006/05/28 18:44:39 silby Exp $ */
 
 #ifndef _BFE_H
 #define _BFE_H
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 4e03d319a137c..e393f4ed85f49 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.198.2.2.2.1 2008/01/22 17:30:13 jkim Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index 3b68cea163799..8566489de3702 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.73 2007/05/22 19:22:58 jkim Exp $
  */
 
 /*
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index b885e15e0a307..c136c7f20a62a 100755
--- a/sys/dev/bktr/CHANGELOG.TXT
+++ b/sys/dev/bktr/CHANGELOG.TXT
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/CHANGELOG.TXT,v 1.22 2006/08/04 07:56:32 yar Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index efc63da05bf4d..e4aff8cecb679 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.16 2005/05/29 04:42:18 nyan Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index c05e40c31ea3f..fd31fb0d6b313 100644
--- a/sys/dev/bktr/bktr_audio.h
+++ b/sys/dev/bktr/bktr_audio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.4 2005/01/06 01:42:31 imp Exp $ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index 00526def16c45..33b3890fce158 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.36 2005/12/04 10:06:03 ru Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_card.h b/sys/dev/bktr/bktr_card.h
index 30a90a880d688..2dedafce09415 100644
--- a/sys/dev/bktr/bktr_card.h
+++ b/sys/dev/bktr/bktr_card.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.12 2005/11/13 13:26:37 netchild Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 9792418b05aa5..7370635628984 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.140 2005/12/04 10:06:03 ru Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index 980ced76621a3..d707bf58f1a84 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.7 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 2f9ca1fe4f60a..72ee4a0a09a12 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.29 2006/12/31 19:42:47 jmg Exp $");
 
 /*
  * I2C support for the bti2c chipset.
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index 5008e6bfb9ceb..1e10d1f707c2c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_i2c.h,v 1.5 2006/09/18 20:17:42 jhb Exp $
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c
index 77c5971bacd46..0961a3034a3a5 100644
--- a/sys/dev/bktr/bktr_mem.c
+++ b/sys/dev/bktr/bktr_mem.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.13 2005/01/27 01:40:12 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/bktr/bktr_mem.h b/sys/dev/bktr/bktr_mem.h
index 8feb55206c11d..87bd3ca08021b 100644
--- a/sys/dev/bktr/bktr_mem.h
+++ b/sys/dev/bktr/bktr_mem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_mem.h,v 1.2 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is prt of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 9ce258cbafa04..0c05b712ea0b9 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.54 2007/02/23 12:18:34 piso Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index 1cd708df3c6ad..74ead039940df 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.8 2005/01/06 01:42:31 imp Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index 982fe2c4a6000..7373dcefea295 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.50 2005/05/24 20:42:08 cognet Exp $
  *
  * Copyright (c) 1999 Roger Hardiman
  * Copyright (c) 1998 Amancio Hasty
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index df24c862cd479..1c0995ce43952 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.20 2005/11/13 13:26:37 netchild Exp $");
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/bktr_tuner.h b/sys/dev/bktr/bktr_tuner.h
index cc00150151ff6..ffd6db83e351b 100644
--- a/sys/dev/bktr/bktr_tuner.h
+++ b/sys/dev/bktr/bktr_tuner.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.h,v 1.7 2005/11/13 13:26:37 netchild Exp $ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index 3731e7d2b34bd..fca5decc36038 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/ioctl_bt848.h,v 1.30 2003/12/20 17:12:25 obrien Exp $
  */
 
 #ifndef  _DEV_BKTR_IOCTL_BT848_H_
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index 681990aa03c0d..2f3320319b33f 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -28,7 +28,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/ioctl_meteor.h,v 1.16 2005/01/06 01:42:31 imp Exp $
  */
 /*
  *	ioctl constants for Matrox Meteor Capture card.
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c
index 940205ac4af8e..df96ce1aa24fa 100644
--- a/sys/dev/bktr/msp34xx.c
+++ b/sys/dev/bktr/msp34xx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.5 2004/12/16 23:19:57 julian Exp $
  */
 
 /*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index b7df4b48522e7..eb221608c5028 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt.c,v 1.50 2007/06/17 05:55:49 scottl Exp $");
 
  /*
   * Special thanks to Leonard N. Zubkoff for writing such a complete and
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index 85a13ac0f5267..3014f51509108 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.22 2006/12/11 18:28:30 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 6206dc6ffdf1b..fddb83b3763ac 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_isa.c,v 1.26 2006/12/11 18:28:30 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c
index 2f72ee4264123..e790e24d700d8 100644
--- a/sys/dev/buslogic/bt_mca.c
+++ b/sys/dev/buslogic/bt_mca.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.11 2006/12/11 18:28:30 mjacob Exp $");
 
 /*
  * Written using the bt_isa/bt_pci code as a reference.
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index de7cc9ed4e8b3..1dd13f43aae3c 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.21 2006/12/11 18:28:30 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index be6e74f90ebe8..8bf5b2366d41a 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/buslogic/btreg.h,v 1.16 2005/01/06 01:42:31 imp Exp $
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index e7fdcad126fea..bc346bbee5399 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.66 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index db1c606405e85..fe6eb7904d3e7 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.62 2007/06/08 04:03:57 imp Exp $");
 
 /*
  * CIS Handling for the Cardbus Bus
diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index 086e4ea2f64fb..a5c2c9d4d7ea9 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.h,v 1.13 2005/02/06 21:03:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbus_device.c b/sys/dev/cardbus/cardbus_device.c
index c03a18a2002e2..74bab7d6b8401 100644
--- a/sys/dev/cardbus/cardbus_device.c
+++ b/sys/dev/cardbus/cardbus_device.c
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_device.c,v 1.1 2005/12/29 01:43:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index 0b4621ffc7f68..120acd5a0b50b 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.11 2005/10/28 06:03:53 imp Exp $
  */
 
 /*
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 713288453f7c0..c66300678c4dc 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cardbus/cardbusvar.h,v 1.14 2005/12/29 23:41:29 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ce/ceddk.c b/sys/dev/ce/ceddk.c
index bc9801292090b..b352483a34dcc 100644
--- a/sys/dev/ce/ceddk.c
+++ b/sys/dev/ce/ceddk.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ce/ceddk.c,v 1.1 2006/01/27 09:02:09 rik Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ce/ceddk.h>
diff --git a/sys/dev/ce/ceddk.h b/sys/dev/ce/ceddk.h
index 8cd8c67774bb7..267ea864d8035 100644
--- a/sys/dev/ce/ceddk.h
+++ b/sys/dev/ce/ceddk.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * $Cronyx: ceddk.h,v 1.2.6.1 2005/11/09 13:01:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ce/ceddk.h,v 1.1 2006/01/27 09:02:09 rik Exp $
  */
 
 #define TAU32_UserContext_Add	void	*sys;
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c
index 8f93667cdc5c2..35a42dc660e21 100644
--- a/sys/dev/ce/if_ce.c
+++ b/sys/dev/ce/if_ce.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.9 2007/07/27 11:59:56 rwatson Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/ce/ng_ce.h b/sys/dev/ce/ng_ce.h
index b8e9604c4f5e5..059c7c92e10e9 100644
--- a/sys/dev/ce/ng_ce.h
+++ b/sys/dev/ce/ng_ce.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * $Cronyx: ng_ce.h,v 1.2 2005/04/23 20:11:57 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ce/ng_ce.h,v 1.1 2006/01/27 09:02:09 rik Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/ce/tau32-ddk.c b/sys/dev/ce/tau32-ddk.c
index 262c8ab38056d..010f51a85a54c 100644
--- a/sys/dev/ce/tau32-ddk.c
+++ b/sys/dev/ce/tau32-ddk.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ce/tau32-ddk.c,v 1.2 2006/03/01 09:50:20 rik Exp $");
 
 #ifndef __noinline
 #	ifdef __GNUC__
diff --git a/sys/dev/ce/tau32-ddk.h b/sys/dev/ce/tau32-ddk.h
index 7c2e92b091456..cfcd8313e29d7 100644
--- a/sys/dev/ce/tau32-ddk.h
+++ b/sys/dev/ce/tau32-ddk.h
@@ -8,7 +8,7 @@
  *
  * $Cronyx: tau32-ddk.h,v 1.2 2006/02/01 09:14:40 ly Exp $
  * $Rik: tau32-ddk.h,v 1.7 2006/02/28 22:33:29 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ce/tau32-ddk.h,v 1.2 2006/03/01 09:50:20 rik Exp $
  */
 
 #if defined(__GNUC__) || defined(__TURBOC__)
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index c71d0d9b5600c..9c5367063b05f 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.81.2.1.2.2 2008/02/15 13:55:23 iwasaki Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index e05422a5ad369..570cee06ce203 100644
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/cissio.h,v 1.5 2005/05/18 05:31:34 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index 16af7bcb03ff1..cdf112b8a7f9f 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.16 2005/08/09 20:53:51 ps Exp $
  */
 
 /*
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index 05e64fa7d211f..1fef97df12e94 100644
--- a/sys/dev/ciss/cissvar.h
+++ b/sys/dev/ciss/cissvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ciss/cissvar.h,v 1.11 2007/05/01 05:13:15 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index 2986c6074793c..f29327e0c9062 100644
--- a/sys/dev/cm/if_cm_isa.c
+++ b/sys/dev/cm/if_cm_isa.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.10 2007/02/23 12:18:35 piso Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index e8645ca007a7d..134867dc3edcc 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.18 2007/03/21 03:38:35 nyan Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6reg.h b/sys/dev/cm/smc90cx6reg.h
index b020c8685f603..4033471334188 100644
--- a/sys/dev/cm/smc90cx6reg.h
+++ b/sys/dev/cm/smc90cx6reg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6reg.h,v 1.7 1999/02/16 23:34:13 is Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6reg.h,v 1.2 2006/06/11 22:25:01 fjoe Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cm/smc90cx6var.h b/sys/dev/cm/smc90cx6var.h
index fe9cdbcb2094a..2e989d7840579 100644
--- a/sys/dev/cm/smc90cx6var.h
+++ b/sys/dev/cm/smc90cx6var.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6var.h,v 1.5 2000/03/23 07:01:32 thorpej Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.5 2006/06/11 22:25:01 fjoe Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index f4455bd5aa1d7..52fc1595f1606 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.25 2007/02/23 19:27:49 imp Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/cnw/if_cnwioctl.h b/sys/dev/cnw/if_cnwioctl.h
index cc1b54890a998..f50dd6b5c1b75 100644
--- a/sys/dev/cnw/if_cnwioctl.h
+++ b/sys/dev/cnw/if_cnwioctl.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_cnwioctl.h,v 1.2 1999/11/29 12:54:00 itojun Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cnw/if_cnwioctl.h,v 1.2 2005/01/06 01:42:32 imp Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 Berkeley Software Design, Inc.
diff --git a/sys/dev/cnw/if_cnwreg.h b/sys/dev/cnw/if_cnwreg.h
index 8b62d203d22c4..297f82d186587 100644
--- a/sys/dev/cnw/if_cnwreg.h
+++ b/sys/dev/cnw/if_cnwreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_cnwreg.h,v 1.3 2000/07/05 18:42:19 itojun Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/cnw/if_cnwreg.h,v 1.1 2001/03/16 07:25:42 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/coretemp/coretemp.c b/sys/dev/coretemp/coretemp.c
index 61e4606fbe912..cc3ccaa386bef 100644
--- a/sys/dev/coretemp/coretemp.c
+++ b/sys/dev/coretemp/coretemp.c
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.2 2007/08/23 10:53:03 des Exp $
  *
  */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.2 2007/08/23 10:53:03 des Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/cp/cpddk.c b/sys/dev/cp/cpddk.c
index b16edfa4baa31..9f05d80c84c7f 100644
--- a/sys/dev/cp/cpddk.c
+++ b/sys/dev/cp/cpddk.c
@@ -18,7 +18,7 @@
  * $Cronyx: cpddk.c,v 1.13.4.37 2004/12/11 16:14:39 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/cpddk.c,v 1.6 2005/12/17 07:09:17 obrien Exp $");
 
 #include <dev/cx/machdep.h>
 
diff --git a/sys/dev/cp/cpddk.h b/sys/dev/cp/cpddk.h
index 3ff40bbd68d1d..6871cbd7ecb62 100644
--- a/sys/dev/cp/cpddk.h
+++ b/sys/dev/cp/cpddk.h
@@ -16,7 +16,7 @@
  * works or modified versions.
  *
  * $Cronyx: cpddk.h,v 1.8.4.20 2004/12/06 16:21:06 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/cpddk.h,v 1.4 2005/01/06 01:42:32 imp Exp $
  */
 #define NBRD		6	/* the maximum number of installed boards */
 #define NCHAN		4	/* the number of channels on the board */
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index dbe40bc5bac0a..ae4a0c056a2d1 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.34 2007/07/27 11:59:56 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/sys/dev/cp/ng_cp.h b/sys/dev/cp/ng_cp.h
index f35d817604996..448ba56b165a7 100644
--- a/sys/dev/cp/ng_cp.h
+++ b/sys/dev/cp/ng_cp.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * $Cronyx: ng_cp.h,v 1.1.2.4 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cp/ng_cp.h,v 1.2 2005/01/06 01:42:32 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index 13d004d97a5e2..a74f498acabc1 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cpufreq/ichss.c,v 1.10 2006/05/16 14:36:24 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 7c6ac932ba852..b529e85ede1ad 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.45 2006/09/15 15:16:10 glebius Exp $");
 
 /*
  *
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 9c3bd3004e6ab..548ebf090123c 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.7 2007/02/23 12:18:36 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index fbb55870c5e78..5b28a1c992398 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.19 2007/02/23 12:18:36 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index dc844c8cc810a..bb9358075d0e3 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cs/if_csreg.h,v 1.6 2005/01/06 01:42:32 imp Exp $
  */
 
 #define CS_89x0_IO_PORTS	0x0020
diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h
index ba3c7d07127dc..16a91c52073d6 100644
--- a/sys/dev/cs/if_csvar.h
+++ b/sys/dev/cs/if_csvar.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cs/if_csvar.h,v 1.9 2006/09/15 15:16:10 glebius Exp $
  */
 
 #ifndef _IF_CSVAR_H
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c
index 128b6d067c8c8..66c4b6679d8a1 100644
--- a/sys/dev/ct/bshw_machdep.c
+++ b/sys/dev/ct/bshw_machdep.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.8 2006/05/16 14:36:24 phk Exp $");
 /*	$NetBSD$	*/
 
 /*-
diff --git a/sys/dev/ct/bshwvar.h b/sys/dev/ct/bshwvar.h
index ba42a72069795..7ba92d1bf7334 100644
--- a/sys/dev/ct/bshwvar.h
+++ b/sys/dev/ct/bshwvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/bshwvar.h,v 1.4 2005/01/06 01:42:33 imp Exp $ */
 /*	$NecBSD: bshwvar.h,v 1.3.14.3 2001/06/21 04:07:37 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ct/ct.c b/sys/dev/ct/ct.c
index 602e094509ca1..39cec92a22321 100644
--- a/sys/dev/ct/ct.c
+++ b/sys/dev/ct/ct.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.10 2005/01/06 01:42:33 imp Exp $");
 /*	$NetBSD$	*/
 
 #define	CT_DEBUG
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index a1e30457b1891..e237df0e7d843 100644
--- a/sys/dev/ct/ct_isa.c
+++ b/sys/dev/ct/ct_isa.c
@@ -1,7 +1,7 @@
 /*	$NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.14 2007/02/23 12:18:36 piso Exp $");
 /*	$NetBSD$	*/
 
 /*-
diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index 2e069f5d33a12..d2e985514a5cd 100644
--- a/sys/dev/ct/ct_machdep.h
+++ b/sys/dev/ct/ct_machdep.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.6 2005/01/06 01:42:33 imp Exp $ */
 /*	$NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ct/ctvar.h b/sys/dev/ct/ctvar.h
index 8c63445e02004..22d2be9561901 100644
--- a/sys/dev/ct/ctvar.h
+++ b/sys/dev/ct/ctvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ct/ctvar.h,v 1.4 2005/01/06 01:42:33 imp Exp $ */
 /*	$NecBSD: ctvar.h,v 1.4.14.3 2001/06/20 06:13:34 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ctau/am8530.h b/sys/dev/ctau/am8530.h
index 09831c624ed7f..a85e2637f0d30 100644
--- a/sys/dev/ctau/am8530.h
+++ b/sys/dev/ctau/am8530.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: am8530.h,v 1.1.2.2 2003/11/12 17:31:21 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/am8530.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctau.c b/sys/dev/ctau/ctau.c
index 9b4f40475af3e..0deffbd111650 100644
--- a/sys/dev/ctau/ctau.c
+++ b/sys/dev/ctau/ctau.c
@@ -17,7 +17,7 @@
  * Cronyx Id: ctau.c,v 1.1.2.4 2003/12/11 17:33:43 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/ctau.c,v 1.3 2005/01/06 01:42:33 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/ctau/ctau2fw.h b/sys/dev/ctau/ctau2fw.h
index 6d43f97258584..fcd1e819593dc 100644
--- a/sys/dev/ctau/ctau2fw.h
+++ b/sys/dev/ctau/ctau2fw.h
@@ -4,7 +4,7 @@
  * from the file `ctau2.dat'
  *
  * Cronyx Id: ctau2fw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctau2fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctau2_fw_len = 98448;
 
diff --git a/sys/dev/ctau/ctaue1fw.h b/sys/dev/ctau/ctaue1fw.h
index cb3311cd1d668..7058e2b91013f 100644
--- a/sys/dev/ctau/ctaue1fw.h
+++ b/sys/dev/ctau/ctaue1fw.h
@@ -4,7 +4,7 @@
  * from the file `ctaue1.dat'
  *
  * Cronyx Id: ctaue1fw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaue1fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctaue1_fw_len = 323982;
 
diff --git a/sys/dev/ctau/ctaufw.h b/sys/dev/ctau/ctaufw.h
index 354f2bac974d3..3212a4c3f683e 100644
--- a/sys/dev/ctau/ctaufw.h
+++ b/sys/dev/ctau/ctaufw.h
@@ -4,7 +4,7 @@
  * from the file `ctau.dat'
  *
  * Cronyx Id: ctaufw.h,v 1.1 2002/06/03 10:19:40 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaufw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctau_fw_len = 131234;
 
diff --git a/sys/dev/ctau/ctaug7fw.h b/sys/dev/ctau/ctaug7fw.h
index 523008932a0f4..8c487da76a72a 100644
--- a/sys/dev/ctau/ctaug7fw.h
+++ b/sys/dev/ctau/ctaug7fw.h
@@ -4,7 +4,7 @@
  * from the file `ctaug703.dat'
  *
  * Cronyx Id: ctaug7fw.h,v 1.1 2002/06/03 10:19:40 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaug7fw.h,v 1.1 2004/02/23 20:19:00 rik Exp $
  */
 long ctaug703_fw_len = 323982;
 
diff --git a/sys/dev/ctau/ctaureg.h b/sys/dev/ctau/ctaureg.h
index 3cd2ce21ceddf..8d9e003faa5f2 100644
--- a/sys/dev/ctau/ctaureg.h
+++ b/sys/dev/ctau/ctaureg.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ctaureg.h,v 1.1.2.1 2003/11/12 17:16:10 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctaureg.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/ctddk.c b/sys/dev/ctau/ctddk.c
index 0a9dbd2fd46b6..756b036ef36e5 100644
--- a/sys/dev/ctau/ctddk.c
+++ b/sys/dev/ctau/ctddk.c
@@ -21,7 +21,7 @@
  * Cronyx Id: ctddk.c,v 1.1.2.3 2003/11/14 16:55:36 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/ctddk.c,v 1.2 2005/01/06 01:42:33 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/ctau/ctddk.h b/sys/dev/ctau/ctddk.h
index 99620902fc96b..e25510b7d0ebb 100644
--- a/sys/dev/ctau/ctddk.h
+++ b/sys/dev/ctau/ctddk.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ctddk.h,v 1.1.2.3 2003/12/11 17:33:44 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ctddk.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 #define NBRD		3	/* the maximum number of installed boards */
 #define NPORT		32	/* the number of i/o ports per board */
diff --git a/sys/dev/ctau/ds2153.h b/sys/dev/ctau/ds2153.h
index 44ab02d41fe96..92076fbe3bd1f 100644
--- a/sys/dev/ctau/ds2153.h
+++ b/sys/dev/ctau/ds2153.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: ds2153.h,v 1.2.4.1 2003/11/12 17:22:33 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ds2153.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/hdc64570.h b/sys/dev/ctau/hdc64570.h
index 29d28cddb04c9..580fa8b45a1ee 100644
--- a/sys/dev/ctau/hdc64570.h
+++ b/sys/dev/ctau/hdc64570.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: hdc64570.h,v 1.1.2.2 2003/11/12 17:31:21 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/hdc64570.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 3769419d3cfb9..2c4784f68ac6e 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.34 2007/07/27 11:59:56 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/dev/ctau/lxt318.h b/sys/dev/ctau/lxt318.h
index a1064afca67c4..a0a6506e0f05b 100644
--- a/sys/dev/ctau/lxt318.h
+++ b/sys/dev/ctau/lxt318.h
@@ -17,7 +17,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: lxt318.h,v 1.2.4.4 2003/11/14 19:08:45 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/lxt318.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 #define LX_WRITE	0x00
diff --git a/sys/dev/ctau/ng_ct.h b/sys/dev/ctau/ng_ct.h
index bd4d208e1204c..6447510e76361 100644
--- a/sys/dev/ctau/ng_ct.h
+++ b/sys/dev/ctau/ng_ct.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  * 
  * Cronyx Id: ng_ct.h,v 1.1.2.3 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ctau/ng_ct.h,v 1.2 2005/01/06 01:42:33 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cx/cronyxfw.h b/sys/dev/cx/cronyxfw.h
index 56b2033b09abf..83a6f6bb0bb4e 100644
--- a/sys/dev/cx/cronyxfw.h
+++ b/sys/dev/cx/cronyxfw.h
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cronyxfw.h,v 1.1.2.1 2003/11/12 17:09:49 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cronyxfw.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 #define CRONYX_DAT_MAGIC 2001107011L	/* firmware file magic */
 
diff --git a/sys/dev/cx/csigma.c b/sys/dev/cx/csigma.c
index e880b88cbef02..a0edab4faa925 100644
--- a/sys/dev/cx/csigma.c
+++ b/sys/dev/cx/csigma.c
@@ -12,7 +12,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: csigma.c,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/csigma.c,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/cx/csigmafw.h b/sys/dev/cx/csigmafw.h
index a5e4e05d75424..b43af9605fed8 100644
--- a/sys/dev/cx/csigmafw.h
+++ b/sys/dev/cx/csigmafw.h
@@ -4,7 +4,7 @@
  * from the file `csigma.dat'
  *
  * Cronyx Id: csigmafw.h,v 1.1 2002/06/03 10:19:39 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/csigmafw.h,v 1.1 2003/12/03 07:29:38 imp Exp $
  */
 long csigma_fw_len = 131234;
 
diff --git a/sys/dev/cx/cxddk.c b/sys/dev/cx/cxddk.c
index bbcc904051e82..1193c2ecd0047 100644
--- a/sys/dev/cx/cxddk.c
+++ b/sys/dev/cx/cxddk.c
@@ -17,7 +17,7 @@
  * Cronyx Id: cxddk.c,v 1.1.2.2 2003/11/27 14:24:50 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cx/cxddk.c,v 1.2 2005/01/06 01:42:34 imp Exp $");
 
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/cx/cxddk.h b/sys/dev/cx/cxddk.h
index bd95aa6e254c0..55a89d9e791f9 100644
--- a/sys/dev/cx/cxddk.h
+++ b/sys/dev/cx/cxddk.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cxddk.h,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cxddk.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 
 #ifndef port_t
diff --git a/sys/dev/cx/cxreg.h b/sys/dev/cx/cxreg.h
index 70a937d112800..aa1f750d5b0e3 100644
--- a/sys/dev/cx/cxreg.h
+++ b/sys/dev/cx/cxreg.h
@@ -13,7 +13,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cxreg.h,v 1.1.2.1 2003/11/12 17:13:41 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/cxreg.h,v 1.2 2005/01/06 01:42:34 imp Exp $
  */
 #define REVCL_MIN   7		/* CD2400 min. revision number G */
 #define REVCL_MAX   13		/* CD2400 max. revision number M */
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index b75f23b9308aa..3a169eeb7ddb7 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.57 2007/07/27 11:59:56 rwatson Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/cx/machdep.h b/sys/dev/cx/machdep.h
index a425af5b717d8..ea071aa7025ed 100644
--- a/sys/dev/cx/machdep.h
+++ b/sys/dev/cx/machdep.h
@@ -15,7 +15,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/machdep.h,v 1.5 2005/03/02 21:33:23 joerg Exp $
  */
 
 /*
diff --git a/sys/dev/cx/ng_cx.h b/sys/dev/cx/ng_cx.h
index 30b3c14daa4ee..33d77105bd055 100644
--- a/sys/dev/cx/ng_cx.h
+++ b/sys/dev/cx/ng_cx.h
@@ -13,7 +13,7 @@
  * works or modified versions.
  *
  * Cronyx Id: ng_cx.h,v 1.1.2.3 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cx/ng_cx.h,v 1.3 2005/01/06 01:42:34 imp Exp $
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cxgb/common/cxgb_ael1002.c b/sys/dev/cxgb/common/cxgb_ael1002.c
index c570ed30c17dd..9b0b4cf7e3c9a 100644
--- a/sys/dev/cxgb/common/cxgb_ael1002.c
+++ b/sys/dev/cxgb/common/cxgb_ael1002.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.3 2007/06/13 05:36:00 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h
index 0b4b6aa982932..82fd8b3462450 100644
--- a/sys/dev/cxgb/common/cxgb_common.h
+++ b/sys/dev/cxgb/common/cxgb_common.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.7 2007/09/09 01:28:03 kmacy Exp $
 
 ***************************************************************************/
 #ifndef __CHELSIO_COMMON_H
diff --git a/sys/dev/cxgb/common/cxgb_ctl_defs.h b/sys/dev/cxgb/common/cxgb_ctl_defs.h
index 3a2eb4fa9a832..4df5a25eafc07 100644
--- a/sys/dev/cxgb/common/cxgb_ctl_defs.h
+++ b/sys/dev/cxgb/common/cxgb_ctl_defs.h
@@ -6,7 +6,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the LICENSE file included in this
  * release for licensing terms and conditions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cxgb/common/cxgb_ctl_defs.h,v 1.3 2007/09/09 01:28:03 kmacy Exp $
  */
 
 #ifndef _CXGB3_OFFLOAD_CTL_DEFS_H
diff --git a/sys/dev/cxgb/common/cxgb_firmware_exports.h b/sys/dev/cxgb/common/cxgb_firmware_exports.h
index e361c959265d0..a34655a6cf140 100644
--- a/sys/dev/cxgb/common/cxgb_firmware_exports.h
+++ b/sys/dev/cxgb/common/cxgb_firmware_exports.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $
 
 ***************************************************************************/
 #ifndef _FIRMWARE_EXPORTS_H_
diff --git a/sys/dev/cxgb/common/cxgb_mc5.c b/sys/dev/cxgb/common/cxgb_mc5.c
index d3eed4a2c32ec..64b85293fa878 100644
--- a/sys/dev/cxgb/common/cxgb_mc5.c
+++ b/sys/dev/cxgb/common/cxgb_mc5.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.5 2007/07/17 06:50:34 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <common/cxgb_common.h>
diff --git a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
index 6cee581bb5010..14a0d0e556772 100644
--- a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
+++ b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
diff --git a/sys/dev/cxgb/common/cxgb_regs.h b/sys/dev/cxgb/common/cxgb_regs.h
index 63744c49191e6..7e8ef4540a657 100644
--- a/sys/dev/cxgb/common/cxgb_regs.h
+++ b/sys/dev/cxgb/common/cxgb_regs.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $
 
 ***************************************************************************/
 /* This file is automatically generated --- do not edit */
diff --git a/sys/dev/cxgb/common/cxgb_sge_defs.h b/sys/dev/cxgb/common/cxgb_sge_defs.h
index 2aae7f894e393..b8e7681c10711 100644
--- a/sys/dev/cxgb/common/cxgb_sge_defs.h
+++ b/sys/dev/cxgb/common/cxgb_sge_defs.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.3 2007/09/09 01:28:03 kmacy Exp $
 
 ***************************************************************************/
 /*
diff --git a/sys/dev/cxgb/common/cxgb_t3_cpl.h b/sys/dev/cxgb/common/cxgb_t3_cpl.h
index e1b40303a6f71..115d6dcf4a4a1 100644
--- a/sys/dev/cxgb/common/cxgb_t3_cpl.h
+++ b/sys/dev/cxgb/common/cxgb_t3_cpl.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.4 2007/07/17 06:50:34 kmacy Exp $
 
 ***************************************************************************/
 #ifndef T3_CPL_H
diff --git a/sys/dev/cxgb/common/cxgb_t3_hw.c b/sys/dev/cxgb/common/cxgb_t3_hw.c
index 6c8b53a96049c..aae522aabbb2e 100644
--- a/sys/dev/cxgb/common/cxgb_t3_hw.c
+++ b/sys/dev/cxgb/common/cxgb_t3_hw.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.9 2007/09/09 03:51:25 kmacy Exp $");
 
 
 #ifdef CONFIG_DEFINED
diff --git a/sys/dev/cxgb/common/cxgb_tcb.h b/sys/dev/cxgb/common/cxgb_tcb.h
index 5dc72f5467fb3..3f129db0f1039 100644
--- a/sys/dev/cxgb/common/cxgb_tcb.h
+++ b/sys/dev/cxgb/common/cxgb_tcb.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/common/cxgb_version.h b/sys/dev/cxgb/common/cxgb_version.h
index 88296af4a1528..e24e9c1b29745 100644
--- a/sys/dev/cxgb/common/cxgb_version.h
+++ b/sys/dev/cxgb/common/cxgb_version.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $
 
 ***************************************************************************/
 /*
diff --git a/sys/dev/cxgb/common/cxgb_vsc7323.c b/sys/dev/cxgb/common/cxgb_vsc7323.c
index ded8261b54807..269d5a942cd57 100644
--- a/sys/dev/cxgb/common/cxgb_vsc7323.c
+++ b/sys/dev/cxgb/common/cxgb_vsc7323.c
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc7323.c,v 1.3 2007/09/09 01:28:03 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <common/cxgb_common.h>
diff --git a/sys/dev/cxgb/common/cxgb_vsc8211.c b/sys/dev/cxgb/common/cxgb_vsc8211.c
index 382ecc73ccacf..1d3ac89b77481 100644
--- a/sys/dev/cxgb/common/cxgb_vsc8211.c
+++ b/sys/dev/cxgb/common/cxgb_vsc8211.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.3 2007/08/25 21:07:37 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
diff --git a/sys/dev/cxgb/common/cxgb_xgmac.c b/sys/dev/cxgb/common/cxgb_xgmac.c
index ca8801f602a81..d10bbac342b02 100644
--- a/sys/dev/cxgb/common/cxgb_xgmac.c
+++ b/sys/dev/cxgb/common/cxgb_xgmac.c
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_xgmac.c,v 1.7 2007/09/09 01:28:03 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
diff --git a/sys/dev/cxgb/common/jhash.h b/sys/dev/cxgb/common/jhash.h
index 4546b7b3d5b3e..bbe6e241b0388 100644
--- a/sys/dev/cxgb/common/jhash.h
+++ b/sys/dev/cxgb/common/jhash.h
@@ -14,7 +14,7 @@
  * Routines to test the hash are included if SELF_TEST is defined.
  * You can use this free for any purpose.  It has no warranty.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cxgb/common/jhash.h,v 1.1 2007/05/25 09:48:19 kmacy Exp $
  */
 
 /* NOTE: Arguments are modified. */
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index 90a5e74531496..93dbc1f7add47 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.20 2007/09/10 00:59:51 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/cxgb_config.h b/sys/dev/cxgb/cxgb_config.h
index 6b072c3cb6e3f..112a15887476c 100644
--- a/sys/dev/cxgb/cxgb_config.h
+++ b/sys/dev/cxgb/cxgb_config.h
@@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/cxgb_config.h,v 1.4 2007/06/13 05:35:59 kmacy Exp $
 
 ***************************************************************************/
 #ifndef _CXGB_CONFIG_H_
diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h
index bbb0f7ac8d425..18d0389c2ab6c 100644
--- a/sys/dev/cxgb/cxgb_include.h
+++ b/sys/dev/cxgb/cxgb_include.h
@@ -1,5 +1,5 @@
 /*
- *  $FreeBSD$
+ *  $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.2 2007/09/10 00:59:51 kmacy Exp $
  */
 
 
diff --git a/sys/dev/cxgb/cxgb_ioctl.h b/sys/dev/cxgb/cxgb_ioctl.h
index 65deb447da3b3..080e0bce57a0b 100644
--- a/sys/dev/cxgb/cxgb_ioctl.h
+++ b/sys/dev/cxgb/cxgb_ioctl.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/cxgb_ioctl.h,v 1.5 2007/08/17 05:57:03 kmacy Exp $
 
 ***************************************************************************/
 #ifndef __CHIOCTL_H__
diff --git a/sys/dev/cxgb/cxgb_l2t.c b/sys/dev/cxgb/cxgb_l2t.c
index d4a40bad430dc..c79b80f35b3ef 100644
--- a/sys/dev/cxgb/cxgb_l2t.c
+++ b/sys/dev/cxgb/cxgb_l2t.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.3 2007/08/17 05:57:03 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cxgb/cxgb_l2t.h b/sys/dev/cxgb/cxgb_l2t.h
index 0944f623a54dd..25365578adcd1 100644
--- a/sys/dev/cxgb/cxgb_l2t.h
+++ b/sys/dev/cxgb/cxgb_l2t.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.h,v 1.2 2007/08/17 05:57:03 kmacy Exp $
 
 ***************************************************************************/
 #ifndef _CHELSIO_L2T_H
diff --git a/sys/dev/cxgb/cxgb_lro.c b/sys/dev/cxgb/cxgb_lro.c
index a502859572b28..67493d096a6ed 100644
--- a/sys/dev/cxgb/cxgb_lro.c
+++ b/sys/dev/cxgb/cxgb_lro.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.8 2007/08/25 21:07:36 kmacy Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index dff4591389edf..2078d1828a76f 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.36 2007/09/11 23:49:27 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cxgb/cxgb_offload.c b/sys/dev/cxgb/cxgb_offload.c
index 991fb7e96a659..0e28e98adab6d 100644
--- a/sys/dev/cxgb/cxgb_offload.c
+++ b/sys/dev/cxgb/cxgb_offload.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.8 2007/08/17 05:57:04 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h
index adfffa6043d67..374e5b1821485 100644
--- a/sys/dev/cxgb/cxgb_offload.h
+++ b/sys/dev/cxgb/cxgb_offload.h
@@ -26,7 +26,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/cxgb_offload.h,v 1.5 2007/09/10 00:59:51 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h
index c2d41c08acb5f..62319a52570c4 100644
--- a/sys/dev/cxgb/cxgb_osdep.h
+++ b/sys/dev/cxgb/cxgb_osdep.h
@@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.14 2007/09/10 00:59:51 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index 30d6520ddfd04..b9dfbec9ea032 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.30 2007/09/09 04:34:03 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cxgb/sys/mbufq.h b/sys/dev/cxgb/sys/mbufq.h
index d8de43296d63f..47de5bee37cf7 100644
--- a/sys/dev/cxgb/sys/mbufq.h
+++ b/sys/dev/cxgb/sys/mbufq.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/sys/mbufq.h,v 1.2 2007/05/28 22:57:27 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/sys/mvec.h b/sys/dev/cxgb/sys/mvec.h
index 47520705f7a71..fe8f9d87ca07d 100644
--- a/sys/dev/cxgb/sys/mvec.h
+++ b/sys/dev/cxgb/sys/mvec.h
@@ -25,7 +25,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.6 2007/07/17 06:50:34 kmacy Exp $
  *
  ***************************************************************************/
 
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index 04082727eb7c0..7c2e44af6bba8 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -29,7 +29,7 @@
  ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.14 2007/05/28 22:57:27 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu b/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu
index fc8472b70bf5c..46bcbfca2603c 100644
--- a/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu
+++ b/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu,v 1.1 2007/07/17 06:50:33 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu b/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu
index 73b5298d2e215..1cc2fd523f71b 100644
--- a/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu
+++ b/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu,v 1.1 2007/07/17 06:50:33 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu b/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu
index 2959b8dc9d68d..cc1614d65b7a6 100644
--- a/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu
+++ b/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu,v 1.1 2007/09/09 01:28:02 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cxgb/ulp/toecore/toedev.h b/sys/dev/cxgb/ulp/toecore/toedev.h
index edf0263f4c65d..3f47b89957811 100644
--- a/sys/dev/cxgb/ulp/toecore/toedev.h
+++ b/sys/dev/cxgb/ulp/toecore/toedev.h
@@ -26,7 +26,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/cxgb/ulp/toecore/toedev.h,v 1.1 2007/05/25 16:17:59 kmacy Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index bfb83dfdcf6a1..7598ddc9bff50 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.163 2007/02/23 12:18:36 piso Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 390ccd22dd203..8e8cda4fe8424 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy_isa.c,v 1.148 2007/02/23 12:18:36 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 3cc3a3bd5df82..b32e00d72a7d5 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cy/cy_pci.c,v 1.38 2007/02/23 12:18:37 piso Exp $");
 
 #include "opt_cy_pci_fastintr.h"
 
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index 88a36eb4a65e2..6d643ff9c9bd9 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cy/cyreg.h,v 1.9 1999/08/28 00:44:40 peter Exp $
  */
 
 /*
diff --git a/sys/dev/cy/cyvar.h b/sys/dev/cy/cyvar.h
index 6b770e8761fa8..252ede58e356a 100644
--- a/sys/dev/cy/cyvar.h
+++ b/sys/dev/cy/cyvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/cy/cyvar.h,v 1.2 2007/02/23 12:18:37 piso Exp $
  */
 
 typedef u_char volatile *cy_addr;
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 3b1de0fc496df..44bcc93583dec 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dc/dcphy.c,v 1.32 2006/08/02 05:28:52 yongari Exp $");
 
 /*
  * Pseudo-driver for internal NWAY support on DEC 21143 and workalike
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index e3d946526b6f1..5498601944ea9 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.192 2007/08/05 11:28:19 marius Exp $");
 
 /*
  * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
diff --git a/sys/dev/dc/if_dcreg.h b/sys/dev/dc/if_dcreg.h
index 9417a1328d226..5d6b6acc2a109 100644
--- a/sys/dev/dc/if_dcreg.h
+++ b/sys/dev/dc/if_dcreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dc/if_dcreg.h,v 1.54 2007/08/05 11:28:19 marius Exp $
  */
 
 /*
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 415c22e241da4..53d391685f944 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dc/pnphy.c,v 1.21 2006/08/02 05:28:52 yongari Exp $");
 
 /*
  * Pseudo-driver for media selection on the Lite-On PNIC 82c168
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index ace8f7e62c6f2..7c7847e8bd214 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.21 2007/05/25 05:00:39 simokawa Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index 49ef869cecc19..9b3520d752919 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.h,v 1.15 2003/10/23 15:05:31 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons.h,v 1.6 2007/06/08 04:33:25 simokawa Exp $
  */
 
 #if defined(_KERNEL) || defined(_BOOT)
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index 290bb1e8ca401..9b0c60e37c74d 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.9 2007/06/08 04:33:25 simokawa Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index d47515c9bfaf0..498a73f03d1d9 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.19 2007/08/17 05:32:39 simokawa Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.h b/sys/dev/dcons/dcons_os.h
index 56a32c3e3eaab..bdfa5e4e04ec7 100644
--- a/sys/dev/dcons/dcons_os.h
+++ b/sys/dev/dcons/dcons_os.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/dcons/dcons_os.h,v 1.3 2007/06/08 00:54:44 simokawa Exp $
  */
 
 
diff --git a/sys/dev/de/dc21040reg.h b/sys/dev/de/dc21040reg.h
index c0ff1916578fb..0b4c3642bf3f3 100644
--- a/sys/dev/de/dc21040reg.h
+++ b/sys/dev/de/dc21040reg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: dc21040reg.h,v 1.15 1998/05/22 18:50:59 matt Exp $	*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/de/dc21040reg.h,v 1.7 2002/06/02 20:05:55 schweikh Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com>
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 35032897f73c9..262a177e5446f 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.183 2007/06/07 00:28:47 yongari Exp $");
 
 #define	TULIP_HDR_DATA
 
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index 3fd341047a661..0d364d56194b9 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $	*/
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/de/if_devar.h,v 1.45 2007/05/20 16:43:35 mjacob Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
diff --git a/sys/dev/digi/CX.bios.h b/sys/dev/digi/CX.bios.h
index 9688921c8c77a..0d18291affa8f 100644
--- a/sys/dev/digi/CX.bios.h
+++ b/sys/dev/digi/CX.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_bios[] = {
diff --git a/sys/dev/digi/CX.c b/sys/dev/digi/CX.c
index 3a9aa31297cea..0f231d43a45da 100644
--- a/sys/dev/digi/CX.c
+++ b/sys/dev/digi/CX.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/CX.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/CX.fepos.h b/sys/dev/digi/CX.fepos.h
index 9b32459f256bd..a861226b43e31 100644
--- a/sys/dev/digi/CX.fepos.h
+++ b/sys/dev/digi/CX.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX.fepos.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_fepos[] = {
diff --git a/sys/dev/digi/CX_PCI.bios.h b/sys/dev/digi/CX_PCI.bios.h
index c4feb28566ff7..338c0826fea19 100644
--- a/sys/dev/digi/CX_PCI.bios.h
+++ b/sys/dev/digi/CX_PCI.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX_PCI.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_PCI_bios[] = {
diff --git a/sys/dev/digi/CX_PCI.c b/sys/dev/digi/CX_PCI.c
index 2a941f7ef5a5d..3c74188fcaf88 100644
--- a/sys/dev/digi/CX_PCI.c
+++ b/sys/dev/digi/CX_PCI.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/CX_PCI.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/CX_PCI.fepos.h b/sys/dev/digi/CX_PCI.fepos.h
index 66ff9d34ef0b4..ef6115954321d 100644
--- a/sys/dev/digi/CX_PCI.fepos.h
+++ b/sys/dev/digi/CX_PCI.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/CX_PCI.fepos.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char CX_PCI_fepos[] = {
diff --git a/sys/dev/digi/EPCX.bios.h b/sys/dev/digi/EPCX.bios.h
index c0a1a7e523a81..8e5a8dca5cd78 100644
--- a/sys/dev/digi/EPCX.bios.h
+++ b/sys/dev/digi/EPCX.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char EPCX_bios[] = {
diff --git a/sys/dev/digi/EPCX.c b/sys/dev/digi/EPCX.c
index a920eb66a2e70..ad3cea30aa35d 100644
--- a/sys/dev/digi/EPCX.c
+++ b/sys/dev/digi/EPCX.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/EPCX.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/EPCX.fepos.h b/sys/dev/digi/EPCX.fepos.h
index ba4de30446ecf..b026888ce40e7 100644
--- a/sys/dev/digi/EPCX.fepos.h
+++ b/sys/dev/digi/EPCX.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX.fepos.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char EPCX_fepos[] = {
diff --git a/sys/dev/digi/EPCX_PCI.bios.h b/sys/dev/digi/EPCX_PCI.bios.h
index e471a3615d278..a8c18f2f0df50 100644
--- a/sys/dev/digi/EPCX_PCI.bios.h
+++ b/sys/dev/digi/EPCX_PCI.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX_PCI.bios.h,v 1.2 2005/05/06 20:53:33 anholt Exp $
  */
 
 static const u_char EPCX_PCI_bios[] = {
diff --git a/sys/dev/digi/EPCX_PCI.c b/sys/dev/digi/EPCX_PCI.c
index a9ef049ea6be1..36d23785040f5 100644
--- a/sys/dev/digi/EPCX_PCI.c
+++ b/sys/dev/digi/EPCX_PCI.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/EPCX_PCI.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/EPCX_PCI.fepos.h b/sys/dev/digi/EPCX_PCI.fepos.h
index 84b4630fc6b4e..cdcafd53b7fce 100644
--- a/sys/dev/digi/EPCX_PCI.fepos.h
+++ b/sys/dev/digi/EPCX_PCI.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/EPCX_PCI.fepos.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char EPCX_PCI_fepos[] = {
diff --git a/sys/dev/digi/Xe.bios.h b/sys/dev/digi/Xe.bios.h
index 53b0ff2eb4798..7077dbe192fb8 100644
--- a/sys/dev/digi/Xe.bios.h
+++ b/sys/dev/digi/Xe.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xe.bios.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xe_bios[] = {
diff --git a/sys/dev/digi/Xe.c b/sys/dev/digi/Xe.c
index b1bb5e53f07ad..3b79aec2983fc 100644
--- a/sys/dev/digi/Xe.c
+++ b/sys/dev/digi/Xe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xe.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xe.fepos.h b/sys/dev/digi/Xe.fepos.h
index fef506e714412..9965dad82c1e0 100644
--- a/sys/dev/digi/Xe.fepos.h
+++ b/sys/dev/digi/Xe.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xe.fepos.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xe_fepos[] = {
diff --git a/sys/dev/digi/Xem.bios.h b/sys/dev/digi/Xem.bios.h
index b417571249b9c..05a1fc27564a2 100644
--- a/sys/dev/digi/Xem.bios.h
+++ b/sys/dev/digi/Xem.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xem.bios.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xem_bios[] = {
diff --git a/sys/dev/digi/Xem.c b/sys/dev/digi/Xem.c
index fb903b6245462..8f3fb4a561ea5 100644
--- a/sys/dev/digi/Xem.c
+++ b/sys/dev/digi/Xem.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xem.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xem.fepos.h b/sys/dev/digi/Xem.fepos.h
index 87df0505e7108..9077ff5296543 100644
--- a/sys/dev/digi/Xem.fepos.h
+++ b/sys/dev/digi/Xem.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xem.fepos.h,v 1.2 2005/05/06 20:53:34 anholt Exp $
  */
 
 static const u_char Xem_fepos[] = {
diff --git a/sys/dev/digi/Xr.bios.h b/sys/dev/digi/Xr.bios.h
index a0805ae9eb3b1..8f616160b6e89 100644
--- a/sys/dev/digi/Xr.bios.h
+++ b/sys/dev/digi/Xr.bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xr.bios.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 static const u_char Xr_bios[] = {
diff --git a/sys/dev/digi/Xr.c b/sys/dev/digi/Xr.c
index 4d68c87d211ba..9d4cc59f5c615 100644
--- a/sys/dev/digi/Xr.c
+++ b/sys/dev/digi/Xr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/Xr.c,v 1.3 2003/08/24 17:46:03 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/digi/Xr.fepos.h b/sys/dev/digi/Xr.fepos.h
index 66fbd10e1d2fb..e91f93e754366 100644
--- a/sys/dev/digi/Xr.fepos.h
+++ b/sys/dev/digi/Xr.fepos.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/Xr.fepos.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 static const u_char Xr_fepos[] = {
diff --git a/sys/dev/digi/con.CX-IBM.h b/sys/dev/digi/con.CX-IBM.h
index b0c9db315986b..b7871fe29ee61 100644
--- a/sys/dev/digi/con.CX-IBM.h
+++ b/sys/dev/digi/con.CX-IBM.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.CX-IBM.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_CX_IBM[] = {
diff --git a/sys/dev/digi/con.CX.h b/sys/dev/digi/con.CX.h
index 8bfb77a81a038..c6b6f40e770f9 100644
--- a/sys/dev/digi/con.CX.h
+++ b/sys/dev/digi/con.CX.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.CX.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_CX[] = {
diff --git a/sys/dev/digi/con.EPCX.h b/sys/dev/digi/con.EPCX.h
index 329c2f1f63f78..b005ac62d419b 100644
--- a/sys/dev/digi/con.EPCX.h
+++ b/sys/dev/digi/con.EPCX.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.EPCX.h,v 1.1 2001/05/02 01:08:03 brian Exp $
  */
 
 const u_char con_EPCX[] = {
diff --git a/sys/dev/digi/con.MBank.h b/sys/dev/digi/con.MBank.h
index 89f2d0ae2901c..97647d27d4d7b 100644
--- a/sys/dev/digi/con.MBank.h
+++ b/sys/dev/digi/con.MBank.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/con.MBank.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 const u_char con_MBank[] = {
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 7adc72a398d1f..07207db0e4744 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi.c,v 1.63 2006/09/27 19:56:58 ru Exp $
  */
 
 /*-
diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h
index 7be171bde7631..8e5d288eafed2 100644
--- a/sys/dev/digi/digi.h
+++ b/sys/dev/digi/digi.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi.h,v 1.19 2004/10/14 18:37:59 phk Exp $
  */
 
 #define	W(p)				(*(u_int16_t *)(p))
diff --git a/sys/dev/digi/digi_isa.c b/sys/dev/digi/digi_isa.c
index f1f4a5f9ab456..c977563fa6140 100644
--- a/sys/dev/digi/digi_isa.c
+++ b/sys/dev/digi/digi_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.13 2004/05/30 20:08:30 phk Exp $");
 
 /*-
  * TODO:
diff --git a/sys/dev/digi/digi_mod.h b/sys/dev/digi/digi_mod.h
index f1e8ced703744..50e00b1d7abfc 100644
--- a/sys/dev/digi/digi_mod.h
+++ b/sys/dev/digi/digi_mod.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi_mod.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 #define	DIGI_MOD_VERSION	1
diff --git a/sys/dev/digi/digi_pci.c b/sys/dev/digi/digi_pci.c
index 342858e5774ed..b230af5694678 100644
--- a/sys/dev/digi/digi_pci.c
+++ b/sys/dev/digi/digi_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/digi/digi_pci.c,v 1.12 2005/03/05 18:30:10 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/digi/digi_pci.h b/sys/dev/digi/digi_pci.h
index 2273d0048dede..22163341655b8 100644
--- a/sys/dev/digi/digi_pci.h
+++ b/sys/dev/digi/digi_pci.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digi_pci.h,v 1.1 2001/05/02 01:08:04 brian Exp $
  */
 
 #define	PCI_VENDOR_DIGI		0x114F
diff --git a/sys/dev/digi/digireg.h b/sys/dev/digi/digireg.h
index 4a1641f92d7e7..ab7bb05c26c7d 100644
--- a/sys/dev/digi/digireg.h
+++ b/sys/dev/digi/digireg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/digi/digireg.h,v 1.3 2003/08/07 15:04:24 jhb Exp $
  */
 
 struct global_data {
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index b1562d3cd3b23..2f01d4e8f757f 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -40,7 +40,7 @@
  */
 
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.18 2007/06/17 05:55:49 scottl Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 9c367c444372f..9d3bc8165393c 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.24 2007/06/17 05:55:49 scottl Exp $");
 
 #include "opt_eisa.h"
 
diff --git a/sys/dev/dpt/dpt_isa.c b/sys/dev/dpt/dpt_isa.c
index 62cf0776bcfe7..fb4a7eb8909f1 100644
--- a/sys/dev/dpt/dpt_isa.c
+++ b/sys/dev/dpt/dpt_isa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_isa.c,v 1.11 2007/06/17 05:55:49 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index df925659e7582..c5533af8108d4 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.37 2007/06/17 05:55:49 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index eb1f3f444626e..58b9e771a0b3d 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -27,9 +27,9 @@
  * SUCH DAMAGE.
  */
 
-#ident "$FreeBSD$"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.57 2007/06/17 05:55:49 scottl Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.57 2007/06/17 05:55:49 scottl Exp $");
 
 /*
  * dpt_scsi.c: SCSI dependant code for the DPT driver
diff --git a/sys/dev/drm/ati_pcigart.c b/sys/dev/drm/ati_pcigart.c
index 386702c6ae1a9..611ba901e6d30 100644
--- a/sys/dev/drm/ati_pcigart.c
+++ b/sys/dev/drm/ati_pcigart.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/ati_pcigart.c,v 1.3 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm-preprocess.sh b/sys/dev/drm/drm-preprocess.sh
index eabcd987cff59..94d746fc5d105 100644
--- a/sys/dev/drm/drm-preprocess.sh
+++ b/sys/dev/drm/drm-preprocess.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/drm/drm-preprocess.sh,v 1.3 2006/04/09 20:45:44 anholt Exp $
 
 cvs up -CPd *.[ch]
 
@@ -14,7 +14,7 @@ rm via*.[ch]
 
 (cd /usr/src/drm/bsd-core/ && make drm_pciids.h)
 
-# Replace drm_pciids.h with one with a $FreeBSD$
+# Replace drm_pciids.h with one with a $FreeBSD: src/sys/dev/drm/drm-preprocess.sh,v 1.3 2006/04/09 20:45:44 anholt Exp $
 line=`grep \\\$FreeBSD drm_pciids.h.cvs`
 rm -f drm_pciids.h
 echo "/*" >> drm_pciids.h
diff --git a/sys/dev/drm/drm-subprocess.pl b/sys/dev/drm/drm-subprocess.pl
index d053c595c12ce..c606bcd03507d 100644
--- a/sys/dev/drm/drm-subprocess.pl
+++ b/sys/dev/drm/drm-subprocess.pl
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/drm/drm-subprocess.pl,v 1.1 2005/11/28 23:13:52 anholt Exp $
 #
 # Props to Daniel Stone for starting this script for me.  I hate perl.
 
@@ -23,7 +23,7 @@ while (<>) {
 			print $lastline;
 		}
 	} elsif ($foundopening && !$foundclosing && /\*\//) {
-		# print the $FreeBSD$ bits after the end of the license block
+		# print the $FreeBSD: src/sys/dev/drm/drm-subprocess.pl,v 1.1 2005/11/28 23:13:52 anholt Exp $ bits after the end of the license block
 		$foundclosing = 1;
 		print;
 		print "\n";
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index d4dad8e0c4109..21b8a5729f9db 100644
--- a/sys/dev/drm/drm.h
+++ b/sys/dev/drm/drm.h
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm.h,v 1.12 2006/05/17 06:36:28 anholt Exp $");
 
 /**
  * \mainpage
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index 8e2855ad6a799..7502b28762874 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.18 2006/11/06 13:41:53 rwatson Exp $");
 
 #ifndef _DRM_P_H_
 #define _DRM_P_H_
diff --git a/sys/dev/drm/drm_agpsupport.c b/sys/dev/drm/drm_agpsupport.c
index 3d657da18ab96..6e4ba4076ed8a 100644
--- a/sys/dev/drm/drm_agpsupport.c
+++ b/sys/dev/drm/drm_agpsupport.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.6 2006/12/28 21:55:47 jhb Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_atomic.h b/sys/dev/drm/drm_atomic.h
index cf9d2068ceb72..df3574d785651 100644
--- a/sys/dev/drm/drm_atomic.h
+++ b/sys/dev/drm/drm_atomic.h
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_atomic.h,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 /* Many of these implementations are rather fake, but good enough. */
 
diff --git a/sys/dev/drm/drm_auth.c b/sys/dev/drm/drm_auth.c
index 03b3a4705d18b..82d49cce6bf36 100644
--- a/sys/dev/drm/drm_auth.c
+++ b/sys/dev/drm/drm_auth.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_auth.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_bufs.c b/sys/dev/drm/drm_bufs.c
index c8ef0e410032a..88458fda4e727 100644
--- a/sys/dev/drm/drm_bufs.c
+++ b/sys/dev/drm/drm_bufs.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_bufs.c,v 1.3 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/pci/pcireg.h"
 
diff --git a/sys/dev/drm/drm_context.c b/sys/dev/drm/drm_context.c
index cf5bc15bcf6bd..dadf935d6a933 100644
--- a/sys/dev/drm/drm_context.c
+++ b/sys/dev/drm/drm_context.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_context.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_dma.c b/sys/dev/drm/drm_dma.c
index a8661ca22d3df..f17618f895cc2 100644
--- a/sys/dev/drm/drm_dma.c
+++ b/sys/dev/drm/drm_dma.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_dma.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_drawable.c b/sys/dev/drm/drm_drawable.c
index 8de8095432cbb..426632c7455ec 100644
--- a/sys/dev/drm/drm_drawable.c
+++ b/sys/dev/drm/drm_drawable.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drawable.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c
index 71d9c7573d553..d76eab3b110eb 100644
--- a/sys/dev/drm/drm_drv.c
+++ b/sys/dev/drm/drm_drv.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.6.4.1 2008/01/29 01:39:16 kensmith Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/drm_fops.c b/sys/dev/drm/drm_fops.c
index 361f5a7012646..6430bcafcfad9 100644
--- a/sys/dev/drm/drm_fops.c
+++ b/sys/dev/drm/drm_fops.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_fops.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_ioctl.c b/sys/dev/drm/drm_ioctl.c
index 0ea2197287ee1..d130388ab7683 100644
--- a/sys/dev/drm/drm_ioctl.c
+++ b/sys/dev/drm/drm_ioctl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_ioctl.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_irq.c b/sys/dev/drm/drm_irq.c
index 580980ee8cbc3..a1df863b8654e 100644
--- a/sys/dev/drm/drm_irq.c
+++ b/sys/dev/drm/drm_irq.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_irq.c,v 1.3 2007/02/23 12:18:38 piso Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/drm_linux_list.h b/sys/dev/drm/drm_linux_list.h
index d0a5c7008a7cf..a825b5ff384a9 100644
--- a/sys/dev/drm/drm_linux_list.h
+++ b/sys/dev/drm/drm_linux_list.h
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_linux_list.h,v 1.4 2005/11/28 23:13:52 anholt Exp $");
 
 struct list_head {
 	struct list_head *next, *prev;
diff --git a/sys/dev/drm/drm_lock.c b/sys/dev/drm/drm_lock.c
index b075fb4bf5f4c..f370157b7bc9a 100644
--- a/sys/dev/drm/drm_lock.c
+++ b/sys/dev/drm/drm_lock.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_lock.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_memory.c b/sys/dev/drm/drm_memory.c
index 6f035387c81f0..f792ea210dc00 100644
--- a/sys/dev/drm/drm_memory.c
+++ b/sys/dev/drm/drm_memory.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_memory.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_pci.c b/sys/dev/drm/drm_pci.c
index 0dca37b075e32..d083820f2905f 100644
--- a/sys/dev/drm/drm_pci.c
+++ b/sys/dev/drm/drm_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_pci.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_pciids.h b/sys/dev/drm/drm_pciids.h
index 59166f47c142d..f189b30588779 100644
--- a/sys/dev/drm/drm_pciids.h
+++ b/sys/dev/drm/drm_pciids.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/drm/drm_pciids.h,v 1.7 2006/09/07 23:04:47 anholt Exp $
  */
 /*
    This file is auto-generated from the drm_pciids.txt in the DRM CVS
diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h
index 842d3ac055637..d1ae9d3f621cb 100644
--- a/sys/dev/drm/drm_sarea.h
+++ b/sys/dev/drm/drm_sarea.h
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.6 2005/11/28 23:13:52 anholt Exp $");
 
 #ifndef _DRM_SAREA_H_
 #define _DRM_SAREA_H_
diff --git a/sys/dev/drm/drm_scatter.c b/sys/dev/drm/drm_scatter.c
index 85b8936f21297..410713169e6d4 100644
--- a/sys/dev/drm/drm_scatter.c
+++ b/sys/dev/drm/drm_scatter.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_scatter.c,v 1.3 2006/05/17 06:29:36 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 
diff --git a/sys/dev/drm/drm_sysctl.c b/sys/dev/drm/drm_sysctl.c
index eb5bbe2c8613a..e74673177687f 100644
--- a/sys/dev/drm/drm_sysctl.c
+++ b/sys/dev/drm/drm_sysctl.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_sysctl.c,v 1.2 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/drm_vm.c b/sys/dev/drm/drm_vm.c
index e01257a37d8d1..95f61178ed63f 100644
--- a/sys/dev/drm/drm_vm.c
+++ b/sys/dev/drm/drm_vm.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_vm.c,v 1.2 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/i915_dma.c b/sys/dev/drm/i915_dma.c
index 9fe278a06abbe..16955bddbc50c 100644
--- a/sys/dev/drm/i915_dma.c
+++ b/sys/dev/drm/i915_dma.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.6 2007/08/21 12:52:57 kib Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/i915_drm.h b/sys/dev/drm/i915_drm.h
index 778088fb25c9a..f9855aa454146 100644
--- a/sys/dev/drm/i915_drm.h
+++ b/sys/dev/drm/i915_drm.h
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drm.h,v 1.4 2006/09/07 23:04:47 anholt Exp $");
 
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915_drv.c
index 8a2033065685a..11cc0713ecfce 100644
--- a/sys/dev/drm/i915_drv.c
+++ b/sys/dev/drm/i915_drv.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drv.c,v 1.5 2006/05/17 06:36:28 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915_drv.h
index 481bd2be051c8..4b61c33ebb546 100644
--- a/sys/dev/drm/i915_drv.h
+++ b/sys/dev/drm/i915_drv.h
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drv.h,v 1.4 2006/09/07 23:04:47 anholt Exp $");
 
 #ifndef _I915_DRV_H_
 #define _I915_DRV_H_
diff --git a/sys/dev/drm/i915_irq.c b/sys/dev/drm/i915_irq.c
index b40669c1ff176..94e494f2995cf 100644
--- a/sys/dev/drm/i915_irq.c
+++ b/sys/dev/drm/i915_irq.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/i915_irq.c,v 1.4 2006/09/07 23:04:47 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/i915_mem.c b/sys/dev/drm/i915_mem.c
index fd234c224fe67..75c49f208d1cb 100644
--- a/sys/dev/drm/i915_mem.c
+++ b/sys/dev/drm/i915_mem.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/i915_mem.c,v 1.3 2006/04/09 20:45:45 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mach64_dma.c b/sys/dev/drm/mach64_dma.c
index 77966a125e770..c45a8d20ff4bb 100644
--- a/sys/dev/drm/mach64_dma.c
+++ b/sys/dev/drm/mach64_dma.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_dma.c,v 1.2 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mach64_drm.h b/sys/dev/drm/mach64_drm.h
index 042c91eca5572..00b8d267783ad 100644
--- a/sys/dev/drm/mach64_drm.h
+++ b/sys/dev/drm/mach64_drm.h
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drm.h,v 1.3 2006/09/07 23:04:47 anholt Exp $");
 
 #ifndef __MACH64_DRM_H__
 #define __MACH64_DRM_H__
diff --git a/sys/dev/drm/mach64_drv.c b/sys/dev/drm/mach64_drv.c
index 8ba4a21ae1654..8408355380321 100644
--- a/sys/dev/drm/mach64_drv.c
+++ b/sys/dev/drm/mach64_drv.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drv.c,v 1.3 2005/12/20 22:44:36 jhb Exp $");
 
 
 #include <sys/types.h>
diff --git a/sys/dev/drm/mach64_drv.h b/sys/dev/drm/mach64_drv.h
index 24e524ea9db85..384c4f4f2ed23 100644
--- a/sys/dev/drm/mach64_drv.h
+++ b/sys/dev/drm/mach64_drv.h
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drv.h,v 1.2 2005/11/28 23:13:53 anholt Exp $");
 
 #ifndef __MACH64_DRV_H__
 #define __MACH64_DRV_H__
diff --git a/sys/dev/drm/mach64_irq.c b/sys/dev/drm/mach64_irq.c
index c6563ce9f5e1b..7ee9090e87c17 100644
--- a/sys/dev/drm/mach64_irq.c
+++ b/sys/dev/drm/mach64_irq.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_irq.c,v 1.2 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mach64_state.c b/sys/dev/drm/mach64_state.c
index 9d5ab63b22589..b915ecb8af6a9 100644
--- a/sys/dev/drm/mach64_state.c
+++ b/sys/dev/drm/mach64_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_state.c,v 1.2 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mga_dma.c b/sys/dev/drm/mga_dma.c
index 093dd25868fc1..99c0468420fb5 100644
--- a/sys/dev/drm/mga_dma.c
+++ b/sys/dev/drm/mga_dma.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.13 2005/11/28 23:13:53 anholt Exp $");
 
 /**
  * \file mga_dma.c
diff --git a/sys/dev/drm/mga_drm.h b/sys/dev/drm/mga_drm.h
index 6c466e06af968..9e99586f160a8 100644
--- a/sys/dev/drm/mga_drm.h
+++ b/sys/dev/drm/mga_drm.h
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_drm.h,v 1.7 2005/11/28 23:13:53 anholt Exp $");
 
 #ifndef __MGA_DRM_H__
 #define __MGA_DRM_H__
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index 8bde4fde78f70..16b864f1aca54 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.12 2006/05/17 06:36:28 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index 95726e2f44a8f..6cd2611623ce5 100644
--- a/sys/dev/drm/mga_drv.h
+++ b/sys/dev/drm/mga_drv.h
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_drv.h,v 1.11 2006/04/09 20:45:45 anholt Exp $");
 
 #ifndef __MGA_DRV_H__
 #define __MGA_DRV_H__
diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga_irq.c
index f8a88ed1553be..b2a18f72166c5 100644
--- a/sys/dev/drm/mga_irq.c
+++ b/sys/dev/drm/mga_irq.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_irq.c,v 1.6 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mga_state.c b/sys/dev/drm/mga_state.c
index 951a4c8adceb2..053141dce812a 100644
--- a/sys/dev/drm/mga_state.c
+++ b/sys/dev/drm/mga_state.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_state.c,v 1.11 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/mga_ucode.h b/sys/dev/drm/mga_ucode.h
index 455e25e5eb0f3..b2ce6ca69269a 100644
--- a/sys/dev/drm/mga_ucode.h
+++ b/sys/dev/drm/mga_ucode.h
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_ucode.h,v 1.4 2005/11/28 23:13:53 anholt Exp $");
 
 /*
  * WARP pipes are named according to the functions they perform, where:
diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga_warp.c
index 23397397711e5..c620a9855428f 100644
--- a/sys/dev/drm/mga_warp.c
+++ b/sys/dev/drm/mga_warp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/mga_warp.c,v 1.8 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/r128_cce.c b/sys/dev/drm/r128_cce.c
index 9ac647eacbc79..25bb666b32e59 100644
--- a/sys/dev/drm/r128_cce.c
+++ b/sys/dev/drm/r128_cce.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r128_cce.c,v 1.14 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/r128_drm.h b/sys/dev/drm/r128_drm.h
index c9ad817d9356e..7fbb2954ffed5 100644
--- a/sys/dev/drm/r128_drm.h
+++ b/sys/dev/drm/r128_drm.h
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r128_drm.h,v 1.8 2005/11/28 23:13:53 anholt Exp $");
 
 #ifndef __R128_DRM_H__
 #define __R128_DRM_H__
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index 71b4259b96ce3..32a431c94c15e 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.11 2005/12/20 22:44:36 jhb Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h
index ba738fa3e80d2..26f6853e16ca9 100644
--- a/sys/dev/drm/r128_drv.h
+++ b/sys/dev/drm/r128_drv.h
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r128_drv.h,v 1.11 2005/11/28 23:13:53 anholt Exp $");
 
 #ifndef __R128_DRV_H__
 #define __R128_DRV_H__
diff --git a/sys/dev/drm/r128_irq.c b/sys/dev/drm/r128_irq.c
index c3b4129995fac..15f0bae3d6f11 100644
--- a/sys/dev/drm/r128_irq.c
+++ b/sys/dev/drm/r128_irq.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r128_irq.c,v 1.6 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c
index 62f17e7b74b31..135c188f64f03 100644
--- a/sys/dev/drm/r128_state.c
+++ b/sys/dev/drm/r128_state.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r128_state.c,v 1.13 2005/11/28 23:13:53 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/r300_cmdbuf.c b/sys/dev/drm/r300_cmdbuf.c
index d71f8cb486aeb..9a44efc41768a 100644
--- a/sys/dev/drm/r300_cmdbuf.c
+++ b/sys/dev/drm/r300_cmdbuf.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r300_cmdbuf.c,v 1.5 2006/05/17 06:36:28 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/r300_reg.h b/sys/dev/drm/r300_reg.h
index 010840628104e..62984b8d909ff 100644
--- a/sys/dev/drm/r300_reg.h
+++ b/sys/dev/drm/r300_reg.h
@@ -24,7 +24,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r300_reg.h,v 1.3 2006/04/09 20:45:45 anholt Exp $");
 
 #ifndef _R300_REG_H
 #define _R300_REG_H
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c
index af2fdcff11cac..54c5d9da325b3 100644
--- a/sys/dev/drm/radeon_cp.c
+++ b/sys/dev/drm/radeon_cp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.19 2006/09/07 23:04:47 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/radeon_drm.h b/sys/dev/drm/radeon_drm.h
index b40b43c801d4a..1a7781e80727b 100644
--- a/sys/dev/drm/radeon_drm.h
+++ b/sys/dev/drm/radeon_drm.h
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drm.h,v 1.14 2006/09/07 23:04:47 anholt Exp $");
 
 #ifndef __RADEON_DRM_H__
 #define __RADEON_DRM_H__
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index af12d3d3f05e7..47585da7858ab 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.14 2005/12/20 22:44:36 jhb Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon_drv.h
index 21832793274ea..6955e7dc2bec2 100644
--- a/sys/dev/drm/radeon_drv.h
+++ b/sys/dev/drm/radeon_drv.h
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.16 2006/09/07 23:04:47 anholt Exp $");
 
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
diff --git a/sys/dev/drm/radeon_irq.c b/sys/dev/drm/radeon_irq.c
index 420fc84c1d38b..14e5188e46f83 100644
--- a/sys/dev/drm/radeon_irq.c
+++ b/sys/dev/drm/radeon_irq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.7 2005/11/28 23:13:54 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon_mem.c
index bb9ff302bb573..5553bfbc6a4ed 100644
--- a/sys/dev/drm/radeon_mem.c
+++ b/sys/dev/drm/radeon_mem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_mem.c,v 1.8 2005/11/28 23:13:54 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/radeon_state.c b/sys/dev/drm/radeon_state.c
index 868b5ca1b2452..033ecff27a92e 100644
--- a/sys/dev/drm/radeon_state.c
+++ b/sys/dev/drm/radeon_state.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.22 2006/09/07 23:04:47 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/savage_bci.c b/sys/dev/drm/savage_bci.c
index bbd45fe75490c..ad78011e5b50c 100644
--- a/sys/dev/drm/savage_bci.c
+++ b/sys/dev/drm/savage_bci.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/savage_bci.c,v 1.3 2006/04/09 20:45:45 anholt Exp $");
 #include "dev/drm/drmP.h"
 #include "dev/drm/savage_drm.h"
 #include "dev/drm/savage_drv.h"
diff --git a/sys/dev/drm/savage_drm.h b/sys/dev/drm/savage_drm.h
index b0e0a04a200ad..87f143a47b3cf 100644
--- a/sys/dev/drm/savage_drm.h
+++ b/sys/dev/drm/savage_drm.h
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/savage_drm.h,v 1.2 2005/11/28 23:13:55 anholt Exp $");
 
 #ifndef __SAVAGE_DRM_H__
 #define __SAVAGE_DRM_H__
diff --git a/sys/dev/drm/savage_drv.c b/sys/dev/drm/savage_drv.c
index 1d046c4d3b3a2..4b46076eea612 100644
--- a/sys/dev/drm/savage_drv.c
+++ b/sys/dev/drm/savage_drv.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/savage_drv.c,v 1.3 2005/12/20 22:44:36 jhb Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/savage_drv.h b/sys/dev/drm/savage_drv.h
index af3ccc86a1bd0..abfdf89dcef39 100644
--- a/sys/dev/drm/savage_drv.h
+++ b/sys/dev/drm/savage_drv.h
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/savage_drv.h,v 1.2 2005/11/28 23:13:55 anholt Exp $");
 
 #ifndef __SAVAGE_DRV_H__
 #define __SAVAGE_DRV_H__
diff --git a/sys/dev/drm/savage_state.c b/sys/dev/drm/savage_state.c
index d2fc0dbae461e..97093d65ca688 100644
--- a/sys/dev/drm/savage_state.c
+++ b/sys/dev/drm/savage_state.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/savage_state.c,v 1.3 2006/04/09 20:45:45 anholt Exp $");
 #include "dev/drm/drmP.h"
 #include "dev/drm/savage_drm.h"
 #include "dev/drm/savage_drv.h"
diff --git a/sys/dev/drm/sis_drm.h b/sys/dev/drm/sis_drm.h
index 6b260a37386ef..6d70b0243e3a4 100644
--- a/sys/dev/drm/sis_drm.h
+++ b/sys/dev/drm/sis_drm.h
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/sis_drm.h,v 1.6 2005/11/28 23:13:55 anholt Exp $");
 
 #ifndef __SIS_DRM_H__
 #define __SIS_DRM_H__
diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c
index 04d14515d9f11..e7d79ab23b80f 100644
--- a/sys/dev/drm/sis_drv.c
+++ b/sys/dev/drm/sis_drv.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/sis_drv.c,v 1.7 2005/12/20 22:44:36 jhb Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/sis_drm.h"
diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis_drv.h
index 7fc37716fa238..d24f02f7f24ad 100644
--- a/sys/dev/drm/sis_drv.h
+++ b/sys/dev/drm/sis_drv.h
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/sis_drv.h,v 1.4 2005/11/28 23:13:55 anholt Exp $");
 
 #ifndef _SIS_DRV_H_
 #define _SIS_DRV_H_
diff --git a/sys/dev/drm/sis_ds.c b/sys/dev/drm/sis_ds.c
index fc5be83de2922..94617f0aa8b72 100644
--- a/sys/dev/drm/sis_ds.c
+++ b/sys/dev/drm/sis_ds.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/sis_ds.c,v 1.5 2006/04/09 20:45:45 anholt Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
diff --git a/sys/dev/drm/sis_ds.h b/sys/dev/drm/sis_ds.h
index 94c7e04a9fc18..d62ff7c54f54e 100644
--- a/sys/dev/drm/sis_ds.h
+++ b/sys/dev/drm/sis_ds.h
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.6 2006/04/09 20:45:45 anholt Exp $");
 
 #ifndef __SIS_DS_H__
 #define __SIS_DS_H__
diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis_mm.c
index 188fedeb03942..4a54c51d93985 100644
--- a/sys/dev/drm/sis_mm.c
+++ b/sys/dev/drm/sis_mm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/sis_mm.c,v 1.9 2006/04/09 20:45:45 anholt Exp $");
 
 #if defined(__linux__) && defined(CONFIG_FB_SIS)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index 87ecf3fb0b2b1..2459256364598 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.10 2005/12/20 22:44:36 jhb Exp $");
 
 #include "dev/drm/tdfx_drv.h"
 #include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/tdfx_drv.h b/sys/dev/drm/tdfx_drv.h
index d798569cb3fe2..309e7c3f1d598 100644
--- a/sys/dev/drm/tdfx_drv.h
+++ b/sys/dev/drm/tdfx_drv.h
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/drm/tdfx_drv.h,v 1.2 2005/11/28 23:13:55 anholt Exp $");
 
 #ifndef __TDFX_H__
 #define __TDFX_H__
diff --git a/sys/dev/ed/ax88x90reg.h b/sys/dev/ed/ax88x90reg.h
index 9d2eeeda32fc9..70346b9c8e671 100644
--- a/sys/dev/ed/ax88x90reg.h
+++ b/sys/dev/ed/ax88x90reg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/ax88x90reg.h,v 1.1 2005/10/05 05:21:07 imp Exp $
  */
 
 /* AX88x90 based miibus defines */
diff --git a/sys/dev/ed/dl100xxreg.h b/sys/dev/ed/dl100xxreg.h
index a4659b0a9d2ea..d370e7c1421e1 100644
--- a/sys/dev/ed/dl100xxreg.h
+++ b/sys/dev/ed/dl100xxreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/dl100xxreg.h,v 1.1 2005/10/05 05:21:07 imp Exp $
  */
 
 /* Dlink chipset used on some Netgear and Dlink PCMCIA cards */
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 785182539cce4..7bd46626d418c 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.271 2007/03/21 03:38:35 nyan Exp $");
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
diff --git a/sys/dev/ed/if_ed98.h b/sys/dev/ed/if_ed98.h
index b16054960b31e..08c20588d3834 100644
--- a/sys/dev/ed/if_ed98.h
+++ b/sys/dev/ed/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed98.h,v 1.3 2005/04/13 13:02:58 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_3c503.c b/sys/dev/ed/if_ed_3c503.c
index 152b863698a7a..ca77f125c59ef 100644
--- a/sys/dev/ed/if_ed_3c503.c
+++ b/sys/dev/ed/if_ed_3c503.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_3c503.c,v 1.5 2006/01/27 19:10:13 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index dc4fabb68859b..7978a287c8fa5 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.28 2007/02/23 12:18:38 piso Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_ed_hpp.c b/sys/dev/ed/if_ed_hpp.c
index 12b59c372c1c2..9aa7226367607 100644
--- a/sys/dev/ed/if_ed_hpp.c
+++ b/sys/dev/ed/if_ed_hpp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_hpp.c,v 1.7 2006/01/27 19:10:13 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index 7d30614963f68..f76ce29c3c7bc 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.31 2007/02/23 12:18:38 piso Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_novell.c b/sys/dev/ed/if_ed_novell.c
index 90f2068dc8f85..a06386a6ff0a9 100644
--- a/sys/dev/ed/if_ed_novell.c
+++ b/sys/dev/ed/if_ed_novell.c
@@ -29,7 +29,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_novell.c,v 1.10 2006/06/12 04:30:42 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 439b3eb151a8d..49ea31b21d1cf 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.113 2007/07/11 04:14:40 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 68099cea5b526..a221b609bde3a 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.49 2007/02/23 12:18:38 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ed/if_ed_rtl80x9.c b/sys/dev/ed/if_ed_rtl80x9.c
index c6a7d76d7a87b..27773c82ce72a 100644
--- a/sys/dev/ed/if_ed_rtl80x9.c
+++ b/sys/dev/ed/if_ed_rtl80x9.c
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_rtl80x9.c,v 1.3 2005/10/22 05:14:18 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_sic.c b/sys/dev/ed/if_ed_sic.c
index d9c67120fd755..e481a7ccbbca6 100644
--- a/sys/dev/ed/if_ed_sic.c
+++ b/sys/dev/ed/if_ed_sic.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_sic.c,v 1.6 2006/01/27 19:10:13 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_ed_wd80x3.c b/sys/dev/ed/if_ed_wd80x3.c
index b3cb439c0fec6..eba4e75059ed9 100644
--- a/sys/dev/ed/if_ed_wd80x3.c
+++ b/sys/dev/ed/if_ed_wd80x3.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_wd80x3.c,v 1.6 2006/01/27 19:10:13 imp Exp $");
 
 #include "opt_ed.h"
 
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 3f2b71932a1a8..520f10fd7d603 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_edreg.h,v 1.40 2005/10/05 05:21:07 imp Exp $
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index 170558ead95ab..afe3b82e7a2a9 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.42 2006/06/12 04:30:42 imp Exp $
  */
 
 #ifndef SYS_DEV_ED_IF_EDVAR_H
diff --git a/sys/dev/ed/rtl80x9reg.h b/sys/dev/ed/rtl80x9reg.h
index 2120fcffa8525..5491f2d623e9a 100644
--- a/sys/dev/ed/rtl80x9reg.h
+++ b/sys/dev/ed/rtl80x9reg.h
@@ -28,7 +28,7 @@
  *
  * Based on patches subitted by: David Madole, edited by M. Warner Losh.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/rtl80x9reg.h,v 1.1 2005/10/05 05:21:07 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ed/tc5299jreg.h b/sys/dev/ed/tc5299jreg.h
index 6fb79398b8485..9c1f8b1e422b0 100644
--- a/sys/dev/ed/tc5299jreg.h
+++ b/sys/dev/ed/tc5299jreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ed/tc5299jreg.h,v 1.1 2005/10/05 05:21:07 imp Exp $
  */
 
 /* Tamarack TC5299J */
diff --git a/sys/dev/eisa/eisa_if.m b/sys/dev/eisa/eisa_if.m
index 72c8184cdce5e..94db7e5cb676f 100644
--- a/sys/dev/eisa/eisa_if.m
+++ b/sys/dev/eisa/eisa_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/eisa/eisa_if.m,v 1.2 2005/01/06 01:42:38 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 2441af5b9db65..fb777ffca8907 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.73 2005/08/01 07:09:15 imp Exp $");
 
 #include "opt_eisa.h"
 
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 522cd5db59e14..e75c069ded72b 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/eisa/eisaconf.h,v 1.24 2005/01/06 01:42:38 imp Exp $
  */
 
 #ifndef _DEV_EISA_EISACONF_H_
diff --git a/sys/dev/em/LICENSE b/sys/dev/em/LICENSE
index ab2250974614f..7e13aa10fcc38 100644
--- a/sys/dev/em/LICENSE
+++ b/sys/dev/em/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/LICENSE,v 1.6 2007/05/04 00:00:11 jfv Exp $
 
   Copyright (c) 2001-2007, Intel Corporation 
   All rights reserved.
diff --git a/sys/dev/em/README b/sys/dev/em/README
index f0816f0309a55..98a16e7d2d171 100644
--- a/sys/dev/em/README
+++ b/sys/dev/em/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/em/README,v 1.15 2007/05/30 23:32:21 jfv Exp $
 FreeBSD* Driver for Intel Network Connection
 =============================================
 
diff --git a/sys/dev/em/e1000_80003es2lan.c b/sys/dev/em/e1000_80003es2lan.c
index 46587aca37be0..ff00e7fdc822b 100644
--- a/sys/dev/em/e1000_80003es2lan.c
+++ b/sys/dev/em/e1000_80003es2lan.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_80003es2lan.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 /* e1000_80003es2lan
  */
diff --git a/sys/dev/em/e1000_80003es2lan.h b/sys/dev/em/e1000_80003es2lan.h
index d81def42867bb..c8e8d7fc71de6 100644
--- a/sys/dev/em/e1000_80003es2lan.h
+++ b/sys/dev/em/e1000_80003es2lan.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_80003es2lan.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_80003ES2LAN_H_
diff --git a/sys/dev/em/e1000_82540.c b/sys/dev/em/e1000_82540.c
index 6f053959e17ce..ebebe9488e5c1 100644
--- a/sys/dev/em/e1000_82540.c
+++ b/sys/dev/em/e1000_82540.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82540.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 /* e1000_82540
  * e1000_82545
diff --git a/sys/dev/em/e1000_82541.c b/sys/dev/em/e1000_82541.c
index 78bcc27269f0e..9a513f73a3d44 100644
--- a/sys/dev/em/e1000_82541.c
+++ b/sys/dev/em/e1000_82541.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82541.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 /* e1000_82541
diff --git a/sys/dev/em/e1000_82541.h b/sys/dev/em/e1000_82541.h
index e72cb83b715f6..597c7ccd38188 100644
--- a/sys/dev/em/e1000_82541.h
+++ b/sys/dev/em/e1000_82541.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82541.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_82541_H_
diff --git a/sys/dev/em/e1000_82542.c b/sys/dev/em/e1000_82542.c
index eb92da6612236..8d5cf712f697a 100644
--- a/sys/dev/em/e1000_82542.c
+++ b/sys/dev/em/e1000_82542.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82542.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 /* e1000_82542 (rev 1 & 2)
diff --git a/sys/dev/em/e1000_82543.c b/sys/dev/em/e1000_82543.c
index 13f2ff953d3b1..b181d2e76f9ee 100644
--- a/sys/dev/em/e1000_82543.c
+++ b/sys/dev/em/e1000_82543.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82543.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 /* e1000_82543
diff --git a/sys/dev/em/e1000_82543.h b/sys/dev/em/e1000_82543.h
index dfb1befbc1b8c..2df6c8c08897c 100644
--- a/sys/dev/em/e1000_82543.h
+++ b/sys/dev/em/e1000_82543.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82543.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_82543_H_
diff --git a/sys/dev/em/e1000_82571.c b/sys/dev/em/e1000_82571.c
index 1ba6be3045a5b..5aa17ea6511ce 100644
--- a/sys/dev/em/e1000_82571.c
+++ b/sys/dev/em/e1000_82571.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 /* e1000_82571
diff --git a/sys/dev/em/e1000_82571.h b/sys/dev/em/e1000_82571.h
index ea44b6cc9dd07..de297690c1901 100644
--- a/sys/dev/em/e1000_82571.h
+++ b/sys/dev/em/e1000_82571.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_82571_H_
diff --git a/sys/dev/em/e1000_82575.c b/sys/dev/em/e1000_82575.c
index 40de43d681427..cf9ca724f4acb 100644
--- a/sys/dev/em/e1000_82575.c
+++ b/sys/dev/em/e1000_82575.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82575.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 /* e1000_82575
diff --git a/sys/dev/em/e1000_82575.h b/sys/dev/em/e1000_82575.h
index 8f4424442b0e4..3cd7c1147cdc3 100644
--- a/sys/dev/em/e1000_82575.h
+++ b/sys/dev/em/e1000_82575.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_82575.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_82575_H_
diff --git a/sys/dev/em/e1000_api.c b/sys/dev/em/e1000_api.c
index 6603a80198726..23f07cd2491e6 100644
--- a/sys/dev/em/e1000_api.c
+++ b/sys/dev/em/e1000_api.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_api.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #include "e1000_api.h"
diff --git a/sys/dev/em/e1000_api.h b/sys/dev/em/e1000_api.h
index bd8e93a3080ae..a516077fad549 100644
--- a/sys/dev/em/e1000_api.h
+++ b/sys/dev/em/e1000_api.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_api.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_API_H_
diff --git a/sys/dev/em/e1000_defines.h b/sys/dev/em/e1000_defines.h
index 9d87064bc332d..81fefbe94b272 100644
--- a/sys/dev/em/e1000_defines.h
+++ b/sys/dev/em/e1000_defines.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_DEFINES_H_
diff --git a/sys/dev/em/e1000_hw.h b/sys/dev/em/e1000_hw.h
index 5e98a24afcdcc..a5ad0f98f100a 100644
--- a/sys/dev/em/e1000_hw.h
+++ b/sys/dev/em/e1000_hw.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_hw.h,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 #ifndef _E1000_HW_H_
diff --git a/sys/dev/em/e1000_ich8lan.c b/sys/dev/em/e1000_ich8lan.c
index 4b288114e59be..aa78aa6b8ae07 100644
--- a/sys/dev/em/e1000_ich8lan.c
+++ b/sys/dev/em/e1000_ich8lan.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_ich8lan.c,v 1.3.4.1 2007/11/28 23:24:37 jfv Exp $ */
 
 
 /* e1000_ich8lan
diff --git a/sys/dev/em/e1000_ich8lan.h b/sys/dev/em/e1000_ich8lan.h
index 2d9e8d34509ad..9bcf9f2ab77bc 100644
--- a/sys/dev/em/e1000_ich8lan.h
+++ b/sys/dev/em/e1000_ich8lan.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_ich8lan.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _E1000_ICH8LAN_H_
diff --git a/sys/dev/em/e1000_mac.c b/sys/dev/em/e1000_mac.c
index 400d30e8dd5ac..ea1b204169936 100644
--- a/sys/dev/em/e1000_mac.c
+++ b/sys/dev/em/e1000_mac.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_mac.c,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #include "e1000_api.h"
diff --git a/sys/dev/em/e1000_mac.h b/sys/dev/em/e1000_mac.h
index 9887280e1198a..ba4d16fb93d14 100644
--- a/sys/dev/em/e1000_mac.h
+++ b/sys/dev/em/e1000_mac.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_mac.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _E1000_MAC_H_
diff --git a/sys/dev/em/e1000_manage.c b/sys/dev/em/e1000_manage.c
index 0eff18b43a2c2..8beaa1b72bde2 100644
--- a/sys/dev/em/e1000_manage.c
+++ b/sys/dev/em/e1000_manage.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_manage.c,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #include "e1000_api.h"
diff --git a/sys/dev/em/e1000_manage.h b/sys/dev/em/e1000_manage.h
index 17849c1f816f2..2411a56b89d40 100644
--- a/sys/dev/em/e1000_manage.h
+++ b/sys/dev/em/e1000_manage.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_manage.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _E1000_MANAGE_H_
diff --git a/sys/dev/em/e1000_nvm.c b/sys/dev/em/e1000_nvm.c
index 726fa7bc5fe6b..fc9d734bd7d02 100644
--- a/sys/dev/em/e1000_nvm.c
+++ b/sys/dev/em/e1000_nvm.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_nvm.c,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #include "e1000_api.h"
diff --git a/sys/dev/em/e1000_nvm.h b/sys/dev/em/e1000_nvm.h
index 8082c3e82460a..494f758c28218 100644
--- a/sys/dev/em/e1000_nvm.h
+++ b/sys/dev/em/e1000_nvm.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_nvm.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _E1000_NVM_H_
diff --git a/sys/dev/em/e1000_osdep.h b/sys/dev/em/e1000_osdep.h
index 257d5da0c5514..2ec2a9cfe3f2a 100644
--- a/sys/dev/em/e1000_osdep.h
+++ b/sys/dev/em/e1000_osdep.h
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_osdep.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _FREEBSD_OS_H_
diff --git a/sys/dev/em/e1000_phy.c b/sys/dev/em/e1000_phy.c
index dbbbdc5984194..2c9560db7ec09 100644
--- a/sys/dev/em/e1000_phy.c
+++ b/sys/dev/em/e1000_phy.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_phy.c,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #include "e1000_api.h"
diff --git a/sys/dev/em/e1000_phy.h b/sys/dev/em/e1000_phy.h
index 4fa91e03ce7b1..35678edf2a4ef 100644
--- a/sys/dev/em/e1000_phy.h
+++ b/sys/dev/em/e1000_phy.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_phy.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _E1000_PHY_H_
diff --git a/sys/dev/em/e1000_regs.h b/sys/dev/em/e1000_regs.h
index bfc641b63b47f..1f3b759a1eba9 100644
--- a/sys/dev/em/e1000_regs.h
+++ b/sys/dev/em/e1000_regs.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/e1000_regs.h,v 1.3.4.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifndef _E1000_REGS_H_
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index cb502675e7de4..eef92a10902c9 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/if_em.c,v 1.184.2.1 2007/11/28 23:24:38 jfv Exp $ */
 
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h
index 621658bab6c58..2bf087932f3d0 100644
--- a/sys/dev/em/if_em.h
+++ b/sys/dev/em/if_em.h
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/em/if_em.h,v 1.62.2.1 2007/11/28 23:24:38 jfv Exp $ */
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 09ba8bcac1e8b..10339e56fdf3e 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.42 2007/02/23 12:18:39 piso Exp $");
 
 /*
  * i f _ e n _ p c i . c  
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.42 2007/02/23 12:18:39 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 34ceff45acfff..0f06a71f4dc4f 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.73 2007/05/29 11:28:27 rwatson Exp $");
 
 /*
  *
diff --git a/sys/dev/en/midwayreg.h b/sys/dev/en/midwayreg.h
index 5c2fe1b8fdbd7..8f214da442201 100644
--- a/sys/dev/en/midwayreg.h
+++ b/sys/dev/en/midwayreg.h
@@ -6,7 +6,7 @@
  * this file contains the description of the ENI ATM midway chip
  * data structures.   see midway.c for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/en/midwayreg.h,v 1.5 2003/04/25 16:14:03 harti Exp $
  */
 
 #define MID_SZTOB(X) 	((X) * 256 * 4) /* size to bytes */
diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h
index 8c2a8c54e04b5..a01de1cb32210 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.h
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/en/midwayvar.h,v 1.15 2005/06/10 16:49:07 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 3b913693a3dcf..6febcc90ed367 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.148 2006/12/01 20:29:55 mlaier Exp $");
 
 /*
  *	Modified from the FreeBSD 1.1.5.1 version by:
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index e25a531f7e07a..742a775713f71 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.35 2007/02/23 12:18:39 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index 0455c40a0d5ea..17ae0779445c6 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.29 2007/02/23 12:18:39 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c
index 3c1645cd33821..1a52ed531f8bb 100644
--- a/sys/dev/ep/if_ep_mca.c
+++ b/sys/dev/ep/if_ep_mca.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_mca.c,v 1.13 2007/02/23 15:55:37 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 430935804bb79..9d41932c007b9 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.50 2007/02/23 12:18:39 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 25ab182ae40c7..0b1f50e65b253 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ep/if_epreg.h,v 1.38 2005/07/31 03:30:46 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
index 704fe025406ea..1906279abdf5d 100644
--- a/sys/dev/ep/if_epvar.h
+++ b/sys/dev/ep/if_epvar.h
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ep/if_epvar.h,v 1.20 2005/07/19 22:26:44 imp Exp $
  */
 
 struct ep_board {
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index 9c62d9b42bea9..885bf37fe9242 100644
--- a/sys/dev/esp/esp_sbus.c
+++ b/sys/dev/esp/esp_sbus.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.14 2007/02/23 12:18:40 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 5492b371ddc15..0919cd2fb55a1 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -104,7 +104,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.17 2007/06/17 05:55:49 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index c24f807cc06d3..d11ac93175b17 100644
--- a/sys/dev/esp/ncr53c9xreg.h
+++ b/sys/dev/esp/ncr53c9xreg.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/esp/ncr53c9xreg.h,v 1.5 2005/05/19 14:51:10 marius Exp $ */
 
 /*
  * Register addresses, relative to some base address
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index c9ac4bbbe5998..58a90a01873f2 100644
--- a/sys/dev/esp/ncr53c9xvar.h
+++ b/sys/dev/esp/ncr53c9xvar.h
@@ -66,7 +66,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/esp/ncr53c9xvar.h,v 1.8 2005/12/04 10:06:03 ru Exp $ */
 
 #ifndef _DEV_IC_NCR53C9XVAR_H_
 #define _DEV_IC_NCR53C9XVAR_H_
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index cd5b975ddb281..def345aaeea9c 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.62 2006/02/04 08:16:41 imp Exp $");
 
 /*
  * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index 84b71a2aaa608..430bdecb7017b 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.12 2007/02/23 12:18:40 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c
index 1d1646339c033..f0d30b80cee5b 100644
--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.18 2007/02/23 12:18:40 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ex/if_exreg.h b/sys/dev/ex/if_exreg.h
index 157eda37298c1..3d8701b49a972 100644
--- a/sys/dev/ex/if_exreg.h
+++ b/sys/dev/ex/if_exreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ex/if_exreg.h,v 1.6 2005/01/06 01:42:39 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ex/if_exvar.h b/sys/dev/ex/if_exvar.h
index 9df9886fe1f87..338f4daac64fe 100644
--- a/sys/dev/ex/if_exvar.h
+++ b/sys/dev/ex/if_exvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/ex/if_exvar.h,v 1.7 2007/04/16 12:31:34 pjd Exp $
  */
 
 struct ex_softc {
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 6edae3896886b..ed0c350ef14b9 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.28 2007/03/23 17:15:07 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index 3bb3b4c9474ff..118bbd3945588 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/exca/excareg.h,v 1.6 2006/08/12 08:53:54 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 M Warner Losh.  All rights reserved.
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index bc29c81a09907..f2c5ac42fc516 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/exca/excavar.h,v 1.7 2005/01/06 01:42:40 imp Exp $ */
 
 /*-
  * Copyright (c) 2002 M Warner Losh.  All rights reserved.
diff --git a/sys/dev/fatm/firmware.h b/sys/dev/fatm/firmware.h
index 24c7bc8e88659..8697d0890ab0f 100644
--- a/sys/dev/fatm/firmware.h
+++ b/sys/dev/fatm/firmware.h
@@ -37,7 +37,7 @@
  *
  * phk got permission from Fore to put firmware images into our tree.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/firmware.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  */
 
 static uint32_t firmware[] = {
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index 8ba31c1a9dd61..987dee9ced667 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.23 2007/02/23 12:18:40 piso Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/fatm/if_fatm_rate.h b/sys/dev/fatm/if_fatm_rate.h
index 5cfd38a9c28ce..08dfe95dcc2c9 100644
--- a/sys/dev/fatm/if_fatm_rate.h
+++ b/sys/dev/fatm/if_fatm_rate.h
@@ -35,7 +35,7 @@
  *	    for(i=period-1; i>0; i--) printf "{ 0x%08x, %u },\n", \
  *		(i * 65536) + (period - i), i * linerate/period; }'
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatm_rate.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  */
 { 0x00000000, 353053 },
 { 0x00fe0001, 351668 },
diff --git a/sys/dev/fatm/if_fatmreg.h b/sys/dev/fatm/if_fatmreg.h
index d488dbfda5bf2..038a20f76caee 100644
--- a/sys/dev/fatm/if_fatmreg.h
+++ b/sys/dev/fatm/if_fatmreg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatmreg.h,v 1.2 2005/01/06 01:42:40 imp Exp $
  *
  * Fore PCA200E hardware definitions.
  */
diff --git a/sys/dev/fatm/if_fatmvar.h b/sys/dev/fatm/if_fatmvar.h
index 697e91543bd79..5a3c5c8fff97f 100644
--- a/sys/dev/fatm/if_fatmvar.h
+++ b/sys/dev/fatm/if_fatmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fatm/if_fatmvar.h,v 1.6 2005/06/10 16:49:08 brooks Exp $
  *
  * Fore PCA200E driver definitions.
  */
diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index b1cc5f08a81b2..638b3f5316900 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/boot_font.c,v 1.9 2007/06/16 21:31:52 marius Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c
index 2a346859ccf86..4bfdc496ec41d 100644
--- a/sys/dev/fb/creator.c
+++ b/sys/dev/fb/creator.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/creator.c,v 1.13 2007/06/16 21:48:49 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fb/creatorreg.h b/sys/dev/fb/creatorreg.h
index c73af6fb40f6d..d8c1c38555652 100644
--- a/sys/dev/fb/creatorreg.h
+++ b/sys/dev/fb/creatorreg.h
@@ -45,7 +45,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/creatorreg.h,v 1.7 2007/01/16 21:08:22 marius Exp $
  */
 
 #ifndef _DEV_FB_CREATORREG_H_
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index ea9c996b0b581..0c0c1b83dacb3 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.33 2005/12/04 10:06:03 ru Exp $");
 
 #include "opt_fb.h"
 
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 30d341d3e72e9..2eb315bb967b3 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.21 2007/01/18 13:08:08 marius Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/gallant12x22.c b/sys/dev/fb/gallant12x22.c
index f6ad0a94fa69a..1902097cd26f0 100644
--- a/sys/dev/fb/gallant12x22.c
+++ b/sys/dev/fb/gallant12x22.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/gallant12x22.c,v 1.5 2007/06/16 21:48:49 marius Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h
index ee70640b8a5f0..491787e80592c 100644
--- a/sys/dev/fb/gfb.h
+++ b/sys/dev/fb/gfb.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 2000 Andrew Miklic
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/gfb.h,v 1.5 2007/06/16 21:31:52 marius Exp $
  */
 
 #ifndef _FB_GFB_H_
diff --git a/sys/dev/fb/machfb.c b/sys/dev/fb/machfb.c
index eb128eb6c1f54..c19cb89b290fb 100644
--- a/sys/dev/fb/machfb.c
+++ b/sys/dev/fb/machfb.c
@@ -55,7 +55,7 @@
  */
  
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/machfb.c,v 1.5 2007/06/16 21:48:50 marius Exp $");
 
 /*
  * Driver for ATI Mach64 graphics chips. Some code is derived from the
diff --git a/sys/dev/fb/machfbreg.h b/sys/dev/fb/machfbreg.h
index 8990a4e3993a8..d73d0ee86a92c 100644
--- a/sys/dev/fb/machfbreg.h
+++ b/sys/dev/fb/machfbreg.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: machfbreg.h,v 1.1 2002/10/24 18:15:57 junyoung Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/machfbreg.h,v 1.1 2005/05/21 20:47:38 marius Exp $
  */
 
 #ifndef _DEV_FB_MACHFB_H_
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 9935b9e414cda..bf1f2a9a14b7b 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/s3_pci.c,v 1.10 2005/09/28 14:54:06 marius Exp $");
 
 /* Enable LFB on S3 cards that has only VESA 1.2 BIOS */
 
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index ec25d1cf03a40..8b8938e86989d 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/splash.c,v 1.14 2004/05/30 20:08:31 phk Exp $");
 
 #include "opt_splash.h"
 
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index 139d1e9a57cf8..088a41865c50e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/splash_bmp.c,v 1.20 2007/07/11 22:34:34 mjacob Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index e67bb244e4a16..5890844321073 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/splash_pcx.c,v 1.8 2004/08/06 21:35:51 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index 36ba9a708d895..ff3822e99c6b0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/splashreg.h,v 1.6 2004/07/15 08:26:01 phk Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 6650569dd4c1e..e385bb63f5c7c 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.36 2005/12/04 02:12:41 ru Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 4ccef40d616f3..d069aeed9351d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fb/vgareg.h,v 1.8 2005/02/28 21:06:14 iedowse Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 22e810b30c1a3..3f76bc00fdf02 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.317 2007/02/27 17:16:52 jhb Exp $");
 
 #include "opt_fdc.h"
 
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index c3cb9b9bd822b..4ed6bed4f1d5a 100644
--- a/sys/dev/fdc/fdc_acpi.c
+++ b/sys/dev/fdc/fdc_acpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.12 2006/02/21 03:19:24 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index ab7057d260b4b..bde0c844ac6ae 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_isa.c,v 1.22 2005/03/15 08:02:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index f960c3b5b1410..b90845b4f4368 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_pccard.c,v 1.13 2005/06/24 14:36:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 5ab60a6a64435..10ee3869142ff 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fdc/fdcvar.h,v 1.9 2005/01/19 07:46:38 imp Exp $
  */
 
 /* XXX should audit this file to see if additional copyrights needed */
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 14d3c464060cc..a895b18421a6b 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.98 2007/02/23 12:18:41 piso Exp $");
 
 /*
  *
diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index 7076f42268ce5..1c5484beddace 100644
--- a/sys/dev/fe/if_fe_cbus.c
+++ b/sys/dev/fe/if_fe_cbus.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.13 2005/06/11 16:30:43 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe_isa.c b/sys/dev/fe/if_fe_isa.c
index 3c37575a40d9d..e10f6628d0e3c 100644
--- a/sys/dev/fe/if_fe_isa.c
+++ b/sys/dev/fe/if_fe_isa.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_isa.c,v 1.9 2005/06/10 16:49:08 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c
index ed0e0018ddaee..4adaa4a0d7b8e 100644
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.32 2005/11/19 23:26:57 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index afc9c5704c58c..fa352b75c8072 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/fe/if_fereg.h,v 1.10 2005/02/20 19:33:13 imp Exp $ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/dev/fe/if_fevar.h b/sys/dev/fe/if_fevar.h
index e80c9567b8a4f..32aa1b8caffe9 100644
--- a/sys/dev/fe/if_fevar.h
+++ b/sys/dev/fe/if_fevar.h
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fe/if_fevar.h,v 1.6 2005/06/10 16:49:08 brooks Exp $
  */
 
 /* How many registers does an fe-supported adapter have at maximum?  */
diff --git a/sys/dev/fe/mb86960.h b/sys/dev/fe/mb86960.h
index 1272dde68331d..66599d296ab99 100644
--- a/sys/dev/fe/mb86960.h
+++ b/sys/dev/fe/mb86960.h
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fe/mb86960.h,v 1.5 2005/02/20 19:33:13 imp Exp $
  */
 
 /*
diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README
index a6536ae61405e..e18fc9db62813 100644
--- a/sys/dev/firewire/00README
+++ b/sys/dev/firewire/00README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/firewire/00README,v 1.2 2005/10/01 18:56:16 glebius Exp $
 
 IEEE 1394 support for FreeBSD-5.X and 4.X.
 
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index c3c09abc4f466..a55ba615d86e5 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.100 2007/07/20 03:42:57 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index ee510e624bc3b..7675c1f7e25f9 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.21 2007/04/24 12:15:05 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 42feff2d27c8b..bfa88c11d002d 100644
--- a/sys/dev/firewire/firewire_phy.h
+++ b/sys/dev/firewire/firewire_phy.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewire_phy.h,v 1.3 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 73445e023d438..f9cea3fdecf45 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.50 2007/07/20 03:42:57 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c
index 8a53bc7fae710..8408d62c0c756 100644
--- a/sys/dev/firewire/fwcrom.c
+++ b/sys/dev/firewire/fwcrom.c
@@ -34,7 +34,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.14 2006/02/04 21:37:39 imp Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index 9e6602d068cee..572dca1b3beaa 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.52 2007/06/06 14:31:36 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index bf3bb6f5fcf6a..5cecc9bd3041c 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -35,7 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.9 2007/06/06 14:31:36 simokawa Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index 3a8278c1c709f..68c4ae89533cf 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwdma.h,v 1.3 2005/01/06 01:42:41 imp Exp $
  */
 
 struct fwdma_alloc {
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index f0aa7ae33cd6e..0956969480c42 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -35,7 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.34 2007/06/06 14:31:36 simokawa Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index de717947e8445..43b3c632aa823 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwmem.h,v 1.8 2005/01/06 01:42:41 imp Exp $
  */
 
 struct fw_xfer *fwmem_read_quad(struct fw_device *, caddr_t, uint8_t,
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index c74d8d84b4935..9d973bb029f38 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.93 2007/06/08 09:04:30 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index b21bb28afb303..a30d22aa4f296 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.60 2007/06/06 14:31:36 simokawa Exp $
  */
 
 #define BOUNCE_BUFFER_TEST	0
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 32b029c7455d7..0310fd854b469 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohcireg.h,v 1.23 2007/04/30 14:06:30 simokawa Exp $
  *
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index d0ee9f65ecaa2..149dbb9b99d9a 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.16 2007/06/06 14:31:36 simokawa Exp $
  *
  */
 
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index 77a006ed3c54a..825a21f520bb5 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/fwphyreg.h,v 1.3 2005/01/06 01:42:41 imp Exp $
  */
 
 struct phyreg_base {
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 058649fc0cc45..f018518cb1f91 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.14 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 11f3042ff9b00..9dc83266640e5 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/iec68113.h,v 1.9 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 438838d404cd4..904dd21c42fdc 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.44 2007/06/06 14:31:36 simokawa Exp $
  */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index 4b8eb76d0605e..79c310d7dc973 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwevar.h,v 1.6 2007/06/06 14:31:36 simokawa Exp $
  */
 
 #ifndef _NET_IF_FWEVAR_H_
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index a9d1f38faf022..2f666f6c4aa6e 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.16 2007/06/06 14:31:36 simokawa Exp $
  */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index 57e7904b5f812..2a3e876febe6c 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/if_fwipvar.h,v 1.5 2007/06/06 14:31:36 simokawa Exp $
  */
 
 #ifndef _NET_IF_FWIPVAR_H_
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index b4d89d54fcf39..31774a15bda96 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.97 2007/06/17 05:55:50 scottl Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 9f85fab38de5a..190bdb6e04200 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.5 2005/01/06 01:42:41 imp Exp $
  *
  */
 
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index c5b9d2312cac8..68df509e1de7b 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/firewire/sbp_targ.c,v 1.16 2007/06/17 05:55:50 scottl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c
index e9536e3a68b4c..37e393ef28550 100644
--- a/sys/dev/flash/at45d.c
+++ b/sys/dev/flash/at45d.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/flash/at45d.c,v 1.1 2006/11/29 08:05:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index a652fb64f5d58..873939ea1a3a3 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.266 2007/05/30 03:46:04 kevlo Exp $");
 
 /*
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index e6bb98b7f2e77..1bdb9bf2811a8 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.39 2005/04/22 13:05:53 mux Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 899315a042be8..bccf3526f3f33 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.40 2006/11/30 14:58:01 glebius Exp $
  */
 
 /*
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index 2510f420b6fdb..ef994002e85bd 100644
--- a/sys/dev/fxp/rcvbundl.h
+++ b/sys/dev/fxp/rcvbundl.h
@@ -29,7 +29,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/fxp/rcvbundl.h,v 1.3 2005/04/21 19:34:57 mux Exp $
  */
 /*
 rcvbundl.h
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index ced67eea12301..1a2f9902906e6 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.44.2.1 2007/10/18 05:12:20 yongari Exp $");
 
 /*
  * Driver for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index 742bf8f4b4781..95f0718bb82d8 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.23 2007/09/26 21:14:17 marius Exp $");
 
 /*
  * PCI bindings for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers
diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h
index 4c060c90ea31e..cab3fa8126670 100644
--- a/sys/dev/gem/if_gemreg.h
+++ b/sys/dev/gem/if_gemreg.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: gemreg.h,v 1.8 2005/12/11 12:21:26 christos Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gem/if_gemreg.h,v 1.5 2007/09/26 21:14:17 marius Exp $
  */
 
 #ifndef	_IF_GEMREG_H
diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h
index 08b21051da33e..ae46af1305d22 100644
--- a/sys/dev/gem/if_gemvar.h
+++ b/sys/dev/gem/if_gemvar.h
@@ -25,7 +25,7 @@
  *
  *	from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.15 2007/09/26 21:14:17 marius Exp $
  */
 
 #ifndef	_IF_GEMVAR_H
diff --git a/sys/dev/harp/if_harp.c b/sys/dev/harp/if_harp.c
index ca11138474942..080292746aa05 100644
--- a/sys/dev/harp/if_harp.c
+++ b/sys/dev/harp/if_harp.c
@@ -31,10 +31,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.7 2005/06/10 16:49:09 brooks Exp $");
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/harp/if_harp.c,v 1.7 2005/06/10 16:49:09 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index 85327643ba312..33bb93505d538 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.27 2007/02/23 12:18:41 piso Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index b20af45955c51..2acd62865f74d 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.22 2007/06/08 01:37:47 mjacob Exp $");
 
 /*
  * ForeHE driver.
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index 5e37b5dc75ea8..316706a05b06b 100644
--- a/sys/dev/hatm/if_hatm_ioctl.c
+++ b/sys/dev/hatm/if_hatm_ioctl.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_ioctl.c,v 1.13 2005/08/09 10:19:48 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index b79b2fcd7c029..8a980b93093ab 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_rx.c,v 1.10 2005/08/09 10:19:48 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index 868b5a3d43d6b..ff330d9ee31df 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.14 2005/08/09 10:19:48 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/hatm/if_hatmconf.h b/sys/dev/hatm/if_hatmconf.h
index 5402697410d72..cd4978c56a0fc 100644
--- a/sys/dev/hatm/if_hatmconf.h
+++ b/sys/dev/hatm/if_hatmconf.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmconf.h,v 1.2 2005/01/06 01:42:43 imp Exp $
  *
  * Default configuration
  */
diff --git a/sys/dev/hatm/if_hatmreg.h b/sys/dev/hatm/if_hatmreg.h
index 9085f07f5a4ba..135adea97933b 100644
--- a/sys/dev/hatm/if_hatmreg.h
+++ b/sys/dev/hatm/if_hatmreg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmreg.h,v 1.2 2005/01/06 01:42:43 imp Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hatm/if_hatmvar.h b/sys/dev/hatm/if_hatmvar.h
index d19fd0eabd742..0007d963e46a4 100644
--- a/sys/dev/hatm/if_hatmvar.h
+++ b/sys/dev/hatm/if_hatmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hatm/if_hatmvar.h,v 1.18 2005/06/22 06:42:03 harti Exp $
  *
  * Fore HE driver for NATM
  */
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 8f0a17f58a9c4..cdd536cc11846 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore.h,v 1.6 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index 93fbf5d587e26..6ea1f46c14c00 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_aali.h,v 1.5 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 491733af197f8..ab94442e395f7 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.15 2004/02/21 19:08:23 harti Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.15 2004/02/21 19:08:23 harti Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index c7e38892e4607..79aa102eb2045 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.19 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.19 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 1f68f7d3e44c3..b076e29e4e7f8 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.12 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.12 2003/08/24 17:46:08 obrien Exp $");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 51bbd0fb69336..b70d4f7cf7fcb 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.13 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.13 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index 93062f451f63a..dced564173cdd 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.7 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index ccaed3f0e0851..b462219dcb7d6 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.17 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.17 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 8454b93f2464f..59f6307b4a1d3 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.12 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -54,7 +54,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.12 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 3910186c309eb..28360ea2c156a 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.20 2005/06/10 16:49:09 brooks Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.20 2005/06/10 16:49:09 brooks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 758f06911cb8a..3441ef46ef74d 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.24 2005/06/10 16:49:09 brooks Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.24 2005/06/10 16:49:09 brooks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 33d73c21dceda..5ac02b4aca02d 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_slave.h,v 1.4 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index 4126c1f0635cf..4cb306c37c3bb 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.14 2005/01/06 01:42:43 imp Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.14 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 32095164d8e4b..9149280119903 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_stats.h,v 1.3 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 51745ac9336f6..b8fed778f2917 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.9 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.9 2003/08/24 17:46:08 obrien Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index e22f696a40b1c..2781fd549f0a2 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.14 2005/06/10 16:49:09 brooks Exp $");
 
 /*
  * FORE Systems 200-Series Adapter Support
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.14 2005/06/10 16:49:09 brooks Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 57cedb3a761f2..0d38913b280c5 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.11 2005/01/06 01:42:43 imp Exp $
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 95bc6524be999..22cdb7e35cc42 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.11 2005/01/06 01:42:43 imp Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.11 2005/01/06 01:42:43 imp Exp $");
 #endif
 
 
diff --git a/sys/dev/hfa/hfa_eisa.c b/sys/dev/hfa/hfa_eisa.c
index 6c42fb8634e34..d305c5e20e636 100644
--- a/sys/dev/hfa/hfa_eisa.c
+++ b/sys/dev/hfa/hfa_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_eisa.c,v 1.2 2003/08/24 17:46:08 obrien Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_freebsd.c b/sys/dev/hfa/hfa_freebsd.c
index 9b8d69caac418..fa090df45dc1e 100644
--- a/sys/dev/hfa/hfa_freebsd.c
+++ b/sys/dev/hfa/hfa_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.10 2005/05/29 04:42:20 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/hfa/hfa_freebsd.h b/sys/dev/hfa/hfa_freebsd.h
index 75400162eda9a..79e97ee64cdcd 100644
--- a/sys/dev/hfa/hfa_freebsd.h
+++ b/sys/dev/hfa/hfa_freebsd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.h,v 1.2 2003/07/31 14:52:44 harti Exp $
  */
 
 struct hfa_softc {
diff --git a/sys/dev/hfa/hfa_pci.c b/sys/dev/hfa/hfa_pci.c
index 382f48634cec2..bf35575be07c7 100644
--- a/sys/dev/hfa/hfa_pci.c
+++ b/sys/dev/hfa/hfa_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_pci.c,v 1.7 2007/02/23 12:18:42 piso Exp $");
 
 /*
  *
diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index 990803cb19d70..93f69cbb43b23 100644
--- a/sys/dev/hfa/hfa_sbus.c
+++ b/sys/dev/hfa/hfa_sbus.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hfa/hfa_sbus.c,v 1.3 2003/08/24 17:46:08 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index d3a66e6209612..c1ef7adf1d036 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.40 2007/03/21 03:42:49 sam Exp $");
 
 /*
  * Driver for various Hifn encryption processors.
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index c3b343801b663..c1c35dd775f02 100644
--- a/sys/dev/hifn/hifn7751reg.h
+++ b/sys/dev/hifn/hifn7751reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.7 2007/03/21 03:42:49 sam Exp $ */
 /*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h
index 0874943d0107d..45e98fca48c96 100644
--- a/sys/dev/hifn/hifn7751var.h
+++ b/sys/dev/hifn/hifn7751var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.9 2007/03/21 03:42:49 sam Exp $ */
 /*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index dd5c0a9ddfc46..e68d4037a6fe3 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.53 2007/05/01 11:50:11 marius Exp $");
 
 /*
  * HME Ethernet module driver.
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index ac775606b2b3d..3600bc9a99db8 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.23 2007/02/23 12:18:42 piso Exp $");
 
 /*
  * PCI front-end device driver for the HME ethernet device.
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 0e8eb45b1cd0f..e01cb8243331f 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.18 2007/02/23 12:18:42 piso Exp $");
 
 /*
  * SBus front-end device driver for the HME ethernet device.
diff --git a/sys/dev/hme/if_hmereg.h b/sys/dev/hme/if_hmereg.h
index a9e5497e82247..cda02a9bf4ecf 100644
--- a/sys/dev/hme/if_hmereg.h
+++ b/sys/dev/hme/if_hmereg.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: hmereg.h,v 1.16 2003/11/02 11:07:45 wiz Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hme/if_hmereg.h,v 1.7 2005/10/25 03:56:21 yongari Exp $
  */
 
 /*
diff --git a/sys/dev/hme/if_hmevar.h b/sys/dev/hme/if_hmevar.h
index 70c9d789ba059..0553feff5d32c 100644
--- a/sys/dev/hme/if_hmevar.h
+++ b/sys/dev/hme/if_hmevar.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: hmevar.h,v 1.5 2000/06/25 01:10:04 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.10 2006/12/06 02:07:20 marius Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index 88aa843c14bfa..1cfd100145f78 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hptiop/hptiop.c,v 1.2.4.1 2008/02/06 03:44:11 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/dev/hptiop/hptiop.h b/sys/dev/hptiop/hptiop.h
index 42bc3303378ad..9e3076911b361 100644
--- a/sys/dev/hptiop/hptiop.h
+++ b/sys/dev/hptiop/hptiop.h
@@ -27,7 +27,7 @@
 #define _HPTIOP_H
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hptiop/hptiop.h,v 1.1.4.1 2008/02/06 03:44:11 scottl Exp $");
 
 #define DBG 0
 
diff --git a/sys/dev/hptmv/access601.h b/sys/dev/hptmv/access601.h
index 26eaab283b952..2e5250ba6b59e 100644
--- a/sys/dev/hptmv/access601.h
+++ b/sys/dev/hptmv/access601.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/access601.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 #ifndef _ACCESS601_H_
 #define _ACCESS601_H_
diff --git a/sys/dev/hptmv/amd64-elf.raid.o.uu b/sys/dev/hptmv/amd64-elf.raid.o.uu
index 5b439c9f98363..aa753fd32a34c 100644
--- a/sys/dev/hptmv/amd64-elf.raid.o.uu
+++ b/sys/dev/hptmv/amd64-elf.raid.o.uu
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/amd64-elf.raid.o.uu,v 1.1 2005/09/07 23:33:26 scottl Exp $
  */
 begin 644 hptmvraid.o
 M?T5,1@(!`0D```````````$`/@`!`````````````````````````"#=````
diff --git a/sys/dev/hptmv/array.h b/sys/dev/hptmv/array.h
index 14d627af58324..f5facd97d1a57 100644
--- a/sys/dev/hptmv/array.h
+++ b/sys/dev/hptmv/array.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/array.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 
 #ifndef _ARRAY_H_
diff --git a/sys/dev/hptmv/atapi.h b/sys/dev/hptmv/atapi.h
index b00100a900e9d..450b5b3065157 100644
--- a/sys/dev/hptmv/atapi.h
+++ b/sys/dev/hptmv/atapi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/atapi.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 
 #ifndef _ATAPI_H_
diff --git a/sys/dev/hptmv/command.h b/sys/dev/hptmv/command.h
index 12eb694af81d2..a95e33f3db26c 100644
--- a/sys/dev/hptmv/command.h
+++ b/sys/dev/hptmv/command.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/command.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 #ifndef _COMMAND_H_
 #define _COMMAND_H_
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index aa67e947ea59c..3bcadb2b8edba 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/entry.c,v 1.17 2007/06/17 05:55:50 scottl Exp $
  */
  
 #include <sys/param.h>
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index 4e6a0d0e668fa..139f24794648b 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/global.h,v 1.4 2005/09/07 23:33:26 scottl Exp $
  */
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
diff --git a/sys/dev/hptmv/gui_lib.c b/sys/dev/hptmv/gui_lib.c
index 13def6ba92406..e826efccd1489 100644
--- a/sys/dev/hptmv/gui_lib.c
+++ b/sys/dev/hptmv/gui_lib.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/gui_lib.c,v 1.5 2005/09/07 23:33:26 scottl Exp $
  */
 /*
  * gui_lib.c
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index 34477a2585241..0d2a4621391b4 100644
--- a/sys/dev/hptmv/hptintf.h
+++ b/sys/dev/hptmv/hptintf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/hptintf.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 
 #ifndef HPT_INTF_H
diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index b38ef385688de..988f8ad52edcb 100644
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/hptproc.c,v 1.7 2005/12/04 02:12:41 ru Exp $
  */
 /*
  * hptproc.c  sysctl support
diff --git a/sys/dev/hptmv/i386-elf.raid.o.uu b/sys/dev/hptmv/i386-elf.raid.o.uu
index a7462b8f1ef2d..32e600c1dde03 100644
--- a/sys/dev/hptmv/i386-elf.raid.o.uu
+++ b/sys/dev/hptmv/i386-elf.raid.o.uu
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/i386-elf.raid.o.uu,v 1.5 2005/09/07 23:33:26 scottl Exp $
  */
 begin 644 hptmvraid.o
 M?T5,1@$!`0D```````````$``P`!``````````````#(O@```````#0`````
diff --git a/sys/dev/hptmv/ioctl.c b/sys/dev/hptmv/ioctl.c
index bf80700b8b6ce..dee70917d2114 100644
--- a/sys/dev/hptmv/ioctl.c
+++ b/sys/dev/hptmv/ioctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/ioctl.c,v 1.8 2007/05/21 09:26:47 mjacob Exp $
  */
 /*
  * ioctl.c   ioctl interface implementation
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index f9f41ffb75da5..87045b1c81f59 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mv.c,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index 510f790f09154..b538f7c6ac05a 100644
--- a/sys/dev/hptmv/mvOs.h
+++ b/sys/dev/hptmv/mvOs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mvOs.h,v 1.5 2005/12/04 02:12:41 ru Exp $
  */
 #ifndef __INCmvOsBsdh
 #define __INCmvOsBsdh
diff --git a/sys/dev/hptmv/mvSata.h b/sys/dev/hptmv/mvSata.h
index bf77fbfcb234c..32262e590e901 100644
--- a/sys/dev/hptmv/mvSata.h
+++ b/sys/dev/hptmv/mvSata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mvSata.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 #ifndef __INCmvSatah
 #define __INCmvSatah
diff --git a/sys/dev/hptmv/mvStorageDev.h b/sys/dev/hptmv/mvStorageDev.h
index 48aad93651f97..91eeb2575cca8 100644
--- a/sys/dev/hptmv/mvStorageDev.h
+++ b/sys/dev/hptmv/mvStorageDev.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/mvStorageDev.h,v 1.4 2005/09/07 23:33:26 scottl Exp $
  */
 #ifndef __INCmvStorageDevh
 #define __INCmvStorageDevh
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index 904bb39c2db8e..749ade821e71c 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/osbsd.h,v 1.6 2006/04/30 16:44:41 scottl Exp $
  */
 #ifndef _OSBSD_H_
 #define _OSBSD_H_
diff --git a/sys/dev/hptmv/raid5n.h b/sys/dev/hptmv/raid5n.h
index 135177a9bbbc2..7c8f176782955 100644
--- a/sys/dev/hptmv/raid5n.h
+++ b/sys/dev/hptmv/raid5n.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/raid5n.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 #ifdef _RAID5N_
 
diff --git a/sys/dev/hptmv/readme.txt b/sys/dev/hptmv/readme.txt
index 6d21e98c98b8e..ae8b6cffcc112 100644
--- a/sys/dev/hptmv/readme.txt
+++ b/sys/dev/hptmv/readme.txt
@@ -1,6 +1,6 @@
 RocketRAID 182x Driver for FreeBSD
 Copyright (C) 2004-2005 HighPoint Technologies, Inc. All rights reserved.
-$FreeBSD$
+$FreeBSD: src/sys/dev/hptmv/readme.txt,v 1.3 2005/09/07 23:33:26 scottl Exp $
 
 #############################################################################
 Revision History:
diff --git a/sys/dev/hptmv/vdevice.h b/sys/dev/hptmv/vdevice.h
index 8d06f10321092..1cde6e04c91be 100644
--- a/sys/dev/hptmv/vdevice.h
+++ b/sys/dev/hptmv/vdevice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptmv/vdevice.h,v 1.3 2005/09/07 23:33:26 scottl Exp $
  */
 
 #ifndef _VDEVICE_H_
diff --git a/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu b/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu
index 92137d917f2f4..ec143e2e11457 100644
--- a/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu
+++ b/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu,v 1.1.2.1.2.2 2008/02/20 04:35:23 kensmith Exp $
  */
 begin 644 hptrr_lib.o
 M?T5,1@(!`0D```````````$`/@`!`````````````````````````,@R!@``
diff --git a/sys/dev/hptrr/array.h b/sys/dev/hptrr/array.h
index 308868ca35966..a37b3956b4304 100644
--- a/sys/dev/hptrr/array.h
+++ b/sys/dev/hptrr/array.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/array.h,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /*
diff --git a/sys/dev/hptrr/him.h b/sys/dev/hptrr/him.h
index f11f0ed03699a..302dadf082538 100644
--- a/sys/dev/hptrr/him.h
+++ b/sys/dev/hptrr/him.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/him.h,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /*
diff --git a/sys/dev/hptrr/himfuncs.h b/sys/dev/hptrr/himfuncs.h
index 6926365ffaec3..28891662a33d2 100644
--- a/sys/dev/hptrr/himfuncs.h
+++ b/sys/dev/hptrr/himfuncs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/himfuncs.h,v 1.1.2.1.2.1 2008/02/06 04:37:58 scottl Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /* $Id: himfuncs.h,v 1.14 2005/12/22 00:13:11 gmm Exp $
diff --git a/sys/dev/hptrr/hptintf.h b/sys/dev/hptrr/hptintf.h
index 45f20f25fe47a..35643f970f603 100644
--- a/sys/dev/hptrr/hptintf.h
+++ b/sys/dev/hptrr/hptintf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/hptintf.h,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 
diff --git a/sys/dev/hptrr/hptrr_config.c b/sys/dev/hptrr/hptrr_config.c
index 9ebbfc87ea2fb..16938246de70c 100644
--- a/sys/dev/hptrr/hptrr_config.c
+++ b/sys/dev/hptrr/hptrr_config.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/hptrr_config.c,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /****************************************************************************
diff --git a/sys/dev/hptrr/hptrr_config.h b/sys/dev/hptrr/hptrr_config.h
index 53010ccd953fb..0ef21555cf32b 100644
--- a/sys/dev/hptrr/hptrr_config.h
+++ b/sys/dev/hptrr/hptrr_config.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/hptrr_config.h,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #ifndef hptrr_CONFIG_H
 #define hptrr_CONFIG_H
diff --git a/sys/dev/hptrr/hptrr_os_bsd.c b/sys/dev/hptrr/hptrr_os_bsd.c
index ee74d21e94452..eb81b55b87427 100644
--- a/sys/dev/hptrr/hptrr_os_bsd.c
+++ b/sys/dev/hptrr/hptrr_os_bsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/hptrr_os_bsd.c,v 1.1.2.1.2.3 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /* $Id: os_bsd.c,v 1.11 2005/06/03 14:06:38 kdh Exp $
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 64596cf6e7edc..60b4508d4862c 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/hptrr_osm_bsd.c,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /* $Id: osm_bsd.c,v 1.26 2007/02/28 03:53:47 gmm Exp $
diff --git a/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu b/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu
index ced2f7b47e976..cf16506d6d17d 100644
--- a/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu
+++ b/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 begin 644 hptrr_lib.o
 M?T5,1@$!`0D```````````$``P`!``````````````!4U`0``````#0`````
diff --git a/sys/dev/hptrr/ldm.h b/sys/dev/hptrr/ldm.h
index af08cf464d65d..da45accd26a37 100644
--- a/sys/dev/hptrr/ldm.h
+++ b/sys/dev/hptrr/ldm.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/ldm.h,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /*
diff --git a/sys/dev/hptrr/list.h b/sys/dev/hptrr/list.h
index 9cfad53e22630..e46317e6c5ea1 100644
--- a/sys/dev/hptrr/list.h
+++ b/sys/dev/hptrr/list.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/list.h,v 1.1.2.1.2.1 2008/02/06 04:37:58 scottl Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /*
diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h
index 2d99a2d7fa808..8dcd4c61543cb 100644
--- a/sys/dev/hptrr/os_bsd.h
+++ b/sys/dev/hptrr/os_bsd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/os_bsd.h,v 1.1.2.1.2.2 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /* $Id: os_bsd.h,v 1.18 2006/04/11 08:19:02 gmm Exp $
diff --git a/sys/dev/hptrr/osm.h b/sys/dev/hptrr/osm.h
index 977cef9919872..86c10ff61c57a 100644
--- a/sys/dev/hptrr/osm.h
+++ b/sys/dev/hptrr/osm.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hptrr/osm.h,v 1.1.2.1.2.3 2008/02/20 04:35:24 kensmith Exp $
  */
 #include <dev/hptrr/hptrr_config.h>
 /*
diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
index b7cdee808ceb0..182ecb94d4136 100644
--- a/sys/dev/hwpmc/hwpmc_amd.c
+++ b/sys/dev/hwpmc/hwpmc_amd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.c,v 1.13 2005/12/05 11:58:32 ru Exp $");
 
 /* Support for the AMD K7 and later processors */
 
diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h
index aa6417b81d7a7..8418f3a0eec0e 100644
--- a/sys/dev/hwpmc/hwpmc_amd.h
+++ b/sys/dev/hwpmc/hwpmc_amd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_arm.c b/sys/dev/hwpmc/hwpmc_arm.c
index af905b66924ee..5f211849a1e47 100644
--- a/sys/dev/hwpmc/hwpmc_arm.c
+++ b/sys/dev/hwpmc/hwpmc_arm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_arm.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_ia64.c b/sys/dev/hwpmc/hwpmc_ia64.c
index af905b66924ee..1786b2c014bb6 100644
--- a/sys/dev/hwpmc/hwpmc_ia64.c
+++ b/sys/dev/hwpmc/hwpmc_ia64.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ia64.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c
index 5af555c46df88..a9154976fffbc 100644
--- a/sys/dev/hwpmc/hwpmc_logging.c
+++ b/sys/dev/hwpmc/hwpmc_logging.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_logging.c,v 1.7 2007/04/19 08:02:51 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index 6c0e0ea272544..0371170c568f5 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.29 2007/06/05 00:00:50 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/eventhandler.h>
diff --git a/sys/dev/hwpmc/hwpmc_pentium.c b/sys/dev/hwpmc/hwpmc_pentium.c
index fc26b5252649d..10adbe237d7c8 100644
--- a/sys/dev/hwpmc/hwpmc_pentium.c
+++ b/sys/dev/hwpmc/hwpmc_pentium.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_pentium.c,v 1.4 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/hwpmc/hwpmc_pentium.h b/sys/dev/hwpmc/hwpmc_pentium.h
index 36ecc64b60a69..f999f4e38406e 100644
--- a/sys/dev/hwpmc/hwpmc_pentium.h
+++ b/sys/dev/hwpmc/hwpmc_pentium.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_pentium.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c
index a6cd3fe6fe22a..93f1e275f8c59 100644
--- a/sys/dev/hwpmc/hwpmc_piv.c
+++ b/sys/dev/hwpmc/hwpmc_piv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.c,v 1.14 2007/04/19 08:02:51 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/hwpmc/hwpmc_piv.h b/sys/dev/hwpmc/hwpmc_piv.h
index 0837b263b6394..767829ae78d9a 100644
--- a/sys/dev/hwpmc/hwpmc_piv.h
+++ b/sys/dev/hwpmc/hwpmc_piv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
index af905b66924ee..df403eb144b9f 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.c
+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_powerpc.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_ppro.c b/sys/dev/hwpmc/hwpmc_ppro.c
index 993a2bf265607..e8a24a78a370e 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.c
+++ b/sys/dev/hwpmc/hwpmc_ppro.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.c,v 1.9 2005/07/14 15:09:14 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/hwpmc/hwpmc_ppro.h b/sys/dev/hwpmc/hwpmc_ppro.h
index f750735c85ea1..469f99c494fc6 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.h
+++ b/sys/dev/hwpmc/hwpmc_ppro.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 /* Machine dependent interfaces */
diff --git a/sys/dev/hwpmc/hwpmc_sparc64.c b/sys/dev/hwpmc/hwpmc_sparc64.c
index af905b66924ee..77f35f8b2e131 100644
--- a/sys/dev/hwpmc/hwpmc_sparc64.c
+++ b/sys/dev/hwpmc/hwpmc_sparc64.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_sparc64.c,v 1.1 2005/06/09 19:45:07 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/pmc.h>
diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
index cb6db23bc1b69..0de466c7c23ed 100644
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.5.2.1 2007/12/03 10:50:58 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index 23fc9dcb1a218..ac8073c07581b 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/hwpmc/pmc_events.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 #ifndef _DEV_HWPMC_PMC_EVENTS_H_
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index 90672c4ee7e6a..6e3693a02e9cd 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/cd1400.h,v 1.6 1999/08/28 00:45:12 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ic/cd180.h b/sys/dev/ic/cd180.h
index ae46a4809b688..118e1f1b912ef 100644
--- a/sys/dev/ic/cd180.h
+++ b/sys/dev/ic/cd180.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/cd180.h,v 1.5 2005/01/06 01:42:44 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index b8f903782395b..7b256b5432e9b 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/esp.h,v 1.6 2001/06/10 04:20:37 nyan Exp $
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index 3399e0a0de576..f99633c35cdcd 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/hd64570.h,v 1.7 2005/01/06 01:42:44 imp Exp $
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index 5d4b3f4c8ffcc..3f6c74bc2cec8 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8237.h,v 1.10 2005/05/14 10:14:56 nyan Exp $
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i8251.h b/sys/dev/ic/i8251.h
index fab1ea4378696..1f4f844d32e7e 100644
--- a/sys/dev/ic/i8251.h
+++ b/sys/dev/ic/i8251.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8251.h,v 1.2 2004/04/07 20:45:57 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h
index d41d3b2af0a63..ac32ecc2d7464 100644
--- a/sys/dev/ic/i8253reg.h
+++ b/sys/dev/ic/i8253reg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8253reg.h,v 1.2 2005/05/14 10:26:31 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index d594730a0dd5b..ac6e2af5509cb 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i82586.h,v 1.11 2003/03/28 06:27:07 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ic/i8259.h b/sys/dev/ic/i8259.h
index 239384c555aee..16411922a86f1 100644
--- a/sys/dev/ic/i8259.h
+++ b/sys/dev/ic/i8259.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/i8259.h,v 1.2 2005/10/23 09:05:51 glebius Exp $
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 62ad0cdc5b9b8..fa05fbf1173f0 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/nec765.h,v 1.13 2006/09/08 21:46:00 jkim Exp $
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index 0400f2babdd2b..461636735427a 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.17 2006/05/23 00:41:12 benno Exp $
  */
 
 /*
diff --git a/sys/dev/ic/rsa.h b/sys/dev/ic/rsa.h
index 6f9376af2f233..b6535d05f1bbe 100644
--- a/sys/dev/ic/rsa.h
+++ b/sys/dev/ic/rsa.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/rsa.h,v 1.1 2001/06/10 04:28:38 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ic/sab82532.h b/sys/dev/ic/sab82532.h
index e570c6a9ae5fb..b36491e379917 100644
--- a/sys/dev/ic/sab82532.h
+++ b/sys/dev/ic/sab82532.h
@@ -34,7 +34,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/sab82532.h,v 1.3 2005/01/06 01:42:44 imp Exp $
  */
 
 #ifndef _DEV_IC_SAB82532_H_
diff --git a/sys/dev/ic/via6522reg.h b/sys/dev/ic/via6522reg.h
index 6e309c7f48c65..10dc38c276c9c 100644
--- a/sys/dev/ic/via6522reg.h
+++ b/sys/dev/ic/via6522reg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/via6522reg.h,v 1.1 2005/12/02 22:36:14 grehan Exp $
  */
 
 #ifndef _VIA6522REG_H_
diff --git a/sys/dev/ic/wd33c93reg.h b/sys/dev/ic/wd33c93reg.h
index 8e536cd1d32da..e67676bbdd98d 100644
--- a/sys/dev/ic/wd33c93reg.h
+++ b/sys/dev/ic/wd33c93reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ic/wd33c93reg.h,v 1.2 2005/01/06 01:42:44 imp Exp $ */
 /*	$NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $	*/
 /*	$NetBSD$	*/
 /*-
diff --git a/sys/dev/ic/z8530.h b/sys/dev/ic/z8530.h
index 2466d1c9198f1..a1cdae9b201d9 100644
--- a/sys/dev/ic/z8530.h
+++ b/sys/dev/ic/z8530.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ic/z8530.h,v 1.4 2006/02/24 02:03:35 marcel Exp $
  */
 
 #ifndef _DEV_IC_Z8530_H_
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 9c60df7302fc7..166ba5b56933a 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.18 2007/02/23 12:18:43 piso Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index e102f1fa1bddb..b84d899aac8dc 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.19.2.1 2007/12/02 08:42:15 remko Exp $");
 
 /*
  * Support for the SMBus controller logical device which is part of the
diff --git a/sys/dev/ichsmb/ichsmb_reg.h b/sys/dev/ichsmb/ichsmb_reg.h
index a031607f4fdcf..c64eb2f4e7cd2 100644
--- a/sys/dev/ichsmb/ichsmb_reg.h
+++ b/sys/dev/ichsmb/ichsmb_reg.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_reg.h,v 1.2 2005/01/06 01:42:45 imp Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_REG_H_
diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h
index a7d0dcb234f92..87bdeb1354bb1 100644
--- a/sys/dev/ichsmb/ichsmb_var.h
+++ b/sys/dev/ichsmb/ichsmb_var.h
@@ -35,7 +35,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichsmb/ichsmb_var.h,v 1.4 2005/06/10 16:12:43 takawata Exp $
  */
 
 #ifndef _DEV_ICHSMB_ICHSMB_VAR_H
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 19b9e3b2b7d47..54f0ae4405243 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.10.2.1 2007/11/26 18:21:42 jfv Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index ca1a15cf9accc..ef1b54603f07e 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.4.2.1 2007/11/26 18:21:42 jfv Exp $
  */
 
 #ifndef _ICHWD_H_
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 663b816a71d88..deaad0cbc8a08 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida.c,v 1.42 2005/05/29 04:42:20 nyan Exp $");
 
 /*
  * Generic driver for Compaq SMART RAID adapters.
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 2446dddbe1856..3512b6d72252c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/ida_disk.c,v 1.46 2005/05/29 04:42:20 nyan Exp $
  */
 
 /*
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index c1a0b4024ae7b..b25c957332a3c 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida_eisa.c,v 1.20 2007/02/23 12:18:43 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index c33e23591954c..1c32c6120f90e 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.35 2007/02/23 12:18:43 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ida/idaio.h b/sys/dev/ida/idaio.h
index b30f2eae1ac7a..652833db1df6e 100644
--- a/sys/dev/ida/idaio.h
+++ b/sys/dev/ida/idaio.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idaio.h,v 1.1 2004/01/15 06:37:52 mdodd Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index a25a768c564e6..7c072eb0ddd18 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idareg.h,v 1.10 2005/04/13 05:09:49 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 9666b0e80e732..088ee731b2367 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ida/idavar.h,v 1.17 2005/04/13 05:06:57 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 00a9e75c7d8e5..3d4e49570cd34 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt.c,v 1.12 2006/05/16 14:36:26 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idt_harp.c b/sys/dev/idt/idt_harp.c
index 84e52eb7b0710..db955ee05f04c 100644
--- a/sys/dev/idt/idt_harp.c
+++ b/sys/dev/idt/idt_harp.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt_harp.c,v 1.8 2005/05/29 04:42:21 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c
index 07c061df2427b..e27fb8bd237d1 100644
--- a/sys/dev/idt/idt_pci.c
+++ b/sys/dev/idt/idt_pci.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/idt/idt_pci.c,v 1.8 2007/02/23 12:18:43 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/idt/idtreg.h b/sys/dev/idt/idtreg.h
index ba433b4dbb34a..972b8bb612161 100644
--- a/sys/dev/idt/idtreg.h
+++ b/sys/dev/idt/idtreg.h
@@ -37,7 +37,7 @@
  *
  ******************************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/idt/idtreg.h,v 1.3 2007/01/09 04:26:51 imp Exp $
  */
 
 #define	IDT_VERSION	"IDT 1.101"
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index b98ee1af2dad9..ce054b28e1a64 100644
--- a/sys/dev/idt/idtvar.h
+++ b/sys/dev/idt/idtvar.h
@@ -47,7 +47,7 @@
  *
  ******************************************************************************
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/idt/idtvar.h,v 1.3 2005/01/06 01:42:46 imp Exp $
  */
 
 /*******************************************************************************
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index bc57da374f10c..175b337ed2a1b 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.106 2005/11/11 16:04:52 ru Exp $");
 
 /*
  * Intel 82586 Ethernet chip
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 7bcc500aa61d2..5eeff15d30471 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ie507.h,v 1.5 2003/03/28 06:27:08 mdodd Exp $
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index 0b80fb60df130..6a1289946f3cd 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie_isa.c,v 1.7 2007/02/23 12:18:43 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ie/if_iee16.h b/sys/dev/ie/if_iee16.h
index 1196676cfed27..4b2d869dc91da 100644
--- a/sys/dev/ie/if_iee16.h
+++ b/sys/dev/ie/if_iee16.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_iee16.h,v 1.4 2005/01/06 01:42:46 imp Exp $
  */
 
 /*
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index d3b0f228f9574..2808fe2bf6f01 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_iereg.h,v 1.6 2003/03/29 13:36:41 mdodd Exp $
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/ie/if_ievar.h b/sys/dev/ie/if_ievar.h
index 2d3851f9cdf2d..a1ca3bb87572a 100644
--- a/sys/dev/ie/if_ievar.h
+++ b/sys/dev/ie/if_ievar.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ie/if_ievar.h,v 1.3 2005/06/10 16:49:10 brooks Exp $
  */
 
 enum ie_hardware {
diff --git a/sys/dev/ieee488/ibfoo.c b/sys/dev/ieee488/ibfoo.c
index 537443dbf0916..ef1870a3d1fcd 100644
--- a/sys/dev/ieee488/ibfoo.c
+++ b/sys/dev/ieee488/ibfoo.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/ibfoo.c,v 1.5 2005/03/07 11:05:46 phk Exp $");
 
 #  define	IBDEBUG
 #  undef	IBDEBUG
diff --git a/sys/dev/ieee488/ibfoo_int.h b/sys/dev/ieee488/ibfoo_int.h
index 28f72897a9dfe..be08ee021816b 100644
--- a/sys/dev/ieee488/ibfoo_int.h
+++ b/sys/dev/ieee488/ibfoo_int.h
@@ -26,7 +26,7 @@
  * This file defines the ABI between the userland gpib library and the
  * kernel.  This file should not be used anywhere else.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/ibfoo_int.h,v 1.2 2005/02/12 21:07:09 phk Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/ieee488/pcii.c b/sys/dev/ieee488/pcii.c
index 7e5e23ec0a059..eca89ec06ec8a 100644
--- a/sys/dev/ieee488/pcii.c
+++ b/sys/dev/ieee488/pcii.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/pcii.c,v 1.8 2007/02/23 19:30:55 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ieee488/tnt4882.c b/sys/dev/ieee488/tnt4882.c
index 1f21731809c78..3e9550dbb52c1 100644
--- a/sys/dev/ieee488/tnt4882.c
+++ b/sys/dev/ieee488/tnt4882.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/tnt4882.c,v 1.3 2007/02/23 19:30:55 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ieee488/ugpib.h b/sys/dev/ieee488/ugpib.h
index 726a70219dd8e..42a1f26a25b33 100644
--- a/sys/dev/ieee488/ugpib.h
+++ b/sys/dev/ieee488/ugpib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/ugpib.h,v 1.5 2005/02/12 23:52:44 phk Exp $
  *
  */
 
diff --git a/sys/dev/ieee488/upd7210.c b/sys/dev/ieee488/upd7210.c
index c014f9fcc81e4..b6bd7406f7051 100644
--- a/sys/dev/ieee488/upd7210.c
+++ b/sys/dev/ieee488/upd7210.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.10 2006/03/11 15:39:22 phk Exp $");
 
 #  define	GPIB_DEBUG
 #  undef	GPIB_DEBUG
diff --git a/sys/dev/ieee488/upd7210.h b/sys/dev/ieee488/upd7210.h
index da1032c311ba8..03ce88bb444dd 100644
--- a/sys/dev/ieee488/upd7210.h
+++ b/sys/dev/ieee488/upd7210.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ieee488/upd7210.h,v 1.6 2005/09/24 20:44:55 phk Exp $
  *
  * Locating an actual µPD7210 data book has proven quite impossible for me.
  * There are a fair number of newer chips which are supersets of the µPD7210
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 0ecf4a4082369..443e0b7b93242 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.124.2.1 2007/12/05 02:53:44 thompsa Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 4eab5d917d24a..20946429c591c 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.14 2007/04/06 11:21:01 pjd Exp $");
 
 #include <sys/ctype.h>
 #include <sys/param.h>
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index e54cb618fce4a..cb7eeaf6051a5 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.17 2005/05/08 23:19:20 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index 3fdc0ac5ba903..84b18af5a0310 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.9 2007/06/18 22:24:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index f4382c6dfce6b..bf3795f093419 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.27 2007/07/12 02:54:05 thompsa Exp $
  */
 
 #define NDIS_DEFAULT_NODENAME	"FreeBSD NDIS node"
diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/ad7418.c
index ec68fc1974352..6d6be2544a89f 100644
--- a/sys/dev/iicbus/ad7418.c
+++ b/sys/dev/iicbus/ad7418.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/ad7418.c,v 1.1 2006/11/19 23:39:54 sam Exp $");
 /*
  * Analog Devices AD7418 chip sitting on the I2C bus.
  */
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/ds1672.c
index be622246a8fc9..d23777003751f 100644
--- a/sys/dev/iicbus/ds1672.c
+++ b/sys/dev/iicbus/ds1672.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/ds1672.c,v 1.1 2006/11/19 23:40:58 sam Exp $");
 /*
  * Dallas Semiconductor DS1672 RTC sitting on the I2C bus.
  */
diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c
index 03de150702b5b..a65becb722763 100644
--- a/sys/dev/iicbus/icee.c
+++ b/sys/dev/iicbus/icee.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/icee.c,v 1.2 2007/04/17 05:48:35 imp Exp $");
 /*
  * Generic IIC eeprom support, modeled after the AT24C family of products.
  */
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index beca6019f0a86..45deea14bb0a6 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.26 2006/08/21 17:32:50 imp Exp $");
 
 /*
  * I2C bus IP driver
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 57b0717384306..055af057a1261 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.39 2007/03/23 23:08:28 imp Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 471f9768d2a61..3faa6289c980f 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iic.h,v 1.5 2006/11/28 06:51:36 imp Exp $
  *
  */
 #ifndef __IIC_H
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index ac10ceed28651..956f7a6e540e2 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.19 2007/03/23 23:03:54 imp Exp $");
 
 /*
  * Generic I2C bit-banging code
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index 7d10fe748b22d..bf9e2480f5c29 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbb_if.m,v 1.6 2005/01/06 01:42:47 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 8594b8d46c608..3e464c0f96358 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.24 2007/03/23 23:08:28 imp Exp $");
 
 /*
  * Autoconfiguration and support routines for the Philips serial I2C bus
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 55f3b937aa4ed..a167ae3a38de7 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicbus.h,v 1.7 2007/03/23 23:02:33 imp Exp $
  *
  */
 #ifndef __IICBUS_H
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index c57fac584216c..22b09ceaaf7dc 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/iicbus/iicbus_if.m,v 1.8 2006/12/05 06:19:36 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 7401820bdfa39..8cf1d740025c0 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.17 2007/03/23 23:03:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 092ba8de065ec..853ef8ccde2ef 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iiconf.h,v 1.11 2006/12/05 06:19:36 imp Exp $
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 0788184c16f29..16c9520c8a939 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.14 2006/09/11 20:52:41 jhb Exp $
  *
  */
 
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 34a801c211c5b..ef1bd0aad5345 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.19 2007/06/17 05:55:50 scottl Exp $");
 
 #define _IIR_C_
 
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index dca493d6b844c..c8debc0a86da5 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/iir/iir.h,v 1.16 2007/06/17 05:55:50 scottl Exp $ */
 /*-
  *       Copyright (c) 2000-04 ICP vortex GmbH
  *       Copyright (c) 2002-04 Intel Corporation
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 206b6ffb42081..bfd22133bbff7 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.17 2005/05/06 02:32:34 cperciva Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index 528b7d71ef951..99f7b129cab48 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -31,7 +31,7 @@
 
 #ident "$Id: iir_pci.c 1.2 2003/08/26 12:29:55 achim Exp $"
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.20 2007/06/17 05:55:50 scottl Exp $");
 
 /*
  *  iir_pci.c:  PCI Bus Attachment for Intel Integrated RAID Controller driver
diff --git a/sys/dev/io/iodev.c b/sys/dev/io/iodev.c
index 33f6c1d099b9c..92bfed947b8d3 100644
--- a/sys/dev/io/iodev.c
+++ b/sys/dev/io/iodev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/io/iodev.c,v 1.2 2004/08/02 20:42:28 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
index d42aedc7efabb..95c7e73e0d301 100644
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.10 2007/03/27 21:03:36 n_hibma Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_acpi.c b/sys/dev/ipmi/ipmi_acpi.c
index e2518ebfcc0ea..3f4c08db3d0e8 100644
--- a/sys/dev/ipmi/ipmi_acpi.c
+++ b/sys/dev/ipmi/ipmi_acpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_acpi.c,v 1.1 2006/09/22 22:11:29 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_isa.c b/sys/dev/ipmi/ipmi_isa.c
index 9d3f9f34c2f28..f801632214fcd 100644
--- a/sys/dev/ipmi/ipmi_isa.c
+++ b/sys/dev/ipmi/ipmi_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_isa.c,v 1.2 2007/07/16 17:03:48 ambrisko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_kcs.c b/sys/dev/ipmi/ipmi_kcs.c
index 8ad606e9b5ae6..c9dca3e7efb28 100644
--- a/sys/dev/ipmi/ipmi_kcs.c
+++ b/sys/dev/ipmi/ipmi_kcs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_kcs.c,v 1.1 2006/09/22 22:11:29 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_pci.c b/sys/dev/ipmi/ipmi_pci.c
index e3225f19ffd85..b8f70a9a0bc49 100644
--- a/sys/dev/ipmi/ipmi_pci.c
+++ b/sys/dev/ipmi/ipmi_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.4 2007/03/31 21:39:02 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c
index d9fcff80540c0..840583eeb6876 100644
--- a/sys/dev/ipmi/ipmi_smbios.c
+++ b/sys/dev/ipmi/ipmi_smbios.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_smbios.c,v 1.4 2007/05/02 18:43:51 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_smbus.c b/sys/dev/ipmi/ipmi_smbus.c
index 3798a628d26f7..06cf22228ee34 100644
--- a/sys/dev/ipmi/ipmi_smbus.c
+++ b/sys/dev/ipmi/ipmi_smbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_smbus.c,v 1.1 2006/09/22 22:11:29 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_smic.c b/sys/dev/ipmi/ipmi_smic.c
index c1c69b3923cd1..c798e40265e59 100644
--- a/sys/dev/ipmi/ipmi_smic.c
+++ b/sys/dev/ipmi/ipmi_smic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_smic.c,v 1.4 2006/10/05 15:38:59 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmi_ssif.c b/sys/dev/ipmi/ipmi_ssif.c
index 78ad64394d39c..d9f9a409ce403 100644
--- a/sys/dev/ipmi/ipmi_ssif.c
+++ b/sys/dev/ipmi/ipmi_ssif.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_ssif.c,v 1.2 2007/02/27 17:23:28 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ipmi/ipmivars.h b/sys/dev/ipmi/ipmivars.h
index c56fb88c38497..3178160c2c942 100644
--- a/sys/dev/ipmi/ipmivars.h
+++ b/sys/dev/ipmi/ipmivars.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ipmi/ipmivars.h,v 1.2 2006/09/22 22:11:29 jhb Exp $
  */
 
 #ifndef __IPMIVARS_H__
diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c
index 1f150420936ef..3807133f347ab 100644
--- a/sys/dev/ips/ips.c
+++ b/sys/dev/ips/ips.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.21 2006/10/05 07:28:43 maxim Exp $");
 
 #include <dev/ips/ipsreg.h>
 #include <dev/ips/ips.h>
diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index 1b32164d90659..6b28bfe424ee7 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ips.h,v 1.17 2006/08/17 22:50:32 imp Exp $
  */
 #ifndef _IPS_H
 #define _IPS_H
diff --git a/sys/dev/ips/ips_commands.c b/sys/dev/ips/ips_commands.c
index 151c0022a3095..969c8299aef92 100644
--- a/sys/dev/ips/ips_commands.c
+++ b/sys/dev/ips/ips_commands.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.16 2005/11/29 09:39:41 scottl Exp $");
 
 #include <dev/ips/ipsreg.h>
 #include <dev/ips/ips.h>
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 9e2fd5c253523..a2b4b8142a442 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_disk.c,v 1.10 2005/11/29 09:39:41 scottl Exp $");
 
 #include <dev/ips/ipsreg.h>
 #include <dev/ips/ips.h>
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index b841eeaeea2fb..c98f811ebf745 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ips_disk.h,v 1.4 2005/05/29 04:42:21 nyan Exp $
  */
 
 
diff --git a/sys/dev/ips/ips_ioctl.c b/sys/dev/ips/ips_ioctl.c
index ea076703237cb..d19ec326c1578 100644
--- a/sys/dev/ips/ips_ioctl.c
+++ b/sys/dev/ips/ips_ioctl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_ioctl.c,v 1.8 2005/11/29 09:39:41 scottl Exp $");
 
 #include <dev/ips/ipsreg.h>
 #include <dev/ips/ips.h>
diff --git a/sys/dev/ips/ips_ioctl.h b/sys/dev/ips/ips_ioctl.h
index ea76ed501fac4..654768cf3a058 100644
--- a/sys/dev/ips/ips_ioctl.h
+++ b/sys/dev/ips/ips_ioctl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ips_ioctl.h,v 1.2 2006/01/03 23:03:39 scottl Exp $
  */
 
 #ifndef _IPS_IOCTL_H
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index 9ccaf373b3e22..af1ef9b4a1ea6 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.15 2007/02/23 12:18:44 piso Exp $");
 
 #include <dev/ips/ipsreg.h>
 #include <dev/ips/ips.h>
diff --git a/sys/dev/ips/ipsreg.h b/sys/dev/ips/ipsreg.h
index ed282574ab8f2..9cdc38e0ea62b 100644
--- a/sys/dev/ips/ipsreg.h
+++ b/sys/dev/ips/ipsreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ips/ipsreg.h,v 1.3 2006/10/05 07:28:43 maxim Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index 66d7b4fac7e56..a278e42466f95 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.30.2.2 2007/12/06 09:52:28 philip Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.30.2.2 2007/12/06 09:52:28 philip Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2100 MiniPCI driver
diff --git a/sys/dev/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h
index b300e13492cae..cc20c1db41cdb 100644
--- a/sys/dev/ipw/if_ipwreg.h
+++ b/sys/dev/ipw/if_ipwreg.h
@@ -1,4 +1,4 @@
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/ipw/if_ipwreg.h,v 1.2.2.1 2007/10/18 01:32:58 thompsa Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index f6ec999a52915..8db732c4d7da3 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -1,4 +1,4 @@
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/ipw/if_ipwvar.h,v 1.6.2.1 2007/10/18 01:32:58 thompsa Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
diff --git a/sys/dev/iscsi/initiator/isc_cam.c b/sys/dev/iscsi/initiator/isc_cam.c
index ed0b74af895f5..0b01f8752c871 100644
--- a/sys/dev/iscsi/initiator/isc_cam.c
+++ b/sys/dev/iscsi/initiator/isc_cam.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/isc_cam.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
 
 #include "opt_iscsi_initiator.h"
 
diff --git a/sys/dev/iscsi/initiator/isc_sm.c b/sys/dev/iscsi/initiator/isc_sm.c
index c767477fe6392..055cd0c92825b 100644
--- a/sys/dev/iscsi/initiator/isc_sm.c
+++ b/sys/dev/iscsi/initiator/isc_sm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/isc_sm.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
 
 #include "opt_iscsi_initiator.h"
 
diff --git a/sys/dev/iscsi/initiator/isc_soc.c b/sys/dev/iscsi/initiator/isc_soc.c
index 49d530df89be5..6f388a19b7411 100644
--- a/sys/dev/iscsi/initiator/isc_soc.c
+++ b/sys/dev/iscsi/initiator/isc_soc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/isc_soc.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
 
 #include "opt_iscsi_initiator.h"
 
diff --git a/sys/dev/iscsi/initiator/isc_subr.c b/sys/dev/iscsi/initiator/isc_subr.c
index 333ee7294d2eb..7e36e7732aef5 100644
--- a/sys/dev/iscsi/initiator/isc_subr.c
+++ b/sys/dev/iscsi/initiator/isc_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/isc_subr.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
 
 #include "opt_iscsi_initiator.h"
 
diff --git a/sys/dev/iscsi/initiator/iscsi.c b/sys/dev/iscsi/initiator/iscsi.c
index 4bd4ed2a14f3b..8fdcfffc10875 100644
--- a/sys/dev/iscsi/initiator/iscsi.c
+++ b/sys/dev/iscsi/initiator/iscsi.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/iscsi.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
 
 #include "opt_iscsi_initiator.h"
 
diff --git a/sys/dev/iscsi/initiator/iscsi.h b/sys/dev/iscsi/initiator/iscsi.h
index cbd9f224c98dc..9b918f80a9a84 100644
--- a/sys/dev/iscsi/initiator/iscsi.h
+++ b/sys/dev/iscsi/initiator/iscsi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iscsi/initiator/iscsi.h,v 1.1 2007/07/24 15:35:02 scottl Exp $
  */
 /*
  | $Id: iscsi.h,v 1.17 2006/12/01 09:10:17 danny Exp danny $
diff --git a/sys/dev/iscsi/initiator/iscsi_subr.c b/sys/dev/iscsi/initiator/iscsi_subr.c
index 6abe1f671dcfb..6a45e9ebafcee 100644
--- a/sys/dev/iscsi/initiator/iscsi_subr.c
+++ b/sys/dev/iscsi/initiator/iscsi_subr.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/iscsi_subr.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
 
 #include "opt_iscsi_initiator.h"
 
diff --git a/sys/dev/iscsi/initiator/iscsivar.h b/sys/dev/iscsi/initiator/iscsivar.h
index fa54b190f3274..6fee5e007b5ba 100644
--- a/sys/dev/iscsi/initiator/iscsivar.h
+++ b/sys/dev/iscsi/initiator/iscsivar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/iscsi/initiator/iscsivar.h,v 1.1 2007/07/24 15:35:02 scottl Exp $
  */
 /*
  | $Id: iscsivar.h,v 1.30 2007/04/22 10:12:11 danny Exp danny $
diff --git a/sys/dev/isp/DriverManual.txt b/sys/dev/isp/DriverManual.txt
index ea1968f9f8830..fc35af47d07ac 100644
--- a/sys/dev/isp/DriverManual.txt
+++ b/sys/dev/isp/DriverManual.txt
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/DriverManual.txt,v 1.1 2001/10/07 18:26:47 mjacob Exp $ */
 
 		Driver Theory of Operation Manual
 
diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt
index 75f01bf7dd36a..00593d82aa385 100644
--- a/sys/dev/isp/Hardware.txt
+++ b/sys/dev/isp/Hardware.txt
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/Hardware.txt,v 1.2 2003/01/01 18:48:50 schweikh Exp $ */
 
 	Hardware that is Known To or Should Work with This Driver
 
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index e22b7bfc0e192..3faf4c70cb773 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD$");
 #endif
 #ifdef	__FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.149 2007/07/10 07:55:04 mjacob Exp $");
 #include <dev/isp/isp_freebsd.h>
 #endif
 #ifdef	__OpenBSD__
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 4ff2f5f34352d..829c21648930f 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -28,7 +28,7 @@
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.146 2007/08/23 15:57:13 jkim Exp $");
 #include <dev/isp/isp_freebsd.h>
 #include <sys/unistd.h>
 #include <sys/kthread.h>
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index b18f0dc9abcc8..8cd35fbba86f2 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.107 2007/08/28 00:09:12 jkim Exp $ */
 /*-
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
  *
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index b52c6f1962855..a27e201d1fe3b 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_ioctl.h,v 1.20 2007/06/11 19:15:49 mjacob Exp $ */
 /*-
  * Copyright (c) 1997-2006 by Matthew Jacob
  * All rights reserved.
diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c
index 1d6e6ee8b277f..b8bdda847a582 100644
--- a/sys/dev/isp/isp_library.c
+++ b/sys/dev/isp/isp_library.c
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD$");
 #endif
 #ifdef	__FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.14 2007/07/02 20:08:20 mjacob Exp $");
 #include <dev/isp/isp_freebsd.h>
 #endif
 #ifdef	__OpenBSD__
diff --git a/sys/dev/isp/isp_library.h b/sys/dev/isp/isp_library.h
index a614bb658fe8b..8f4640d4bad19 100644
--- a/sys/dev/isp/isp_library.h
+++ b/sys/dev/isp/isp_library.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.8 2007/04/02 01:04:20 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 526337ccd7a29..fd939a3056955 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -28,7 +28,7 @@
  * FreeBSD Version.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.148 2007/06/26 23:08:57 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 839d7eb5f4614..1dcbbfb1fde87 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.35.4.1 2008/01/27 15:44:37 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/isp/isp_stds.h b/sys/dev/isp/isp_stds.h
index 42bffd98c74c7..1c996b83ef7b0 100644
--- a/sys/dev/isp/isp_stds.h
+++ b/sys/dev/isp/isp_stds.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_stds.h,v 1.4 2007/03/10 02:39:54 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index 9ad79abc675f9..faba36cc70346 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -40,7 +40,7 @@
 #endif
 #ifdef	__FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_target.c,v 1.44 2007/03/10 02:39:54 mjacob Exp $");
 #include <dev/isp/isp_freebsd.h>
 #endif
 #ifdef	__OpenBSD__
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index e57df6cc35492..9838cecfdce32 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.30 2007/03/10 02:39:54 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index b16440b0748e6..17a27984c19df 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.19 2007/05/05 20:17:23 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 272d74e8650c2..0d950d4f992d5 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.59 2007/03/10 02:39:54 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index ee0e154da32a9..96d79d6b1115c 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispreg.h,v 1.29 2007/03/10 02:39:54 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 96c8b067ac219..9a8bfedc662bd 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.85 2007/07/02 20:08:20 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
diff --git a/sys/dev/ispfw/asm_1000.h b/sys/dev/ispfw/asm_1000.h
index fb064094d30bf..52a41632c2d4f 100644
--- a/sys/dev/ispfw/asm_1000.h
+++ b/sys/dev/ispfw/asm_1000.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1000.h,v 1.2 2005/01/06 01:42:49 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1040.h b/sys/dev/ispfw/asm_1040.h
index 3be21f1f60362..959400611062e 100644
--- a/sys/dev/ispfw/asm_1040.h
+++ b/sys/dev/ispfw/asm_1040.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1040.h,v 1.5 2006/07/09 17:50:17 mjacob Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_1080.h b/sys/dev/ispfw/asm_1080.h
index 8f4664c59368c..668b6f1ffd080 100644
--- a/sys/dev/ispfw/asm_1080.h
+++ b/sys/dev/ispfw/asm_1080.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_1080.h,v 1.4 2006/07/09 17:50:17 mjacob Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_12160.h b/sys/dev/ispfw/asm_12160.h
index 4f5fbd02a7530..9182ee7e06dde 100644
--- a/sys/dev/ispfw/asm_12160.h
+++ b/sys/dev/ispfw/asm_12160.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_12160.h,v 1.7 2006/07/09 17:50:17 mjacob Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2100.h b/sys/dev/ispfw/asm_2100.h
index 399707d575438..e7fe40bcd829c 100644
--- a/sys/dev/ispfw/asm_2100.h
+++ b/sys/dev/ispfw/asm_2100.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2100.h,v 1.6 2005/01/06 01:42:50 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2200.h b/sys/dev/ispfw/asm_2200.h
index 3d92bf7c99e43..5faba6e14da54 100644
--- a/sys/dev/ispfw/asm_2200.h
+++ b/sys/dev/ispfw/asm_2200.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2200.h,v 1.7 2005/01/06 01:42:50 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2300.h b/sys/dev/ispfw/asm_2300.h
index d1641c929288c..43010ba250c82 100644
--- a/sys/dev/ispfw/asm_2300.h
+++ b/sys/dev/ispfw/asm_2300.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2300.h,v 1.10 2006/11/02 03:23:01 mjacob Exp $ */
 /*-
  * Copyright (C) 2001, 2002, 2003, 2004, 2005 by Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2322.h b/sys/dev/ispfw/asm_2322.h
index 18b60612d78b0..c3a9e732d23e2 100644
--- a/sys/dev/ispfw/asm_2322.h
+++ b/sys/dev/ispfw/asm_2322.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2322.h,v 1.1 2006/07/03 08:22:09 mjacob Exp $ */
 /*-
  * Copyright (C) 2004-2005 by Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/asm_2400.h b/sys/dev/ispfw/asm_2400.h
index 8f62917e42ea8..c80ecf00261d5 100644
--- a/sys/dev/ispfw/asm_2400.h
+++ b/sys/dev/ispfw/asm_2400.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2400.h,v 1.1 2006/08/26 18:39:18 mjacob Exp $ */
 /*-
  * Copyright (C) 2005-2006 by Qlogic, Inc.
  * All rights reserved.
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index eb19cba1c7445..a25e4b2baafd8 100644
--- a/sys/dev/ispfw/ispfw.c
+++ b/sys/dev/ispfw/ispfw.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.19 2006/12/10 03:42:57 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index f3eae30db1722..48c0203efe0aa 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.57.2.1 2007/12/06 09:50:48 philip Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
diff --git a/sys/dev/iwi/if_iwireg.h b/sys/dev/iwi/if_iwireg.h
index fb56fa59bbffe..3947548095cc6 100644
--- a/sys/dev/iwi/if_iwireg.h
+++ b/sys/dev/iwi/if_iwireg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.15 2007/06/11 03:36:51 sam Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
diff --git a/sys/dev/iwi/if_iwivar.h b/sys/dev/iwi/if_iwivar.h
index fca0b7aaaf7c5..dc9d054ff18c0 100644
--- a/sys/dev/iwi/if_iwivar.h
+++ b/sys/dev/iwi/if_iwivar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/iwi/if_iwivar.h,v 1.16 2007/06/11 10:56:06 thompsa Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005
diff --git a/sys/dev/ixgb/LICENSE b/sys/dev/ixgb/LICENSE
index 5017645146967..333a0fce99501 100644
--- a/sys/dev/ixgb/LICENSE
+++ b/sys/dev/ixgb/LICENSE
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/LICENSE,v 1.2 2005/01/06 01:42:53 imp Exp $*/
 /*-
 
 Copyright (c) 2001-2004, Intel Corporation
diff --git a/sys/dev/ixgb/README b/sys/dev/ixgb/README
index 1508eac95c442..1354dede9fe6d 100644
--- a/sys/dev/ixgb/README
+++ b/sys/dev/ixgb/README
@@ -1,4 +1,4 @@
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/README,v 1.2 2005/10/01 18:56:17 glebius Exp $*/
 FreeBSD Driver for Intel(R) PRO/10GbE Server Adapters
 =====================================================
 
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index c1d68582479aa..3c7e65e2d59f7 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.22 2007/03/04 03:38:07 csjp Exp $*/
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index c2f0acffee836..e4aa0a455665e 100644
--- a/sys/dev/ixgb/if_ixgb.h
+++ b/sys/dev/ixgb/if_ixgb.h
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.h,v 1.9 2006/05/16 14:36:27 phk Exp $*/
 
 #ifndef _IXGB_H_DEFINED_
 #define _IXGB_H_DEFINED_
diff --git a/sys/dev/ixgb/if_ixgb_osdep.h b/sys/dev/ixgb/if_ixgb_osdep.h
index e8ce885525bb7..d39562901de5a 100644
--- a/sys/dev/ixgb/if_ixgb_osdep.h
+++ b/sys/dev/ixgb/if_ixgb_osdep.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/if_ixgb_osdep.h,v 1.4 2006/05/16 14:36:27 phk Exp $*/
 
 #ifndef _FREEBSD_OS_H_
 #define _FREEBSD_OS_H_
diff --git a/sys/dev/ixgb/ixgb_ee.c b/sys/dev/ixgb/ixgb_ee.c
index 861a99a139972..c7ec7b729fb22 100644
--- a/sys/dev/ixgb/ixgb_ee.c
+++ b/sys/dev/ixgb/ixgb_ee.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ee.c,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 #include <dev/ixgb/ixgb_hw.h> 
 #include <dev/ixgb/ixgb_ee.h> 
diff --git a/sys/dev/ixgb/ixgb_ee.h b/sys/dev/ixgb/ixgb_ee.h
index 6a1163aab61bf..d30667aa72e8d 100644
--- a/sys/dev/ixgb/ixgb_ee.h
+++ b/sys/dev/ixgb/ixgb_ee.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ee.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 #ifndef _IXGB_EE_H_
 #define _IXGB_EE_H_
 
diff --git a/sys/dev/ixgb/ixgb_hw.c b/sys/dev/ixgb/ixgb_hw.c
index 23b0b2846e593..131c9d685f79a 100644
--- a/sys/dev/ixgb/ixgb_hw.c
+++ b/sys/dev/ixgb/ixgb_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_hw.c,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 /* ixgb_hw.c
  * Shared functions for accessing and configuring the adapter
diff --git a/sys/dev/ixgb/ixgb_hw.h b/sys/dev/ixgb/ixgb_hw.h
index 2194544e04ee4..88c13bbe55e7f 100644
--- a/sys/dev/ixgb/ixgb_hw.h
+++ b/sys/dev/ixgb/ixgb_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_hw.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 #ifndef _IXGB_HW_H_
 #define _IXGB_HW_H_
 
diff --git a/sys/dev/ixgb/ixgb_ids.h b/sys/dev/ixgb/ixgb_ids.h
index a224f6300fa20..d33ba85719be9 100644
--- a/sys/dev/ixgb/ixgb_ids.h
+++ b/sys/dev/ixgb/ixgb_ids.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/ixgb/ixgb_ids.h,v 1.1 2004/05/28 00:22:59 tackerman Exp $*/
 
 #ifndef _IXGB_IDS_H_
 #define _IXGB_IDS_H_
diff --git a/sys/dev/ixgbe/LICENSE b/sys/dev/ixgbe/LICENSE
index ab2250974614f..6a5e187a11172 100644
--- a/sys/dev/ixgbe/LICENSE
+++ b/sys/dev/ixgbe/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/ixgbe/LICENSE,v 1.1 2007/07/11 23:03:16 jfv Exp $
 
   Copyright (c) 2001-2007, Intel Corporation 
   All rights reserved.
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index e498e07c057c3..10412bfbf1581 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.4.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 707c86cab4516..e71c1ea3e7c55 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe.h,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifndef _IXGBE_H_
 #define _IXGBE_H_
diff --git a/sys/dev/ixgbe/ixgbe_82598.c b/sys/dev/ixgbe/ixgbe_82598.c
index e777326737040..0ded302b21776 100644
--- a/sys/dev/ixgbe/ixgbe_82598.c
+++ b/sys/dev/ixgbe/ixgbe_82598.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_82598.c,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #include "ixgbe_type.h"
 #include "ixgbe_api.h"
diff --git a/sys/dev/ixgbe/ixgbe_api.c b/sys/dev/ixgbe/ixgbe_api.c
index 529f4adf1b050..4f76057b6134b 100644
--- a/sys/dev/ixgbe/ixgbe_api.c
+++ b/sys/dev/ixgbe/ixgbe_api.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_api.c,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
diff --git a/sys/dev/ixgbe/ixgbe_api.h b/sys/dev/ixgbe/ixgbe_api.h
index 340ae956ebd60..a6a8fea44bc5a 100644
--- a/sys/dev/ixgbe/ixgbe_api.h
+++ b/sys/dev/ixgbe/ixgbe_api.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_api.h,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifndef _IXGBE_API_H_
 #define _IXGBE_API_H_
diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c
index c2db336c1c355..b872e7dabd44b 100644
--- a/sys/dev/ixgbe/ixgbe_common.c
+++ b/sys/dev/ixgbe/ixgbe_common.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_common.c,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #include "ixgbe_common.h"
 #include "ixgbe_api.h"
diff --git a/sys/dev/ixgbe/ixgbe_common.h b/sys/dev/ixgbe/ixgbe_common.h
index edc925109baa1..bce1b6f5ac43d 100644
--- a/sys/dev/ixgbe/ixgbe_common.h
+++ b/sys/dev/ixgbe/ixgbe_common.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_common.h,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifndef _IXGBE_COMMON_H_
 #define _IXGBE_COMMON_H_
diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h
index d995c7c97faf7..b975d31b54d6f 100644
--- a/sys/dev/ixgbe/ixgbe_osdep.h
+++ b/sys/dev/ixgbe/ixgbe_osdep.h
@@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_osdep.h,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifndef _IXGBE_OS_H_
 #define _IXGBE_OS_H_
diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c
index 4a0e03fc1fe1a..4b69f5d3524b3 100644
--- a/sys/dev/ixgbe/ixgbe_phy.c
+++ b/sys/dev/ixgbe/ixgbe_phy.c
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_phy.c,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
diff --git a/sys/dev/ixgbe/ixgbe_phy.h b/sys/dev/ixgbe/ixgbe_phy.h
index 9f047325c3bf8..253dbe5a95a13 100644
--- a/sys/dev/ixgbe/ixgbe_phy.h
+++ b/sys/dev/ixgbe/ixgbe_phy.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_phy.h,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifndef _IXGBE_PHY_H_
 #define _IXGBE_PHY_H_
diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h
index 9bba824d0a30e..4c14a7f0a6c71 100644
--- a/sys/dev/ixgbe/ixgbe_type.h
+++ b/sys/dev/ixgbe/ixgbe_type.h
@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 *******************************************************************************/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.3.2.1 2007/11/28 23:52:14 jfv Exp $ */
 
 #ifndef _IXGBE_TYPE_H_
 #define _IXGBE_TYPE_H_
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 472985b626810..06f97c43d4dc9 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy.c,v 1.54 2005/11/09 20:26:00 jylefort Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joy_isa.c b/sys/dev/joy/joy_isa.c
index efb1e29280dc0..80c54645e40d1 100644
--- a/sys/dev/joy/joy_isa.c
+++ b/sys/dev/joy/joy_isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy_isa.c,v 1.3 2003/08/24 17:49:14 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joy_pccard.c b/sys/dev/joy/joy_pccard.c
index 9fb823a420025..7143d1567b563 100644
--- a/sys/dev/joy/joy_pccard.c
+++ b/sys/dev/joy/joy_pccard.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/joy/joy_pccard.c,v 1.6 2005/09/20 19:51:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/joy/joyvar.h b/sys/dev/joy/joyvar.h
index 966fe78abb60e..3a566e0205b84 100644
--- a/sys/dev/joy/joyvar.h
+++ b/sys/dev/joy/joyvar.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/joy/joyvar.h,v 1.3 2004/06/16 09:46:48 phk Exp $
  */
 
 struct joy_softc {
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 462983fecca78..2330fed109608 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.46 2006/11/06 13:41:54 rwatson Exp $");
 
 #include "opt_kbd.h"
 
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 184c607a015ad..5a04869f943df 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/kbdreg.h,v 1.18 2005/07/13 23:58:57 emax Exp $
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 5ff744c0c7162..6a6704cb4b66f 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbd/kbdtables.h,v 1.50 2005/05/12 13:39:31 nyan Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index 63f3db6cbeb56..6b49077353a04 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.15 2007/07/11 18:57:15 emax Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/dev/le/am7990.c b/sys/dev/le/am7990.c
index 10a809d97d107..9768dd833fba7 100644
--- a/sys/dev/le/am7990.c
+++ b/sys/dev/le/am7990.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/am7990.c,v 1.4 2006/12/06 02:14:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/le/am79900.c b/sys/dev/le/am79900.c
index abaed2dc3b64e..5500abb780fd1 100644
--- a/sys/dev/le/am79900.c
+++ b/sys/dev/le/am79900.c
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/am79900.c,v 1.4 2006/12/06 02:14:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/le/am79900reg.h b/sys/dev/le/am79900reg.h
index 33610645d394a..1edc0ee322632 100644
--- a/sys/dev/le/am79900reg.h
+++ b/sys/dev/le/am79900reg.h
@@ -70,7 +70,7 @@
  *	@(#)if_lereg.h	8.1 (Berkeley) 6/10/93
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/le/am79900reg.h,v 1.1 2006/01/31 14:48:58 marius Exp $ */
 
 #ifndef _DEV_LE_AM79900REG_H_
 #define	_DEV_LE_AM79900REG_H_
diff --git a/sys/dev/le/am79900var.h b/sys/dev/le/am79900var.h
index 196667e045b0a..848d290b996b3 100644
--- a/sys/dev/le/am79900var.h
+++ b/sys/dev/le/am79900var.h
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/le/am79900var.h,v 1.1 2006/01/31 14:48:58 marius Exp $ */
 
 #ifndef _DEV_LE_AM79900VAR_H_
 #define	_DEV_LE_AM79900VAR_H_
diff --git a/sys/dev/le/am7990reg.h b/sys/dev/le/am7990reg.h
index d3f8e0d3d9f07..2005e0f8febed 100644
--- a/sys/dev/le/am7990reg.h
+++ b/sys/dev/le/am7990reg.h
@@ -70,7 +70,7 @@
  *	@(#)if_lereg.h	8.1 (Berkeley) 6/10/93
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/le/am7990reg.h,v 1.1 2006/01/31 14:48:58 marius Exp $ */
 
 #ifndef _DEV_LE_AM7990REG_H_
 #define	_DEV_LE_AM7990REG_H_
diff --git a/sys/dev/le/am7990var.h b/sys/dev/le/am7990var.h
index 8b2c8bf91c871..0cc53977a2d82 100644
--- a/sys/dev/le/am7990var.h
+++ b/sys/dev/le/am7990var.h
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/le/am7990var.h,v 1.1 2006/01/31 14:48:58 marius Exp $ */
 
 #ifndef _DEV_LE_AM7990VAR_H_
 #define	_DEV_LE_AM7990VAR_H_
diff --git a/sys/dev/le/if_le_cbus.c b/sys/dev/le/if_le_cbus.c
index 18026bd97e516..40d0e19832185 100644
--- a/sys/dev/le/if_le_cbus.c
+++ b/sys/dev/le/if_le_cbus.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/if_le_cbus.c,v 1.5 2007/02/23 12:18:45 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/le/if_le_isa.c b/sys/dev/le/if_le_isa.c
index 0519f5afdfaba..9299943cbced2 100644
--- a/sys/dev/le/if_le_isa.c
+++ b/sys/dev/le/if_le_isa.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.4 2007/02/23 12:18:45 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/le/if_le_lebuffer.c b/sys/dev/le/if_le_lebuffer.c
index 08955981cebaa..5ad8d31538e94 100644
--- a/sys/dev/le/if_le_lebuffer.c
+++ b/sys/dev/le/if_le_lebuffer.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/if_le_lebuffer.c,v 1.2 2007/02/23 12:18:45 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/le/if_le_ledma.c b/sys/dev/le/if_le_ledma.c
index affd5c893c433..248b8a06dc66b 100644
--- a/sys/dev/le/if_le_ledma.c
+++ b/sys/dev/le/if_le_ledma.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/if_le_ledma.c,v 1.4 2007/02/23 12:18:45 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/le/if_le_pci.c b/sys/dev/le/if_le_pci.c
index 841ab934c926c..3124814c27967 100644
--- a/sys/dev/le/if_le_pci.c
+++ b/sys/dev/le/if_le_pci.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.7 2007/02/23 12:18:45 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
index 68673a9c5b01f..50490ca890339 100644
--- a/sys/dev/le/lance.c
+++ b/sys/dev/le/lance.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/lance.c,v 1.4 2007/01/20 10:47:16 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/le/lancereg.h b/sys/dev/le/lancereg.h
index 3e0ce060dcf20..cbb129e54f4e4 100644
--- a/sys/dev/le/lancereg.h
+++ b/sys/dev/le/lancereg.h
@@ -120,7 +120,7 @@
  * valid on the LANCE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/le/lancereg.h,v 1.2 2006/05/16 21:04:01 marius Exp $ */
 
 #ifndef _DEV_LE_LANCEREG_H_
 #define	_DEV_LE_LANCEREG_H_
diff --git a/sys/dev/le/lancevar.h b/sys/dev/le/lancevar.h
index b5245961084d6..d107c3babcad1 100644
--- a/sys/dev/le/lancevar.h
+++ b/sys/dev/le/lancevar.h
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/le/lancevar.h,v 1.3 2006/12/06 02:14:31 marius Exp $ */
 
 #ifndef _DEV_LE_LANCEVAR_H_
 #define	_DEV_LE_LANCEVAR_H_
diff --git a/sys/dev/le/lebuffer_sbus.c b/sys/dev/le/lebuffer_sbus.c
index 71a19faef7fdd..b9414f2465e59 100644
--- a/sys/dev/le/lebuffer_sbus.c
+++ b/sys/dev/le/lebuffer_sbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/le/lebuffer_sbus.c,v 1.1 2007/01/20 12:53:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c
index b9aae50cc162d..6c32ceafdeee9 100644
--- a/sys/dev/led/led.c
+++ b/sys/dev/led/led.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.17 2007/04/23 12:42:15 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/led/led.h b/sys/dev/led/led.h
index bbf301e5ed749..d920fd14071e2 100644
--- a/sys/dev/led/led.h
+++ b/sys/dev/led/led.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/led/led.h,v 1.6 2007/04/23 12:42:15 phk Exp $
  */
 
 #ifndef _DEV_LED_H
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index e09134c809171..a7158608918f9 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.50 2007/02/23 12:18:45 piso Exp $");
 
 /*
  * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index d1894656cdc5f..ea8318f5ebdc0 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/lge/if_lgereg.h,v 1.9 2006/09/15 15:16:11 glebius Exp $
  */
 
 
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index f0599dfd6b746..b7cf0879f06a2 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.32 2007/05/27 20:50:23 rwatson Exp $
  *
  * Copyright (c) 2002-2004 David Boggs. <boggs@boggs.palo-alto.ca.us>
  * All rights reserved.
diff --git a/sys/dev/lmc/if_lmc.h b/sys/dev/lmc/if_lmc.h
index 140750d86b1c7..7b76027396ffe 100644
--- a/sys/dev/lmc/if_lmc.h
+++ b/sys/dev/lmc/if_lmc.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/lmc/if_lmc.h,v 1.5 2006/11/06 13:41:54 rwatson Exp $
  *
  * Copyright (c) 2002-2004 David Boggs. (boggs@boggs.palo-alto.ca.us)
  * All rights reserved.
diff --git a/sys/dev/mc146818/mc146818.c b/sys/dev/mc146818/mc146818.c
index ea59d2c3c5405..34a7673fea4fd 100644
--- a/sys/dev/mc146818/mc146818.c
+++ b/sys/dev/mc146818/mc146818.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mc146818/mc146818.c,v 1.5 2007/06/16 23:10:00 marius Exp $");
 
 /*
  * mc146818 and compatible time of day chip subroutines
diff --git a/sys/dev/mc146818/mc146818reg.h b/sys/dev/mc146818/mc146818reg.h
index 7e17aa248d3ac..b70ab59eaa778 100644
--- a/sys/dev/mc146818/mc146818reg.h
+++ b/sys/dev/mc146818/mc146818reg.h
@@ -24,7 +24,7 @@
  *
  *	from: NetBSD: mc146818reg.h,v 1.5 2003/11/02 11:07:45 wiz Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mc146818/mc146818reg.h,v 1.7 2007/01/20 14:57:51 marius Exp $
  */
 
 /*
diff --git a/sys/dev/mc146818/mc146818var.h b/sys/dev/mc146818/mc146818var.h
index cce95086edf35..a703d0f259d87 100644
--- a/sys/dev/mc146818/mc146818var.h
+++ b/sys/dev/mc146818/mc146818var.h
@@ -25,7 +25,7 @@
  *
  *	from: NetBSD: mc146818var.h,v 1.3 2003/11/24 06:20:40 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mc146818/mc146818var.h,v 1.4 2007/06/16 23:10:00 marius Exp $
  */
 
 struct mc146818_softc {
diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c
index efa70d29b8a6d..f6e4f89f99dda 100644
--- a/sys/dev/mca/mca_bus.c
+++ b/sys/dev/mca/mca_bus.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mca/mca_bus.c,v 1.13 2003/08/24 17:54:09 obrien Exp $");
 
 /*
  * References:
diff --git a/sys/dev/mca/mca_busreg.h b/sys/dev/mca/mca_busreg.h
index e818b68b80239..6b9324ec4191b 100644
--- a/sys/dev/mca/mca_busreg.h
+++ b/sys/dev/mca/mca_busreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mca/mca_busreg.h,v 1.1 1999/09/03 03:40:00 mdodd Exp $
  */
 
 /*
diff --git a/sys/dev/mca/mca_busvar.h b/sys/dev/mca/mca_busvar.h
index db11d67699f60..6555c47f42988 100644
--- a/sys/dev/mca/mca_busvar.h
+++ b/sys/dev/mca/mca_busvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mca/mca_busvar.h,v 1.2 1999/09/26 07:02:05 mdodd Exp $
  */
 
 typedef u_int16_t mca_id_t;
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 86e40c474436e..a34a589301efe 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mcd/mcd.c,v 1.147 2005/05/29 04:42:22 nyan Exp $");
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include <sys/param.h>
diff --git a/sys/dev/mcd/mcd_isa.c b/sys/dev/mcd/mcd_isa.c
index 8b71f105977d2..9a6376dd92cbc 100644
--- a/sys/dev/mcd/mcd_isa.c
+++ b/sys/dev/mcd/mcd_isa.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mcd/mcd_isa.c,v 1.9 2005/05/29 04:42:22 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 451fc5de76c3e..1fb1c7ae1cc6e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mcd/mcdreg.h,v 1.18 2005/03/02 21:33:24 joerg Exp $
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mcd/mcdvar.h b/sys/dev/mcd/mcdvar.h
index adfd4a4f41911..162906369e968 100644
--- a/sys/dev/mcd/mcdvar.h
+++ b/sys/dev/mcd/mcdvar.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mcd/mcdvar.h,v 1.4 2004/06/16 09:46:49 phk Exp $
  */
 
 struct mcd_mbx {
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 48cd0595bd160..464df1332bc4b 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/md/md.c,v 1.169 2007/06/05 00:00:51 jeff Exp $
  *
  */
 
diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c
index 9fb33d2c4d48b..6e8ba71d00de6 100644
--- a/sys/dev/mem/memdev.c
+++ b/sys/dev/mem/memdev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mem/memdev.c,v 1.3 2004/08/04 18:30:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c
index f514f50bedb69..61030b3ef8f4d 100644
--- a/sys/dev/mem/memutil.c
+++ b/sys/dev/mem/memutil.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mem/memutil.c,v 1.1 2004/08/04 18:30:31 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 2e9f4e7b47eb2..2337f1993c874 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.33.4.1 2008/02/04 14:54:21 ambrisko Exp $");
 
 #include "opt_mfi.h"
 
diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c
index 83a8e4eda797e..e0c253e63f619 100644
--- a/sys/dev/mfi/mfi_cam.c
+++ b/sys/dev/mfi/mfi_cam.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_cam.c,v 1.2.2.1 2007/10/19 15:23:23 scottl Exp $");
 
 #include "opt_mfi.h"
 
diff --git a/sys/dev/mfi/mfi_debug.c b/sys/dev/mfi/mfi_debug.c
index 515e6ed05ada7..b0d4d24173c43 100644
--- a/sys/dev/mfi/mfi_debug.c
+++ b/sys/dev/mfi/mfi_debug.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_debug.c,v 1.3 2006/10/16 04:18:38 scottl Exp $");
 
 #include "opt_mfi.h"
 
diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c
index 0a553fa36ce02..758cc7a1df933 100644
--- a/sys/dev/mfi/mfi_disk.c
+++ b/sys/dev/mfi/mfi_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_disk.c,v 1.7 2007/08/13 19:29:17 jhb Exp $");
 
 #include "opt_mfi.h"
 
diff --git a/sys/dev/mfi/mfi_ioctl.h b/sys/dev/mfi/mfi_ioctl.h
index 40521ae88dc80..5cd03b6485ff4 100644
--- a/sys/dev/mfi/mfi_ioctl.h
+++ b/sys/dev/mfi/mfi_ioctl.h
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_ioctl.h,v 1.5 2007/05/10 15:33:41 scottl Exp $");
 
 #if defined(__amd64__) /* Assume amd64 wants 32 bit Linux */
 struct iovec32 {
diff --git a/sys/dev/mfi/mfi_linux.c b/sys/dev/mfi/mfi_linux.c
index 911c02c9059c5..4726f2ae55ae5 100644
--- a/sys/dev/mfi/mfi_linux.c
+++ b/sys/dev/mfi/mfi_linux.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_linux.c,v 1.2 2006/11/14 16:48:00 ambrisko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c
index 70850089778cb..c3c5aacc4d04b 100644
--- a/sys/dev/mfi/mfi_pci.c
+++ b/sys/dev/mfi/mfi_pci.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi_pci.c,v 1.9 2007/08/25 23:58:45 scottl Exp $");
 
 /* PCI/PCI-X/PCIe bus interface for the LSI MegaSAS controllers */
 
diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h
index c54602664003d..f89d1d255e625 100644
--- a/sys/dev/mfi/mfireg.h
+++ b/sys/dev/mfi/mfireg.h
@@ -54,7 +54,7 @@
 #define _MFIREG_H
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfireg.h,v 1.10.4.1 2008/02/04 14:54:21 ambrisko Exp $");
 
 /*
  * MegaRAID SAS MFI firmware definitions
diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h
index f6b633bac49f3..578d1b8cd1552 100644
--- a/sys/dev/mfi/mfivar.h
+++ b/sys/dev/mfi/mfivar.h
@@ -54,7 +54,7 @@
 #define _MFIVAR_H
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfivar.h,v 1.11 2007/08/25 23:58:45 scottl Exp $");
 
 #include <sys/lock.h>
 #include <sys/sx.h>
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 4f3e9f169c9dd..7cba0e83b66ff 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/acphy.c,v 1.21 2007/01/12 22:59:38 marius Exp $");
 
 /*
  * Driver for Altima AC101 10/100 PHY
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
index dc34010e0d343..e3084c79f0711 100644
--- a/sys/dev/mii/acphyreg.h
+++ b/sys/dev/mii/acphyreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/acphyreg.h,v 1.2 2007/01/12 22:58:04 marius Exp $
  */
 
 #ifndef _DEV_MII_ACPHYREG_H_
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 2b9ec72d60257..0c5fab459eac1 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.22 2007/01/12 22:27:46 marius Exp $");
 
 /*
  * driver for AMD AM79c873 PHYs
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index 6cdbc95647b50..91732dc1fbc64 100644
--- a/sys/dev/mii/amphyreg.h
+++ b/sys/dev/mii/amphyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/amphyreg.h,v 1.2 2005/01/06 01:42:55 imp Exp $
  */
 
 #ifndef _DEV_MII_AMTPHYREG_H_
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 221725761d85d..ef9117e4b0aec 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/bmtphy.c,v 1.12 2006/12/02 15:32:33 marius Exp $");
 
 /*
  * Driver for the Broadcom BCM5201/BCM5202 "Mini-Theta" PHYs.  This also
diff --git a/sys/dev/mii/bmtphyreg.h b/sys/dev/mii/bmtphyreg.h
index 223d631a54d58..7b8abe16259ac 100644
--- a/sys/dev/mii/bmtphyreg.h
+++ b/sys/dev/mii/bmtphyreg.h
@@ -35,7 +35,7 @@
  *
  *	from NetBSD: bmtphyreg.h,v 1.1 2001/06/02 21:42:10 thorpej Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/bmtphyreg.h,v 1.2 2005/01/06 01:42:55 imp Exp $
  */
 
 #ifndef _DEV_MII_BMTPHYREG_H_
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index d35125e09acea..3724b04a5a4b1 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.70 2007/06/08 02:34:44 davidch Exp $");
 
 /*
  * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY.
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index a80942f17d6ae..87d0a456a914f 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/brgphyreg.h,v 1.10 2007/06/07 02:21:38 davidch Exp $
  */
 
 #ifndef _DEV_MII_BRGPHYREG_H_
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 4ad1a6cc0ebe4..1c97cacffbf33 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.9 2007/06/06 06:55:49 yongari Exp $");
 
 /*
  * Driver for the Cicada CS8201 10/100/1000 copper PHY.
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index 3c5c5de968c71..485e0a422047f 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/ciphyreg.h,v 1.3 2007/06/06 06:55:49 yongari Exp $
  */
 
 #ifndef _DEV_MII_CIPHYREG_H_
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 91da628217057..bfb4a0e3e8ab6 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.18.2.1 2007/11/01 04:26:33 yongari Exp $");
 
 /*
  * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY.
diff --git a/sys/dev/mii/e1000phyreg.h b/sys/dev/mii/e1000phyreg.h
index 6f30f5c2996c0..178202d126c11 100644
--- a/sys/dev/mii/e1000phyreg.h
+++ b/sys/dev/mii/e1000phyreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.4.2.1 2007/11/01 04:26:33 yongari Exp $ */
 /*-
  * Principal Author: Parag Patel
  * Copyright (c) 2001
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index c4ab68ba3e68d..d7c2bf9581d9a 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.23 2007/01/12 23:17:43 marius Exp $");
 
 /*
  * driver for 3Com internal PHYs
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 5536445e8c7be..0fb3452850a0a 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/gentbi.c,v 1.3 2007/01/26 17:06:02 dwhite Exp $");
 
 /*
  * Driver for generic unknown ten-bit interfaces(1000BASE-{LX,SX}
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 9c1c351192432..a27951706f7dc 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/icsphy.c,v 1.1 2007/06/11 02:04:50 yongari Exp $");
 
 /*
  * driver for Integrated Circuit Systems' ICS1889-1893 ethernet 10/100 PHY
diff --git a/sys/dev/mii/icsphyreg.h b/sys/dev/mii/icsphyreg.h
index 22e44860c6338..c145a1c98e568 100644
--- a/sys/dev/mii/icsphyreg.h
+++ b/sys/dev/mii/icsphyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/icsphyreg.h,v 1.1 2007/06/11 02:04:50 yongari Exp $
  */
 
 #ifndef _DEV_MII_ICSPHYREG_H_
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index 44c3a4d86b84b..bd729381f22d4 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.17 2007/01/12 22:27:46 marius Exp $");
 
 /*
  * driver for Intel 82553 and 82555 PHYs
diff --git a/sys/dev/mii/inphyreg.h b/sys/dev/mii/inphyreg.h
index 4b7d1f113051a..c7a9888ced804 100644
--- a/sys/dev/mii/inphyreg.h
+++ b/sys/dev/mii/inphyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mii/inphyreg.h,v 1.1 2001/03/12 02:41:57 jlemon Exp $
  */
 
 #define MII_INPHY_SCR           0x10    /* status and control register */
diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c
index 73f0ca2b774f1..c910416603772 100644
--- a/sys/dev/mii/ip1000phy.c
+++ b/sys/dev/mii/ip1000phy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ip1000phy.c,v 1.2 2006/12/02 15:32:33 marius Exp $");
 
 /*
  * Driver for the IC Plus IP1000A 10/100/1000 PHY.
diff --git a/sys/dev/mii/ip1000phyreg.h b/sys/dev/mii/ip1000phyreg.h
index 26dc84071815d..2c540c759c07d 100644
--- a/sys/dev/mii/ip1000phyreg.h
+++ b/sys/dev/mii/ip1000phyreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/ip1000phyreg.h,v 1.1 2006/07/25 00:16:09 yongari Exp $
  */
 
 #ifndef	_DEV_MII_IP1000PHYREG_H_
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 9945fb284d24a..082d42f3ceac3 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.19 2007/01/12 22:27:46 marius Exp $");
 
 /*
  * driver for Level One's LXT-970 ethernet 10/100 PHY
diff --git a/sys/dev/mii/lxtphyreg.h b/sys/dev/mii/lxtphyreg.h
index 662bd34b280e1..efcb0dbf74ccc 100644
--- a/sys/dev/mii/lxtphyreg.h
+++ b/sys/dev/mii/lxtphyreg.h
@@ -1,6 +1,6 @@
 /*	OpenBSD: lxtphyreg.h,v 1.1 1998/11/11 19:34:47 jason Exp 	*/
 /*	NetBSD: lxtphyreg.h,v 1.1 1998/10/24 00:33:17 thorpej Exp 	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/lxtphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 065bc5de4f183..8b58b01dfc35a 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mii.c,v 1.29 2007/05/01 18:21:24 marcel Exp $");
 
 /*
  * MII bus layer, glues MII-capable network interface drivers to sharable
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 0f1a4426e6fe2..d9883b6c40c0d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/mii.h,v 1.5 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 218f0803c4d7b..8caf43e363d16 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mii_physubr.c,v 1.29 2007/01/13 00:14:45 marius Exp $");
 
 /*
  * Subroutines common to all PHYs.
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index 017812f4dfb0a..0931059fba7e7 100644
--- a/sys/dev/mii/miibus_if.m
+++ b/sys/dev/mii/miibus_if.m
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/mii/miibus_if.m,v 1.4 2001/09/29 18:40:06 jlemon Exp $
 
 #include <sys/bus.h>
 
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index f2e848d43ebf0..fe6a7e9530d9a 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.46.2.1 2007/11/05 01:42:02 yongari Exp $
 /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
 
 /*-
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 569dced9b2ef7..7a0eefa6525c0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/miivar.h,v 1.21 2007/01/13 00:14:45 marius Exp $
  */
 
 #ifndef _DEV_MII_MIIVAR_H_
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index d0a549cc67548..1cec03a766a68 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/mlphy.c,v 1.22 2006/12/02 19:36:25 marius Exp $");
 
 /*
  * driver for Micro Linear 6692 PHYs
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index d7db537bee979..87dd6e8fcee20 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.24 2006/12/02 15:32:33 marius Exp $");
 
 /*
  * Driver for the National Semiconductor DP83891 and DP83861
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index 44899191715ed..14f33cc39caa2 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/nsgphyreg.h,v 1.4 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_NSGPHYREG_H_
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 01429ab217b0b..064785bdd1762 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.28 2007/01/12 22:27:46 marius Exp $");
 
 /*
  * driver for National Semiconductor's DP83840A ethernet 10/100 PHY
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index 5ff0490b1dfe5..5e8d3478e854a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/nsphyreg.h,v 1.2 1999/08/28 00:42:16 peter Exp $
  */
 
 #ifndef _DEV_MII_NSPHYREG_H_
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index d37ffafa0d0e9..b49fcb6caefe2 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.18 2006/12/02 15:32:33 marius Exp $");
 
 /*
  * driver for homePNA PHYs
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 2bed7b382d98e..da4972d032d0c 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.18 2006/12/02 15:32:33 marius Exp $");
 
 /*
  * driver for Quality Semiconductor's QS6612 ethernet 10/100 PHY
diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h
index a69786596a292..29a32b045a338 100644
--- a/sys/dev/mii/qsphyreg.h
+++ b/sys/dev/mii/qsphyreg.h
@@ -1,6 +1,6 @@
 /*	OpenBSD: qsphyreg.h,v 1.2 1999/03/09 00:02:45 jason Exp 	*/
 /*	NetBSD: qsphyreg.h,v 1.1 1998/08/11 00:01:03 thorpej Exp 	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/mii/qsphyreg.h,v 1.1 2001/02/07 19:57:16 semenu Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index aca7978b69612..050427477b887 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.15.2.2 2007/11/05 01:39:25 yongari Exp $");
 
 /*
  * Driver for the RealTek 8169S/8110S/8211B internal 10/100/1000 PHY.
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index fd0d32cb31526..cff7baa3f1ebc 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/rgephyreg.h,v 1.2.10.1 2007/11/05 01:39:25 yongari Exp $
  */
 
 #ifndef _DEV_MII_RGEPHYREG_H_
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index aa9ff76461613..bda014bd24ace 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.31 2007/06/06 07:07:23 yongari Exp $");
 
 /*
  * driver for RealTek 8139 internal PHYs
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index 95e1e7f46dbdb..4faa575fbb8dc 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rlswitch.c,v 1.1 2007/01/05 01:46:26 ticso Exp $");
 
 /*
  * driver for RealTek 8305 pseudo PHYs
diff --git a/sys/dev/mii/ruephy.c b/sys/dev/mii/ruephy.c
index a1b43bcda77ca..8d5a87f7db532 100644
--- a/sys/dev/mii/ruephy.c
+++ b/sys/dev/mii/ruephy.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ruephy.c,v 1.6 2007/01/13 00:06:41 marius Exp $");
 
 /*
  * driver for RealTek RTL8150 internal PHY
diff --git a/sys/dev/mii/ruephyreg.h b/sys/dev/mii/ruephyreg.h
index 5f3911bebd5db..4690df15c244d 100644
--- a/sys/dev/mii/ruephyreg.h
+++ b/sys/dev/mii/ruephyreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/ruephyreg.h,v 1.1 2003/05/03 10:16:56 akiyama Exp $
  */
 
 #ifndef _RUEPHYREG_H_
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 1b31ee2de9b4b..5c98f6633aea4 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tdkphy.c,v 1.22 2006/12/02 20:16:45 marius Exp $");
 
 /*
  * Driver for the TDK 78Q2120 MII
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 4429c9481ec70..5986335a893ea 100644
--- a/sys/dev/mii/tdkphyreg.h
+++ b/sys/dev/mii/tdkphyreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/tdkphyreg.h,v 1.2 2005/01/06 01:42:56 imp Exp $
  */
 
 /*
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index d21fe7f910e03..c44b333d70524 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.22 2006/12/02 19:36:25 marius Exp $");
 
 /*
  * Driver for Texas Instruments's ThunderLAN PHYs
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index a016f4cc69103..6689f76c3075d 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/tlphyreg.h,v 1.3 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_TLPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index e51964041d60f..10347825bfeae 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.20 2007/01/20 00:52:29 marius Exp $");
 
 /*
  * driver for generic unknown PHYs
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 9d7df3d594b8f..884a3a26748e4 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy_subr.c,v 1.9 2006/05/19 03:51:42 yongari Exp $");
 
 /*
  * Subroutines shared by the ukphy driver and other PHY drivers.
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 7beaae7c55cba..b2e55883aa8e3 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.21 2006/12/02 19:36:25 marius Exp $");
 
 /*
  * driver for the XaQti XMAC II's internal PHY. This is sort of
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 1e828e1681a16..3eba00358c41b 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mii/xmphyreg.h,v 1.4 2005/01/06 01:42:56 imp Exp $
  */
 
 #ifndef _DEV_MII_XMPHYREG_H_
diff --git a/sys/dev/mk48txx/mk48txx.c b/sys/dev/mk48txx/mk48txx.c
index 71ab8f518df1c..9a56874297c73 100644
--- a/sys/dev/mk48txx/mk48txx.c
+++ b/sys/dev/mk48txx/mk48txx.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.9 2007/03/27 21:03:36 n_hibma Exp $");
 
 /*
  * Mostek MK48T02, MK48T08, MK48T18, MK48T59 time-of-day chip subroutines.
diff --git a/sys/dev/mk48txx/mk48txxreg.h b/sys/dev/mk48txx/mk48txxreg.h
index 25b9cb392086c..91b37324ced58 100644
--- a/sys/dev/mk48txx/mk48txxreg.h
+++ b/sys/dev/mk48txx/mk48txxreg.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: mk48txxreg.h,v 1.7 2003/11/01 22:41:42 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txxreg.h,v 1.5 2005/05/19 21:16:50 marius Exp $
  */
 
 /*
diff --git a/sys/dev/mk48txx/mk48txxvar.h b/sys/dev/mk48txx/mk48txxvar.h
index f7c3d3195062d..8334732c4abae 100644
--- a/sys/dev/mk48txx/mk48txxvar.h
+++ b/sys/dev/mk48txx/mk48txxvar.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: mk48txxvar.h,v 1.1 2003/11/01 22:41:42 tsutsui Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txxvar.h,v 1.2 2005/05/19 21:16:50 marius Exp $
  */
 
 typedef uint8_t (*mk48txx_nvrd_t)(device_t, int);
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index 76205e193e800..9560bb100707e 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlx.c,v 1.54 2007/02/23 12:18:46 piso Exp $
  */
 
 /*
diff --git a/sys/dev/mlx/mlx_compat.h b/sys/dev/mlx/mlx_compat.h
index 7160c3d1639bc..176c6439ead91 100644
--- a/sys/dev/mlx/mlx_compat.h
+++ b/sys/dev/mlx/mlx_compat.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mlx/mlx_compat.h,v 1.3 2003/03/08 08:01:29 phk Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index db86bf85e2e72..9102ee60087db 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.34 2004/11/25 12:15:49 scottl Exp $");
 
 /*
  * Disk driver for Mylex DAC960 RAID adapters.
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index b39a6b87d0926..3def62aa70a9e 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mlx/mlx_pci.c,v 1.24 2005/07/30 15:53:40 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index f091befad2d0d..43c51cb669666 100644
--- a/sys/dev/mlx/mlxio.h
+++ b/sys/dev/mlx/mlxio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlxio.h,v 1.3 2000/04/11 02:52:44 msmith Exp $
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index 16fdd0cf8ed35..dd2856a925dda 100644
--- a/sys/dev/mlx/mlxreg.h
+++ b/sys/dev/mlx/mlxreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlxreg.h,v 1.9 2004/11/25 12:15:49 scottl Exp $
  */
 
 #define MLX_BLKSIZE	512		/* fixed feature */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 345cf9933c22c..dc9c7e368ae96 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mlx/mlxvar.h,v 1.22 2004/06/16 09:46:50 phk Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index d9e78bd7c563e..4196dfce7a46e 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mly.c,v 1.45 2007/06/17 05:55:51 scottl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 433a1cb1036e0..2f04c87c1f5b3 100644
--- a/sys/dev/mly/mly_tables.h
+++ b/sys/dev/mly/mly_tables.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mly_tables.h,v 1.3 2002/02/27 23:57:18 peter Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mlyio.h b/sys/dev/mly/mlyio.h
index 504b5040b5327..554544d347fd6 100644
--- a/sys/dev/mly/mlyio.h
+++ b/sys/dev/mly/mlyio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mlyio.h,v 1.2 2001/07/14 00:12:22 msmith Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/mly/mlyreg.h b/sys/dev/mly/mlyreg.h
index a4106a57b0039..944998eb9ec81 100644
--- a/sys/dev/mly/mlyreg.h
+++ b/sys/dev/mly/mlyreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mlyreg.h,v 1.2 2002/09/23 18:54:30 alfred Exp $
  */
 
 /*
diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h
index 62e674c736348..f03d65aaa62e4 100644
--- a/sys/dev/mly/mlyvar.h
+++ b/sys/dev/mly/mlyvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/mly/mlyvar.h,v 1.7 2005/08/08 12:23:27 scottl Exp $
  */
 
 /********************************************************************************
diff --git a/sys/dev/mmc/bridge.h b/sys/dev/mmc/bridge.h
index 3537e6a4d79fb..faef59b281c2f 100644
--- a/sys/dev/mmc/bridge.h
+++ b/sys/dev/mmc/bridge.h
@@ -48,7 +48,7 @@
  * or the SD Card Association to disclose or distribute any technical
  * information, know-how or other confidential information to any third party.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mmc/bridge.h,v 1.2 2007/05/26 05:23:36 imp Exp $
  */
 
 #ifndef DEV_MMC_BRIDGE_H
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c
index 260aefb13b3e7..f235fc5be4765 100644
--- a/sys/dev/mmc/mmc.c
+++ b/sys/dev/mmc/mmc.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mmc/mmc.c,v 1.4 2007/06/05 17:04:44 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mmc/mmcbr_if.m b/sys/dev/mmc/mmcbr_if.m
index e82293de35b0f..7c3538b0f79d2 100644
--- a/sys/dev/mmc/mmcbr_if.m
+++ b/sys/dev/mmc/mmcbr_if.m
@@ -50,7 +50,7 @@
 # or the SD Card Association to disclose or distribute any technical
 # information, know-how or other confidential information to any third party.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/mmc/mmcbr_if.m,v 1.2 2007/05/26 05:23:36 imp Exp $
 #
 
 #include <sys/types.h>
diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h
index 0f8a9cfdd9e03..fc2828767c904 100644
--- a/sys/dev/mmc/mmcbrvar.h
+++ b/sys/dev/mmc/mmcbrvar.h
@@ -49,7 +49,7 @@
  * or the SD Card Association to disclose or distribute any technical
  * information, know-how or other confidential information to any third party.
  *
- * "$FreeBSD$"
+ * "$FreeBSD: src/sys/dev/mmc/mmcbrvar.h,v 1.2 2007/05/26 05:23:36 imp Exp $"
  */
 
 #ifndef DEV_MMC_MMCBRVAR_H
diff --git a/sys/dev/mmc/mmcbus_if.m b/sys/dev/mmc/mmcbus_if.m
index 14dc8e92f8cd0..1f9469801710e 100644
--- a/sys/dev/mmc/mmcbus_if.m
+++ b/sys/dev/mmc/mmcbus_if.m
@@ -50,7 +50,7 @@
 # or the SD Card Association to disclose or distribute any technical
 # information, know-how or other confidential information to any third party.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/mmc/mmcbus_if.m,v 1.2 2007/05/26 05:23:36 imp Exp $
 #
 
 #include <dev/mmc/mmcreg.h>
diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h
index 1b868cbaffb8a..94e345898a89f 100644
--- a/sys/dev/mmc/mmcreg.h
+++ b/sys/dev/mmc/mmcreg.h
@@ -48,7 +48,7 @@
  * or the SD Card Association to disclose or distribute any technical
  * information, know-how or other confidential information to any third party.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mmc/mmcreg.h,v 1.2 2007/05/26 05:23:36 imp Exp $
  */
 
 #ifndef DEV_MMC_MMCREG_H
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index a9bf17f34e67e..e22b4ba365fd9 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mmc/mmcsd.c,v 1.3 2007/05/26 05:23:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h
index b5c7c09b2aa53..9c6d5c2a20cb6 100644
--- a/sys/dev/mmc/mmcvar.h
+++ b/sys/dev/mmc/mmcvar.h
@@ -49,7 +49,7 @@
  * or the SD Card Association to disclose or distribute any technical
  * information, know-how or other confidential information to any third party.
  *
- * "$FreeBSD$"
+ * "$FreeBSD: src/sys/dev/mmc/mmcvar.h,v 1.3 2007/05/26 05:23:36 imp Exp $"
  */
 
 #ifndef DEV_MMC_MMCVAR_H
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index 2b3b840877c99..3e482e05d2b5b 100644
--- a/sys/dev/mpt/mpilib/mpi.h
+++ b/sys/dev/mpt/mpilib/mpi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.9 2007/06/03 22:58:26 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index 38235b73258db..c620791554161 100644
--- a/sys/dev/mpt/mpilib/mpi_cnfg.h
+++ b/sys/dev/mpt/mpilib/mpi_cnfg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.9 2007/06/03 22:58:26 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index b50a332617911..54128c94dd259 100644
--- a/sys/dev/mpt/mpilib/mpi_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_fc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.6 2006/01/21 00:29:51 mjacob Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_inb.h b/sys/dev/mpt/mpilib/mpi_inb.h
index 9239ecfa318d2..c6c8209879b96 100644
--- a/sys/dev/mpt/mpilib/mpi_inb.h
+++ b/sys/dev/mpt/mpilib/mpi_inb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_inb.h,v 1.1 2006/01/21 00:29:51 mjacob Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index dd896e7dadfcc..95e18f18601e8 100644
--- a/sys/dev/mpt/mpilib/mpi_init.h
+++ b/sys/dev/mpt/mpilib/mpi_init.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_init.h,v 1.8 2007/06/03 22:58:27 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index 107c561aeee72..b21a7858834fe 100644
--- a/sys/dev/mpt/mpilib/mpi_ioc.h
+++ b/sys/dev/mpt/mpilib/mpi_ioc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.9 2007/06/03 22:58:27 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index 9357064637127..3118fdb1e453f 100644
--- a/sys/dev/mpt/mpilib/mpi_lan.h
+++ b/sys/dev/mpt/mpilib/mpi_lan.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_lan.h,v 1.6 2006/01/21 00:29:51 mjacob Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index 44832aea66c3f..19bf09dfcff3a 100644
--- a/sys/dev/mpt/mpilib/mpi_raid.h
+++ b/sys/dev/mpt/mpilib/mpi_raid.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_raid.h,v 1.8 2007/06/03 22:58:27 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_sas.h b/sys/dev/mpt/mpilib/mpi_sas.h
index 017c39b094b1b..d2cf83b1a8815 100644
--- a/sys/dev/mpt/mpilib/mpi_sas.h
+++ b/sys/dev/mpt/mpilib/mpi_sas.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.3 2007/06/03 22:58:27 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index 918bba227ce13..825d30b73bcb0 100644
--- a/sys/dev/mpt/mpilib/mpi_targ.h
+++ b/sys/dev/mpt/mpilib/mpi_targ.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_targ.h,v 1.7 2007/06/03 22:58:27 scottl Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_tool.h b/sys/dev/mpt/mpilib/mpi_tool.h
index 14c44110133a9..ac0c3a2571eaa 100644
--- a/sys/dev/mpt/mpilib/mpi_tool.h
+++ b/sys/dev/mpt/mpilib/mpi_tool.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_tool.h,v 1.1 2006/01/21 00:29:51 mjacob Exp $ */
 /*-
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index 236baf674f20c..9af8d4df64532 100644
--- a/sys/dev/mpt/mpilib/mpi_type.h
+++ b/sys/dev/mpt/mpilib/mpi_type.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.10 2006/02/26 22:50:14 mjacob Exp $ */
 /*
  * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
  * All rights reserved.
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index b35d109d2f627..97157ae361d91 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.44.2.2 2007/12/15 18:39:07 delphij Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h> /* XXX For static handler registration */
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index c8fb76c4cd6d0..e7f16c47dab56 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.42 2007/08/14 19:17:35 scottl Exp $ */
 /*-
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index 7a67fbc34ea43..d5e0210f01542 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -94,7 +94,7 @@
  * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.61.2.1 2007/10/19 15:22:24 scottl Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h>
diff --git a/sys/dev/mpt/mpt_cam.h b/sys/dev/mpt/mpt_cam.h
index f2faa4abdff86..a24ffe35395aa 100644
--- a/sys/dev/mpt/mpt_cam.h
+++ b/sys/dev/mpt/mpt_cam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_cam.h,v 1.6 2007/05/05 20:18:24 mjacob Exp $ */
 /*-
  * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index fd723cb66e206..57df7c1bbdb9b 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.18 2006/12/07 22:02:28 mjacob Exp $");
 
 #include <dev/mpt/mpt.h>
 
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 8338f79a35e13..d38dced7f6854 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.51 2007/09/18 16:39:24 ambrisko Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h>
diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c
index 192c9d4115959..f7b8b785da602 100644
--- a/sys/dev/mpt/mpt_raid.c
+++ b/sys/dev/mpt/mpt_raid.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.15 2007/05/05 20:18:24 mjacob Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_raid.h>
diff --git a/sys/dev/mpt/mpt_raid.h b/sys/dev/mpt/mpt_raid.h
index bc5aa7dd9fe2c..69c12f3740984 100644
--- a/sys/dev/mpt/mpt_raid.h
+++ b/sys/dev/mpt/mpt_raid.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.7 2006/07/16 03:31:01 mjacob Exp $ */
 /*-
  * Definitions for the integrated RAID features LSI MPT Fusion adapters.
  *
diff --git a/sys/dev/mpt/mpt_reg.h b/sys/dev/mpt/mpt_reg.h
index dca924c845693..e4b0e4386a0bb 100644
--- a/sys/dev/mpt/mpt_reg.h
+++ b/sys/dev/mpt/mpt_reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_reg.h,v 1.4 2006/05/29 20:34:28 mjacob Exp $ */
 /*-
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 405be420b235f..51263091bf84d 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/mse.c,v 1.75 2007/02/23 12:18:47 piso Exp $
  */
 
 /*
diff --git a/sys/dev/mse/mse_cbus.c b/sys/dev/mse/mse_cbus.c
index 75a72ddec2cde..6697b6a367f2e 100644
--- a/sys/dev/mse/mse_cbus.c
+++ b/sys/dev/mse/mse_cbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/mse_cbus.c,v 1.5 2006/05/16 14:36:28 phk Exp $
  */
 
 /*-
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
index 517d678936c97..7a0727eebe1e0 100644
--- a/sys/dev/mse/mse_isa.c
+++ b/sys/dev/mse/mse_isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/mse_isa.c,v 1.5 2006/05/16 14:36:28 phk Exp $
  */
 
 /*-
diff --git a/sys/dev/mse/msevar.h b/sys/dev/mse/msevar.h
index 2c2b856c4421c..40a1506606634 100644
--- a/sys/dev/mse/msevar.h
+++ b/sys/dev/mse/msevar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/mse/msevar.h,v 1.4 2005/03/29 09:22:40 imp Exp $
  */
 
 /*-
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index cd390d353fc64..466a4608b3062 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.18.2.1 2007/12/08 12:16:14 remko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/msk/if_mskreg.h b/sys/dev/msk/if_mskreg.h
index 534469d343aa8..993238df4f0f8 100644
--- a/sys/dev/msk/if_mskreg.h
+++ b/sys/dev/msk/if_mskreg.h
@@ -93,7 +93,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*$FreeBSD$*/
+/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.6.2.1 2007/12/08 12:16:15 remko Exp $*/
 
 /*
  * SysKonnect PCI vendor ID
diff --git a/sys/dev/mxge/eth_z8e.h b/sys/dev/mxge/eth_z8e.h
index 94ffdad57464b..96580c3160049 100644
--- a/sys/dev/mxge/eth_z8e.h
+++ b/sys/dev/mxge/eth_z8e.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/mxge/eth_z8e.h,v 1.2.6.1 2008/01/15 17:59:15 gallatin Exp $
 ***************************************************************************/
 
 /* Using zlib-1.1.3.  gendat version $Name:  $ */
diff --git a/sys/dev/mxge/ethp_z8e.h b/sys/dev/mxge/ethp_z8e.h
index efc1b8e48340a..78f64931debf6 100644
--- a/sys/dev/mxge/ethp_z8e.h
+++ b/sys/dev/mxge/ethp_z8e.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/mxge/ethp_z8e.h,v 1.2.6.1 2008/01/15 17:59:15 gallatin Exp $
 ***************************************************************************/
 
 /* Using zlib-1.1.3.  gendat version $Name:  $ */
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index 7a53a5b1561e9..9eef22a608792 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.42.4.1 2008/01/28 15:58:03 gallatin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h
index 2163f605505ba..ad5de89ad7255 100644
--- a/sys/dev/mxge/if_mxge_var.h
+++ b/sys/dev/mxge/if_mxge_var.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/mxge/if_mxge_var.h,v 1.16 2007/09/13 21:29:02 gallatin Exp $
 
 ***************************************************************************/
 
diff --git a/sys/dev/mxge/mcp_gen_header.h b/sys/dev/mxge/mcp_gen_header.h
index 65fe27cf4cd01..58a09fa13fe2f 100644
--- a/sys/dev/mxge/mcp_gen_header.h
+++ b/sys/dev/mxge/mcp_gen_header.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/mxge/mcp_gen_header.h,v 1.2 2007/07/12 16:04:55 gallatin Exp $
 ***************************************************************************/
 
 #ifndef _mcp_gen_header_h
diff --git a/sys/dev/mxge/mxge_eth_z8e.c b/sys/dev/mxge/mxge_eth_z8e.c
index 570f65476f003..b14da3ebf4c20 100644
--- a/sys/dev/mxge/mxge_eth_z8e.c
+++ b/sys/dev/mxge/mxge_eth_z8e.c
@@ -2,7 +2,7 @@
  * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_eth_z8e.c,v 1.1 2007/07/19 16:15:59 gallatin Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/mxge/mxge_ethp_z8e.c b/sys/dev/mxge/mxge_ethp_z8e.c
index 8d0e31b5b9e5e..557a29d9e0b46 100644
--- a/sys/dev/mxge/mxge_ethp_z8e.c
+++ b/sys/dev/mxge/mxge_ethp_z8e.c
@@ -2,7 +2,7 @@
  * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_ethp_z8e.c,v 1.1 2007/07/19 16:15:59 gallatin Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/mxge/mxge_lro.c b/sys/dev/mxge/mxge_lro.c
index e3a53c817968a..86e7f604d9d9c 100644
--- a/sys/dev/mxge/mxge_lro.c
+++ b/sys/dev/mxge/mxge_lro.c
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_lro.c,v 1.5 2007/07/12 16:04:55 gallatin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h
index 61e8601e41c8e..6984f921e9c1a 100644
--- a/sys/dev/mxge/mxge_mcp.h
+++ b/sys/dev/mxge/mxge_mcp.h
@@ -25,7 +25,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/mxge/mxge_mcp.h,v 1.8 2007/08/22 13:22:12 gallatin Exp $
 ***************************************************************************/
 
 #ifndef _myri10ge_mcp_h
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 4cd0781b04aaf..afea3be8e63ae 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.43 2007/03/11 15:20:04 brueffer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/my/if_myreg.h b/sys/dev/my/if_myreg.h
index 71eb3f37bd5af..20d6fa06660b9 100644
--- a/sys/dev/my/if_myreg.h
+++ b/sys/dev/my/if_myreg.h
@@ -25,7 +25,7 @@
  *
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/my/if_myreg.h,v 1.6 2006/09/15 15:16:12 glebius Exp $
  *
  * Myson MTD80x register definitions.
  *
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index c56820bbf895d..1c9ea7b1e7f3e 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.13 2006/05/16 14:36:29 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 22dc82751b716..bfd8f4d776823 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.29 2007/02/23 12:18:47 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/dev/ncv/ncr53c500hw.h b/sys/dev/ncv/ncr53c500hw.h
index 7a4b337b89855..0f89a1c331e28 100644
--- a/sys/dev/ncv/ncr53c500hw.h
+++ b/sys/dev/ncv/ncr53c500hw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.4 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500hwtab.h b/sys/dev/ncv/ncr53c500hwtab.h
index 47406b1947e42..e1dd84376833e 100644
--- a/sys/dev/ncv/ncr53c500hwtab.h
+++ b/sys/dev/ncv/ncr53c500hwtab.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500hwtab.h,v 1.3 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500hwtab.h,v 1.2.18.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500reg.h b/sys/dev/ncv/ncr53c500reg.h
index 2a9906e44cdf6..7dbba7589f30c 100644
--- a/sys/dev/ncv/ncr53c500reg.h
+++ b/sys/dev/ncv/ncr53c500reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500reg.h,v 1.3 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500reg.h,v 1.5.14.1 2001/06/08 06:27:44 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h
index b3aff4660f0d2..e60f4a9d01f98 100644
--- a/sys/dev/ncv/ncr53c500var.h
+++ b/sys/dev/ncv/ncr53c500var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ncv/ncr53c500var.h,v 1.9 2005/01/06 01:42:59 imp Exp $	*/
 /*	$NecBSD: ncr53c500var.h,v 1.11.18.1 2001/06/08 06:27:45 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index d76ff570f1b72..a549a13b49776 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -21,7 +21,7 @@
 /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.21.2.2 2007/12/06 04:05:56 yongari Exp $");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/nfe/if_nfereg.h b/sys/dev/nfe/if_nfereg.h
index 78b73bb730ba6..27756e309c59d 100644
--- a/sys/dev/nfe/if_nfereg.h
+++ b/sys/dev/nfe/if_nfereg.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.10 2007/06/12 10:51:47 yongari Exp $
  */
 
 #define	NFE_RX_RING_COUNT	256
diff --git a/sys/dev/nfe/if_nfevar.h b/sys/dev/nfe/if_nfevar.h
index cd00d0b32e81c..8186bd307fa30 100644
--- a/sys/dev/nfe/if_nfevar.h
+++ b/sys/dev/nfe/if_nfevar.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nfe/if_nfevar.h,v 1.5 2007/07/24 01:11:00 yongari Exp $
  */
 
 struct nfe_tx_data {
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index f728f88c1d3e1..0875698b2c667 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.91 2007/03/04 03:38:07 csjp Exp $");
 
 /*
  * National Semiconductor DP83820/DP83821 gigabit ethernet driver
diff --git a/sys/dev/nge/if_ngereg.h b/sys/dev/nge/if_ngereg.h
index 8927bee9fb7c5..4e23119520f15 100644
--- a/sys/dev/nge/if_ngereg.h
+++ b/sys/dev/nge/if_ngereg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.16 2006/09/15 15:16:12 glebius Exp $
  */
 
 #define NGE_CSR			0x00
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 110553ac5c484..a901127669c10 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.39 2007/08/01 21:38:11 emax Exp $");
 
 /*
  * Pseudo-nulmodem driver
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index 3b394f70e6f02..ebe5fc32964ef 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.15 2006/05/16 14:36:29 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index 718181bf2400f..b059e5dd70d9b 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.25 2007/02/23 12:18:48 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/nsp/nspreg.h b/sys/dev/nsp/nspreg.h
index 81512c91a6099..43db0f80d2c38 100644
--- a/sys/dev/nsp/nspreg.h
+++ b/sys/dev/nsp/nspreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/nsp/nspreg.h,v 1.3 2005/01/06 01:43:00 imp Exp $	*/
 /*	$NecBSD: nspreg.h,v 1.4.14.3 2001/06/29 06:27:53 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h
index 59af783ade024..b70b942bf317e 100644
--- a/sys/dev/nsp/nspvar.h
+++ b/sys/dev/nsp/nspvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/nsp/nspvar.h,v 1.8 2005/01/06 01:43:00 imp Exp $	*/
 /*	$NecBSD: nspvar.h,v 1.7.14.5 2001/06/29 06:27:54 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 0b94eb7aa865e..7bf2c11a939ea 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.32 2006/11/06 13:41:54 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index 7ae7993458e9c..546e440afef4a 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.28 2007/06/12 02:21:02 yongari Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/nve/if_nvereg.h b/sys/dev/nve/if_nvereg.h
index 80a0e686af467..de35b35ebe881 100644
--- a/sys/dev/nve/if_nvereg.h
+++ b/sys/dev/nve/if_nvereg.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $Id: if_nvreg.h,v 1.6 2004/08/12 14:00:05 q Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.8 2006/12/05 15:31:05 jhb Exp $
  */
  
 #ifndef _IF_NVEREG_H_
diff --git a/sys/dev/nvram/nvram.c b/sys/dev/nvram/nvram.c
index fde9d8850ae55..d0f5dba8f148e 100644
--- a/sys/dev/nvram/nvram.c
+++ b/sys/dev/nvram/nvram.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nvram/nvram.c,v 1.1.2.1 2007/10/29 22:26:34 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/nxge/if_nxge.c b/sys/dev/nxge/if_nxge.c
index 95f97a8923b48..1e2fc6f3cd634 100644
--- a/sys/dev/nxge/if_nxge.c
+++ b/sys/dev/nxge/if_nxge.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/if_nxge.c,v 1.3.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #include <dev/nxge/if_nxge.h>
diff --git a/sys/dev/nxge/if_nxge.h b/sys/dev/nxge/if_nxge.h
index 1cc128691c52f..7983bbf3c624c 100644
--- a/sys/dev/nxge/if_nxge.h
+++ b/sys/dev/nxge/if_nxge.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/if_nxge.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef _IF_XGE_H
diff --git a/sys/dev/nxge/include/build-version.h b/sys/dev/nxge/include/build-version.h
index 33fb24d257f49..0d58a3d3326da 100644
--- a/sys/dev/nxge/include/build-version.h
+++ b/sys/dev/nxge/include/build-version.h
@@ -1,6 +1,6 @@
 #ifndef BUILD_VERSION_H
 #define BUILD_VERSION_H
 /* Do not edit! Automatically generated when released.*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/nxge/include/build-version.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $ */
 #define GENERATED_BUILD_VERSION "11230"
 #endif /* BUILD_VERSION_H */
diff --git a/sys/dev/nxge/include/version.h b/sys/dev/nxge/include/version.h
index 47d4fc1bfdece..748e6fa3599b1 100644
--- a/sys/dev/nxge/include/version.h
+++ b/sys/dev/nxge/include/version.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/version.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef VERSION_H
diff --git a/sys/dev/nxge/include/xge-debug.h b/sys/dev/nxge/include/xge-debug.h
index 74b9756040c24..12a4cc252ec7d 100644
--- a/sys/dev/nxge/include/xge-debug.h
+++ b/sys/dev/nxge/include/xge-debug.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xge-debug.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_DEBUG_H
diff --git a/sys/dev/nxge/include/xge-defs.h b/sys/dev/nxge/include/xge-defs.h
index 17bc907b8a34a..7e94fb6371906 100644
--- a/sys/dev/nxge/include/xge-defs.h
+++ b/sys/dev/nxge/include/xge-defs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xge-defs.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_DEFS_H
diff --git a/sys/dev/nxge/include/xge-list.h b/sys/dev/nxge/include/xge-list.h
index 544a623043861..77d50ddcadaf4 100644
--- a/sys/dev/nxge/include/xge-list.h
+++ b/sys/dev/nxge/include/xge-list.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xge-list.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_LIST_H
diff --git a/sys/dev/nxge/include/xge-os-pal.h b/sys/dev/nxge/include/xge-os-pal.h
index 166cadb7f2a50..c2d2264d70fc5 100644
--- a/sys/dev/nxge/include/xge-os-pal.h
+++ b/sys/dev/nxge/include/xge-os-pal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xge-os-pal.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_OS_PAL_H
diff --git a/sys/dev/nxge/include/xge-queue.h b/sys/dev/nxge/include/xge-queue.h
index c38ffb8ca349a..e3ecdae31bf7f 100644
--- a/sys/dev/nxge/include/xge-queue.h
+++ b/sys/dev/nxge/include/xge-queue.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xge-queue.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_QUEUE_H
diff --git a/sys/dev/nxge/include/xgehal-channel.h b/sys/dev/nxge/include/xgehal-channel.h
index d7866491f70e7..3835ca30789cc 100644
--- a/sys/dev/nxge/include/xgehal-channel.h
+++ b/sys/dev/nxge/include/xgehal-channel.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-channel.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_CHANNEL_H
diff --git a/sys/dev/nxge/include/xgehal-config.h b/sys/dev/nxge/include/xgehal-config.h
index c320b4a736601..779a9417c5ad6 100644
--- a/sys/dev/nxge/include/xgehal-config.h
+++ b/sys/dev/nxge/include/xgehal-config.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-config.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_CONFIG_H
diff --git a/sys/dev/nxge/include/xgehal-device.h b/sys/dev/nxge/include/xgehal-device.h
index 31d99b4e94dd7..648e557428919 100644
--- a/sys/dev/nxge/include/xgehal-device.h
+++ b/sys/dev/nxge/include/xgehal-device.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-device.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_DEVICE_H
diff --git a/sys/dev/nxge/include/xgehal-driver.h b/sys/dev/nxge/include/xgehal-driver.h
index 507031b00740d..806741c815a6a 100644
--- a/sys/dev/nxge/include/xgehal-driver.h
+++ b/sys/dev/nxge/include/xgehal-driver.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-driver.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_DRIVER_H
diff --git a/sys/dev/nxge/include/xgehal-event.h b/sys/dev/nxge/include/xgehal-event.h
index 1613aaeb5933c..5bb183c97fb3f 100644
--- a/sys/dev/nxge/include/xgehal-event.h
+++ b/sys/dev/nxge/include/xgehal-event.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-event.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_EVENT_H
diff --git a/sys/dev/nxge/include/xgehal-fifo.h b/sys/dev/nxge/include/xgehal-fifo.h
index 5f082d6b8232f..64fc12778a1b4 100644
--- a/sys/dev/nxge/include/xgehal-fifo.h
+++ b/sys/dev/nxge/include/xgehal-fifo.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-fifo.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_FIFO_H
diff --git a/sys/dev/nxge/include/xgehal-mgmt.h b/sys/dev/nxge/include/xgehal-mgmt.h
index 93e60a29186e1..206b47851026c 100644
--- a/sys/dev/nxge/include/xgehal-mgmt.h
+++ b/sys/dev/nxge/include/xgehal-mgmt.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-mgmt.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_HAL_MGMT_H
diff --git a/sys/dev/nxge/include/xgehal-mgmtaux.h b/sys/dev/nxge/include/xgehal-mgmtaux.h
index 93a9865f9c2d4..4ecca58a32811 100644
--- a/sys/dev/nxge/include/xgehal-mgmtaux.h
+++ b/sys/dev/nxge/include/xgehal-mgmtaux.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-mgmtaux.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_MGMTAUX_H
diff --git a/sys/dev/nxge/include/xgehal-mm.h b/sys/dev/nxge/include/xgehal-mm.h
index 7b43de404e514..a0c5435cce983 100644
--- a/sys/dev/nxge/include/xgehal-mm.h
+++ b/sys/dev/nxge/include/xgehal-mm.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-mm.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_MM_H
diff --git a/sys/dev/nxge/include/xgehal-regs.h b/sys/dev/nxge/include/xgehal-regs.h
index a20e083c92339..66f77e8f34db3 100644
--- a/sys/dev/nxge/include/xgehal-regs.h
+++ b/sys/dev/nxge/include/xgehal-regs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-regs.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_REGS_H
diff --git a/sys/dev/nxge/include/xgehal-ring.h b/sys/dev/nxge/include/xgehal-ring.h
index 0e5b7e66e2910..f37fe9ff2c05a 100644
--- a/sys/dev/nxge/include/xgehal-ring.h
+++ b/sys/dev/nxge/include/xgehal-ring.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-ring.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_RING_H
diff --git a/sys/dev/nxge/include/xgehal-stats.h b/sys/dev/nxge/include/xgehal-stats.h
index ec093e7f72239..0a8255675929b 100644
--- a/sys/dev/nxge/include/xgehal-stats.h
+++ b/sys/dev/nxge/include/xgehal-stats.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-stats.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_STATS_H
diff --git a/sys/dev/nxge/include/xgehal-types.h b/sys/dev/nxge/include/xgehal-types.h
index 58dd09187372c..4010a40066868 100644
--- a/sys/dev/nxge/include/xgehal-types.h
+++ b/sys/dev/nxge/include/xgehal-types.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal-types.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_TYPES_H
diff --git a/sys/dev/nxge/include/xgehal.h b/sys/dev/nxge/include/xgehal.h
index c8645120edec2..ad9f7be2023d2 100644
--- a/sys/dev/nxge/include/xgehal.h
+++ b/sys/dev/nxge/include/xgehal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/include/xgehal.h,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifndef XGE_HAL_H
diff --git a/sys/dev/nxge/xge-osdep.h b/sys/dev/nxge/xge-osdep.h
index 15adfe7b38472..79e77c3c55af2 100644
--- a/sys/dev/nxge/xge-osdep.h
+++ b/sys/dev/nxge/xge-osdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xge-osdep.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGE_OSDEP_H
diff --git a/sys/dev/nxge/xgehal/xge-queue.c b/sys/dev/nxge/xgehal/xge-queue.c
index a1a792e0b8a01..33e44a15db92d 100644
--- a/sys/dev/nxge/xgehal/xge-queue.c
+++ b/sys/dev/nxge/xgehal/xge-queue.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xge-queue.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xge-queue.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-channel-fp.c b/sys/dev/nxge/xgehal/xgehal-channel-fp.c
index 98c98103adec7..b897cfea7c230 100644
--- a/sys/dev/nxge/xgehal/xgehal-channel-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-channel-fp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-channel-fp.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifdef XGE_DEBUG_FP
diff --git a/sys/dev/nxge/xgehal/xgehal-channel.c b/sys/dev/nxge/xgehal/xgehal-channel.c
index c1ca17bea7332..49d32b150db49 100644
--- a/sys/dev/nxge/xgehal/xgehal-channel.c
+++ b/sys/dev/nxge/xgehal/xgehal-channel.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-channel.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-channel.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-config.c b/sys/dev/nxge/xgehal/xgehal-config.c
index a937d5370e8c4..b1f3ebd9490d0 100644
--- a/sys/dev/nxge/xgehal/xgehal-config.c
+++ b/sys/dev/nxge/xgehal/xgehal-config.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-config.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-config.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-device-fp.c b/sys/dev/nxge/xgehal/xgehal-device-fp.c
index 2788e512883ca..e7ffd6e826b19 100644
--- a/sys/dev/nxge/xgehal/xgehal-device-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-device-fp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-device-fp.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifdef XGE_DEBUG_FP
diff --git a/sys/dev/nxge/xgehal/xgehal-device.c b/sys/dev/nxge/xgehal/xgehal-device.c
index 882aaf7bcc447..a02be233de532 100644
--- a/sys/dev/nxge/xgehal/xgehal-device.c
+++ b/sys/dev/nxge/xgehal/xgehal-device.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-device.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-device.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-driver.c b/sys/dev/nxge/xgehal/xgehal-driver.c
index 430931c32f249..3629a4086f2e7 100644
--- a/sys/dev/nxge/xgehal/xgehal-driver.c
+++ b/sys/dev/nxge/xgehal/xgehal-driver.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-driver.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-driver.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-fifo-fp.c b/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
index efc4d377fb13d..08cc2733772ad 100644
--- a/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifdef XGE_DEBUG_FP
diff --git a/sys/dev/nxge/xgehal/xgehal-fifo.c b/sys/dev/nxge/xgehal/xgehal-fifo.c
index 303afafbf7ce6..67527eeb47c41 100644
--- a/sys/dev/nxge/xgehal/xgehal-fifo.c
+++ b/sys/dev/nxge/xgehal/xgehal-fifo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-fifo.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-fifo.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-mgmt.c b/sys/dev/nxge/xgehal/xgehal-mgmt.c
index 7f8346bd00357..30dff7001ee90 100644
--- a/sys/dev/nxge/xgehal/xgehal-mgmt.c
+++ b/sys/dev/nxge/xgehal/xgehal-mgmt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-mgmt.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-mgmt.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-mgmtaux.c b/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
index 00550d830f4b9..518e92c799b1e 100644
--- a/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
+++ b/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-mgmt.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-mm.c b/sys/dev/nxge/xgehal/xgehal-mm.c
index a787dad67d8ad..320d8c7760229 100644
--- a/sys/dev/nxge/xgehal/xgehal-mm.c
+++ b/sys/dev/nxge/xgehal/xgehal-mm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-mm.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xge-os-pal.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-ring-fp.c b/sys/dev/nxge/xgehal/xgehal-ring-fp.c
index e25a2659f931f..74551f316df92 100644
--- a/sys/dev/nxge/xgehal/xgehal-ring-fp.c
+++ b/sys/dev/nxge/xgehal/xgehal-ring-fp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-ring-fp.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #ifdef XGE_DEBUG_FP
diff --git a/sys/dev/nxge/xgehal/xgehal-ring.c b/sys/dev/nxge/xgehal/xgehal-ring.c
index 444e10c4f06d3..32fc2379d47cb 100644
--- a/sys/dev/nxge/xgehal/xgehal-ring.c
+++ b/sys/dev/nxge/xgehal/xgehal-ring.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-ring.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-ring.h>
diff --git a/sys/dev/nxge/xgehal/xgehal-stats.c b/sys/dev/nxge/xgehal/xgehal-stats.c
index c5f59b6a855d3..2ee1690b1b28d 100644
--- a/sys/dev/nxge/xgehal/xgehal-stats.c
+++ b/sys/dev/nxge/xgehal/xgehal-stats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgehal/xgehal-stats.c,v 1.1.2.1 2007/11/02 00:52:33 rwatson Exp $
  */
 
 #include <dev/nxge/include/xgehal-stats.h>
diff --git a/sys/dev/nxge/xgell-version.h b/sys/dev/nxge/xgell-version.h
index df724827ee50c..8765e40baadc2 100644
--- a/sys/dev/nxge/xgell-version.h
+++ b/sys/dev/nxge/xgell-version.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/nxge/xgell-version.h,v 1.1.2.1 2007/11/02 00:52:32 rwatson Exp $
  */
 
 #ifndef XGELL_VERSION_H
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 3f4fbae9754d2..443eccd88d6bd 100644
--- a/sys/dev/ofw/ofw_bus.h
+++ b/sys/dev/ofw/ofw_bus.h
@@ -23,7 +23,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_bus.h,v 1.1 2004/08/12 17:41:29 marius Exp $
  */
 
 #ifndef	_DEV_OFW_OFW_BUS_H_
diff --git a/sys/dev/ofw/ofw_bus_if.m b/sys/dev/ofw/ofw_bus_if.m
index 446338c4551d9..f52c8467af79d 100644
--- a/sys/dev/ofw/ofw_bus_if.m
+++ b/sys/dev/ofw/ofw_bus_if.m
@@ -23,7 +23,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/ofw/ofw_bus_if.m,v 1.3 2005/11/22 16:37:45 marius Exp $
 
 # Interface for retrieving the package handle and a subset, namely
 # 'compatible', 'device_type', 'model' and 'name', of the standard
diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c
index 7a394c1e7f51b..a624218f1f643 100644
--- a/sys/dev/ofw/ofw_bus_subr.c
+++ b/sys/dev/ofw/ofw_bus_subr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_bus_subr.c,v 1.1 2005/11/22 16:37:45 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
index 6096b3e36d76a..521ab24e531ab 100644
--- a/sys/dev/ofw/ofw_bus_subr.h
+++ b/sys/dev/ofw/ofw_bus_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_bus_subr.h,v 1.1 2005/11/22 16:37:45 marius Exp $
  */
 
 #ifndef	_DEV_OFW_OFW_BUS_SUBR_H_
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 0d1133f57ac0a..4418cbaed8737 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.36 2006/11/06 17:43:10 rwatson Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_ofw.h"
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 130c869fe46d4..a2e31e7f0e1da 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.18 2005/10/31 03:09:38 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h
index ef48ee96ab63b..0a143a47608da 100644
--- a/sys/dev/ofw/ofw_pci.h
+++ b/sys/dev/ofw/ofw_pci.h
@@ -36,7 +36,7 @@
  *
  *	from: NetBSD: ofw_pci.h,v 1.5 2003/10/22 09:04:39 mjl Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/ofw_pci.h,v 1.2 2005/02/12 19:12:17 marius Exp $
  */
 
 #ifndef _DEV_OFW_OFW_PCI_H_
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index ff889e512a330..c692edda20588 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.21 2007/07/06 00:47:44 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index a8c06331f3f80..02bd7a42e3160 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -54,7 +54,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/openfirm.h,v 1.13 2007/06/16 22:30:38 marius Exp $
  */
 
 #ifndef _OPENFIRM_H_
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index 47f251797665c..a087bc68d7dd3 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: openfirmio.c,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirmio.c,v 1.14 2006/09/01 20:12:12 marius Exp $");
 
 /*-
  * Copyright (c) 1992, 1993
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index 676cfb8007d0e..62f0244af237f 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -34,7 +34,7 @@
  *
  *	@(#)openpromio.h	8.1 (Berkeley) 6/11/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/openfirmio.h,v 1.6 2005/05/19 15:22:16 marius Exp $
  */
 
 #ifndef _DEV_OFW_OPENFIRMIO_H_
diff --git a/sys/dev/ofw/openpromio.c b/sys/dev/ofw/openpromio.c
index cb7343ff6d705..a189fadf8fd80 100644
--- a/sys/dev/ofw/openpromio.c
+++ b/sys/dev/ofw/openpromio.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openpromio.c,v 1.7.14.1 2007/12/23 11:26:48 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ofw/openpromio.h b/sys/dev/ofw/openpromio.h
index 5233d29eb870b..35e6a50d63727 100644
--- a/sys/dev/ofw/openpromio.h
+++ b/sys/dev/ofw/openpromio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ofw/openpromio.h,v 1.1 2003/06/19 01:40:11 jake Exp $
  */
 
 #ifndef	_DEV_OFW_OPENPROMIO_H_
diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile
index a4f50329795b5..d4c538f9dfe9e 100644
--- a/sys/dev/patm/genrtab/Makefile
+++ b/sys/dev/patm/genrtab/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.6 2004/12/21 08:47:19 ru Exp $
 #
 # This program is used to generate the if_patm_rtables.c file
 # for the idt77252 driver. It is not installed.
diff --git a/sys/dev/patm/genrtab/genrtab.c b/sys/dev/patm/genrtab/genrtab.c
index 8d696cfa8ef64..7de217cfd483c 100644
--- a/sys/dev/patm/genrtab/genrtab.c
+++ b/sys/dev/patm/genrtab/genrtab.c
@@ -31,7 +31,7 @@
  * IDT manual.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/genrtab/genrtab.c,v 1.2 2005/01/06 01:43:02 imp Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -445,7 +445,7 @@ main(int argc, char *argv[])
 	printf(" */\n");
 	printf("\n");
 	printf("#include <sys/cdefs.h>\n");
-	printf("__FBSDID(\"$FreeBSD$\");\n");
+	printf("__FBSDID(\"$FreeBSD: src/sys/dev/patm/genrtab/genrtab.c,v 1.2 2005/01/06 01:43:02 imp Exp $\");\n");
 	printf("\n");
 	printf("#include <sys/types.h>\n");
 	printf("\n");
diff --git a/sys/dev/patm/idt77252reg.h b/sys/dev/patm/idt77252reg.h
index 13013a2f1056b..78c66bf0e9fac 100644
--- a/sys/dev/patm/idt77252reg.h
+++ b/sys/dev/patm/idt77252reg.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/patm/idt77252reg.h,v 1.2 2005/01/06 01:43:01 imp Exp $
  *
  * Register definitions for the IDT77252 chip.
  */
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index 279afde1d440e..f640a8adb007a 100644
--- a/sys/dev/patm/if_patm.c
+++ b/sys/dev/patm/if_patm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm.c,v 1.9 2005/08/09 10:19:51 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 940d0ac3009a4..da0eab83b0f24 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_attach.c,v 1.14 2007/02/23 12:18:48 piso Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_intr.c b/sys/dev/patm/if_patm_intr.c
index 2e50b6a76059d..78aaba4910922 100644
--- a/sys/dev/patm/if_patm_intr.c
+++ b/sys/dev/patm/if_patm_intr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_intr.c,v 1.7 2006/08/04 07:56:33 yar Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_ioctl.c b/sys/dev/patm/if_patm_ioctl.c
index 2ed466d81f2b8..2f7bc8c0e4f53 100644
--- a/sys/dev/patm/if_patm_ioctl.c
+++ b/sys/dev/patm/if_patm_ioctl.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_ioctl.c,v 1.10 2005/08/09 10:19:51 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_rtables.c b/sys/dev/patm/if_patm_rtables.c
index f945276690b4b..410b25ac9fba2 100644
--- a/sys/dev/patm/if_patm_rtables.c
+++ b/sys/dev/patm/if_patm_rtables.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rtables.c,v 1.3 2004/03/10 17:03:27 bms Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index b972e3cf36cf1..ee1b67f872be8 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.8 2005/09/19 22:04:41 andre Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index cb40aa530fc52..37b185f3f703b 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_tx.c,v 1.10 2005/08/09 10:19:51 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_natm.h"
diff --git a/sys/dev/patm/if_patmvar.h b/sys/dev/patm/if_patmvar.h
index e934784aec093..d5cd244320b4c 100644
--- a/sys/dev/patm/if_patmvar.h
+++ b/sys/dev/patm/if_patmvar.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/patm/if_patmvar.h,v 1.5 2005/06/10 16:49:13 brooks Exp $
  *
  * Driver for IDT77252 (ABR) based cards like ProSum's.
  */
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index 3ba3c1271cfd7..d33cb1b73afa4 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pbio/pbio.c,v 1.10 2006/05/16 14:36:30 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pbio/pbioio.h b/sys/dev/pbio/pbioio.h
index 9a08bfab02542..d1bd57f0c2556 100644
--- a/sys/dev/pbio/pbioio.h
+++ b/sys/dev/pbio/pbioio.h
@@ -25,7 +25,7 @@
  *  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  *  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pbio/pbioio.h,v 1.3 2005/01/06 01:43:02 imp Exp $
  *
  */
 
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 3cf814c54271a..4e7feec05a6ce 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.31 2005/09/25 01:39:04 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 583b6e5ecaa5d..dd00e3d5cd514 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.119 2007/06/16 23:33:57 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index 00a4a345e18a3..5a779463cea94 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -1,5 +1,5 @@
 /* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.c,v 1.40 2007/02/27 17:23:28 jhb Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h
index d6b9c3899f863..dd41716d01cd0 100644
--- a/sys/dev/pccard/pccard_cis.h
+++ b/sys/dev/pccard/pccard_cis.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccard_cis.h,v 1.4 2005/07/13 14:59:06 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 925da6c69ea61..2730a1a3bd7cf 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.16.2.1 2007/10/30 10:17:11 remko Exp $");
 
 #define	PCCARDDEBUG
 
diff --git a/sys/dev/pccard/pccard_device.c b/sys/dev/pccard/pccard_device.c
index 807ed79841871..3fe3cca583235 100644
--- a/sys/dev/pccard/pccard_device.c
+++ b/sys/dev/pccard/pccard_device.c
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_device.c,v 1.3 2005/09/21 20:08:24 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index a6359d5da01c1..1a8250323d30b 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.129.2.1 2007/10/30 10:17:11 remko Exp $
 /* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */
 /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
 
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index e0f6647771bce..d386cb755a6c0 100644
--- a/sys/dev/pccard/pccardreg.h
+++ b/sys/dev/pccard/pccardreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciareg.h,v 1.7 1998/10/29 09:45:52 enami Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardreg.h,v 1.3 2005/01/06 01:43:03 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index cda5e98451127..df00d86c757a1 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.61 2005/09/25 01:38:02 imp Exp $ */
 
 /*-
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
diff --git a/sys/dev/pccard/pccardvarp.h b/sys/dev/pccard/pccardvarp.h
index e41873060eab9..3784f68a3890c 100644
--- a/sys/dev/pccard/pccardvarp.h
+++ b/sys/dev/pccard/pccardvarp.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccard/pccardvarp.h,v 1.4 2007/05/31 19:29:20 piso Exp $
  */
 
 #ifndef _PCCARD_PCCARDVARP_H
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m
index a85fd01e50e00..f03340d47ec9b 100644
--- a/sys/dev/pccard/power_if.m
+++ b/sys/dev/pccard/power_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pccard/power_if.m,v 1.4 2005/01/06 01:43:03 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 7b8fb62f4174f..17303d3eda830 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.165 2007/09/30 11:05:15 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index 677967d8c3da4..3fbdf7c21647c 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_isa.c,v 1.7 2006/06/03 21:10:50 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 73a52b0d82cd5..e319c5e5324cc 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.26 2007/09/30 11:05:15 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index b73036f376bdf..369feb284d4bd 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbdevid.h,v 1.22 2005/11/08 15:42:12 imp Exp $
  */
 
 /* Vendor/Device IDs */
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index ae73fe1c71491..0cc9cc24a03de 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbreg.h,v 1.20 2006/08/12 09:06:55 imp Exp $
  */
 
 /*
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index ef2d82f590a42..8f63a5865af62 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pccbb/pccbbvar.h,v 1.32 2007/09/30 11:05:15 marius Exp $
  */
 
 /*
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 8c4795867881c..9f6cbd347fc74 100644
--- a/sys/dev/pcf/envctrl.c
+++ b/sys/dev/pcf/envctrl.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/envctrl.c,v 1.8 2007/03/21 03:38:36 nyan Exp $");
 
 /*
  * Device specific driver for the SUNW,envctrl device found on some
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 032095855f59c..862185850c699 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.25 2004/05/31 14:24:21 nsouch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c
index e53e6d47fe0dc..da25cb12ba249 100644
--- a/sys/dev/pcf/pcf_ebus.c
+++ b/sys/dev/pcf/pcf_ebus.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_ebus.c,v 1.7 2007/03/21 03:38:36 nyan Exp $");
 
 /*
  * Device specific driver for the EBus i2c devices found on some sun4u
diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c
index 40064cc74bc3c..165ea3f753eb4 100644
--- a/sys/dev/pcf/pcf_isa.c
+++ b/sys/dev/pcf/pcf_isa.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf_isa.c,v 1.9 2007/03/21 03:38:36 nyan Exp $");
 
 /*
  * Hardware driver for a Philips PCF8584 I2C bus controller sitting
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index ed4d9d8cb9a9a..c000ec10aeee1 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pcf/pcfvar.h,v 1.3 2004/08/11 21:19:31 marius Exp $
  */
 
 #define IO_PCFSIZE	2
diff --git a/sys/dev/pci/eisa_pci.c b/sys/dev/pci/eisa_pci.c
index 61027a1cbc678..092438551210b 100644
--- a/sys/dev/pci/eisa_pci.c
+++ b/sys/dev/pci/eisa_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/eisa_pci.c,v 1.6 2004/05/30 20:08:37 phk Exp $");
 
 /*
  * PCI:EISA bridge support
diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
index 13fc4b15ffccd..ebbec52ce7fe1 100644
--- a/sys/dev/pci/fixup_pci.c
+++ b/sys/dev/pci/fixup_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/fixup_pci.c,v 1.7 2006/05/24 14:08:31 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/pci/hostb_pci.c b/sys/dev/pci/hostb_pci.c
index ca1b2f61542a9..9e24a8fc6672d 100644
--- a/sys/dev/pci/hostb_pci.c
+++ b/sys/dev/pci/hostb_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/hostb_pci.c,v 1.1 2005/12/20 21:09:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 1ae9d34545c11..0445c6490da30 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/sys/dev/pci/ignore_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/ignore_pci.c,v 1.4 2004/05/30 17:57:41 phk Exp $");
 
 /*
  * 'Ignore' driver - eats devices that show up errnoeously on PCI
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index 073aff7a80956..b8e996bde1fc9 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/sys/dev/pci/isa_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/isa_pci.c,v 1.13 2005/09/29 15:00:09 jhb Exp $");
 
 /*
  * PCI:ISA bridge support
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index d7343d2b28a53..1703191724680 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.355.2.1 2007/11/26 17:37:24 jkim Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index 05dfa382d96ba..53eba830f1a7e 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pci/pci_if.m,v 1.12 2007/05/02 17:50:35 jhb Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 033ea7473eabe..1742522e8e356 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.50 2007/09/30 11:05:15 marius Exp $");
 
 /*
  * PCI:PCI bridge support.
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index f7ccc1958c306..037fd38d29f29 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pci/pci_private.h,v 1.25 2007/09/30 11:05:15 marius Exp $
  *
  */
 
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index b7ae55a3a04b6..a60268d8e9d44 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.22.2.1.2.2 2008/01/24 18:53:29 jhb Exp $");
 
 #include "opt_bus.h"	/* XXX trim includes */
 #include "opt_compat.h"
diff --git a/sys/dev/pci/pcib_if.m b/sys/dev/pci/pcib_if.m
index 0b7e8bc62c9bb..ece82614b9c5b 100644
--- a/sys/dev/pci/pcib_if.m
+++ b/sys/dev/pci/pcib_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/pci/pcib_if.m,v 1.11 2007/05/02 17:50:35 jhb Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h
index c375e3ee5d073..cad775d9593a1 100644
--- a/sys/dev/pci/pcib_private.h
+++ b/sys/dev/pci/pcib_private.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $
  */
 
 #ifndef __PCIB_PRIVATE_H__
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 6ec6600a564a1..9b8a5d0a41678 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.64 2007/09/19 13:05:58 sepotvin Exp $
  *
  */
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 1aec1b5c39276..8b89142349534 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.80 2007/09/30 11:05:15 marius Exp $
  *
  */
 
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 54424a235b37c..28fa9c0caad57 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.5 2006/02/01 15:45:29 jhb Exp $");
 
 /*
  * Simple driver for PCI VGA display devices.  Drivers such as agp(4) and
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index a2cb27fe7aa32..c0279af496f23 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.30 2007/02/23 20:11:25 piso Exp $
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 55d5e05b6bc76..2bbd51c009c68 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.27 2007/02/23 19:31:44 imp Exp $");
 
 /*
  * DEC PDQ FDDI Controller; code for BSD derived operating systems
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 2f4443954d0c8..0fa8ea076dc99 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq.c,v 1.11 2005/06/10 16:49:13 brooks Exp $");
 
 /*
  * DEC PDQ FDDI Controller O/S independent code
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index cdbf3893e904a..cb95e17703f12 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdq_freebsd.h,v 1.13 2006/05/16 14:36:30 phk Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index ce1a2087bbd74..20e5f22fe2079 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.30 2007/06/08 01:49:04 mjacob Exp $");
 
 /*
  * DEC PDQ FDDI Controller; code for BSD derived operating systems
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index a4dea690b1548..64500cc04a0ea 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqreg.h,v 1.11 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqreg.h,v 1.5 2007/06/08 01:48:23 mjacob Exp $
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index d978809c23263..d859936b2a19c 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Id: pdqvar.h,v 1.21 1997/03/21 21:16:04 thomas Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.14 2006/05/16 14:36:30 phk Exp $
  *
  */
 
diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c
index e131d6a99484c..258e92954bea5 100644
--- a/sys/dev/powermac_nvram/powermac_nvram.c
+++ b/sys/dev/powermac_nvram/powermac_nvram.c
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/powermac_nvram/powermac_nvram.c,v 1.1 2006/08/01 22:19:00 sobomax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/powermac_nvram/powermac_nvramvar.h b/sys/dev/powermac_nvram/powermac_nvramvar.h
index 6f4fb26e89903..376db75c0f38b 100644
--- a/sys/dev/powermac_nvram/powermac_nvramvar.h
+++ b/sys/dev/powermac_nvram/powermac_nvramvar.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/powermac_nvram/powermac_nvramvar.h,v 1.1 2006/08/01 22:19:00 sobomax Exp $
  */
 
 #ifndef	_POWERPC_POWERMAC_POWERMAC_NVRAMVAR_H_
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index dfee00d2e919b..68bd014085f8f 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.44 2007/02/23 12:18:49 piso Exp $");
 
 /*
  * Parallel port TCP/IP interfaces added.  I looked at the driver from
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 6dc30cc639611..6f032a5846f3f 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/immio.c,v 1.18 2005/12/21 00:09:11 sam Exp $");
 
 /*
  * Iomega ZIP+ Matchmaker Parallel Port Interface driver
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 07a2f213a9fbf..3380ed0e91133 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpbb.c,v 1.19 2005/12/21 10:54:46 ru Exp $");
 
 /*
  * I2C Bit-Banging over parallel port
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 1986d56dccb28..43f1f97ea4f3e 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.40 2007/02/23 12:18:49 piso Exp $");
 
 /*
  * Device Driver for AT parallel printer port
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 9075b4ec6e5ad..da1a527ee5b85 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lpt.h,v 1.4 1999/08/28 00:42:23 peter Exp $
  */
 
 /*
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index e8471d396d20e..e9ee722b68df4 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>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/lptio.h,v 1.9 2005/01/06 01:43:06 imp Exp $
  */
 
 #ifndef	_DEV_PPBUS_LPT_H_
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 0a650552aecea..cb84a16db6a25 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pcfclock.c,v 1.20 2005/01/06 01:43:06 imp Exp $");
 
 #include "opt_pcfclock.h"
 
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 566350301cbee..96121cc88def8 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_1284.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 
 /*
  * General purpose routines for the IEEE1284-1994 Standard
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index 5c4010f88bf52..39657494dd7c6 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_1284.h,v 1.7 2000/01/14 08:03:14 nsouch Exp $
  *
  */
 #ifndef __1284_H
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index f54dae1e44ec8..117ad8615ff74 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 533ab5f4603a5..553babad0c24f 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppb_msq.c,v 1.14 2003/08/24 17:54:16 obrien Exp $");
 #include <machine/stdarg.h>
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 1ee55e56d4bfa..59dc74a6a922f 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppb_msq.h,v 1.9 2002/11/09 12:55:05 alfred Exp $
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 2ad164c3961d8..71cdc0859697b 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.26.4.1 2008/01/15 22:28:15 jhb Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 5f7a201963953..001ddf8d9519a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppbconf.h,v 1.19.24.1 2008/01/15 22:28:15 jhb Exp $
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppbio.h b/sys/dev/ppbus/ppbio.h
index 2794eddc1dea3..b288fc892ed57 100644
--- a/sys/dev/ppbus/ppbio.h
+++ b/sys/dev/ppbus/ppbio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppbio.h,v 1.1 2000/01/14 00:17:57 nsouch Exp $
  *
  */
 
diff --git a/sys/dev/ppbus/ppbus_if.m b/sys/dev/ppbus/ppbus_if.m
index ccc308d23f367..5e72b555927f2 100644
--- a/sys/dev/ppbus/ppbus_if.m
+++ b/sys/dev/ppbus/ppbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/ppbus/ppbus_if.m,v 1.3 2005/01/06 01:43:06 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index c6ab7a7f484e1..9d0ede1a48a17 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.41 2007/02/23 19:32:21 imp Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 8ff2fb48c4ad6..e5b9994cdbce7 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/ppi.h,v 1.5 1999/12/29 04:35:43 peter Exp $
  *
  */
 #ifndef __PPI_H
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index e491ed25093dc..bee8249d1124a 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pps.c,v 1.52 2007/02/23 12:18:49 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 189a58c4eaa89..99354905f78ac 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.36 2007/06/17 05:55:52 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 7ff515f6d7831..934400117f0da 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpoio.c,v 1.19 2006/05/16 14:36:31 phk Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index fe66fa5299be7..64d2ccbe76376 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppbus/vpoio.h,v 1.5 2001/01/02 21:29:06 nsouch Exp $
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 6d6e55475952c..ba7c0dc8b4ac5 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.57 2007/03/21 03:38:36 nyan Exp $");
 
 #include "opt_ppc.h"
 
diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c
index c3a42fe8feb9d..e00273af2baa0 100644
--- a/sys/dev/ppc/ppc_acpi.c
+++ b/sys/dev/ppc/ppc_acpi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_acpi.c,v 1.1 2006/04/24 23:31:51 marcel Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 0324a497ff06a..48477bda7511a 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_isa.c,v 1.1 2006/04/24 23:31:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c
index 77331e2524e25..5464ab10b948c 100644
--- a/sys/dev/ppc/ppc_pci.c
+++ b/sys/dev/ppc/ppc_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_pci.c,v 1.1 2006/04/24 23:31:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index adcc0580bed8a..20e2306779897 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_puc.c,v 1.5 2006/04/28 21:21:52 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index 6b26ed98399e3..6d536415072e6 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppc/ppcreg.h,v 1.16 2006/04/24 23:31:51 marcel Exp $
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index b8723bc23518a..3fb7a1decdfa1 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ppc/ppcvar.h,v 1.5 2007/02/23 12:18:50 piso Exp $
  *
  */
 
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index d4e83f01ecbe0..f3d090fcf43a5 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.8 2007/02/23 12:18:50 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pst/pst-iop.h b/sys/dev/pst/pst-iop.h
index 59314ce0bb339..e402c2371314b 100644
--- a/sys/dev/pst/pst-iop.h
+++ b/sys/dev/pst/pst-iop.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/pst/pst-iop.h,v 1.6 2004/10/03 16:06:46 stefanf Exp $
  */
 
 /* misc defines */
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index c5f4a85921603..feb4d770ed308 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/sys/dev/pst/pst-pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.8 2005/03/05 18:10:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index f14be91904d21..046d7c5cad463 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.14 2004/09/15 15:39:28 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 39e7a19a61116..210e02724954a 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.50 2007/06/06 22:17:01 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h
index f6d69c407a9e2..e069f69ab2a4a 100644
--- a/sys/dev/puc/puc_bfe.h
+++ b/sys/dev/puc/puc_bfe.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/puc/puc_bfe.h,v 1.2 2007/02/23 12:18:50 piso Exp $
  */
 
 #ifndef _DEV_PUC_BFE_H_
diff --git a/sys/dev/puc/puc_bus.h b/sys/dev/puc/puc_bus.h
index 59da93da9b6ef..6474248a2485a 100644
--- a/sys/dev/puc/puc_bus.h
+++ b/sys/dev/puc/puc_bus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/puc/puc_bus.h,v 1.1 2006/04/28 21:21:52 marcel Exp $
  */
 
 #ifndef _DEV_PUC_BUS_H_
diff --git a/sys/dev/puc/puc_cfg.c b/sys/dev/puc/puc_cfg.c
index 7de6ea3c80196..88a0e3241fbfe 100644
--- a/sys/dev/puc/puc_cfg.c
+++ b/sys/dev/puc/puc_cfg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_cfg.c,v 1.2 2006/06/29 16:27:19 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc_cfg.h b/sys/dev/puc/puc_cfg.h
index 4c2c65ee3bbd2..98bdc5d5712fc 100644
--- a/sys/dev/puc/puc_cfg.h
+++ b/sys/dev/puc/puc_cfg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/puc/puc_cfg.h,v 1.1 2006/04/28 21:21:52 marcel Exp $
  */
 
 #ifndef _DEV_PUC_CFG_H_
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index 2cb9513a875f3..0231810ebe92d 100644
--- a/sys/dev/puc/puc_pccard.c
+++ b/sys/dev/puc/puc_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.11 2006/06/29 16:27:19 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index a846b74195e9f..014f116d98ceb 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.16.2.1 2007/10/18 09:03:40 des Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 10cd6883ebfab..f28e6b1a742f4 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.59 2007/06/07 06:28:48 peter Exp $");
 
 /*
  * PCI "universal" communications card driver configuration data (used to
diff --git a/sys/dev/ral/if_ral_pci.c b/sys/dev/ral/if_ral_pci.c
index 2ceafe4a97ae6..117b932e5134f 100644
--- a/sys/dev/ral/if_ral_pci.c
+++ b/sys/dev/ral/if_ral_pci.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.7 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.7 2007/06/11 03:36:52 sam Exp $");
 
 /*
  * PCI/Cardbus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
diff --git a/sys/dev/ral/if_ralrate.c b/sys/dev/ral/if_ralrate.c
index b8922ba0da04c..92b6e08fb5830 100644
--- a/sys/dev/ral/if_ralrate.c
+++ b/sys/dev/ral/if_ralrate.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ralrate.c,v 1.1 2005/04/18 18:47:36 damien Exp $	*/
 /* $NetBSD: ieee80211_rssadapt.c,v 1.9 2005/02/26 22:45:09 perry Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/sys/dev/ral/if_ralrate.h b/sys/dev/ral/if_ralrate.h
index 50eee4429bc34..787dbc7c8534b 100644
--- a/sys/dev/ral/if_ralrate.h
+++ b/sys/dev/ral/if_ralrate.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/if_ralrate.h,v 1.1 2005/04/18 18:47:36 damien Exp $	*/
 /* $NetBSD: ieee80211_rssadapt.h,v 1.4 2005/02/26 22:45:09 perry Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index b72ca403f1499..c317161ce471c 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.17 2007/09/17 19:07:23 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.17 2007/09/17 19:07:23 sam Exp $");
 
 /*-
  * Ralink Technology RT2560 chipset driver
diff --git a/sys/dev/ral/rt2560reg.h b/sys/dev/ral/rt2560reg.h
index 3871ed3f28bef..2112b50cdc30a 100644
--- a/sys/dev/ral/rt2560reg.h
+++ b/sys/dev/ral/rt2560reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2560reg.h,v 1.2 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/ral/rt2560var.h b/sys/dev/ral/rt2560var.h
index c01abb1093d2b..1d7dacd2e4917 100644
--- a/sys/dev/ral/rt2560var.h
+++ b/sys/dev/ral/rt2560var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2560var.h,v 1.3 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 60171ee6e74bb..8078c5eb75f7d 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.17 2007/09/17 19:07:23 sam Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.17 2007/09/17 19:07:23 sam Exp $");
 
 /*-
  * Ralink Technology RT2561, RT2561S and RT2661 chipset driver
diff --git a/sys/dev/ral/rt2661_ucode.h b/sys/dev/ral/rt2661_ucode.h
index 556ac5f03b237..71ce147ce0c1d 100644
--- a/sys/dev/ral/rt2661_ucode.h
+++ b/sys/dev/ral/rt2661_ucode.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2661_ucode.h,v 1.1 2006/03/05 20:41:51 damien Exp $	*/
 /*	OpenBSD: microcode.h,v 1.1 2006/01/09 20:03:40 damien Exp	*/
 
 /*-
diff --git a/sys/dev/ral/rt2661reg.h b/sys/dev/ral/rt2661reg.h
index b4325b053d330..033d566982c4a 100644
--- a/sys/dev/ral/rt2661reg.h
+++ b/sys/dev/ral/rt2661reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2661reg.h,v 1.2 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2006
diff --git a/sys/dev/ral/rt2661var.h b/sys/dev/ral/rt2661var.h
index 9f12a15fca618..701b7b4084fc1 100644
--- a/sys/dev/ral/rt2661var.h
+++ b/sys/dev/ral/rt2661var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/ral/rt2661var.h,v 1.3 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index d78306524ff98..da541a952a310 100644
--- a/sys/dev/random/harvest.c
+++ b/sys/dev/random/harvest.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/harvest.c,v 1.25 2004/10/18 19:29:13 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kthread.h>
diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 611f866c42426..2057053d1182c 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/hash.c,v 1.13 2005/03/11 15:42:50 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h
index 8580d145d6832..9c31976bc8f8b 100644
--- a/sys/dev/random/hash.h
+++ b/sys/dev/random/hash.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/random/hash.h,v 1.5 2004/04/09 15:47:09 markm Exp $
  */
 
 #define KEYSIZE		32		/* (in bytes) 32 bytes == 256 bits */
diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c
index 3001b2030e11b..836a545326cea 100644
--- a/sys/dev/random/nehemiah.c
+++ b/sys/dev/random/nehemiah.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/nehemiah.c,v 1.4 2005/12/20 21:41:52 ps Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/dev/random/nehemiah.h b/sys/dev/random/nehemiah.h
index b35fb3fb2262f..90af99b159d01 100644
--- a/sys/dev/random/nehemiah.h
+++ b/sys/dev/random/nehemiah.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/random/nehemiah.h,v 1.1 2004/04/09 15:47:09 markm Exp $
  */
 
 extern struct random_systat random_nehemiah;
diff --git a/sys/dev/random/probe.c b/sys/dev/random/probe.c
index 264f9d5940704..66482bc8f34c9 100644
--- a/sys/dev/random/probe.c
+++ b/sys/dev/random/probe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/probe.c,v 1.7 2006/07/13 11:47:36 mr Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 7cc78e61e8c2d..8375ae7f43d53 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/randomdev.c,v 1.61 2006/11/06 13:41:55 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h
index 2529a82ec710e..cb57e0e039ae2 100644
--- a/sys/dev/random/randomdev.h
+++ b/sys/dev/random/randomdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/random/randomdev.h,v 1.7 2005/12/20 21:41:52 ps Exp $
  */
 
 /* This header contains only those definitions that are global
diff --git a/sys/dev/random/randomdev_soft.c b/sys/dev/random/randomdev_soft.c
index 365f3eacc4fec..5578899a344ba 100644
--- a/sys/dev/random/randomdev_soft.c
+++ b/sys/dev/random/randomdev_soft.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/randomdev_soft.c,v 1.15 2007/05/28 18:20:15 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/random/randomdev_soft.h b/sys/dev/random/randomdev_soft.h
index 489d45a3c5fda..c36045e7dc793 100644
--- a/sys/dev/random/randomdev_soft.h
+++ b/sys/dev/random/randomdev_soft.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/random/randomdev_soft.h,v 1.2 2005/12/20 21:41:52 ps Exp $
  */
 
 /* This header contains only those definitions that are global
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index 6f631bb111375..bc2c9b7ebc0ad 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.47.2.1 2007/11/29 16:05:38 simon Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/random/yarrow.h b/sys/dev/random/yarrow.h
index 558354d27f737..098065fdc5992 100644
--- a/sys/dev/random/yarrow.h
+++ b/sys/dev/random/yarrow.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/random/yarrow.h,v 1.18 2004/04/09 15:47:09 markm Exp $
  */
 
 /* This contains Yarrow-specific declarations.
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 0742c7c9e976c..0fad88dc35139 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ray/if_ray.c,v 1.87 2007/09/05 21:25:58 sam Exp $");
 
 /*
  * Card configuration
diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
index 4981da6b85fe4..1afdc2bd8cd72 100644
--- a/sys/dev/ray/if_raydbg.h
+++ b/sys/dev/ray/if_raydbg.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_raydbg.h,v 1.13 2005/01/06 01:43:09 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_raymib.h b/sys/dev/ray/if_raymib.h
index de3bb16411316..599b6ebe9e43c 100644
--- a/sys/dev/ray/if_raymib.h
+++ b/sys/dev/ray/if_raymib.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_raymib.h,v 1.13 2005/01/06 01:43:09 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayreg.h b/sys/dev/ray/if_rayreg.h
index 562279f7aa3df..eeecb78a8ea64 100644
--- a/sys/dev/ray/if_rayreg.h
+++ b/sys/dev/ray/if_rayreg.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_rayreg.h,v 1.11 2005/01/06 01:43:09 imp Exp $
  *
  */
 
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index 7376405bb19ad..cd159366137a6 100644
--- a/sys/dev/ray/if_rayvar.h
+++ b/sys/dev/ray/if_rayvar.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ray/if_rayvar.h,v 1.22 2005/08/09 10:19:53 rwatson Exp $
  *
  */
 
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 0c11358c21796..fa9d8a9046a23 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rc/rc.c,v 1.103 2007/02/23 12:18:51 piso Exp $
  */
 
 /*
diff --git a/sys/dev/rc/rcreg.h b/sys/dev/rc/rcreg.h
index 8ba287e7251c0..e23576548f678 100644
--- a/sys/dev/rc/rcreg.h
+++ b/sys/dev/rc/rcreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rc/rcreg.h,v 1.6 2005/01/06 01:43:10 imp Exp $
  */
 
 /*
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 8abe82345b978..265d68abb73fe 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95.2.3 2007/12/15 02:57:18 yongari Exp $");
 
 /*
  * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 15ddcceeb59c6..e9207dab66afa 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rndtest/rndtest.c,v 1.5 2005/01/06 01:43:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 5a284e9a91de5..83d6fd94f0e72 100644
--- a/sys/dev/rndtest/rndtest.h
+++ b/sys/dev/rndtest/rndtest.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.2 2005/01/06 01:43:10 imp Exp $	*/
 /*	$OpenBSD$	*/
 
 /*-
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 809a2a418cbb1..b0c324410f177 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.74 2007/07/05 06:51:49 peter Exp $");
 
 /* 
  * rp.c - for RocketPort FreeBSD
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index 2f612308f45b5..9990b38017ec6 100644
--- a/sys/dev/rp/rp_isa.c
+++ b/sys/dev/rp/rp_isa.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp_isa.c,v 1.8 2005/12/04 10:06:04 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index 4c27b6222efbd..74682fb9d1aac 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/sys/dev/rp/rp_pci.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.13 2006/01/25 14:55:11 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/rp/rpreg.h b/sys/dev/rp/rpreg.h
index 735ba87130d3f..4f2be326cb2f6 100644
--- a/sys/dev/rp/rpreg.h
+++ b/sys/dev/rp/rpreg.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rp/rpreg.h,v 1.8 2006/11/20 12:59:27 marius Exp $
  */
 
 /*
diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h
index 7aff0d67179d1..0d3c991d980c2 100644
--- a/sys/dev/rp/rpvar.h
+++ b/sys/dev/rp/rpvar.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/rp/rpvar.h,v 1.10 2006/11/20 12:59:27 marius Exp $
  */
 
 /*
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index f3f124301b6dd..3a777ae96a611 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18.2.1 2007/11/08 07:14:37 sam Exp $");
 
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
diff --git a/sys/dev/safe/safereg.h b/sys/dev/safe/safereg.h
index 6d07999eb10e3..c38c3d203acdc 100644
--- a/sys/dev/safe/safereg.h
+++ b/sys/dev/safe/safereg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/safe/safereg.h,v 1.1 2003/07/21 21:46:07 sam Exp $
  */
 #ifndef _SAFE_SAFEREG_H_
 #define	_SAFE_SAFEREG_H_
diff --git a/sys/dev/safe/safevar.h b/sys/dev/safe/safevar.h
index aadf30dd6e638..34a69e0a72a0b 100644
--- a/sys/dev/safe/safevar.h
+++ b/sys/dev/safe/safevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/safe/safevar.h,v 1.2 2006/05/17 18:34:26 pjd Exp $
  */
 #ifndef _SAFE_SAFEVAR_H_
 #define	_SAFE_SAFEVAR_H_
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index 4f881dc8789df..9135d4112c7db 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.24 2007/07/05 07:46:33 peter Exp $");
 
 /*
  * Device driver for Granch SBNI12 leased line adapters
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index cacb94fc426b2..0591ec024e21e 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.15 2007/02/23 12:18:53 piso Exp $");
 
 
 #include <sys/param.h>
diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
index 6aac792adc528..e9de62ba590fb 100644
--- a/sys/dev/sbni/if_sbni_pci.c
+++ b/sys/dev/sbni/if_sbni_pci.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.12 2007/02/23 12:18:53 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sbni/if_sbnireg.h b/sys/dev/sbni/if_sbnireg.h
index 4fec30c62f1fb..53ad92fecf692 100644
--- a/sys/dev/sbni/if_sbnireg.h
+++ b/sys/dev/sbni/if_sbnireg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sbni/if_sbnireg.h,v 1.2 2005/01/06 01:43:12 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
index 91fb363a49ee6..0766bc2fdb09d 100644
--- a/sys/dev/sbni/if_sbnivar.h
+++ b/sys/dev/sbni/if_sbnivar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.5 2005/06/10 16:49:14 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 27565a7744930..bb04639ca112a 100644
--- a/sys/dev/sbsh/if_sbsh.c
+++ b/sys/dev/sbsh/if_sbsh.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.19 2007/06/08 01:54:22 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sbsh/if_sbshreg.h b/sys/dev/sbsh/if_sbshreg.h
index 94cb0aac46c92..19c7968c92116 100644
--- a/sys/dev/sbsh/if_sbshreg.h
+++ b/sys/dev/sbsh/if_sbshreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sbsh/if_sbshreg.h,v 1.2 2005/01/06 01:43:13 imp Exp $
  */
 
 /* SBNI16 controller chip definitions */
diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h
index 8209592aeb605..d662060a45e47 100644
--- a/sys/dev/scc/scc_bfe.h
+++ b/sys/dev/scc/scc_bfe.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/scc/scc_bfe.h,v 1.6 2007/03/28 18:05:17 marcel Exp $
  */
 
 #ifndef _DEV_SCC_BFE_H_
diff --git a/sys/dev/scc/scc_bfe_ebus.c b/sys/dev/scc/scc_bfe_ebus.c
index 2d4a9d8e92a10..f30e738a283cc 100644
--- a/sys/dev/scc/scc_bfe_ebus.c
+++ b/sys/dev/scc/scc_bfe_ebus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scc/scc_bfe_ebus.c,v 1.3 2007/03/22 23:45:25 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scc/scc_bfe_macio.c b/sys/dev/scc/scc_bfe_macio.c
index c09859549b34c..9a99098e9bae6 100644
--- a/sys/dev/scc/scc_bfe_macio.c
+++ b/sys/dev/scc/scc_bfe_macio.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scc/scc_bfe_macio.c,v 1.2 2007/03/22 23:45:25 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scc/scc_bfe_sbus.c b/sys/dev/scc/scc_bfe_sbus.c
index 2ce1e1e8d1210..9e5def5e50d73 100644
--- a/sys/dev/scc/scc_bfe_sbus.c
+++ b/sys/dev/scc/scc_bfe_sbus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scc/scc_bfe_sbus.c,v 1.5 2007/03/22 23:45:25 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scc/scc_bus.h b/sys/dev/scc/scc_bus.h
index ed16309e3136e..875715aafe478 100644
--- a/sys/dev/scc/scc_bus.h
+++ b/sys/dev/scc/scc_bus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/scc/scc_bus.h,v 1.1 2006/03/30 18:33:22 marcel Exp $
  */
 
 #ifndef _DEV_SCC_BUS_H_
diff --git a/sys/dev/scc/scc_core.c b/sys/dev/scc/scc_core.c
index 7f8ed9117f923..23238cd4a72cf 100644
--- a/sys/dev/scc/scc_core.c
+++ b/sys/dev/scc/scc_core.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.10 2007/03/28 18:05:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scc/scc_dev_sab82532.c b/sys/dev/scc/scc_dev_sab82532.c
index f8845c517cf38..1561a61603629 100644
--- a/sys/dev/scc/scc_dev_sab82532.c
+++ b/sys/dev/scc/scc_dev_sab82532.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scc/scc_dev_sab82532.c,v 1.2 2006/04/01 04:51:56 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scc/scc_dev_z8530.c b/sys/dev/scc/scc_dev_z8530.c
index 3d63c227b2486..3109f49569a98 100644
--- a/sys/dev/scc/scc_dev_z8530.c
+++ b/sys/dev/scc/scc_dev_z8530.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scc/scc_dev_z8530.c,v 1.3 2006/07/26 03:10:01 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scc/scc_if.m b/sys/dev/scc/scc_if.m
index c67e23f65a97b..32a86fd76045a 100644
--- a/sys/dev/scc/scc_if.m
+++ b/sys/dev/scc/scc_if.m
@@ -23,7 +23,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/scc/scc_if.m,v 1.2 2007/03/28 18:05:17 marcel Exp $
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 0175db6205cb4..4ffd39ceae436 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scd/scd.c,v 1.86 2007/02/27 17:23:28 jhb Exp $");
 
 
 #undef	SCD_DEBUG
diff --git a/sys/dev/scd/scd_isa.c b/sys/dev/scd/scd_isa.c
index 082d0d8461af5..d0ad54e882490 100644
--- a/sys/dev/scd/scd_isa.c
+++ b/sys/dev/scd/scd_isa.c
@@ -2,7 +2,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/scd/scd_isa.c,v 1.5 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index c98c6ca630a61..5a09fc5a3958e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/scd/scdreg.h,v 1.8 2005/03/02 21:33:25 joerg Exp $
  *
  */
 
diff --git a/sys/dev/scd/scdvar.h b/sys/dev/scd/scdvar.h
index 773a78be1fb65..e94e20cba6238 100644
--- a/sys/dev/scd/scdvar.h
+++ b/sys/dev/scd/scdvar.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/scd/scdvar.h,v 1.3 2004/06/16 09:46:55 phk Exp $
  */
 
 struct scd_mbx {
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 967a4fcdb10a0..7ba432dab4c6e 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si.c,v 1.139 2007/01/18 13:33:36 marius Exp $");
 
 #ifndef lint
 static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International, 1990,1992,1998",
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index c9adefb788e97..4df57aad61dad 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/si.h,v 1.20 2005/01/06 01:43:13 imp Exp $
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/si2_z280.c b/sys/dev/si/si2_z280.c
index 44bb2e42c3d3c..21f9ff81d8a4f 100644
--- a/sys/dev/si/si2_z280.c
+++ b/sys/dev/si/si2_z280.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si2_z280.c,v 1.7 2006/01/06 20:17:48 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/si/si3_t225.c b/sys/dev/si/si3_t225.c
index 72bb7791a7eb2..aa805b9d9bde0 100644
--- a/sys/dev/si/si3_t225.c
+++ b/sys/dev/si/si3_t225.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si3_t225.c,v 1.9 2006/01/06 19:58:08 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c
index c2ee533d06112..03e80d93282df 100644
--- a/sys/dev/si/si_eisa.c
+++ b/sys/dev/si/si_eisa.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_eisa.c,v 1.7 2007/02/23 20:11:27 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c
index f6d5ab6aceceb..829cdbc6f3070 100644
--- a/sys/dev/si/si_isa.c
+++ b/sys/dev/si/si_isa.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_isa.c,v 1.8 2007/02/23 19:33:07 imp Exp $");
 
 #include "opt_debug_si.h"
 
diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c
index 7aa390fca3fae..181fc2dcaaf4d 100644
--- a/sys/dev/si/si_pci.c
+++ b/sys/dev/si/si_pci.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.9 2007/02/23 19:33:07 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index b6c7adf14cb3c..b3f1978dee3e3 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/sireg.h,v 1.11 2005/11/07 21:53:58 jhb Exp $
  */
 
 /*
diff --git a/sys/dev/si/sivar.h b/sys/dev/si/sivar.h
index e479f470faf43..eb9927ef0199f 100644
--- a/sys/dev/si/sivar.h
+++ b/sys/dev/si/sivar.h
@@ -17,7 +17,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/si/sivar.h,v 1.4 2005/01/06 01:43:14 imp Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 006eefc92730f..b54b81259bcb1 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.470 2007/02/23 12:18:53 piso Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index afb6fac79cffb..33343ab9d872f 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.16 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index 7bdb755d8051d..76877df77fc4f 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pccard.c,v 1.18 2006/09/14 03:47:59 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c
index 459baa1693666..56cc6351b3440 100644
--- a/sys/dev/sio/sio_pci.c
+++ b/sys/dev/sio/sio_pci.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.23 2007/03/29 04:26:52 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c
index 0ae0e7d6424d7..21f8b43923f9d 100644
--- a/sys/dev/sio/sio_puc.c
+++ b/sys/dev/sio/sio_puc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.10 2006/04/28 21:21:52 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 7b00452c88ce9..51e09ed2b6d9c 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.24 2004/04/07 20:45:58 imp Exp $
  */
 
 /* Receiver clock frequency for "standard" pc serial ports. */
diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h
index 22a6019d8e62e..094bdd14fe21c 100644
--- a/sys/dev/sio/siovar.h
+++ b/sys/dev/sio/siovar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sio/siovar.h,v 1.6 2004/04/07 20:45:58 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index fe2490209e1d9..5bd58f13f5d6a 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.137 2007/05/27 20:50:23 rwatson Exp $");
 
 /*
  * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
@@ -140,7 +140,7 @@ MODULE_DEPEND(sk, miibus, 1, 1, 1);
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.137 2007/05/27 20:50:23 rwatson Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index e9e55ea5e615e..8b4693645c0c8 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sk/if_skreg.h,v 1.41 2007/04/02 04:43:41 yongari Exp $
  */
 
 /*-
diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h
index 604073b72a38a..85a59980bc4e9 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sk/xmaciireg.h,v 1.5 2006/04/27 05:59:09 yongari Exp $
  */
 
 /*
diff --git a/sys/dev/sk/yukonreg.h b/sys/dev/sk/yukonreg.h
index efe71a0d34624..c66487472e172 100644
--- a/sys/dev/sk/yukonreg.h
+++ b/sys/dev/sk/yukonreg.h
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sk/yukonreg.h,v 1.3 2006/04/27 05:59:09 yongari Exp $
  */
 
 /* General Purpose Status Register (GPSR) */
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 6fce9b2f5ebd3..814ed14dcc293 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smb.c,v 1.38 2006/09/26 14:38:56 jhb Exp $
  */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index 32347f8f4c2d7..2756046e7b937 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smb.h,v 1.5 2006/09/11 20:52:41 jhb Exp $
  *
  */
 #ifndef __SMB_H
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 06d225a03869d..aa2272f8a07e9 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/smbus/smbconf.c,v 1.14 2006/09/11 20:52:41 jhb Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index a3d403d566ea4..9296fbdaece92 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbconf.h,v 1.8 2006/09/11 20:52:41 jhb Exp $
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index 41cc49a77c50a..7fe78e5413df4 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/smbus/smbus.c,v 1.23 2006/09/11 22:20:37 jhb Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index f8335e8e97671..de1f9f50b8fb0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/smbus/smbus.h,v 1.4 2006/09/11 20:52:41 jhb Exp $
  *
  */
 #ifndef __SMBUS_H
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index d969e25ed5661..f7362575e6a37 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/smbus/smbus_if.m,v 1.8 2006/09/11 20:52:41 jhb Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 42da0dd9f98bd..650bf9a31decb 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.55 2007/02/23 12:18:54 piso Exp $");
 
 /*
  * This is a driver for SMC's 9000 series of Ethernet adapters.
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index eb7bda71b03e2..39efd0dde61a7 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_isa.c,v 1.14 2005/07/06 15:59:47 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index 034f51a704560..b6ae1ef9d2671 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.35 2005/09/13 19:25:30 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/dev/sn/if_snreg.h b/sys/dev/sn/if_snreg.h
index 8b1b701b7895d..6c8b926cc158a 100644
--- a/sys/dev/sn/if_snreg.h
+++ b/sys/dev/sn/if_snreg.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.
  *
- *   $FreeBSD$
+ *   $FreeBSD: src/sys/dev/sn/if_snreg.h,v 1.6 2005/09/22 05:56:32 imp Exp $
  */
 
 /*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index 048f23a41fc0e..6112005a0eb66 100644
--- a/sys/dev/sn/if_snvar.h
+++ b/sys/dev/sn/if_snvar.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sn/if_snvar.h,v 1.10 2005/09/15 19:34:12 ru Exp $
  */
 
 #ifndef _IF_SNVAR_H
diff --git a/sys/dev/sn/ositech.h b/sys/dev/sn/ositech.h
index 18ce6780151ea..ba68cbcb7415c 100644
--- a/sys/dev/sn/ositech.h
+++ b/sys/dev/sn/ositech.h
@@ -26,7 +26,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/sys/dev/sn/ositech.h,v 1.1 2005/07/13 14:49:06 imp Exp $
 
 */
 
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index e6c0dd64314a3..632f50573a0a1 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.23 2005/12/06 11:19:37 ru Exp $	*/
 /*	$NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $	*/
 /*	$NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $	*/
 
diff --git a/sys/dev/snc/dp83932reg.h b/sys/dev/snc/dp83932reg.h
index 31ab550b83ca5..be6cf5e8516a1 100644
--- a/sys/dev/snc/dp83932reg.h
+++ b/sys/dev/snc/dp83932reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932reg.h,v 1.2 2005/01/06 01:43:15 imp Exp $	*/
 /*	$NecBSD: dp83932reg.h,v 1.2 1999/02/12 05:50:13 kmatsuda Exp $	*/
 /*      $NetBSD: if_snreg.h,v 1.4 1997/06/15 20:20:12 scottr Exp $	*/
 
diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c
index 064cb2c3d614a..f905766d8978a 100644
--- a/sys/dev/snc/dp83932subr.c
+++ b/sys/dev/snc/dp83932subr.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.7 2005/01/06 01:43:15 imp Exp $");
 /*
  * Routines of NEC PC-9801-83, 84, 103, 104, PC-9801N-25 and PC-9801N-J02, J02R 
  * Ethernet interface for NetBSD/pc98, ported by Kouichi Matsuda.
diff --git a/sys/dev/snc/dp83932subr.h b/sys/dev/snc/dp83932subr.h
index f5df4f97970f5..ad9ef0ca5e5eb 100644
--- a/sys/dev/snc/dp83932subr.h
+++ b/sys/dev/snc/dp83932subr.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932subr.h,v 1.3 2005/01/06 01:43:15 imp Exp $	*/
 /*	$NecBSD: dp83932subr.h,v 1.5 1999/02/02 00:47:25 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h
index 59ffefbd5a2cf..c1e7361c76c97 100644
--- a/sys/dev/snc/dp83932var.h
+++ b/sys/dev/snc/dp83932var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932var.h,v 1.6 2005/12/06 11:19:37 ru Exp $	*/
 /*	$NecBSD: dp83932var.h,v 1.3 1999/01/24 01:39:51 kmatsuda Exp $	*/
 /*	$NetBSD: if_snvar.h,v 1.12 1998/05/01 03:42:47 scottr Exp $	*/
 
diff --git a/sys/dev/snc/if_snc.c b/sys/dev/snc/if_snc.c
index 7cbdd804f7ba0..67227b190dcef 100644
--- a/sys/dev/snc/if_snc.c
+++ b/sys/dev/snc/if_snc.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc.c,v 1.7 2005/01/06 01:43:15 imp Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c
index f280de3a073ea..49fe1481e3135 100644
--- a/sys/dev/snc/if_snc_cbus.c
+++ b/sys/dev/snc/if_snc_cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_cbus.c,v 1.7 2007/02/23 12:18:54 piso Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_snc_pccard.c b/sys/dev/snc/if_snc_pccard.c
index 5a0a2d5ddb537..004a7c77d7800 100644
--- a/sys/dev/snc/if_snc_pccard.c
+++ b/sys/dev/snc/if_snc_pccard.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.11 2007/02/23 12:18:54 piso Exp $");
 
 /*
  *	National Semiconductor  DP8393X SONIC Driver
diff --git a/sys/dev/snc/if_sncreg.h b/sys/dev/snc/if_sncreg.h
index 888aa4f3ceb39..d3ab86cbe6aa6 100644
--- a/sys/dev/snc/if_sncreg.h
+++ b/sys/dev/snc/if_sncreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.2 2005/01/06 01:43:15 imp Exp $	*/
 /*	$NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
   
diff --git a/sys/dev/snc/if_sncvar.h b/sys/dev/snc/if_sncvar.h
index 8b6a75b998127..5c58ebe835aa3 100644
--- a/sys/dev/snc/if_sncvar.h
+++ b/sys/dev/snc/if_sncvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/snc/if_sncvar.h,v 1.3 2005/01/06 01:43:15 imp Exp $
  */
 
 /*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 845ef3159be98..e297e666291a8 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.105.4.1 2008/01/04 04:53:21 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 012910c978d30..5acbb18f12df0 100644
--- a/sys/dev/sound/chip.h
+++ b/sys/dev/sound/chip.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/chip.h,v 1.2 2000/01/03 02:51:14 tanimura Exp $
  */
 
 /*
diff --git a/sys/dev/sound/clone.c b/sys/dev/sound/clone.c
index 29632d95e41a1..32833e8aa4e48 100644
--- a/sys/dev/sound/clone.c
+++ b/sys/dev/sound/clone.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/clone.c,v 1.4 2007/06/14 11:10:21 ariff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/clone.h b/sys/dev/sound/clone.h
index 18149ba266db6..4c15692f9153e 100644
--- a/sys/dev/sound/clone.h
+++ b/sys/dev/sound/clone.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/clone.h,v 1.2 2007/06/14 11:10:21 ariff Exp $
  */
 
 #ifndef _SND_CLONE_H_
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index 1f7c3b77dedf6..b1bd3da443dde 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/driver.c,v 1.21 2007/01/31 08:53:45 joel Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index d3ece80a0823a..d6d3e0cff6056 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -33,7 +33,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.45 2007/06/17 06:10:40 ariff Exp $");
 
 struct ad1816_info;
 
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index e09f40d5fadc3..d65398029d0f2 100644
--- a/sys/dev/sound/isa/ad1816.h
+++ b/sys/dev/sound/isa/ad1816.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.4 2007/02/02 13:44:09 joel Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 4e5977788ab71..788dc947bea9c 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.42 2007/06/17 06:10:40 ariff Exp $");
 
 #define ESS_BUFFSIZE (4096)
 #define ABS(x) (((x) < 0)? -(x) : (x))
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 706081c9823c1..01b87cc760be5 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -42,7 +42,7 @@
 #include <isa/isavar.h>
 #include <isa/isa_common.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.19 2007/02/23 19:40:13 ariff Exp $");
 
 #define LOGICALID_NOPNP 0
 #define LOGICALID_PCM   0x0000561e
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 411296b75d678..87ebb241e6754 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -29,7 +29,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.112 2007/06/17 06:10:40 ariff Exp $");
 
 /* board-specific include files */
 #include <dev/sound/isa/mss.h>
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index aaa28c0e8f8ae..f5715d1904d4c 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.14 2007/02/02 13:44:09 joel Exp $
  */
 
 /*
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index 020f2baf02831..89ee4c5f435fa 100644
--- a/sys/dev/sound/isa/sb.h
+++ b/sys/dev/sound/isa/sb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.16 2007/02/02 13:33:35 joel Exp $
  */
 
 #ifndef SB_H
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index eb37337664d0e..655180cd6c451 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.97 2007/06/17 06:10:40 ariff Exp $");
 
 #define SB16_BUFFSIZE	4096
 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16)
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 3b0f295a44514..c3fb1909df5e6 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.86 2007/06/17 06:10:41 ariff Exp $");
 
 #define SB_DEFAULT_BUFSZ	4096
 
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 9cbe523274182..5554b9bf3756c 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -30,7 +30,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.48 2007/03/15 16:41:25 ariff Exp $");
 
 #define IO_MAX	3
 #define IRQ_MAX	1
diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c
index 9e45cde9636d2..d073f847568e1 100644
--- a/sys/dev/sound/isa/sndbuf_dma.c
+++ b/sys/dev/sound/isa/sndbuf_dma.c
@@ -28,7 +28,7 @@
 
 #include <isa/isavar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sndbuf_dma.c,v 1.3 2005/01/06 01:43:17 imp Exp $");
 
 int
 sndbuf_dmasetup(struct snd_dbuf *b, struct resource *drq)
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 364c6ba41163b..eb01db151b3ab 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -42,7 +42,7 @@
   */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.24 2007/04/02 06:03:47 ariff Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h
index c694b7b4851d4..6b4275939c203 100644
--- a/sys/dev/sound/midi/midi.h
+++ b/sys/dev/sound/midi/midi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.16 2007/02/25 13:51:51 netchild Exp $
  */
 
 #ifndef MIDI_H
diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h
index 6b3017542cca5..fff780429dffa 100644
--- a/sys/dev/sound/midi/midiq.h
+++ b/sys/dev/sound/midi/midiq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/midi/midiq.h,v 1.3 2007/02/25 13:51:51 netchild Exp $
  */
 
 #ifndef MIDIQ_H
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index 14f2212ae2462..347436a989a8f 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/mpu401.c,v 1.3 2007/02/25 13:51:51 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/dev/sound/midi/mpu401.h b/sys/dev/sound/midi/mpu401.h
index 9ac99a6c9dd55..ca0cd790bbd2a 100644
--- a/sys/dev/sound/midi/mpu401.h
+++ b/sys/dev/sound/midi/mpu401.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/midi/mpu401.h,v 1.3 2007/02/25 13:51:51 netchild Exp $
  */
 
 #ifndef MPU401_H
diff --git a/sys/dev/sound/midi/mpu_if.m b/sys/dev/sound/midi/mpu_if.m
index 2db606e1b812b..10011e60cfc3c 100644
--- a/sys/dev/sound/midi/mpu_if.m
+++ b/sys/dev/sound/midi/mpu_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/midi/mpu_if.m,v 1.3 2007/02/25 13:51:51 netchild Exp $
 #
 
 #include <dev/sound/midi/midi.h>
diff --git a/sys/dev/sound/midi/mpufoi_if.m b/sys/dev/sound/midi/mpufoi_if.m
index 299b7f9a7003f..b6b128b98d596 100644
--- a/sys/dev/sound/midi/mpufoi_if.m
+++ b/sys/dev/sound/midi/mpufoi_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/midi/mpufoi_if.m,v 1.3 2007/02/25 13:51:52 netchild Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index d9bf387a4c8d1..a87d36692ed75 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.26 2007/03/15 14:57:54 ariff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/midi/sequencer.h b/sys/dev/sound/midi/sequencer.h
index 946582e9f690b..b1987b17332a5 100644
--- a/sys/dev/sound/midi/sequencer.h
+++ b/sys/dev/sound/midi/sequencer.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.9 2007/02/25 13:51:52 netchild Exp $
  */
 
 /*
diff --git a/sys/dev/sound/midi/synth_if.m b/sys/dev/sound/midi/synth_if.m
index e29032b9ca870..d181f964e6e97 100644
--- a/sys/dev/sound/midi/synth_if.m
+++ b/sys/dev/sound/midi/synth_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/midi/synth_if.m,v 1.3 2007/02/25 13:51:52 netchild Exp $
 #
 
 INTERFACE synth;
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 6df5ffd3ad2bc..a8f3023ed6a48 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -42,7 +42,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.27 2007/06/17 06:10:41 ariff Exp $");
 
 /* Debugging macro's */
 #undef DEB
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index 00661a039b453..4dfa9f112bf35 100644
--- a/sys/dev/sound/pci/als4000.h
+++ b/sys/dev/sound/pci/als4000.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/als4000.h,v 1.3 2005/01/06 01:43:18 imp Exp $
  */
 
 #define ALS_PCI_ID0 		0x40004005
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index 6ec50ba916d46..8d279f633f236 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -63,7 +63,7 @@
 
 #include <dev/sound/pci/atiixp.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.19.2.1 2007/11/06 02:07:56 ariff Exp $");
 
 #define ATI_IXP_DMA_RETRY_MAX	100
 
diff --git a/sys/dev/sound/pci/atiixp.h b/sys/dev/sound/pci/atiixp.h
index d9bd79b2f4941..bb8d9fbdc4681 100644
--- a/sys/dev/sound/pci/atiixp.h
+++ b/sys/dev/sound/pci/atiixp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/atiixp.h,v 1.3.2.1 2007/11/06 02:07:56 ariff Exp $
  */
 
 #ifndef _ATIIXP_H_
diff --git a/sys/dev/sound/pci/au88x0.c b/sys/dev/sound/pci/au88x0.c
index 4050827e99ab0..1f3b4e56b5454 100644
--- a/sys/dev/sound/pci/au88x0.c
+++ b/sys/dev/sound/pci/au88x0.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.13 2007/06/17 06:10:41 ariff Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/au88x0.h b/sys/dev/sound/pci/au88x0.h
index 15f7b767a0c77..bae2c032bb03e 100644
--- a/sys/dev/sound/pci/au88x0.h
+++ b/sys/dev/sound/pci/au88x0.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/au88x0.h,v 1.2 2003/10/12 11:33:39 des Exp $
  */
 
 #ifndef _AU88X0_H_INCLUDED
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 6b2c6442aab92..b4a1a8c646aa9 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -31,7 +31,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.36 2007/06/17 06:10:41 ariff Exp $");
 
 /* PCI IDs of supported chips */
 #define AU8820_PCI_ID 0x000112eb
diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h
index e835c7119fcb3..038b148958ae4 100644
--- a/sys/dev/sound/pci/aureal.h
+++ b/sys/dev/sound/pci/aureal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/aureal.h,v 1.4 2005/01/06 01:43:18 imp Exp $
  */
 
 #ifndef _AU8820_REG_H
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 7e9d1bd7d076f..d1a59e369272e 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -53,7 +53,7 @@
 #include "mixer_if.h"
 #include "mpufoi_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.44 2007/06/17 06:10:41 ariff Exp $");
 
 /* Supported chip ID's */
 #define CMI8338A_PCI_ID   0x010013f6
diff --git a/sys/dev/sound/pci/cmireg.h b/sys/dev/sound/pci/cmireg.h
index 5c468b55ed8b8..cda5e07b0fbc3 100644
--- a/sys/dev/sound/pci/cmireg.h
+++ b/sys/dev/sound/pci/cmireg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/cmireg.h,v 1.3 2005/01/06 01:43:19 imp Exp $
  */
 
 /* C-Media CMI8x38 Audio Chip Support */
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index 5b4b8216e1ad8..49a89b2546f05 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -37,7 +37,7 @@
 
 #include <dev/sound/pci/cs4281.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.26 2007/06/17 06:10:41 ariff Exp $");
 
 #define CS4281_DEFAULT_BUFSZ 16384
 
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index c7b3799ab89db..69d0ad193b271 100644
--- a/sys/dev/sound/pci/cs4281.h
+++ b/sys/dev/sound/pci/cs4281.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/cs4281.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _CS4281_H_
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 37a83c5b934c4..0dcd89f4e9c4e 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -48,7 +48,7 @@
 
 #include <gnu/dev/sound/pci/csaimg.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.37 2007/03/17 19:37:09 ariff Exp $");
 
 /* This is the pci device id. */
 #define CS4610_PCI_ID 0x60011013
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index c932c1d3dfa68..adf479afc1079 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -38,7 +38,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.41 2007/06/17 06:10:41 ariff Exp $");
 
 /* Buffer size on dma transfer. Fixed for CS416x. */
 #define CS461x_BUFFSIZE   (4 * 1024)
diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h
index c6767fbe1d707..87843cdaae553 100644
--- a/sys/dev/sound/pci/csareg.h
+++ b/sys/dev/sound/pci/csareg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csareg.h,v 1.4 2005/06/27 07:43:57 glebius Exp $
  */
 
 #ifndef _CSA_REG_H
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index c8e3697ba9480..4968833afdf36 100644
--- a/sys/dev/sound/pci/csavar.h
+++ b/sys/dev/sound/pci/csavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/csavar.h,v 1.5 2005/06/27 07:43:57 glebius Exp $
  */
 
 #ifndef _CSA_VAR_H
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index a34d2338954c4..abbe9c389d86e 100644
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1-fw.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 #ifndef _HWMCODE_
 #define _HWMCODE_
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index cf6425e19f9af..0689bb1db25ca 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -33,7 +33,7 @@
 #include <dev/sound/pci/ds1.h>
 #include <dev/sound/pci/ds1-fw.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.52 2007/06/17 06:10:41 ariff Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h
index ad4e829cbfee1..8cccf33d1808f 100644
--- a/sys/dev/sound/pci/ds1.h
+++ b/sys/dev/sound/pci/ds1.h
@@ -5,7 +5,7 @@
  *	author		: Taichi Sugiyama
  *	create Data     : 28/Sep/99
  * =======================================================================
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ds1.h,v 1.1 2000/05/31 03:21:36 cg Exp $
  */
 
 
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 910859217c411..1cc034f143aae 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -37,7 +37,7 @@
 #include <dev/sound/midi/mpu401.h>
 #include "mpufoi_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.69 2007/06/17 06:10:42 ariff Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c
index 736e7c25c3773..1a97d3131e59f 100644
--- a/sys/dev/sound/pci/emu10kx-midi.c
+++ b/sys/dev/sound/pci/emu10kx-midi.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/emu10kx-midi.c,v 1.4 2007/09/12 07:43:42 ariff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 99fefd742bbf4..ab15d6dcdd80e 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/emu10kx-pcm.c,v 1.11 2007/09/12 07:43:42 ariff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index 35af8aabe26cc..e519a9f18ff40 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.12 2007/09/12 07:43:42 ariff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/pci/emu10kx.h b/sys/dev/sound/pci/emu10kx.h
index d27c9db4fc3f6..d8984da17e22c 100644
--- a/sys/dev/sound/pci/emu10kx.h
+++ b/sys/dev/sound/pci/emu10kx.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/emu10kx.h,v 1.4 2007/09/12 07:43:42 ariff Exp $
  */
 
 #ifndef EMU10KX_H
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 136477b3cd221..ff69bf12fb67e 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -35,7 +35,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.13 2007/05/27 19:58:39 joel Exp $");
 
 MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
 
diff --git a/sys/dev/sound/pci/envy24.h b/sys/dev/sound/pci/envy24.h
index b6dad28f65093..1f6ab4ef04b7c 100644
--- a/sys/dev/sound/pci/envy24.h
+++ b/sys/dev/sound/pci/envy24.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/envy24.h,v 1.2 2007/05/27 19:58:39 joel Exp $
  */
 
 
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 4b08c0cf50d7c..fc28bcfae83df 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -47,7 +47,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.15 2007/06/02 17:28:26 ariff Exp $");
 
 MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio");
 
diff --git a/sys/dev/sound/pci/envy24ht.h b/sys/dev/sound/pci/envy24ht.h
index 7eb0a65db7d3c..3c7c06b322d0b 100644
--- a/sys/dev/sound/pci/envy24ht.h
+++ b/sys/dev/sound/pci/envy24ht.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/envy24ht.h,v 1.5 2007/05/27 19:58:39 joel Exp $
  */
 
 
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 984aac9e4ee38..0fc030654b58c 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -59,7 +59,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.71 2007/07/05 10:22:37 ariff Exp $");
 
 #define MEM_MAP_REG 0x14
 
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index 7e0225fe8caec..34343cc1f9698 100644
--- a/sys/dev/sound/pci/es137x.h
+++ b/sys/dev/sound/pci/es137x.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/es137x.h,v 1.6 2005/07/31 13:19:38 netchild Exp $
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 8ee8f28f8c412..a3f26c0269a71 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -29,7 +29,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.33 2007/06/17 06:10:42 ariff Exp $");
 
 #define PCI_VENDOR_FORTEMEDIA	0x1319
 #define PCI_DEVICE_FORTEMEDIA1	0x08011319	/* Audio controller */
diff --git a/sys/dev/sound/pci/hda/hda_reg.h b/sys/dev/sound/pci/hda/hda_reg.h
index 7965daf90ede5..17f1f35361f07 100644
--- a/sys/dev/sound/pci/hda/hda_reg.h
+++ b/sys/dev/sound/pci/hda/hda_reg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hda_reg.h,v 1.2 2006/11/26 12:24:05 ariff Exp $
  */
 
 #ifndef _HDA_REG_H_
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index a09df97cddcb3..10d32b1a8e54e 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -84,7 +84,7 @@
 #define HDA_DRV_TEST_REV	"20071129_0050"
 #define HDA_WIDGET_PARSER_REV	1
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.44.2.5 2007/12/15 04:06:12 ariff Exp $");
 
 #define HDA_BOOTVERBOSE(stmt)	do {			\
 	if (bootverbose != 0 || snd_verbose > 3) {	\
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 298afde5728d9..5e163c0f04701 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hdac.h,v 1.1 2006/10/01 11:12:59 ariff Exp $
  */
 
 #ifndef _HDAC_H_
diff --git a/sys/dev/sound/pci/hda/hdac_private.h b/sys/dev/sound/pci/hda/hdac_private.h
index dd8d3c42904c9..158f37b35870c 100644
--- a/sys/dev/sound/pci/hda/hdac_private.h
+++ b/sys/dev/sound/pci/hda/hdac_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hdac_private.h,v 1.8 2007/07/09 20:42:11 ariff Exp $
  */
 
 #ifndef _HDAC_PRIVATE_H_
diff --git a/sys/dev/sound/pci/hda/hdac_reg.h b/sys/dev/sound/pci/hda/hdac_reg.h
index 969471023d347..e1e6cbdb0c03c 100644
--- a/sys/dev/sound/pci/hda/hdac_reg.h
+++ b/sys/dev/sound/pci/hda/hdac_reg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hdac_reg.h,v 1.1 2006/10/01 11:12:59 ariff Exp $
  */
 
 #ifndef _HDAC_REG_H_
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 7351355ea9634..8efde921dd554 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -32,7 +32,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.78.2.1 2007/12/15 04:06:52 ariff Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index be3f3fca3b4a3..01e8dad05347a 100644
--- a/sys/dev/sound/pci/ich.h
+++ b/sys/dev/sound/pci/ich.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/ich.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #define PCIR_NAMBAR 0x10
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index cec690a940147..cba7f38db1562 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -54,7 +54,7 @@
 
 #include <dev/sound/pci/maestro_reg.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.36.2.1 2007/12/15 04:07:25 ariff Exp $");
 
 /*
  * PCI IDs of supported chips:
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 8f1084c8473d1..fbe164024eb7d 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -61,7 +61,7 @@
 #include <gnu/dev/sound/pci/maestro3_reg.h>
 #include <gnu/dev/sound/pci/maestro3_dsp.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.35 2007/06/17 06:10:42 ariff Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index ab3542368484d..bc27cd8a00885 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	maestro_reg.h,v 1.13 2001/11/11 18:29:46 taku Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/maestro_reg.h,v 1.3 2004/11/10 04:29:09 julian Exp $
  */
 
 #ifndef	MAESTRO_REG_H_INCLUDED
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index 2fec6427ae145..4547f54b90e9e 100644
--- a/sys/dev/sound/pci/neomagic-coeff.h
+++ b/sys/dev/sound/pci/neomagic-coeff.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic-coeff.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #define NM_TOTAL_COEFF_COUNT 0x3158
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 4b011bbc14bcd..7559fba841928 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -34,7 +34,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.37 2007/06/17 06:10:42 ariff Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index 0b87f99cbf977..4cc3c56fc8a2e 100644
--- a/sys/dev/sound/pci/neomagic.h
+++ b/sys/dev/sound/pci/neomagic.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/neomagic.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _NM256_H_
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 5cf776d4de7e7..e53a926be8e88 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -33,7 +33,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.45 2007/06/17 06:10:42 ariff Exp $");
 
 #define SOLO_DEFAULT_BUFSZ 16384
 #define ABS(x) (((x) < 0)? -(x) : (x))
diff --git a/sys/dev/sound/pci/spicds.c b/sys/dev/sound/pci/spicds.c
index d559a6c6c3503..77b9ceadf93ee 100644
--- a/sys/dev/sound/pci/spicds.c
+++ b/sys/dev/sound/pci/spicds.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/spicds.c,v 1.6 2007/05/27 19:58:39 joel Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/spicds.h b/sys/dev/sound/pci/spicds.h
index c206be3b69e61..36d6a0fc2cd89 100644
--- a/sys/dev/sound/pci/spicds.h
+++ b/sys/dev/sound/pci/spicds.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/spicds.h,v 1.4 2007/05/27 19:58:39 joel Exp $
  */
 
 /* supported CODECs */
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 39ce02e815619..47e4ae8dde214 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -31,7 +31,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.53.2.1 2007/11/15 16:59:29 ariff Exp $");
 
 /* -------------------------------------------------------------------- */
 
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index 4a2ec626c5083..066b160660da2 100644
--- a/sys/dev/sound/pci/t4dwave.h
+++ b/sys/dev/sound/pci/t4dwave.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/t4dwave.h,v 1.7 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _T4DWAVE_REG_H
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 68de81b7e5f81..96d55c0c30371 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -44,7 +44,7 @@
 
 #include <dev/sound/pci/via8233.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.37 2007/06/14 11:13:38 ariff Exp $");
 
 #define VIA8233_PCI_ID 0x30591106
 
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index a38afc96255c3..43d159975efe6 100644
--- a/sys/dev/sound/pci/via8233.h
+++ b/sys/dev/sound/pci/via8233.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/via8233.h,v 1.4 2005/01/06 01:43:19 imp Exp $
  */
 
 #ifndef _SYS_SOUND_PCI_VIA8233_H_
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index e04e4802bd1a8..8b7b8b71b1616 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -33,7 +33,7 @@
 
 #include <dev/sound/pci/via82c686.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.43 2007/06/17 06:10:42 ariff Exp $");
 
 #define VIA_PCI_ID 0x30581106
 #define	NSEGS		4	/* Number of segments in SGD table */
diff --git a/sys/dev/sound/pci/via82c686.h b/sys/dev/sound/pci/via82c686.h
index ac6750e71b08a..a4a9a086fd441 100644
--- a/sys/dev/sound/pci/via82c686.h
+++ b/sys/dev/sound/pci/via82c686.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/via82c686.h,v 1.6 2003/03/26 05:35:38 orion Exp $
  */
 
 #ifndef _VIA_H
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index ee205fe686d5e..4dfd1e21a27a3 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -36,7 +36,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.26 2007/06/17 06:10:42 ariff Exp $");
 
 /* ------------------------------------------------------------------------- */
 /* Constants */
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index d1eac407efbe4..f2b1baf4f3cd1 100644
--- a/sys/dev/sound/pci/vibes.h
+++ b/sys/dev/sound/pci/vibes.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pci/vibes.h,v 1.2 2005/01/06 01:43:19 imp Exp $
  */
 
 /* ------------------------------------------------------------------------- */
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 22c14e81dd865..a46065246f49b 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -32,7 +32,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.73.2.1 2007/10/29 18:47:47 ariff Exp $");
 
 MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
 
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 3112cc0d474e4..461d8272fea4d 100644
--- a/sys/dev/sound/pcm/ac97.h
+++ b/sys/dev/sound/pcm/ac97.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/ac97.h,v 1.20 2007/04/19 13:54:22 ariff Exp $
  */
 
 #define AC97_MUTE	0x8080
diff --git a/sys/dev/sound/pcm/ac97_if.m b/sys/dev/sound/pcm/ac97_if.m
index 19f7378d1c6d2..3a01f5f61ff82 100644
--- a/sys/dev/sound/pcm/ac97_if.m
+++ b/sys/dev/sound/pcm/ac97_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/ac97_if.m,v 1.4 2005/01/06 01:43:20 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c
index da6fb1bb32254..d6c66cc2942e8 100644
--- a/sys/dev/sound/pcm/ac97_patch.c
+++ b/sys/dev/sound/pcm/ac97_patch.c
@@ -28,7 +28,7 @@
 #include <dev/sound/pcm/ac97.h>
 #include <dev/sound/pcm/ac97_patch.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97_patch.c,v 1.10.2.1 2007/10/29 18:47:27 ariff Exp $");
 
 void ad1886_patch(struct ac97_info* codec)
 {
diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h
index c8df443e36278..d802d179a76fa 100644
--- a/sys/dev/sound/pcm/ac97_patch.h
+++ b/sys/dev/sound/pcm/ac97_patch.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/ac97_patch.h,v 1.7 2007/04/19 13:54:22 ariff Exp $
  */
 
 typedef void (*ac97_patch)(struct ac97_info*);
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 98fb60ede539b..150313e86b1d4 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.37 2007/06/16 03:37:27 ariff Exp $");
 
 struct snd_dbuf *
 sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel)
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index a21c8ec4256b5..72ca4f54f5e68 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/buffer.h,v 1.17 2007/06/14 11:15:51 ariff Exp $
  */
 
 #define SND_DMA(b) (sndbuf_getflags((b)) & SNDBUF_F_DMA)
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index ffc0ffed1649a..3073a6d2adb4b 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -31,7 +31,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.121.2.1 2007/12/06 05:21:39 ariff Exp $");
 
 int report_soft_formats = 1;
 SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 65175a38db749..5cc4c1f4e9319 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/channel.h,v 1.37 2007/06/16 03:37:28 ariff Exp $
  */
 
 struct pcmchan_caps {
diff --git a/sys/dev/sound/pcm/channel_if.m b/sys/dev/sound/pcm/channel_if.m
index 3429a3323d79c..36adaac667380 100644
--- a/sys/dev/sound/pcm/channel_if.m
+++ b/sys/dev/sound/pcm/channel_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/channel_if.m,v 1.7 2007/03/16 17:16:24 ariff Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index e60c0a9f72edf..1d570a91cee7b 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -27,7 +27,7 @@
 #include <dev/sound/pcm/sound.h>
 #include <sys/ctype.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.107 2007/07/04 12:33:11 ariff Exp $");
 
 static int dsp_mmap_allow_prot_exec = 0;
 SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RW,
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index b02085cfb86a3..d797ef67eba18 100644
--- a/sys/dev/sound/pcm/dsp.h
+++ b/sys/dev/sound/pcm/dsp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/dsp.h,v 1.13 2007/06/16 03:37:28 ariff Exp $
  */
 
 #ifndef _PCMDSP_H_
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index 9cd17e162671b..858159d6446b4 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -26,7 +26,7 @@
 
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/fake.c,v 1.18 2007/03/15 18:19:01 ariff Exp $");
 
 static u_int32_t fk_fmt[] = {
 	AFMT_MU_LAW,
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 18e509bbd4697..9c7cc0679959f 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -28,7 +28,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.44 2007/06/17 15:53:11 ariff Exp $");
 
 MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
 
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 6bb0741dc3f26..a794f1ea95efc 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/feeder.h,v 1.15 2007/03/16 17:15:33 ariff Exp $
  */
 
 struct pcm_feederdesc {
diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c
index 9fcf2604f46d6..8d477e4398e49 100644
--- a/sys/dev/sound/pcm/feeder_fmt.c
+++ b/sys/dev/sound/pcm/feeder_fmt.c
@@ -41,7 +41,7 @@
 #include <dev/sound/pcm/sound.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.23 2007/06/02 13:07:44 joel Exp $");
 
 static int feeder_fmt_stereodownmix = 0;
 TUNABLE_INT("hw.snd.feeder_fmt_stereodownmix", &feeder_fmt_stereodownmix);
diff --git a/sys/dev/sound/pcm/feeder_if.m b/sys/dev/sound/pcm/feeder_if.m
index 83c0fb073b538..7de23a60d38b4 100644
--- a/sys/dev/sound/pcm/feeder_if.m
+++ b/sys/dev/sound/pcm/feeder_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/feeder_if.m,v 1.6 2005/01/06 01:43:21 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index cf9d7c1f2666e..ee4cfaa259c8f 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -77,7 +77,7 @@
 #include <dev/sound/pcm/sound.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.23 2007/06/16 03:37:28 ariff Exp $");
 
 #define RATE_ASSERT(x, y)	/* KASSERT(x,y) */
 #define RATE_TEST(x, y)		/* if (!(x)) printf y */
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
index 754a10e6c683f..de30bcb6129e4 100644
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -29,7 +29,7 @@
 #include <dev/sound/pcm/sound.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_volume.c,v 1.6 2007/06/16 20:36:39 ariff Exp $");
 
 #define FVOL_OSS_SCALE		100
 #define FVOL_RESOLUTION		PCM_FXSHIFT
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 6196817e9b260..9786309217a2d 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -28,7 +28,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.61 2007/06/16 03:37:28 ariff Exp $");
 
 MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index bcded4bd529bd..26e76ca8fc295 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/mixer.h,v 1.19 2007/06/16 03:37:28 ariff Exp $
  */
 
 struct snd_mixer *mixer_create(device_t dev, kobj_class_t cls, void *devinfo,
diff --git a/sys/dev/sound/pcm/mixer_if.m b/sys/dev/sound/pcm/mixer_if.m
index 9bd974ce7d9e1..1f92f6478647e 100644
--- a/sys/dev/sound/pcm/mixer_if.m
+++ b/sys/dev/sound/pcm/mixer_if.m
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.6 2005/01/06 01:43:21 imp Exp $
 #
 
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index 9d9f9db93f105..b0ef910e0401a 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -31,7 +31,7 @@
 #include <sys/sx.h>
 #endif
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sndstat.c,v 1.28 2007/06/16 03:37:28 ariff Exp $");
 
 #define	SS_TYPE_MODULE		0
 #define	SS_TYPE_FIRST		1
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index b842ae8ea22d1..52e9edf952ccd 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -35,7 +35,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.119 2007/06/17 19:02:05 ariff Exp $");
 
 devclass_t pcm_devclass;
 
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 1ce2c772e1395..514c5101c1be4 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.78 2007/06/16 03:37:28 ariff Exp $
  */
 
 /*
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index d88165412263a..b6d794a39ac75 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -31,7 +31,7 @@
 #include <dev/sound/pcm/vchan.h>
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$FreeBSD$");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/vchan.c,v 1.36 2007/06/16 03:37:28 ariff Exp $");
 
 MALLOC_DEFINE(M_VCHANFEEDER, "vchanfeed", "pcm vchan feeder");
 
diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h
index 076ec82b0144b..bc433ae5fb37a 100644
--- a/sys/dev/sound/pcm/vchan.h
+++ b/sys/dev/sound/pcm/vchan.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/pcm/vchan.h,v 1.5 2007/05/31 18:43:32 ariff Exp $
  */
 
 int vchan_create(struct pcm_channel *parent, int num);
diff --git a/sys/dev/sound/sbus/apcdmareg.h b/sys/dev/sound/sbus/apcdmareg.h
index d4296adbe9feb..aef9b83333b1f 100644
--- a/sys/dev/sound/sbus/apcdmareg.h
+++ b/sys/dev/sound/sbus/apcdmareg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/sound/sbus/apcdmareg.h,v 1.2 2005/01/06 01:43:22 imp Exp $	*/
 /*	$OpenBSD: apcdmareg.h,v 1.2 2003/06/02 18:53:18 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c
index 26e930125f06d..0358a1c3816f9 100644
--- a/sys/dev/sound/sbus/cs4231.c
+++ b/sys/dev/sound/sbus/cs4231.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sound/sbus/cs4231.c,v 1.9 2007/06/17 06:10:43 ariff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sound/sbus/cs4231.h b/sys/dev/sound/sbus/cs4231.h
index 26ca399a0fe09..b98f7bbac4472 100644
--- a/sys/dev/sound/sbus/cs4231.h
+++ b/sys/dev/sound/sbus/cs4231.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/sound/sbus/cs4231.h,v 1.2 2005/01/06 01:43:22 imp Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/sound/unit.c b/sys/dev/sound/unit.c
index 3a9cbb6325673..319d7d552a52e 100644
--- a/sys/dev/sound/unit.c
+++ b/sys/dev/sound/unit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/unit.c,v 1.1 2007/05/31 18:35:24 ariff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/sound/unit.h b/sys/dev/sound/unit.h
index e49e8f8e9bb19..96dda78950cd5 100644
--- a/sys/dev/sound/unit.h
+++ b/sys/dev/sound/unit.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/unit.h,v 1.1 2007/05/31 18:35:24 ariff Exp $
  */
 
 #ifndef _SND_UNIT_H_
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 5e446ef60a85b..1c8f5fdc6a6d5 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.36 2007/06/20 05:11:37 imp Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index b73f7a559e251..6f55e103c292a 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.8 2007/03/16 17:19:03 ariff Exp $ */
 
 /*-
  * Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 618a0ed16a794..56c7690fa86e2 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.24 2007/06/17 06:10:43 ariff Exp $ */
 
 /*-
  * Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index 3cc09ba5ae450..114725fcb8612 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.4 2005/01/06 01:43:22 imp Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sound/version.h b/sys/dev/sound/version.h
index a0961af170a4c..109a3f156cdcd 100644
--- a/sys/dev/sound/version.h
+++ b/sys/dev/sound/version.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sound/version.h,v 1.2 2007/06/16 03:37:27 ariff Exp $
  */
 
 #ifndef _SND_VERSION_H_
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index 9e195c3f0d8b6..291e998a79d49 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>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/speaker/speaker.h,v 1.8 2005/11/11 09:57:30 ru Exp $
  */
 
 #ifndef	_DEV_SPEAKER_SPEAKER_H_
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 4ab065e192433..c5147b3f38abd 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/speaker/spkr.c,v 1.72 2007/06/04 09:27:13 brian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/spibus/spi.h b/sys/dev/spibus/spi.h
index 663f5ff2ded4d..8924e968f836d 100644
--- a/sys/dev/spibus/spi.h
+++ b/sys/dev/spibus/spi.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/spibus/spi.h,v 1.2 2006/07/17 21:18:03 cognet Exp $ */
 
 struct spi_command {
 	void	*tx_cmd;
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
index 76b4a8cc3c722..fc3ed4b9ad26f 100644
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/spibus/spibus.c,v 1.2 2006/10/20 07:11:52 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/spibus/spibus_if.m b/sys/dev/spibus/spibus_if.m
index 4e8fa11f28051..63ed4b0a86d15 100644
--- a/sys/dev/spibus/spibus_if.m
+++ b/sys/dev/spibus/spibus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/spibus/spibus_if.m,v 1.1 2006/07/14 22:47:07 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h
index 543fcfe8a2738..c4b6976256eb9 100644
--- a/sys/dev/spibus/spibusvar.h
+++ b/sys/dev/spibus/spibusvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/spibus/spibusvar.h,v 1.2 2006/07/17 21:18:03 cognet Exp $ */
 
 #define SPIBUS_IVAR(d) (struct spibus_ivar *) device_get_ivars(d)
 #define SPIBUS_SOFTC(d) (struct spibus_softc *) device_get_softc(d)
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 2711dfeaaa353..0be7664e00a2b 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.73 2007/03/21 03:38:36 nyan Exp $");
 
 /*
  * Programming assumptions and other issues.
diff --git a/sys/dev/sr/if_sr.h b/sys/dev/sr/if_sr.h
index c66f667f0023d..197bf46101af4 100644
--- a/sys/dev/sr/if_sr.h
+++ b/sys/dev/sr/if_sr.h
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sr/if_sr.h,v 1.4 2005/01/06 01:43:22 imp Exp $
  */
 
 #ifndef _I386_ISA_IF_SR_H_
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 3f68e001295b6..22ea395b321d8 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr_isa.c,v 1.51 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 8f62513b360fe..694323b5e7c3a 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr_pci.c,v 1.23 2005/05/29 04:42:25 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 16925e6e581e8..b1ba98d5fab41 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sr/if_srregs.h,v 1.9 2005/01/06 01:43:22 imp Exp $
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index 19b4905af0658..a061d593d9c46 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.15 2006/05/16 14:36:32 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30.h b/sys/dev/stg/tmc18c30.h
index 8a1848c6b5bf3..0033a822bb2c8 100644
--- a/sys/dev/stg/tmc18c30.h
+++ b/sys/dev/stg/tmc18c30.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/stg/tmc18c30.h,v 1.1 2003/04/07 10:13:25 mdodd Exp $
  */
 
 extern devclass_t stg_devclass;
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index 6d9061326b1dc..bdc54549373fe 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_isa.c,v 1.13 2007/02/23 12:18:55 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 079cfed0b7a98..0e958ad6c28af 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.26 2007/02/23 12:18:55 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c
index 08443d050fe3c..0574a4ce6025f 100644
--- a/sys/dev/stg/tmc18c30_pci.c
+++ b/sys/dev/stg/tmc18c30_pci.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pci.c,v 1.7 2007/02/23 12:18:55 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c
index 44cb319c8719c..a3d2e9e63d8cf 100644
--- a/sys/dev/stg/tmc18c30_subr.c
+++ b/sys/dev/stg/tmc18c30_subr.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_subr.c,v 1.6 2006/07/14 04:35:59 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/stg/tmc18c30reg.h b/sys/dev/stg/tmc18c30reg.h
index 93c9940ba6492..341ba030e3b36 100644
--- a/sys/dev/stg/tmc18c30reg.h
+++ b/sys/dev/stg/tmc18c30reg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/stg/tmc18c30reg.h,v 1.3 2005/01/06 01:43:23 imp Exp $	*/
 /*	$NecBSD: tmc18c30reg.h,v 1.4.24.1 2001/06/08 06:27:50 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h
index 69e837fc6786b..ea22018160252 100644
--- a/sys/dev/stg/tmc18c30var.h
+++ b/sys/dev/stg/tmc18c30var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/stg/tmc18c30var.h,v 1.8 2005/01/06 01:43:23 imp Exp $	*/
 /*	$NecBSD: tmc18c30var.h,v 1.12.18.2 2001/06/13 05:51:23 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
index 54eee1a6cb5bf..b2f9ac0ffdf54 100644
--- a/sys/dev/stge/if_stge.c
+++ b/sys/dev/stge/if_stge.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/stge/if_stge.c,v 1.9 2007/05/01 03:40:57 yongari Exp $");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/dev/stge/if_stgereg.h b/sys/dev/stge/if_stgereg.h
index 4a62f4fee5937..3e1931201ff8a 100644
--- a/sys/dev/stge/if_stgereg.h
+++ b/sys/dev/stge/if_stgereg.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/stge/if_stgereg.h,v 1.3 2007/05/01 03:35:48 yongari Exp $ */
 
 /*
  * Sundance Technology PCI vendor ID
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index dc67fc53811c9..d2a7edeb9efe6 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.56 2007/08/06 14:26:00 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sym/README.sym b/sys/dev/sym/README.sym
index d310cd4d150fb..25f29f86302d6 100644
--- a/sys/dev/sym/README.sym
+++ b/sys/dev/sym/README.sym
@@ -54,7 +54,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/sym/README.sym,v 1.6 2005/01/06 01:43:24 imp Exp $
  */
 
 README.sym
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 768baa7b10a59..c445595e5f543 100644
--- a/sys/dev/sym/sym_conf.h
+++ b/sys/dev/sym/sym_conf.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_conf.h,v 1.9 2005/01/06 01:43:24 imp Exp $ */
 
 #ifndef SYM_CONF_H
 #define SYM_CONF_H
diff --git a/sys/dev/sym/sym_defs.h b/sys/dev/sym/sym_defs.h
index ad1481f71af3f..aaaef2b96be9b 100644
--- a/sys/dev/sym/sym_defs.h
+++ b/sys/dev/sym/sym_defs.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_defs.h,v 1.11 2005/01/06 01:43:24 imp Exp $ */
 
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
diff --git a/sys/dev/sym/sym_fw.h b/sys/dev/sym/sym_fw.h
index a274bbcee4302..4a219801662d6 100644
--- a/sys/dev/sym/sym_fw.h
+++ b/sys/dev/sym/sym_fw.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw.h,v 1.5 2005/01/06 01:43:24 imp Exp $ */
 
 #ifndef	SYM_FW_H
 #define	SYM_FW_H
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index d7622d8ef3311..3a73de007c3bf 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw1.h,v 1.8 2006/08/04 07:56:34 yar Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 93beaac2ad441..e84c26689532e 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -55,7 +55,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/sym/sym_fw2.h,v 1.9 2006/08/04 07:56:34 yar Exp $ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 547db5462e92e..45e45024db916 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.67 2007/07/20 23:02:01 se Exp $");
 
 #define SYM_DRIVER_NAME	"sym-1.6.5-20000902"
 
diff --git a/sys/dev/syscons/apm/apm_saver.c b/sys/dev/syscons/apm/apm_saver.c
index 567b452e0b2ea..9cc772ff5c501 100644
--- a/sys/dev/syscons/apm/apm_saver.c
+++ b/sys/dev/syscons/apm/apm_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/apm/apm_saver.c,v 1.11 2006/05/25 23:06:38 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 960acca5a5122..03c6df0780d8d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/blank/blank_saver.c,v 1.17 1999/08/28 00:47:45 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 92d807f9ed994..5017ea1eed8b8 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.23 2005/05/15 08:59:00 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/dragon/dragon_saver.c b/sys/dev/syscons/dragon/dragon_saver.c
index f8fa51b5e08bd..f847f3f7eabc9 100644
--- a/sys/dev/syscons/dragon/dragon_saver.c
+++ b/sys/dev/syscons/dragon/dragon_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/dragon/dragon_saver.c,v 1.2 2003/07/21 13:04:54 nyan Exp $
  */
 
 #include	<sys/param.h>
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index d7793b6dd96f2..3b057c8ae7dac 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/fade/fade_saver.c,v 1.19 2003/05/31 20:29:34 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index de60a20a58f9b..9556f909d9e08 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/fire/fire_saver.c,v 1.11 2007/02/21 12:27:12 philip Exp $
  */
 
 /*
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index d6cfe80da6897..f37d377eac732 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/green/green_saver.c,v 1.17 1999/08/28 00:47:50 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/logo/logo.c b/sys/dev/syscons/logo/logo.c
index ea3f46e5c3a7e..f9d3b419c88cb 100644
--- a/sys/dev/syscons/logo/logo.c
+++ b/sys/dev/syscons/logo/logo.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/syscons/logo/logo.c,v 1.3 2001/08/09 00:02:30 peter Exp $ */
 
 #define logo_width 88
 #define logo_height 88
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 20f2bdcef02af..0efe786bfe6f0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/logo/logo_saver.c,v 1.13 2007/02/21 12:27:12 philip Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 3cdf980eceed1..24a85c27f7f35 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/rain/rain_saver.c,v 1.13 2007/02/21 12:27:12 philip Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index bca5ad65d2d24..54bd4de8ea6b4 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.24 2007/06/18 22:15:17 marius Exp $");
 
 #include "opt_syscons.h"
 #include "opt_gfb.h"
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index 860e8f95b85b5..4e12b1cfe7d00 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/schistory.c,v 1.20 2005/12/04 02:12:42 ru Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 25a2da0c2a931..704a98400a08e 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.42 2007/05/25 13:13:12 delphij Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-dumb.c b/sys/dev/syscons/scterm-dumb.c
index 1c130b6af4d65..212cdbd161792 100644
--- a/sys/dev/syscons/scterm-dumb.c
+++ b/sys/dev/syscons/scterm-dumb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-dumb.c,v 1.7 2005/12/04 02:12:42 ru Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm-sc.c b/sys/dev/syscons/scterm-sc.c
index e89debbe403a4..2d2b28f06bdc1 100644
--- a/sys/dev/syscons/scterm-sc.c
+++ b/sys/dev/syscons/scterm-sc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.23 2006/05/12 05:04:43 jhb Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 0b9135a4a0076..f167ad32a3356 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm.c,v 1.6 2003/08/24 18:17:24 obrien Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/sctermvar.h b/sys/dev/syscons/sctermvar.h
index b1c01af1f800f..5d24deef6e062 100644
--- a/sys/dev/syscons/sctermvar.h
+++ b/sys/dev/syscons/sctermvar.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/sctermvar.h,v 1.4 2002/10/20 22:50:13 robert Exp $
  */
 
 #ifndef _DEV_SYSCONS_SCTERMVAR_H_
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index c68d46a7d9d63..d824ab3866101 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.25 2007/01/10 19:04:00 marius Exp $");
 
 #include "opt_vga.h"
 
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 5b056d396af0f..209ead3ce5350 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.21 2006/05/12 05:04:43 jhb Exp $");
 
 #include "opt_syscons.h"
 #include "opt_vga.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 65a56c63b8e7c..60f635ba6861c 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.38 2006/09/27 19:56:59 ru Exp $");
 
 #include "opt_compat.h"
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 8d2b224b36dd8..134d5d26a5b2d 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/scvtb.c,v 1.13 2005/05/21 20:28:15 marius Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 6a7b7dadba850..3abe350acdd56 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/snake/snake_saver.c,v 1.31 2005/05/15 09:07:42 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 3963e083a813b..8508fd7bc935c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/star/star_saver.c,v 1.26 2005/05/15 09:07:04 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 8822e8f6d27db..c49e81ffcb54f 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.453.4.1 2008/01/28 12:49:33 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_syscons.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 53e5ab7b4bc05..088ca4ef735cd 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.88 2007/09/20 04:05:59 simokawa Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index fa89a23f521b5..70160d52d0b79 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.29 2006/11/06 13:41:56 rwatson Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index aba2439534c3f..45c01bd47dba2 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/syscons/warp/warp_saver.c,v 1.14 2007/02/21 12:27:12 philip Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/tdfx/tdfx_io.h b/sys/dev/tdfx/tdfx_io.h
index faec61e11771d..27d44a4787d27 100644
--- a/sys/dev/tdfx/tdfx_io.h
+++ b/sys/dev/tdfx/tdfx_io.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.
  *
- *   $FreeBSD$
+ *   $FreeBSD: src/sys/dev/tdfx/tdfx_io.h,v 1.4 2005/01/06 01:43:24 imp Exp $
  */
 
 /* This code originally came from <shocking@prth.pgs.com>
diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c
index 2e877f6d0173d..7fb09d03843e2 100644
--- a/sys/dev/tdfx/tdfx_linux.c
+++ b/sys/dev/tdfx/tdfx_linux.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_linux.c,v 1.1 2006/03/03 21:37:36 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index a3235cc8ba028..23127fd740561 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.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.
  *
- *   $FreeBSD$
+ *   $FreeBSD: src/sys/dev/tdfx/tdfx_linux.h,v 1.6 2005/01/06 01:43:24 imp Exp $
  */
 
 
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 6c7a832fc20e3..eb57c519fe045 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.39 2006/03/03 21:37:36 yar Exp $");
 
 /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
  *
diff --git a/sys/dev/tdfx/tdfx_pci.h b/sys/dev/tdfx/tdfx_pci.h
index 0c60e5a2b6c12..bea33e64a73a7 100644
--- a/sys/dev/tdfx/tdfx_pci.h
+++ b/sys/dev/tdfx/tdfx_pci.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.
  *
- *   $FreeBSD$
+ *   $FreeBSD: src/sys/dev/tdfx/tdfx_pci.h,v 1.4 2005/01/06 01:43:25 imp Exp $
  */
 
 /* tdfx_pci.h -- Prototypes for tdfx device methods */
diff --git a/sys/dev/tdfx/tdfx_vars.h b/sys/dev/tdfx/tdfx_vars.h
index 1e10e3c3a669d..a7d2629bf6399 100644
--- a/sys/dev/tdfx/tdfx_vars.h
+++ b/sys/dev/tdfx/tdfx_vars.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.
  *
- *   $FreeBSD$
+ *   $FreeBSD: src/sys/dev/tdfx/tdfx_vars.h,v 1.10 2005/01/06 01:43:25 imp Exp $
  */
 
 /* tdfx_vars.h -- constants and structs used in the tdfx driver
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 91d571b567049..01f9cdfbb96b4 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ti/if_ti.c,v 1.128 2007/03/04 03:38:08 csjp Exp $");
 
 #include "opt_ti.h"
 
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index 5f0bda9561a34..807d3061591f8 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ti/if_tireg.h,v 1.37 2006/01/03 06:14:07 yongari Exp $
  */
 
 /*
diff --git a/sys/dev/ti/ti_fw.h b/sys/dev/ti/ti_fw.h
index 89f5c9f9dae70..f907bce8e8be2 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ti/ti_fw.h,v 1.10 2002/06/26 03:34:52 ken Exp $
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x4;
diff --git a/sys/dev/ti/ti_fw2.h b/sys/dev/ti/ti_fw2.h
index e54c920531e53..4ae97a3d0bd2e 100644
--- a/sys/dev/ti/ti_fw2.h
+++ b/sys/dev/ti/ti_fw2.h
@@ -2,7 +2,7 @@
  * Generated by Ken's special genfw.c
  * Built on Wed Aug  2 17:21:09 MDT 2000 by ken@roadwarrior.plutotech.com
  * OS: FreeBSD 5.0-CURRENT
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/ti/ti_fw2.h,v 1.11 2002/06/26 03:34:52 ken Exp $
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x4;
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 222857fb7c376..d60fc2d2ff140 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.33 2007/06/17 05:55:52 scottl Exp $");
 
 /*
  *	HISTORY:					
diff --git a/sys/dev/trm/trm.h b/sys/dev/trm/trm.h
index 21248835a5106..ac744e10298b0 100644
--- a/sys/dev/trm/trm.h
+++ b/sys/dev/trm/trm.h
@@ -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.	
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/trm/trm.h,v 1.5 2005/01/06 01:43:25 imp Exp $
  */
 
 #ifndef trm_H
diff --git a/sys/dev/twa/tw_cl.h b/sys/dev/twa/tw_cl.h
index f4741fa066d8c..ba903115d8e38 100644
--- a/sys/dev/twa/tw_cl.h
+++ b/sys/dev/twa/tw_cl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_externs.h b/sys/dev/twa/tw_cl_externs.h
index 1dd24255e5f78..441a841a86a5f 100644
--- a/sys/dev/twa/tw_cl_externs.h
+++ b/sys/dev/twa/tw_cl_externs.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_externs.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_fwif.h b/sys/dev/twa/tw_cl_fwif.h
index 965dddad85735..1e7c18a27e15e 100644
--- a/sys/dev/twa/tw_cl_fwif.h
+++ b/sys/dev/twa/tw_cl_fwif.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_fwif.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_init.c b/sys/dev/twa/tw_cl_init.c
index 52864b2c6de50..d18ec8f06046b 100644
--- a/sys/dev/twa/tw_cl_init.c
+++ b/sys/dev/twa/tw_cl_init.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_init.c,v 1.4 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_intr.c b/sys/dev/twa/tw_cl_intr.c
index 44b4c14897bb8..ad6631552b743 100644
--- a/sys/dev/twa/tw_cl_intr.c
+++ b/sys/dev/twa/tw_cl_intr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_intr.c,v 1.4 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_io.c b/sys/dev/twa/tw_cl_io.c
index 162b1ea326f30..64d37bf3d8af2 100644
--- a/sys/dev/twa/tw_cl_io.c
+++ b/sys/dev/twa/tw_cl_io.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_io.c,v 1.4 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_ioctl.h b/sys/dev/twa/tw_cl_ioctl.h
index aab7fd958154b..4b2ee79092fd2 100644
--- a/sys/dev/twa/tw_cl_ioctl.h
+++ b/sys/dev/twa/tw_cl_ioctl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_ioctl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_misc.c b/sys/dev/twa/tw_cl_misc.c
index 1ee81207eae4f..bc4e3f35a3155 100644
--- a/sys/dev/twa/tw_cl_misc.c
+++ b/sys/dev/twa/tw_cl_misc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_misc.c,v 1.4 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_cl_share.h b/sys/dev/twa/tw_cl_share.h
index 265ff77afefa7..dbc82caed3e30 100644
--- a/sys/dev/twa/tw_cl_share.h
+++ b/sys/dev/twa/tw_cl_share.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_cl_share.h,v 1.4 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl.h b/sys/dev/twa/tw_osl.h
index d68cc5ec600f0..8e9864ac25020 100644
--- a/sys/dev/twa/tw_osl.h
+++ b/sys/dev/twa/tw_osl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.5.2.1 2007/10/19 15:21:16 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c
index b7a085f19789f..9da0bfe3075c9 100644
--- a/sys/dev/twa/tw_osl_cam.c
+++ b/sys/dev/twa/tw_osl_cam.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_cam.c,v 1.12 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_externs.h b/sys/dev/twa/tw_osl_externs.h
index e46c2d29b4fe2..c2aa2ec3c4951 100644
--- a/sys/dev/twa/tw_osl_externs.h
+++ b/sys/dev/twa/tw_osl_externs.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_externs.h,v 1.2 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c
index 4b098ae99d154..32a9ba3fef1e5 100644
--- a/sys/dev/twa/tw_osl_freebsd.c
+++ b/sys/dev/twa/tw_osl_freebsd.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.9 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_includes.h b/sys/dev/twa/tw_osl_includes.h
index 21f662e9dd3be..d8dbbc20f888f 100644
--- a/sys/dev/twa/tw_osl_includes.h
+++ b/sys/dev/twa/tw_osl_includes.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_includes.h,v 1.5 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_inline.h b/sys/dev/twa/tw_osl_inline.h
index ad7ece5337e4c..63b573bac3216 100644
--- a/sys/dev/twa/tw_osl_inline.h
+++ b/sys/dev/twa/tw_osl_inline.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_inline.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_ioctl.h b/sys/dev/twa/tw_osl_ioctl.h
index 10066a71288d3..20544da66a020 100644
--- a/sys/dev/twa/tw_osl_ioctl.h
+++ b/sys/dev/twa/tw_osl_ioctl.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_ioctl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_share.h b/sys/dev/twa/tw_osl_share.h
index 08276d01760e1..0cc2e634672f7 100644
--- a/sys/dev/twa/tw_osl_share.h
+++ b/sys/dev/twa/tw_osl_share.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.9 2007/10/09 17:43:57 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twa/tw_osl_types.h b/sys/dev/twa/tw_osl_types.h
index 7fcfd4ca75153..f8b9eab08628a 100644
--- a/sys/dev/twa/tw_osl_types.h
+++ b/sys/dev/twa/tw_osl_types.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twa/tw_osl_types.h,v 1.2 2007/05/09 04:16:32 scottl Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 59b5027adac97..d1b7ea2b2e44d 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twe.c,v 1.25.14.1 2008/02/14 20:52:03 brueffer Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 1bd46f0022aee..c8fc8b713653c 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/twe/twe_compat.h,v 1.14 2005/05/29 04:42:26 nyan Exp $
  */
 /*
  * Portability and compatibility interfaces.
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index 7e03883c75d98..0a91afc8ae6c9 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.44 2007/02/23 12:18:56 piso Exp $
  */
 
 /*
diff --git a/sys/dev/twe/twe_tables.h b/sys/dev/twe/twe_tables.h
index 3ba83c972c4b7..c8871a280213f 100644
--- a/sys/dev/twe/twe_tables.h
+++ b/sys/dev/twe/twe_tables.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twe_tables.h,v 1.4 2003/12/02 07:57:20 ps Exp $
  */
 
 /*
diff --git a/sys/dev/twe/tweio.h b/sys/dev/twe/tweio.h
index 1b78472495ab3..202de992b28fb 100644
--- a/sys/dev/twe/tweio.h
+++ b/sys/dev/twe/tweio.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/tweio.h,v 1.5 2005/02/17 19:05:42 vkashyap Exp $
  */
 
 
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index f6e7db6e1a03b..2f77bc85cce76 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/dev/twe/twereg.h,v 1.11 2004/05/12 04:10:37 vkashyap Exp $
  */
 
 /* 
diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h
index 90391ad95dfca..3245e10fbc057 100644
--- a/sys/dev/twe/twevar.h
+++ b/sys/dev/twe/twevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/twe/twevar.h,v 1.13 2004/06/11 18:42:44 vkashyap Exp $
  */
 
 #define TWE_DRIVER_VERSION_STRING	"1.50.01.002"
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index ed1bf7e97fb2f..e6cac966f8214 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.97 2007/02/23 12:18:57 piso Exp $");
 
 /*
  * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie)
diff --git a/sys/dev/tx/if_txreg.h b/sys/dev/tx/if_txreg.h
index 63891cda2457c..291f06e354d6f 100644
--- a/sys/dev/tx/if_txreg.h
+++ b/sys/dev/tx/if_txreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/tx/if_txreg.h,v 1.14 2003/09/02 17:30:39 jhb Exp $
  */
 
 #define	EPIC_MAX_MTU		1600	/* This is experiment-derived value */
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index a1322c90060a9..ed5bbbc76ba71 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/tx/if_txvar.h,v 1.19 2005/06/10 16:49:15 brooks Exp $
  */
 
 /*
diff --git a/sys/dev/txp/3c990img.h b/sys/dev/txp/3c990img.h
index 6e75f5d83cf01..6a39870ffd157 100644
--- a/sys/dev/txp/3c990img.h
+++ b/sys/dev/txp/3c990img.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: 3c990img.h,v 1.2 2001/06/05 02:15:17 jason Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/txp/3c990img.h,v 1.2 2005/01/06 01:43:26 imp Exp $ */
 
 /*-
  * Copyright (C) 1999-2001 3Com, Inc.
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 6d7eda1600f7a..2ac002b44eb47 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.46 2007/06/12 04:33:21 yongari Exp $");
 
 /*
  * Driver for 3c990 (Typhoon) Ethernet ASIC
@@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.46 2007/06/12 04:33:21 yongari Exp $";
 #endif
 
 /*
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index f5ab7c92506f6..00e5213066143 100644
--- a/sys/dev/txp/if_txpreg.h
+++ b/sys/dev/txp/if_txpreg.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/txp/if_txpreg.h,v 1.6 2005/10/27 21:16:17 jhb Exp $ */
 
 /*-
  * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index f4320d4c53ab0..b91456ca084e5 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart.h,v 1.6 2007/04/02 22:00:22 marcel Exp $
  */
 
 #ifndef _DEV_UART_H_
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index 7154d859026a0..fa7b14a84e391 100644
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.15 2007/04/02 22:00:22 marcel Exp $
  */
 
 #ifndef _DEV_UART_BUS_H_
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 042dfef5d219a..61ef8a7624d5b 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.3 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_ebus.c b/sys/dev/uart/uart_bus_ebus.c
index e4ea2d1493765..27488e7c3016f 100644
--- a/sys/dev/uart/uart_bus_ebus.c
+++ b/sys/dev/uart/uart_bus_ebus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.12 2006/04/02 21:58:09 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 51713ad25a62f..8667144cc3360 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.6 2005/01/06 01:43:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index 0189a5f2f01ec..23665ac755c52 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pccard.c,v 1.11 2005/10/28 06:27:53 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index 450e62951c36e..8ebe4df5db5d9 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.11 2007/05/17 04:07:19 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index dff35b30dee5c..c3a2629215041 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_puc.c,v 1.3 2006/04/28 21:21:52 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_bus_scc.c b/sys/dev/uart/uart_bus_scc.c
index 9fdcb8bc1b1f7..747081089bf93 100644
--- a/sys/dev/uart/uart_bus_scc.c
+++ b/sys/dev/uart/uart_bus_scc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_scc.c,v 1.1 2006/03/30 18:33:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index f99127881e82b..2b2a93e37a679 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.22 2007/04/02 22:00:22 marcel Exp $");
 
 #ifndef KLD_MODULE
 #include "opt_comconsole.h"
diff --git a/sys/dev/uart/uart_cpu.h b/sys/dev/uart/uart_cpu.h
index db64d497e5946..3adc9d220edd1 100644
--- a/sys/dev/uart/uart_cpu.h
+++ b/sys/dev/uart/uart_cpu.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_cpu.h,v 1.12 2007/04/02 22:00:22 marcel Exp $
  */
 
 #ifndef _DEV_UART_CPU_H_
diff --git a/sys/dev/uart/uart_cpu_amd64.c b/sys/dev/uart/uart_cpu_amd64.c
index 3624f7973d5c4..c67d1fb57221d 100644
--- a/sys/dev/uart/uart_cpu_amd64.c
+++ b/sys/dev/uart/uart_cpu_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.12 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_i386.c b/sys/dev/uart/uart_cpu_i386.c
index 0d0f0f71134fa..94245c3349691 100644
--- a/sys/dev/uart/uart_cpu_i386.c
+++ b/sys/dev/uart/uart_cpu_i386.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.12 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c
index 9a71e20e506e0..d0ae710a78e94 100644
--- a/sys/dev/uart/uart_cpu_ia64.c
+++ b/sys/dev/uart/uart_cpu_ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.13 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_pc98.c b/sys/dev/uart/uart_cpu_pc98.c
index c0c1f4e1d5c23..1fd18cae17117 100644
--- a/sys/dev/uart/uart_cpu_pc98.c
+++ b/sys/dev/uart/uart_cpu_pc98.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.17 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_powerpc.c b/sys/dev/uart/uart_cpu_powerpc.c
index 6647c7dbb3479..4723aeade61b3 100644
--- a/sys/dev/uart/uart_cpu_powerpc.c
+++ b/sys/dev/uart/uart_cpu_powerpc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_powerpc.c,v 1.3 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_cpu_sparc64.c b/sys/dev/uart/uart_cpu_sparc64.c
index 9d92a3908732f..cf6c18b2fb295 100644
--- a/sys/dev/uart/uart_cpu_sparc64.c
+++ b/sys/dev/uart/uart_cpu_sparc64.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.23 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index e2c7831244b17..11a43449399ba 100644
--- a/sys/dev/uart/uart_dbg.c
+++ b/sys/dev/uart/uart_dbg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dbg.c,v 1.3 2006/05/26 11:54:32 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index abe141b705ac5..d023350541824 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.27 2007/04/03 01:21:10 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_sab82532.c b/sys/dev/uart/uart_dev_sab82532.c
index 11cdb4b47387a..a6e80793c7c36 100644
--- a/sys/dev/uart/uart_dev_sab82532.c
+++ b/sys/dev/uart/uart_dev_sab82532.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.16 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index 33bacdc98f72c..04a66b3090194 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.22 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_if.m b/sys/dev/uart/uart_if.m
index 0bb145490ed42..572733797a984 100644
--- a/sys/dev/uart/uart_if.m
+++ b/sys/dev/uart/uart_if.m
@@ -23,7 +23,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/uart/uart_if.m,v 1.3 2005/01/06 01:43:26 imp Exp $
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c
index 1564d3ff726d5..f7388f9b6a2d2 100644
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.13 2007/05/01 14:14:52 marius Exp $");
 
 #include "opt_compat.h"
 #include "opt_kbd.h"
diff --git a/sys/dev/uart/uart_kbd_sun.h b/sys/dev/uart/uart_kbd_sun.h
index 84b55536b6e3a..161270d493361 100644
--- a/sys/dev/uart/uart_kbd_sun.h
+++ b/sys/dev/uart/uart_kbd_sun.h
@@ -32,7 +32,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun.h,v 1.3 2006/11/02 00:01:15 marius Exp $
  */
 
 /* keyboard commands (host->kbd) */
diff --git a/sys/dev/uart/uart_kbd_sun_tables.h b/sys/dev/uart/uart_kbd_sun_tables.h
index e7dc612051043..5a3a0e3d82caa 100644
--- a/sys/dev/uart/uart_kbd_sun_tables.h
+++ b/sys/dev/uart/uart_kbd_sun_tables.h
@@ -2,7 +2,7 @@
  * Automatically generated from sun.us.unix.kbd.
  * DO NOT EDIT!
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun_tables.h,v 1.1 2003/11/11 07:33:24 jake Exp $
  */
 static keymap_t keymap_sun_us_unix_kbd = { 0x80, {
 /*                                                         alt
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index 2cab82535d0a7..f80ae12083894 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.6 2007/04/02 22:00:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index 1971049ce43ae..f42f1c7e5774b 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.29 2006/07/27 00:07:10 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index f0e5399db241f..e44e8b692b7de 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.49 2007/03/21 03:42:50 sam Exp $");
 
 /*
  * uBsec 5[56]01, 58xx hardware crypto accelerator
diff --git a/sys/dev/ubsec/ubsecreg.h b/sys/dev/ubsec/ubsecreg.h
index 2ba1f937d06e6..b6c6fdd9205bb 100644
--- a/sys/dev/ubsec/ubsecreg.h
+++ b/sys/dev/ubsec/ubsecreg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ubsec/ubsecreg.h,v 1.6 2005/01/06 01:43:27 imp Exp $ */
 /*	$OpenBSD: ubsecreg.h,v 1.27 2002/09/11 22:40:31 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/ubsec/ubsecvar.h b/sys/dev/ubsec/ubsecvar.h
index 4a9fa0bfd3555..1f2b57e8f8644 100644
--- a/sys/dev/ubsec/ubsecvar.h
+++ b/sys/dev/ubsec/ubsecvar.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/ubsec/ubsecvar.h,v 1.9 2006/05/17 18:34:26 pjd Exp $ */
 /*	$OpenBSD: ubsecvar.h,v 1.35 2002/09/24 18:33:26 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/usb/FILES b/sys/dev/usb/FILES
index 5a77cbd36c83f..d7fb47b488e0b 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/FILES,v 1.8 2006/11/21 22:29:06 dougb Exp $
 
 A small roadmap of the USB files:
 
diff --git a/sys/dev/usb/dsbr100io.h b/sys/dev/usb/dsbr100io.h
index f1c8a971eb491..4acfdc05617a8 100644
--- a/sys/dev/usb/dsbr100io.h
+++ b/sys/dev/usb/dsbr100io.h
@@ -28,7 +28,7 @@
  * its contributors.
  */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/dsbr100io.h,v 1.3 2007/06/12 19:01:32 imp Exp $ */
 
 #include <sys/ioccom.h>
 
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 6b99d54b42e30..8b01489148127 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.56 2007/08/12 18:45:24 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c
index d64dd5c44728c..b17019ca3eb05 100644
--- a/sys/dev/usb/ehci_pci.c
+++ b/sys/dev/usb/ehci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.28.2.1 2007/11/26 18:21:42 jfv Exp $");
 
 /*
  * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
diff --git a/sys/dev/usb/ehcireg.h b/sys/dev/usb/ehcireg.h
index e9182736edde7..92d57dd73469a 100644
--- a/sys/dev/usb/ehcireg.h
+++ b/sys/dev/usb/ehcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ehcireg.h,v 1.18 2004/10/22 10:38:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.8 2005/09/18 11:45:39 netchild Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h
index 7b22845380214..5ad2de3806c0f 100644
--- a/sys/dev/usb/ehcivar.h
+++ b/sys/dev/usb/ehcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ehcivar.h,v 1.19 2005/04/29 15:04:29 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ehcivar.h,v 1.17 2007/06/14 16:23:31 imp Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index 6a9589e956ef7..6511f08d082b1 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.29 2007/06/20 05:10:52 imp Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index a4ab7d2b2969f..803560b55479c 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.13 2005/01/06 01:43:27 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 884333fc6eefc..958d03284c767 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.117 2007/06/23 05:59:53 imp Exp $");
 
 /*
  * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.
diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h
index 18cc0f4767851..2f714f88d162f 100644
--- a/sys/dev/usb/if_auereg.h
+++ b/sys/dev/usb/if_auereg.h
@@ -32,7 +32,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_auereg.h,v 1.27 2007/01/08 23:24:21 alfred Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 84dd0e0226976..0391f6b3153ea 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.55 2007/09/25 21:08:33 imp Exp $");
 
 /*
  * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver.
diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h
index 15bbaf5891c28..53dce52229cb1 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/dev/usb/if_axereg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.16 2007/09/25 21:08:33 imp Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index d41a54f0cc0b5..3b7d71c1fab9f 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.25 2007/06/30 20:18:44 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/if_cdcereg.h b/sys/dev/usb/if_cdcereg.h
index e658eab48389f..5f03aa4f04d8b 100644
--- a/sys/dev/usb/if_cdcereg.h
+++ b/sys/dev/usb/if_cdcereg.h
@@ -29,7 +29,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_cdcereg.h,v 1.8 2007/06/10 07:33:48 imp Exp $
  */
 
 #ifndef _USB_IF_CDCEREG_H_
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index cd3a5432ef16a..3abdbfd806216 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.72 2007/06/23 06:29:19 imp Exp $");
 
 /*
  * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index 4c8165362abb3..77f7bb241d5f0 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/dev/usb/if_cuereg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.20 2007/06/11 05:42:47 imp Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index f68eaa831f774..bcbe0c242fe7e 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.82 2007/06/23 06:47:43 imp Exp $");
 
 /*
  * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h
index 595eaa7061d3e..fdf9018aaa3ad 100644
--- a/sys/dev/usb/if_kuereg.h
+++ b/sys/dev/usb/if_kuereg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.20 2007/06/11 05:50:47 imp Exp $
  */
 
 /*
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index 4449f7d60d9ca..ac27a4f23cdd0 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.40 2007/07/09 16:58:07 imp Exp $");
 
 /*
  * RealTek RTL8150 USB to fast ethernet controller driver.
diff --git a/sys/dev/usb/if_ruereg.h b/sys/dev/usb/if_ruereg.h
index da6470f431a41..5ff4df26da0f2 100644
--- a/sys/dev/usb/if_ruereg.h
+++ b/sys/dev/usb/if_ruereg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/if_ruereg.h,v 1.8 2007/07/09 20:56:39 imp Exp $
  */
 
 #ifndef _IF_RUEREG_H_
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index aa060f4f7d2f3..de9048c745c05 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.13 2007/09/17 19:07:24 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.13 2007/09/17 19:07:24 sam Exp $");
 
 /*-
  * Ralink Technology RT2501USB/RT2601USB chipset driver
diff --git a/sys/dev/usb/if_rumreg.h b/sys/dev/usb/if_rumreg.h
index 75a51bcd4ad48..c4719e532b4f8 100644
--- a/sys/dev/usb/if_rumreg.h
+++ b/sys/dev/usb/if_rumreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_rumreg.h,v 1.2 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/if_rumvar.h b/sys/dev/usb/if_rumvar.h
index e7d6d15cd6c3b..5c5a2da5e9c31 100644
--- a/sys/dev/usb/if_rumvar.h
+++ b/sys/dev/usb/if_rumvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_rumvar.h,v 1.2 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index cc42477c47141..5a0db78549b0e 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.33 2007/07/24 14:44:23 imp Exp $	*/
 /*-
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.33 2007/07/24 14:44:23 imp Exp $");
 
 #include "opt_inet.h"
 #if defined(__NetBSD__)
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index cb7da283a4244..44dcd3cea9176 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_udavreg.h,v 1.7 2006/09/07 00:06:41 imp Exp $	*/
 /*-
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 819a730dec893..6768d1e4759d3 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.69 2007/09/17 19:07:24 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.69 2007/09/17 19:07:24 sam Exp $");
 
 /*-
  * Ralink Technology RT2500USB chipset driver
diff --git a/sys/dev/usb/if_uralreg.h b/sys/dev/usb/if_uralreg.h
index 428089f945894..814cf35111661 100644
--- a/sys/dev/usb/if_uralreg.h
+++ b/sys/dev/usb/if_uralreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_uralreg.h,v 1.6 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/usb/if_uralvar.h b/sys/dev/usb/if_uralvar.h
index 665b05bd40706..6b881ec528fcc 100644
--- a/sys/dev/usb/if_uralvar.h
+++ b/sys/dev/usb/if_uralvar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.9 2007/06/11 03:36:52 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 1e0858289349a..f2eb65cd2d1a0 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
 /*	$NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.4.2.4 2007/11/30 15:39:22 ariff Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/if_zydfw.h b/sys/dev/usb/if_zydfw.h
index 46f5c2aba7516..c470508765bbe 100644
--- a/sys/dev/usb/if_zydfw.h
+++ b/sys/dev/usb/if_zydfw.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_zydfw.h,v 1.1.2.1 2007/11/11 00:24:43 sam Exp $	*/
 
 uint8_t zd1211_firmware[] = {
 	0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE,
diff --git a/sys/dev/usb/if_zydreg.h b/sys/dev/usb/if_zydreg.h
index fc736ae8885c3..1c092781443ad 100644
--- a/sys/dev/usb/if_zydreg.h
+++ b/sys/dev/usb/if_zydreg.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $	*/
 /*	$NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/if_zydreg.h,v 1.1.2.2 2007/11/30 15:39:22 ariff Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/kue_fw.h b/sys/dev/usb/kue_fw.h
index 8934465cf9da5..7f804dcba070b 100644
--- a/sys/dev/usb/kue_fw.h
+++ b/sys/dev/usb/kue_fw.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/kue_fw.h,v 1.4 2006/09/06 23:44:24 imp Exp $
  */
 
 /*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 736bdf8123119..1c70762a2c792 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -13,7 +13,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.170 2007/06/20 05:10:52 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index 05d4cb9138d8b..ffe68399b0f9a 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.50 2007/06/21 14:42:33 imp Exp $");
 
 /*
  * USB Open Host Controller driver.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index 429beb8fbd831..eaef1e50b81be 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcireg.h,v 1.17 2000/04/01 09:27:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.23 2006/05/28 05:27:08 iedowse Exp $	*/
 
 
 /*-
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 48f99e769f4cb..3ac06ab1ed05e 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ohcivar.h,v 1.30 2001/12/31 12:20:35 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.47 2007/06/14 16:23:31 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/rio500_usb.h b/sys/dev/usb/rio500_usb.h
index 363e0e9b116d4..64e6de2fee0cb 100644
--- a/sys/dev/usb/rio500_usb.h
+++ b/sys/dev/usb/rio500_usb.h
@@ -20,7 +20,7 @@
 
     ---------------------------------------------------------------------- */
 
-/*  $FreeBSD$ */
+/*  $FreeBSD: src/sys/dev/usb/rio500_usb.h,v 1.3 2007/06/12 19:01:32 imp Exp $ */
 
 #include <sys/ioccom.h>
 #ifndef USB_VENDOR_DIAMOND
diff --git a/sys/dev/usb/rt2573_ucode.h b/sys/dev/usb/rt2573_ucode.h
index f2040f3c41ea4..acaa378e1c95e 100644
--- a/sys/dev/usb/rt2573_ucode.h
+++ b/sys/dev/usb/rt2573_ucode.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/rt2573_ucode.h,v 1.1 2007/05/06 10:07:20 kevlo Exp $	*/
 
 /*-
  * Copyright (c) 2005-2006, Ralink Technology, Corp.
diff --git a/sys/dev/usb/sl811hs.c b/sys/dev/usb/sl811hs.c
index 3620d5f91afbd..ba9b0c680cbca 100644
--- a/sys/dev/usb/sl811hs.c
+++ b/sys/dev/usb/sl811hs.c
@@ -70,7 +70,7 @@
 #include <dev/usb/sl811hsreg.h>
 #include <dev/usb/sl811hsvar.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/sl811hs.c,v 1.6 2007/06/19 10:28:08 delphij Exp $");
 
 static inline u_int8_t sl11read(struct slhci_softc *, int);
 static inline void     sl11write(struct slhci_softc *, int, u_int8_t);
diff --git a/sys/dev/usb/sl811hsreg.h b/sys/dev/usb/sl811hsreg.h
index f9c0328584dab..4280dfd90ef8c 100644
--- a/sys/dev/usb/sl811hsreg.h
+++ b/sys/dev/usb/sl811hsreg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD$	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/sl811hsreg.h,v 1.1 2005/07/14 15:57:00 takawata Exp $	*/
 
 
 /*
diff --git a/sys/dev/usb/sl811hsvar.h b/sys/dev/usb/sl811hsvar.h
index 6f5e6d674134a..4382e12f90338 100644
--- a/sys/dev/usb/sl811hsvar.h
+++ b/sys/dev/usb/sl811hsvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD$	*/
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/usb/sl811hsvar.h,v 1.4 2007/02/27 17:19:33 jhb Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/slhci_pccard.c b/sys/dev/usb/slhci_pccard.c
index dc37d59d2a3ac..3246b6820e1e0 100644
--- a/sys/dev/usb/slhci_pccard.c
+++ b/sys/dev/usb/slhci_pccard.c
@@ -51,7 +51,7 @@
 #include <dev/usb/sl811hsvar.h>
 #include "pccarddevs.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/slhci_pccard.c,v 1.4 2007/06/19 10:28:08 delphij Exp $");
 
 static void	slhci_pccard_intr(void *arg);
 
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index dcdf186ad0204..2a12ceb3a93f3 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/uark.c,v 1.7 2007/06/30 02:42:36 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index e65b9222562d7..25bd6e973beb3 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.32 2007/06/22 05:56:05 imp Exp $");
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index 29994b9d93d93..6eaf027362adf 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.30 2007/07/05 06:42:14 imp Exp $");
 
 /*
  * BWCT serial adapter driver
diff --git a/sys/dev/usb/ubser.h b/sys/dev/usb/ubser.h
index f256d4a403d88..afb9360b82413 100644
--- a/sys/dev/usb/ubser.h
+++ b/sys/dev/usb/ubser.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/ubser.h,v 1.3 2005/03/17 22:47:18 ticso Exp $
  */
 
 #ifndef UBSER_H
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index aaa06d379c081..5f0c641138d28 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.64 2007/06/25 06:40:20 imp Exp $");
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index 25cbc53d70e44..7d6743175135f 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.9 2007/06/12 17:30:54 imp Exp $	*/
 
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index ecf115f97a376..63cad22874702 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/ucycom.c,v 1.6 2007/06/21 14:42:33 imp Exp $
  */
 
 /*
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ucycom.c,v 1.6 2007/06/21 14:42:33 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 2ca437541aec4..6ab627969560a 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.41 2007/07/05 15:25:32 imp Exp $");
 
 /* Driver for arbitrary double bulk pipe devices.
  * The driver assumes that there will be the same driver on the other side.
diff --git a/sys/dev/usb/udbp.h b/sys/dev/usb/udbp.h
index 97ef9455b664a..9f86afb9d5a8c 100644
--- a/sys/dev/usb/udbp.h
+++ b/sys/dev/usb/udbp.h
@@ -34,7 +34,7 @@
  * This file was derived from src/sys/netgraph/ng_sample.h, revision 1.1
  * written by Julian Elischer, Whistle Communications.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/udbp.h,v 1.4 2005/01/06 01:43:28 imp Exp $
  */
 
 #ifndef _NETGRAPH_UDBP_H_
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 9eaf497204e94..fb209636fdbad 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.36 2007/06/21 14:42:33 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/ufoma.c b/sys/dev/usb/ufoma.c
index 9621a30da0780..1debe13dc2df8 100644
--- a/sys/dev/usb/ufoma.c
+++ b/sys/dev/usb/ufoma.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.10 2007/07/27 12:00:29 takawata Exp $");
 /*-
  * Copyright (c) 2005, Takanori Watanabe
  * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>.
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 73d0aa0e9e1db..3658cd33cb5ee 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.37 2007/06/22 05:53:05 imp Exp $");
 
 /*
  * FTDI FT8U100AX serial adapter driver
diff --git a/sys/dev/usb/uftdireg.h b/sys/dev/usb/uftdireg.h
index a7c6edcb6005d..11bab9c987749 100644
--- a/sys/dev/usb/uftdireg.h
+++ b/sys/dev/usb/uftdireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uftdireg.h,v 1.2 2004/07/01 17:16:20 brooks Exp $	*/
 
 /*
  * Definitions for the FTDI USB Single Port Serial Converter -
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index a63422feb3059..aded4843ea34a 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.111 2007/06/28 06:22:40 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index 9c5a0c1a6cf7b..bf6a64a4ba628 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb/ugraphire_rdesc.h,v 1.1 2000/12/29 01:47:49 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/ugraphire_rdesc.h,v 1.3 2005/12/31 04:38:50 mux Exp $ */
 /*-
  * Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
  * All rights reserved.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 4d4c61bf65c94..5c9bf67209908 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.175 2007/06/14 16:23:31 imp Exp $");
 
 
 /*-
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 81e0ec7630dcf..e095db6cd9312 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.61.2.1 2007/11/26 18:21:42 jfv Exp $");
 
 /* Universal Host Controller Interface
  *
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index 512dd2d7d3c0a..e897f07313d06 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcireg.h,v 1.15 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.22 2005/01/06 01:43:28 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 0df23f186ae7d..52779fcd275a1 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: uhcivar.h,v 1.33 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.45 2007/06/14 16:23:31 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 2a33cb321f177..66e3b093a9813 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.96 2007/06/21 14:42:33 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 86fbba216e77e..76669bc122b56 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhub.c,v 1.82 2007/06/30 20:18:44 imp Exp $");
 
 /*
  * USB spec: http://www.usb.org/developers/docs/usbspec.zip
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 49fc14ea99c44..5af55ba92d23e 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.7 2007/06/21 14:42:33 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 6d2943d9a3187..243f672f69ab2 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.72.2.2 2007/11/12 16:09:45 kan Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 909aa28eb6bb9..28d82471dfa5f 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.80 2007/06/21 14:42:34 imp Exp $");
 
 /*
  * Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 5cef737bd3781..d9bb7c8bf7001 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/dev/usb/umass.c,v 1.160 2007/07/05 05:26:08 imp Exp $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 58db9d6f104d0..ae2ba6cad907e 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umct.c,v 1.18 2007/06/18 22:27:57 imp Exp $");
 
 /*
  * Driver for the MCT (Magic Control Technology) USB-RS232 Converter.
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 6424496d7f195..093aa27c5b7ce 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.71 2007/07/29 18:16:43 imp Exp $");
 /*-
  * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>.
  * All rights reserved.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index ca3b5d72eb380..2e4f0cfc3bf06 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.96 2007/07/25 06:43:06 imp Exp $");
 
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index a27bd17edb0a0..248352e5e18a0 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.50 2007/06/20 05:10:53 imp Exp $");
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 01e276a41bade..627d51fdc66ad 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.48 2007/06/21 14:42:34 imp Exp $");
 
 
 /*
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 6c2da4a5fd857..2e2335c04d5a1 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.120 2007/06/20 05:10:53 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index d7a4a4d7015e2..a6e278bac2449 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $	*/
-/*	$FreeBSD$    */
+/*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.47 2007/06/30 02:40:21 imp Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index 2cb5fa6c892b3..7dc625b775965 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.23 2007/01/08 23:21:06 alfred Exp $");
 
 /*
  * Callbacks in the USB code operate at splusb() (actually splbio()
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h
index f3d2e3429b484..ef4fa7ad03811 100644
--- a/sys/dev/usb/usb_ethersubr.h
+++ b/sys/dev/usb/usb_ethersubr.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/usb_ethersubr.h,v 1.12 2007/01/08 23:21:06 alfred Exp $
  */
 
 #ifndef _USB_ETHERSUBR_H_
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index b04c8a45a4c46..24566dc7d0c44 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/dev/usb/usb_if.m
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/dev/usb/usb_if.m,v 1.10 2005/01/06 01:43:29 imp Exp $
 #
 
 # USB interface description
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index bbb0bf66c9ba6..137c53ac66be2 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.13 2007/06/20 05:10:53 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.13 2007/06/20 05:10:53 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index b8f0a14673d7e..9fdf5b527de0d 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_mem.h,v 1.18 2002/05/28 17:45:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.22 2007/06/13 05:45:48 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 6a0417f67d500..6afdb0cfcddfe 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
 /*	$NetBSD: usb_port.h,v 1.54 2002/03/28 21:49:19 ichiro Exp $	*/
-/*	$FreeBSD$       */
+/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.98 2007/07/06 20:02:37 imp Exp $       */
 
 /* Also already merged from NetBSD:
  *	$NetBSD: usb_port.h,v 1.57 2002/09/27 20:42:01 thorpej Exp $
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 76c2d35173511..7ef2db10a56bd 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.63.4.1 2008/01/07 23:12:45 brix Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index 16e2f3f4ae5d4..749a1e63f144d 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usb_quirks.h,v 1.20 2001/04/15 09:38:01 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.25 2007/06/29 21:07:41 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 575b111ff1015..f3b25c0dc3b37 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.95 2007/06/30 20:18:44 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index d684108743037..ea0b05f2b23ac 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.12 2005/03/01 06:35:04 sobomax Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2f3db54db0d82..f9ec0ac3e7771 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.328.2.1.2.1 2008/01/07 23:12:45 brix Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 35c201cca5ee4..775d9f904125b 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: usbdi.c,v 1.106 2004/10/24 12:52:40 augustss Exp $	*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.103 2007/06/30 20:18:44 imp Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index b3b26cff757b4..1c62482dd830b 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.63 2007/06/30 20:18:44 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 78ea571450c52..9a5d6223ad4a2 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.38 2007/06/20 05:10:54 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index b535f0c076508..a11941a414079 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdi_util.h,v 1.31 2004/12/03 08:53:40 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdi_util.h,v 1.21 2007/01/03 10:50:03 luigi Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 95d8e0eff1fee..a814f1d1fd92a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.50 2007/06/14 16:23:31 imp Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 8e0ecd5799076..575202ced0d78 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.h,v 1.9 2000/09/03 19:09:14 augustss Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.15 2005/01/06 01:43:29 imp Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 54bf5c6fece79..a17454bbe2d52 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.89 2007/10/05 07:26:39 luigi Exp $");
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index f7b237499b88f..01b3d50747121 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $	*/
-/*      $FreeBSD$	*/
+/*      $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.40 2007/07/05 06:28:46 imp Exp $	*/
 
 /* Also already merged from NetBSD:
  *	$NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 3528643e32c4a..efb840ffdc169 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uvscom.c,v 1.41 2007/07/05 06:28:46 imp Exp $");
 
 /*
  * uvscom: SUNTAC Slipper U VS-10U driver.
diff --git a/sys/dev/usb/uxb360gp_rdesc.h b/sys/dev/usb/uxb360gp_rdesc.h
index d51b52f807e8c..4371eb4b2b0c5 100644
--- a/sys/dev/usb/uxb360gp_rdesc.h
+++ b/sys/dev/usb/uxb360gp_rdesc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb/uxb360gp_rdesc.h,v 1.2 2005/12/31 04:38:50 mux Exp $
  */
 
 /*
diff --git a/sys/dev/utopia/idtphy.c b/sys/dev/utopia/idtphy.c
index 5aaa576abb235..9bdd55cc2edf2 100644
--- a/sys/dev/utopia/idtphy.c
+++ b/sys/dev/utopia/idtphy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/idtphy.c,v 1.1 2005/02/24 16:56:36 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/idtphy.h b/sys/dev/utopia/idtphy.h
index 1451d0561fa3a..b49df52b1313b 100644
--- a/sys/dev/utopia/idtphy.h
+++ b/sys/dev/utopia/idtphy.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/idtphy.h,v 1.3 2005/01/06 01:43:31 imp Exp $
  *
  * Register definitions for the following chips:
  *	IDT 77105
diff --git a/sys/dev/utopia/suni.c b/sys/dev/utopia/suni.c
index ffc49e8e84dad..707676469bb54 100644
--- a/sys/dev/utopia/suni.c
+++ b/sys/dev/utopia/suni.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/suni.c,v 1.1 2005/02/24 16:56:36 harti Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/suni.h b/sys/dev/utopia/suni.h
index fd1be7e13e39b..e73476115eb99 100644
--- a/sys/dev/utopia/suni.h
+++ b/sys/dev/utopia/suni.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/suni.h,v 1.2 2005/01/06 01:43:31 imp Exp $
  *
  * Register definitions for the following chips:
  *	PMC-Sierra PMC-5346 (S/UNI-LITE)
diff --git a/sys/dev/utopia/utopia.c b/sys/dev/utopia/utopia.c
index 30c661c080e6c..06a25c943037f 100644
--- a/sys/dev/utopia/utopia.c
+++ b/sys/dev/utopia/utopia.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/utopia/utopia.c,v 1.11.10.1 2007/12/06 09:53:42 philip Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/utopia/utopia.h b/sys/dev/utopia/utopia.h
index 6e42e99b2e51d..054ec84f7e4e5 100644
--- a/sys/dev/utopia/utopia.h
+++ b/sys/dev/utopia/utopia.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/utopia.h,v 1.5 2005/02/24 16:56:36 harti Exp $
  */
 #ifndef _DEV_UTOPIA_UTOPIA_H
 #define	_DEV_UTOPIA_UTOPIA_H
diff --git a/sys/dev/utopia/utopia_priv.h b/sys/dev/utopia/utopia_priv.h
index cbb242cb99916..41397af815f1a 100644
--- a/sys/dev/utopia/utopia_priv.h
+++ b/sys/dev/utopia/utopia_priv.h
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/utopia/utopia_priv.h,v 1.1 2005/02/24 16:56:36 harti Exp $
  *
  * Private include file for the interface between chip files and
  * the utopia main stuff.
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 466e4fc3e1b45..52d9f89ff2baf 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.31 2007/03/04 03:38:08 csjp Exp $");
 
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index 8d11a9c3e1f64..c097c3be99ff3 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vge/if_vgereg.h,v 1.2 2005/01/06 01:43:31 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index 5d240a33a9ede..52cd072f54e7a 100644
--- a/sys/dev/vge/if_vgevar.h
+++ b/sys/dev/vge/if_vgevar.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vge/if_vgevar.h,v 1.4 2005/06/10 16:49:16 brooks Exp $
  */
 
 #if !defined(__i386__)
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index 9eca6de588d3b..60777fd299d2f 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: vkbd.c,v 1.20 2004/11/15 23:53:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vkbd/vkbd.c,v 1.11 2006/09/27 19:57:00 ru Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/dev/vkbd/vkbd_var.h b/sys/dev/vkbd/vkbd_var.h
index 51e7ff467d17b..24f8ed0cd35ea 100644
--- a/sys/dev/vkbd/vkbd_var.h
+++ b/sys/dev/vkbd/vkbd_var.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: vkbd_var.h,v 1.4 2004/08/17 17:43:14 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vkbd/vkbd_var.h,v 1.2 2005/01/06 01:43:32 imp Exp $
  */
 
 #ifndef _VKBD_VAR_H_
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index a5434407995ae..0ae19fd1af232 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx.c,v 1.60 2005/11/11 16:04:56 ru Exp $");
 
 /*
  * Created from if_ep.c driver by Fred Gray (fgray@rice.edu) to support
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 9eb41a4d7aac8..e744de3000bfe 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.27 2007/02/23 12:18:59 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 194887f5040b6..cafe8223ead5b 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.37 2007/02/23 12:18:59 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h
index b876782ca8cba..620a88cbb82ae 100644
--- a/sys/dev/vx/if_vxreg.h
+++ b/sys/dev/vx/if_vxreg.h
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vx/if_vxreg.h,v 1.13 2005/01/06 01:43:32 imp Exp $
  */
 
 /*
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index ec20a3fbcfe4f..f119b98c23f55 100644
--- a/sys/dev/vx/if_vxvar.h
+++ b/sys/dev/vx/if_vxvar.h
@@ -19,7 +19,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/vx/if_vxvar.h,v 1.6 2005/10/06 18:27:59 jhb Exp $
  *
  October 2, 1994
 
diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c
index 06498c956c9c9..42fcd8dece576 100644
--- a/sys/dev/watchdog/watchdog.c
+++ b/sys/dev/watchdog/watchdog.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/watchdog/watchdog.c,v 1.5 2007/03/27 21:03:36 n_hibma Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index bad36e162981a..4bd08a8e82c5f 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wds/wd7000.c,v 1.14 2007/06/17 05:55:53 scottl Exp $");
 
 /* All bugs are subject to removal without further notice */
 
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index 0a04bed317452..85152f80657de 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.21 2007/07/11 21:25:48 thompsa Exp $
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 9ff16a42159f4..caf79bfdda40d 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.214 2007/09/16 20:02:29 thompsa Exp $");
 
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 53f067b97ba19..50ed9dfd7ddfb 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.59 2005/10/14 15:06:16 imp Exp $");
 
 #include "opt_wi.h"
 
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index fa67a6bf99384..f9eacdd5d34fe 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wi_pci.c,v 1.27 2006/05/16 14:36:33 phk Exp $
  */
 
 /*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 33cf5c9b4817b..05c91d4abc636 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wireg.h,v 1.45 2006/08/05 04:58:25 sam Exp $
  */
 
 #define WI_DELAY	5
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index 88238a3465340..3cd874949bda9 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.31 2007/06/11 03:36:53 sam Exp $
  */
 
 #if 0
diff --git a/sys/dev/wi/spectrum24t_cf.h b/sys/dev/wi/spectrum24t_cf.h
index ce053fa1930c2..374fefee02b5f 100644
--- a/sys/dev/wi/spectrum24t_cf.h
+++ b/sys/dev/wi/spectrum24t_cf.h
@@ -1,5 +1,5 @@
 /*	$NetBSD$	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/wi/spectrum24t_cf.h,v 1.2 2005/01/06 01:43:33 imp Exp $ */
 
 /*-
  * Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 17ad81a3e2fab..db485908134ce 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -173,7 +173,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.76 2007/03/21 03:38:36 nyan Exp $");
 
 /*
  * NOTE:
diff --git a/sys/dev/wl/if_wl.h b/sys/dev/wl/if_wl.h
index e883b782b0463..b177c4c114e4a 100644
--- a/sys/dev/wl/if_wl.h
+++ b/sys/dev/wl/if_wl.h
@@ -18,7 +18,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wl/if_wl.h,v 1.7 2005/01/06 01:43:34 imp Exp $
  */
 /* Definitions for WaveLAN driver */
 
diff --git a/sys/dev/wl/if_wl_i82586.h b/sys/dev/wl/if_wl_i82586.h
index fc08adcc5226a..712ff9262e85e 100644
--- a/sys/dev/wl/if_wl_i82586.h
+++ b/sys/dev/wl/if_wl_i82586.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/wl/if_wl_i82586.h,v 1.1 2005/05/09 04:47:57 nyan Exp $
  */
 /*
   Copyright 1988, 1989 by Olivetti Advanced Technology Center, Inc.,
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 7a85efced87d4..3375f3a129082 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -19,7 +19,7 @@
 #define VERSION "20071127"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.5.2.1.2.1 2008/02/02 07:30:02 sam Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
diff --git a/sys/dev/wpi/if_wpireg.h b/sys/dev/wpi/if_wpireg.h
index 0f83d0a396485..2046e1a3bd57b 100644
--- a/sys/dev/wpi/if_wpireg.h
+++ b/sys/dev/wpi/if_wpireg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/wpi/if_wpireg.h,v 1.2.2.1 2007/12/08 12:44:57 benjsc Exp $	*/
 
 /*-
  * Copyright (c) 2006,2007
diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h
index a8fe4cc013b82..90f3e416d6739 100644
--- a/sys/dev/wpi/if_wpivar.h
+++ b/sys/dev/wpi/if_wpivar.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/dev/wpi/if_wpivar.h,v 1.1.2.1 2007/12/08 12:44:57 benjsc Exp $	*/
 
 /*-
  * Copyright (c) 2006,2007
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index accaafec80829..b54318acc3df6 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.64 2007/02/23 12:18:59 piso Exp $");
 
 /*		
  * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters.  The
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index 48f11803fd60a..24ad007f851b9 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe_pccard.c,v 1.32 2005/09/19 03:10:21 imp Exp $");
 
 /* xe pccard interface driver */
 
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index f3ab4b5c21a4a..cce59b77a6012 100644
--- a/sys/dev/xe/if_xereg.h
+++ b/sys/dev/xe/if_xereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xereg.h,v 1.7 2005/10/06 08:30:40 pjd Exp $
  */
 #ifndef DEV_XE_IF_XEREG_H
 #define DEV_XE_IF_XEREG_H
diff --git a/sys/dev/xe/if_xevar.h b/sys/dev/xe/if_xevar.h
index 0e6610219ca1c..46defb37034d3 100644
--- a/sys/dev/xe/if_xevar.h
+++ b/sys/dev/xe/if_xevar.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/xe/if_xevar.h,v 1.6 2005/06/10 16:49:17 brooks Exp $
  */
 #ifndef DEV_XE_IF_XEDEV_H
 #define DEV_XE_IF_XEDEV_H
diff --git a/sys/fs/cd9660/TODO b/sys/fs/cd9660/TODO
index b8d7f3efebb99..5948037eb5954 100644
--- a/sys/fs/cd9660/TODO
+++ b/sys/fs/cd9660/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/fs/cd9660/TODO,v 1.8 2007/02/11 13:54:25 rodrigc Exp $
 
  2) should understand Rock Ridge
 
diff --git a/sys/fs/cd9660/TODO.hibler b/sys/fs/cd9660/TODO.hibler
index e0842da82d5a3..158f47990c787 100644
--- a/sys/fs/cd9660/TODO.hibler
+++ b/sys/fs/cd9660/TODO.hibler
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/fs/cd9660/TODO.hibler,v 1.4 2007/02/11 13:54:25 rodrigc Exp $
 
 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS).
    Since it was modelled after the inode code, we might be able to merge
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index 57345011efb02..f2c0b3ae7224e 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_bmap.c,v 1.16 2007/02/11 13:54:25 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_iconv.c b/sys/fs/cd9660/cd9660_iconv.c
index 43a5a0de89604..9c70e1e12eb99 100644
--- a/sys/fs/cd9660/cd9660_iconv.c
+++ b/sys/fs/cd9660/cd9660_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_iconv.c,v 1.2 2007/02/11 13:54:25 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 3d177c441f130..28beb89de6797 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_lookup.c,v 1.43 2007/02/11 13:54:25 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_mount.h b/sys/fs/cd9660/cd9660_mount.h
index 518677d19ae2e..57b810cffe0fb 100644
--- a/sys/fs/cd9660/cd9660_mount.h
+++ b/sys/fs/cd9660/cd9660_mount.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_mount.h	8.1 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/cd9660/cd9660_mount.h,v 1.9 2007/02/11 13:54:25 rodrigc Exp $
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 9f9f1b6dc5e08..6626a9fd8abc7 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_node.c,v 1.56 2007/02/11 13:54:25 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index a0eb135661377..f0e5c6ba77194 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/cd9660/cd9660_node.h,v 1.33 2007/02/11 13:54:25 rodrigc Exp $
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index c3c8027d3cd7b..523c37836be5f 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.30 2007/02/11 13:54:25 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index f6fa050368d2f..b39663650b287 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/cd9660/cd9660_rrip.h,v 1.9 2007/02/11 13:54:25 rodrigc Exp $
  */
 
 typedef struct {
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 5372c759b1d40..ac83a8c9621f1 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_util.c,v 1.23 2007/02/11 13:54:25 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 2b557a063fdae..ba705cfca9fdc 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_vfsops.c,v 1.150 2007/03/13 01:50:22 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index ab6fea8f092e5..a1cf140573a84 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_vnops.c,v 1.113 2007/02/15 22:08:34 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 0988bf6b4066f..f3e034ab7adb3 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/cd9660/iso.h,v 1.33 2007/02/15 22:08:34 pjd Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 75c004c40b626..e5baa3a5c364e 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/cd9660/iso_rrip.h,v 1.9 2007/02/11 13:54:25 rodrigc Exp $
  */
 
 
diff --git a/sys/fs/coda/README b/sys/fs/coda/README
index 19de799c0eac7..c220cd09186e6 100644
--- a/sys/fs/coda/README
+++ b/sys/fs/coda/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/fs/coda/README,v 1.4 2007/07/12 20:40:37 rwatson Exp $
 
                 Announcing the Availability of the
                         Coda Distributed
diff --git a/sys/fs/coda/TODO b/sys/fs/coda/TODO
index 76b7b2d8ae972..072bd2923dd99 100644
--- a/sys/fs/coda/TODO
+++ b/sys/fs/coda/TODO
@@ -16,4 +16,4 @@ Medium term:
 Eventually:
 	Use standard queue macros.
 
-$FreeBSD$
+$FreeBSD: src/sys/fs/coda/TODO,v 1.3 2007/07/12 20:40:37 rwatson Exp $
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index 297d538953088..f6974797b33de 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/cnode.h,v 1.21.4.1 2008/01/23 12:09:43 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
index 93547a4d7e80d..43fa85b7c226d 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda.h,v 1.16 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index bf4e10cc4ea46..c7117ecb38974 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_fbsd.c,v 1.46 2007/07/12 21:04:57 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_io.h b/sys/fs/coda/coda_io.h
index 1985b01a5c566..c0f777ae0fe1f 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_io.h,v 1.9 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_kernel.h b/sys/fs/coda/coda_kernel.h
index fd365b8ad37df..b55115b3d5a2e 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_kernel.h,v 1.6 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_namecache.c b/sys/fs/coda/coda_namecache.c
index af8508cbe4a06..916e6050211ab 100644
--- a/sys/fs/coda/coda_namecache.c
+++ b/sys/fs/coda/coda_namecache.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_namecache.c,v 1.23 2007/07/12 21:04:57 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_namecache.h b/sys/fs/coda/coda_namecache.h
index 637a0d02bc462..a162bb61e15aa 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_namecache.h,v 1.11.4.1 2008/01/23 12:09:43 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_opstats.h b/sys/fs/coda/coda_opstats.h
index a8d52b3a8456a..9ef457d033680 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_opstats.h,v 1.7 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_pioctl.h b/sys/fs/coda/coda_pioctl.h
index ea61b6429a4e6..cb8b07700fca4 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_pioctl.h,v 1.9 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index 0321bb1f9c39d..2ab4632955af3 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -49,7 +49,7 @@
 /* These routines are the device entry points for Venus. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_psdev.c,v 1.39.4.1 2008/01/23 12:09:43 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_psdev.h b/sys/fs/coda/coda_psdev.h
index 5d1193ba0447f..13e6682c9150a 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 $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_psdev.h,v 1.6 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
index 59e8c875f1a0e..31911ac84abea 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_subr.c,v 1.33 2007/07/12 21:04:57 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_subr.h b/sys/fs/coda/coda_subr.h
index 91bf1228e6ce5..3dd6caa811329 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_subr.h,v 1.10 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
index baea20a218e75..c066c83283ae4 100644
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_venus.c,v 1.27 2007/07/12 21:04:57 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_venus.h b/sys/fs/coda/coda_venus.h
index d8f0198710fe5..3303b61022014 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_venus.h,v 1.10 2007/07/12 20:40:37 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index bd3d33c37278b..4bba1f555b7b7 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.67.4.1 2008/01/23 12:09:43 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_vfsops.h b/sys/fs/coda/coda_vfsops.h
index 4dbc47300b3c8..3218c48d30157 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 $ 
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_vfsops.h,v 1.12 2007/07/12 20:40:38 rwatson Exp $
  * 
  */
 
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index 4d7e6df8abf9d..dd10243ea121b 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.76.4.1 2008/01/23 12:09:43 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
index 5ea0091833192..85ffc706fffdc 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 $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/coda/coda_vnops.h,v 1.19 2007/07/12 20:40:38 rwatson Exp $
  * 
   */
 
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index a5c359f4ed1d7..fbe9752639494 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.50 2007/01/22 11:25:22 kib Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h
index 1050ba5fa155e..f4d961bef425c 100644
--- a/sys/fs/devfs/devfs.h
+++ b/sys/fs/devfs/devfs.h
@@ -33,7 +33,7 @@
  *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs.h 1.14
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.31 2006/10/18 11:17:14 kib Exp $
  */
 
 #ifndef _FS_DEVFS_DEVFS_H_
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index ca5c2dead80d2..11b3097834f62 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -25,7 +25,7 @@
  *
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.50 2007/04/23 13:36:52 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h
index 3848ab4c19049..51c36256130ba 100644
--- a/sys/fs/devfs/devfs_int.h
+++ b/sys/fs/devfs/devfs_int.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.4 2007/07/03 17:42:36 kib Exp $
  */
 
 /*
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index f6aef0370bfd0..1255e03902d3a 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_rule.c,v 1.23 2006/11/06 13:41:56 rwatson Exp $
  */
 
 /*
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index f3a364b40d08a..9e9cc744d0099 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -31,7 +31,7 @@
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.52 2006/09/26 04:12:45 tegge Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 3eed86c9bf9ba..a165c4428e04f 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -31,7 +31,7 @@
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
  * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.149.4.1 2008/01/12 00:13:33 jhb Exp $
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index fb7d9528a4b38..e82029a9fea48 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -31,7 +31,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.20 2005/02/10 12:09:15 phk Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 4d862580fef02..7201ba9b0d5cd 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.56 2007/04/04 09:11:32 rwatson Exp $
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index a293b9cf7b3a1..3ca7b7f14d533 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.104 2007/04/04 09:11:32 rwatson Exp $
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index da85ae23d86bf..6d62759c54437 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fifofs/fifo.h,v 1.20 2005/01/06 18:10:38 imp Exp $
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 2d3254f968ddc..18db076c3c9dc 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.138 2007/07/26 16:58:09 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h
index fba0c4515ae04..0c3f3a1e5fda0 100644
--- a/sys/fs/hpfs/hpfs.h
+++ b/sys/fs/hpfs/hpfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.20 2006/08/04 07:56:34 yar Exp $
  */
 
 /*#define HPFS_DEBUG 10*/
diff --git a/sys/fs/hpfs/hpfs_alsubr.c b/sys/fs/hpfs/hpfs_alsubr.c
index 226865fd1e2de..48b0c06641e79 100644
--- a/sys/fs/hpfs/hpfs_alsubr.c
+++ b/sys/fs/hpfs/hpfs_alsubr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_alsubr.c,v 1.3 2003/03/04 00:04:42 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_ioctl.h b/sys/fs/hpfs/hpfs_ioctl.h
index 7f60729b1ba3a..fb6a65b5b5a00 100644
--- a/sys/fs/hpfs/hpfs_ioctl.h
+++ b/sys/fs/hpfs/hpfs_ioctl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_ioctl.h,v 1.1 1999/12/09 19:09:59 semenu Exp $
  */
 
 #ifndef _HPFS_IOCTL_H_
diff --git a/sys/fs/hpfs/hpfs_lookup.c b/sys/fs/hpfs/hpfs_lookup.c
index 88542cb2160be..cde396abf8308 100644
--- a/sys/fs/hpfs/hpfs_lookup.c
+++ b/sys/fs/hpfs/hpfs_lookup.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_lookup.c,v 1.2 2000/05/05 09:57:53 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c
index 6844545ae239d..3471c762b6731 100644
--- a/sys/fs/hpfs/hpfs_subr.c
+++ b/sys/fs/hpfs/hpfs_subr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.c,v 1.7 2004/12/06 20:14:20 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfs_subr.h b/sys/fs/hpfs/hpfs_subr.h
index 4cddcf705baba..8676049738fc3 100644
--- a/sys/fs/hpfs/hpfs_subr.h
+++ b/sys/fs/hpfs/hpfs_subr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.h,v 1.3 2004/12/06 20:14:20 phk Exp $
  */
 
 #define	hpfs_bmmarkfree(hpmp, bn,bl) hpfs_bmmark(hpmp, bn, bl, 1)
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index bb29a838bc808..b5278aa73a8e7 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.60 2007/03/13 01:50:22 tegge Exp $
  */
 
 
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index ffe13d91cbcd4..e6b42fcc5695c 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.70 2007/02/15 22:08:32 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/hpfs/hpfsmount.h b/sys/fs/hpfs/hpfsmount.h
index 3566776b96ade..7ccc96c9e3b36 100644
--- a/sys/fs/hpfs/hpfsmount.h
+++ b/sys/fs/hpfs/hpfsmount.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/hpfs/hpfsmount.h,v 1.1 1999/12/09 19:10:00 semenu Exp $
  */
 
 #define HPFSMNT_TABLES		0x0001
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 9e8aa9767b905..cec966900eec3 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.13 2005/09/29 14:09:46 peadar Exp $ */
 /*	$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 addacd22fa15c..e6e25799ebb93 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.16 2007/07/12 16:09:07 bde Exp $ */
 /*	$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 da9eca29fd68b..c5ad8f086caed 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.37 2007/08/07 03:22:10 bde Exp $ */
 /*	$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 a55b0af219a9b..6c794a06e426f 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/direntry.h,v 1.24 2007/08/31 22:29:55 bde Exp $ */
 /*	$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 cd6b7d18b8114..2d196d5cc9042 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/fat.h,v 1.14 2005/01/06 18:10:38 imp Exp $ */
 /*	$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 25efcc5306e53..b68792bd51e87 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_conv.c,v 1.53 2007/08/31 22:29:55 bde Exp $ */
 /*	$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 37f1433ff2980..c6581e1967354 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.97 2007/08/07 03:59:49 bde Exp $ */
 /*	$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 fa8741c616563..71f1b14e16737 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.48 2007/09/23 14:49:32 bde Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_fileno.c b/sys/fs/msdosfs/msdosfs_fileno.c
index ff1f2b7d37866..9b81380f9f32c 100644
--- a/sys/fs/msdosfs/msdosfs_fileno.c
+++ b/sys/fs/msdosfs/msdosfs_fileno.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_fileno.c,v 1.5 2007/08/07 02:25:55 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/msdosfs/msdosfs_iconv.c b/sys/fs/msdosfs/msdosfs_iconv.c
index a6a97bb0ec161..d290911ef5f44 100644
--- a/sys/fs/msdosfs/msdosfs_iconv.c
+++ b/sys/fs/msdosfs/msdosfs_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.4 2007/08/07 02:25:56 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/iconv.h>
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 9ebae3e483274..c3502abfe9578 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_lookup.c,v 1.51 2007/08/31 22:29:55 bde Exp $ */
 /*	$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 cc8b0549892a1..8d454dad5608f 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.174 2007/08/15 17:40:09 jhb Exp $ */
 /*	$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 124beeb0ad2e8..521fb919e3003 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.179 2007/08/31 22:29:55 bde Exp $ */
 /*	$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 088467951f12d..f9f0727716729 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.39 2007/07/12 16:09:07 bde Exp $ */
 /*	$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 0d5242bac28fc..de956f043327c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.20 2005/09/11 15:57:07 rodrigc Exp $
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 6816220c0e5c1..e25ec1f65addd 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_compr.c,v 1.13 2001/11/26 23:45:12 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_compr.h b/sys/fs/ntfs/ntfs_compr.h
index e51bc09f2fdad..3ede7027aa955 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_compr.h,v 1.6 1999/12/03 20:37:38 semenu Exp $
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/fs/ntfs/ntfs_iconv.c b/sys/fs/ntfs/ntfs_iconv.c
index 347306e885360..cffe5cc88a2fb 100644
--- a/sys/fs/ntfs/ntfs_iconv.c
+++ b/sys/fs/ntfs/ntfs_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/ntfs/ntfs_iconv.c,v 1.1 2003/09/26 20:26:23 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index 1356560ec9990..e4a3a3166a0e2 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.22.2.1 2007/11/29 19:02:05 maxim Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index 7df7495c770ac..f39053de6a9a2 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.h,v 1.8 2004/06/16 09:47:04 phk Exp $
  */
 
 extern struct lock ntfs_hashlock;
diff --git a/sys/fs/ntfs/ntfs_inode.h b/sys/fs/ntfs/ntfs_inode.h
index c11cfa1f6317e..62c4ca075b4f3 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_inode.h,v 1.12 2004/06/16 09:47:04 phk Exp $
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index 972cfb0510694..19039b63d3941 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.42 2006/11/20 19:28:36 le Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index 65b002529d1a0..01034dcecd9de 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.h,v 1.14 2006/11/20 19:28:36 le Exp $
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 9d1f485d0c773..d5dd0cb226a51 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.88 2007/09/21 23:50:15 rodrigc Exp $
  */
 
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.h b/sys/fs/ntfs/ntfs_vfsops.h
index adb737d4e54b1..09001e4c0bb92 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.h,v 1.8 2005/02/10 12:09:49 phk Exp $
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadntnode() on ntnode, even if */
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index bc300444bef8a..e820174c85937 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.60 2007/02/15 22:08:32 pjd Exp $
  *
  */
 
diff --git a/sys/fs/ntfs/ntfsmount.h b/sys/fs/ntfs/ntfsmount.h
index 5497ad9f2176f..bf62f0f86f6ef 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/ntfs/ntfsmount.h,v 1.8 2003/09/26 20:26:23 fjoe Exp $
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index c8fc5de3c838e..95e09a19c2ef1 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -31,7 +31,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null.h,v 1.23 2005/03/15 13:49:33 jeff Exp $
  */
 
 struct null_mount {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 496be3cd58a74..6adc2a914a4e7 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -31,7 +31,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.51.2.1 2007/10/22 05:44:07 daichi Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 21ee108d2ee9e..1153afe4516c7 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -32,7 +32,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.83 2007/05/29 11:28:28 rwatson Exp $
  */
 
 /*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 66ccc7f4b4025..320d492df52ad 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -36,7 +36,7 @@
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.95.2.1 2007/10/22 05:44:07 daichi Exp $
  */
 
 /*
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h
index d7b2f6299e2f3..7700002f935ce 100644
--- a/sys/fs/nwfs/nwfs.h
+++ b/sys/fs/nwfs/nwfs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs.h,v 1.9 2005/01/14 08:09:42 phk Exp $
  */
 
 #ifndef _NWFS_H_
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index c7c4473f7ca13..a7cf70d69f147 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.46 2007/06/01 14:33:10 kib Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/fs/nwfs/nwfs_ioctl.c b/sys/fs/nwfs/nwfs_ioctl.c
index 0fd55319493d0..eb5a794ee707f 100644
--- a/sys/fs/nwfs/nwfs_ioctl.c
+++ b/sys/fs/nwfs/nwfs_ioctl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_ioctl.c,v 1.8 2005/01/06 18:10:39 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nwfs/nwfs_mount.h b/sys/fs/nwfs/nwfs_mount.h
index a6f9568bb6665..395b2dd9693b5 100644
--- a/sys/fs/nwfs/nwfs_mount.h
+++ b/sys/fs/nwfs/nwfs_mount.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_mount.h,v 1.8 2005/01/06 18:10:39 imp Exp $
  */
 #ifndef _NWFS_MOUNT_H_
 #define	_NWFS_MOUNT_H_
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index 92b7f863cb755..b55b8deff6b7d 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.39 2007/03/13 01:50:23 tegge Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nwfs/nwfs_node.h b/sys/fs/nwfs/nwfs_node.h
index f2e0adae58ac5..8a6af9030c0e5 100644
--- a/sys/fs/nwfs/nwfs_node.h
+++ b/sys/fs/nwfs/nwfs_node.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_node.h,v 1.10 2005/01/06 18:10:39 imp Exp $
  */
 #ifndef _NWFS_NODE_H_
 #define _NWFS_NODE_H_
diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c
index da646409f74b0..bfb159aebafc6 100644
--- a/sys/fs/nwfs/nwfs_subr.c
+++ b/sys/fs/nwfs/nwfs_subr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.c,v 1.17 2006/10/24 11:43:41 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/nwfs/nwfs_subr.h b/sys/fs/nwfs/nwfs_subr.h
index 683a94379d976..d1a7f28479935 100644
--- a/sys/fs/nwfs/nwfs_subr.h
+++ b/sys/fs/nwfs/nwfs_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_subr.h,v 1.5 2005/01/06 18:10:39 imp Exp $
  */
 #ifndef _NWFS_SUBR_H_
 #define _NWFS_SUBR_H_
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index aad0b999b1747..ac177e855612b 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.44 2006/09/26 04:12:46 tegge Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index 1dd2ae5c16526..a97c22ea8c63a 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/nwfs/nwfs_vnops.c,v 1.42 2005/10/16 21:54:35 truckman Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 6606ccc014c3f..f1efaf984928a 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -31,7 +31,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/portalfs/portal.h,v 1.10 2005/01/06 18:10:40 imp Exp $
  */
 
 struct portal_args {
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 412e81acacfab..d8c7de1378f2c 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.60 2007/03/13 01:50:23 tegge Exp $
  */
 
 /*
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index d6c4bc58640a1..7af73c7c6ad5f 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -31,7 +31,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.73 2007/03/13 01:50:23 tegge Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/README b/sys/fs/procfs/README
index f816b321b432c..e7a941f288cde 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.
 
-$FreeBSD$
+$FreeBSD: src/sys/fs/procfs/README,v 1.4 1999/08/28 00:46:53 peter Exp $
diff --git a/sys/fs/procfs/procfs.c b/sys/fs/procfs/procfs.c
index 56bc0cc037516..99ad418fe7cf5 100644
--- a/sys/fs/procfs/procfs.c
+++ b/sys/fs/procfs/procfs.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.16 2007/03/12 12:16:52 des Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 48d4bca84b485..4f23f3fefbb78 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -33,7 +33,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.47 2005/01/06 18:10:40 imp Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 89aa304d99e0e..a41758335da8b 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_ctl.c,v 1.51 2003/12/07 17:40:00 des Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.56 2007/06/05 00:00:51 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index d985245528b93..02806e75b225f 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -40,7 +40,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.27 2007/04/15 13:24:03 des Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 25412d83e7e25..dbcc5c369f112 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.33 2007/04/15 13:29:36 des Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_ioctl.c b/sys/fs/procfs/procfs_ioctl.c
index ccff555280f6b..d354ca28dd5d9 100644
--- a/sys/fs/procfs/procfs_ioctl.c
+++ b/sys/fs/procfs/procfs_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.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.19 2007/06/12 00:11:58 rwatson Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 748fef36a7da3..c84611e8e9940 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -32,7 +32,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.40 2007/04/23 06:12:24 alc Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index d4a789635b01c..f4304a9e46f6f 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -33,7 +33,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_mem.c,v 1.60 2005/01/06 18:10:40 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 16c917e787959..2ad11287b0a9c 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -32,7 +32,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_note.c,v 1.9 2004/04/07 20:46:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index 481c05347160c..14614caf20318 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.32 2007/04/15 13:24:03 des Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 3885f566f6eaf..ae6c87a32baaa 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_rlimit.c,v 1.10 2005/01/06 18:10:40 imp Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 871d7fc024052..016852a869620 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_status.c,v 1.62 2007/09/17 05:31:39 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index c19bf9d9c7c04..0826d1f7ac160 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/procfs/procfs_type.c,v 1.12 2005/01/06 18:10:40 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index de0d1f18462ea..e590879830340 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.32 2007/04/15 17:10:01 des Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h
index c9e1697245e0e..55a04a4570a85 100644
--- a/sys/fs/pseudofs/pseudofs.h
+++ b/sys/fs/pseudofs/pseudofs.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.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.36 2007/04/15 17:10:01 des Exp $
  */
 
 #ifndef _PSEUDOFS_H_INCLUDED
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index d9dc6d29ae6b8..27cdef0d4b7b3 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_fileno.c,v 1.15 2007/04/15 17:10:01 des Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h
index d52ae6eb38ab0..9b7cca2124fa5 100644
--- a/sys/fs/pseudofs/pseudofs_internal.h
+++ b/sys/fs/pseudofs/pseudofs_internal.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.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/fs/pseudofs/pseudofs_internal.h,v 1.7 2007/04/15 17:10:01 des Exp $
  */
 
 #ifndef _PSEUDOFS_INTERNAL_H_INCLUDED
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index 57aa983b10f7a..98a7ef350a3be 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.38 2007/04/23 19:17:01 des Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index 354b01ad7baa1..56133f43ed4b8 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.65 2007/10/05 17:37:25 jhb Exp $");
 
 #include "opt_pseudofs.h"
 
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h
index 59693e3cd6027..fcd5e78cc0f5c 100644
--- a/sys/fs/smbfs/smbfs.h
+++ b/sys/fs/smbfs/smbfs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs.h,v 1.12 2005/01/14 08:52:55 phk Exp $
  */
 #ifndef _SMBFS_SMBFS_H_
 #define _SMBFS_SMBFS_H_
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 98008be2b206e..951b7cea20738 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.41 2007/06/04 21:45:16 attilio Exp $
  *
  */
 #include <sys/param.h>
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index 84fa330fe0640..d20479f8e231f 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.34 2007/05/29 11:28:28 rwatson Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_node.h b/sys/fs/smbfs/smbfs_node.h
index 4e923936adbb0..76dd51059351f 100644
--- a/sys/fs/smbfs/smbfs_node.h
+++ b/sys/fs/smbfs/smbfs_node.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_node.h,v 1.7 2005/01/06 18:10:41 imp Exp $
  */
 #ifndef _FS_SMBFS_NODE_H_
 #define _FS_SMBFS_NODE_H_
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index 7ee93f6a0fec4..6fd9232c51284 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.18 2007/02/27 17:23:28 jhb Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_subr.c b/sys/fs/smbfs/smbfs_subr.c
index 68ed0b191cfca..17e7a0e90082f 100644
--- a/sys/fs/smbfs/smbfs_subr.c
+++ b/sys/fs/smbfs/smbfs_subr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_subr.c,v 1.11 2006/10/24 11:55:18 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/smbfs/smbfs_subr.h b/sys/fs/smbfs/smbfs_subr.h
index a72b9e657a5f6..c9916278ad4a2 100644
--- a/sys/fs/smbfs/smbfs_subr.h
+++ b/sys/fs/smbfs/smbfs_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_subr.h,v 1.6 2005/05/04 15:05:46 takawata Exp $
  */
 #ifndef _FS_SMBFS_SMBFS_SUBR_H_
 #define _FS_SMBFS_SMBFS_SUBR_H_
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index 182ba2b2a6a00..e375ef592a36c 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.41 2006/09/26 04:12:46 tegge Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index 4c84e0083b7a5..fdcb12de0cb49 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.65 2007/05/31 11:51:50 kib Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h
index d730e9e53a6d6..09876e78d6d16 100644
--- a/sys/fs/tmpfs/tmpfs.h
+++ b/sys/fs/tmpfs/tmpfs.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.11.2.1 2007/11/26 06:46:44 delphij Exp $
  */
 
 #ifndef _FS_TMPFS_TMPFS_H_
diff --git a/sys/fs/tmpfs/tmpfs_fifoops.c b/sys/fs/tmpfs/tmpfs_fifoops.c
index a50bbbc6f7cb8..3876c6871b0de 100644
--- a/sys/fs/tmpfs/tmpfs_fifoops.c
+++ b/sys/fs/tmpfs/tmpfs_fifoops.c
@@ -41,7 +41,7 @@
  * tmpfs vnode interface for named pipes.
  */
 #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
+ __FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.c,v 1.3 2007/06/28 02:39:31 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/filedesc.h>
diff --git a/sys/fs/tmpfs/tmpfs_fifoops.h b/sys/fs/tmpfs/tmpfs_fifoops.h
index 49d4e95997941..0e607fc73c5fd 100644
--- a/sys/fs/tmpfs/tmpfs_fifoops.h
+++ b/sys/fs/tmpfs/tmpfs_fifoops.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.3 2007/06/28 02:36:41 delphij Exp $
  */
 
 #ifndef _FS_TMPFS_TMPFS_FIFOOPS_H_
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
index a855fd09cdc5d..fbf0741d36acd 100644
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -41,7 +41,7 @@
  * Efficient memory file system supporting functions.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.12.2.1 2007/11/26 06:46:44 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/namei.h>
diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c
index fc2e1ee0be077..3f11b2d124c17 100644
--- a/sys/fs/tmpfs/tmpfs_vfsops.c
+++ b/sys/fs/tmpfs/tmpfs_vfsops.c
@@ -48,7 +48,7 @@
  * allocate and release resources.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.11.2.3 2007/11/26 06:46:44 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/limits.h>
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
index 6da260ce5d6ae..e15c7f98a590d 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.c
+++ b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -41,7 +41,7 @@
  * tmpfs vnode interface.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.11.2.1 2007/11/26 06:46:44 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
diff --git a/sys/fs/tmpfs/tmpfs_vnops.h b/sys/fs/tmpfs/tmpfs_vnops.h
index ee83b2bb8e21a..3bdbd01ce063b 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.h
+++ b/sys/fs/tmpfs/tmpfs_vnops.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.h,v 1.2 2007/06/28 02:36:41 delphij Exp $
  */
 
 #ifndef _FS_TMPFS_TMPFS_VNOPS_H_
diff --git a/sys/fs/udf/ecma167-udf.h b/sys/fs/udf/ecma167-udf.h
index 2d787584608a3..0da0c17d35ec2 100644
--- a/sys/fs/udf/ecma167-udf.h
+++ b/sys/fs/udf/ecma167-udf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/ecma167-udf.h,v 1.7 2006/07/25 14:15:50 yar Exp $
  */
 
 /* ecma167-udf.h */
diff --git a/sys/fs/udf/osta.c b/sys/fs/udf/osta.c
index 81c72862d45f6..8780edc2ec34e 100644
--- a/sys/fs/udf/osta.c
+++ b/sys/fs/udf/osta.c
@@ -3,7 +3,7 @@
  * each code segment.  Slight whitespace modifications have been made for
  * formatting purposes.  Typos/bugs have been fixed.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/osta.c,v 1.4 2005/01/06 18:10:41 imp Exp $
  */
 
 #include <fs/udf/osta.h>
diff --git a/sys/fs/udf/osta.h b/sys/fs/udf/osta.h
index 8fe43424870b4..131d4f0988920 100644
--- a/sys/fs/udf/osta.h
+++ b/sys/fs/udf/osta.h
@@ -1,7 +1,7 @@
 /*
  * Prototypes for the OSTA functions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/osta.h,v 1.3 2006/09/12 19:02:34 imp Exp $
  */
 
 /*-
diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h
index 05eb2e4eae386..7ada12fc02412 100644
--- a/sys/fs/udf/udf.h
+++ b/sys/fs/udf/udf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf.h,v 1.14 2007/02/15 22:08:33 pjd Exp $
  */
 
 #define UDF_HASHTBLSIZE 100
diff --git a/sys/fs/udf/udf_iconv.c b/sys/fs/udf/udf_iconv.c
index 934516986c853..812baef2a6f9e 100644
--- a/sys/fs/udf/udf_iconv.c
+++ b/sys/fs/udf/udf_iconv.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/fs/udf/udf_iconv.c,v 1.1 2003/11/05 06:56:08 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/iconv.h>
diff --git a/sys/fs/udf/udf_mount.h b/sys/fs/udf/udf_mount.h
index 1c34694c3d4c4..a04888144a689 100644
--- a/sys/fs/udf/udf_mount.h
+++ b/sys/fs/udf/udf_mount.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf_mount.h,v 1.3 2003/11/05 06:56:08 scottl Exp $
  */
 
 #define	UDFMNT_KICONV	0x00000001
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 8f36a147cd2d8..437aadf6ad372 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.48.4.1 2008/01/28 12:51:31 kib Exp $
  */
 
 /* udf_vfsops.c */
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index b77e571969cfd..e30b1fdad14c7 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.66 2007/06/11 20:14:44 remko Exp $
  */
 
 /* udf_vnops.c */
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index e97936df8b5b0..14cbb0adfed7b 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union.h,v 1.34.2.2 2007/10/22 05:41:54 daichi Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index fc5e27c582e9f..9a073e5c99295 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.92.2.2 2007/10/22 05:30:40 daichi Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 3125f59ccde19..1233ae7e999d3 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.82.2.4 2007/10/22 05:41:54 daichi Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 7a0cb6076f78d..27ae5b261ef85 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.142.2.7 2007/10/22 05:41:54 daichi Exp $
  *
  */
 
diff --git a/sys/gdb/gdb.h b/sys/gdb/gdb.h
index 97b4a4adad43a..6e99e294ff81b 100644
--- a/sys/gdb/gdb.h
+++ b/sys/gdb/gdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gdb/gdb.h,v 1.3 2006/05/26 11:54:32 phk Exp $
  */
 
 #ifndef _GDB_GDB_H_
diff --git a/sys/gdb/gdb_cons.c b/sys/gdb/gdb_cons.c
index edd44068d8453..235660c253da6 100644
--- a/sys/gdb/gdb_cons.c
+++ b/sys/gdb/gdb_cons.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_cons.c,v 1.2 2006/05/26 13:54:27 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/gdb/gdb_int.h b/sys/gdb/gdb_int.h
index d06943a2a0029..655b8a9eb5207 100644
--- a/sys/gdb/gdb_int.h
+++ b/sys/gdb/gdb_int.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gdb/gdb_int.h,v 1.3 2006/03/23 23:06:14 sam Exp $
  */
 
 #ifndef _GDB_GDB_INT_H_
diff --git a/sys/gdb/gdb_main.c b/sys/gdb/gdb_main.c
index 3ba3dbf00c9b3..1b58de0d096bc 100644
--- a/sys/gdb/gdb_main.c
+++ b/sys/gdb/gdb_main.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_main.c,v 1.7 2006/05/26 11:52:59 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/gdb/gdb_packet.c b/sys/gdb/gdb_packet.c
index d3e5a0ab5aec5..54f049d9c60f6 100644
--- a/sys/gdb/gdb_packet.c
+++ b/sys/gdb/gdb_packet.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_packet.c,v 1.4 2007/06/09 21:55:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index 90aaf7a44b83f..662c7467f8b1d 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde.c,v 1.29 2005/03/11 15:42:51 ume Exp $
  *
  */
 
diff --git a/sys/geom/bde/g_bde.h b/sys/geom/bde/g_bde.h
index 9332c6b270615..efd3d9fce658f 100644
--- a/sys/geom/bde/g_bde.h
+++ b/sys/geom/bde/g_bde.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde.h,v 1.6 2003/10/07 09:28:07 phk Exp $
  */
 
 #ifndef _SYS_GEOM_BDE_G_BDE_H_
diff --git a/sys/geom/bde/g_bde_crypt.c b/sys/geom/bde/g_bde_crypt.c
index c5de0b9323946..bd54ffd3f2112 100644
--- a/sys/geom/bde/g_bde_crypt.c
+++ b/sys/geom/bde/g_bde_crypt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.23 2005/07/20 18:08:16 phk Exp $
  */
 /* This source file contains the functions responsible for the crypto, keying
  * and mapping operations on the I/O requests.
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c
index 855987e529477..5b5cd1d24492b 100644
--- a/sys/geom/bde/g_bde_lock.c
+++ b/sys/geom/bde/g_bde_lock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.17 2005/11/30 19:07:28 sobomax Exp $
  */
 /* This souce file contains routines which operates on the lock sectors, both
  * for the kernel and the userland program gbde(1).
diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c
index 9a653e379eb27..5aad34090d99c 100644
--- a/sys/geom/bde/g_bde_work.c
+++ b/sys/geom/bde/g_bde_work.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/bde/g_bde_work.c,v 1.28 2006/08/04 07:56:34 yar Exp $
  */
 /*
  * This source file contains the state-engine which makes things happen in the
diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c
index 7be8cb34385c0..79f1615e12d54 100644
--- a/sys/geom/cache/g_cache.c
+++ b/sys/geom/cache/g_cache.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/cache/g_cache.c,v 1.2 2007/06/04 18:25:06 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/cache/g_cache.h b/sys/geom/cache/g_cache.h
index 4164abf7cefd8..d2ac802e85978 100644
--- a/sys/geom/cache/g_cache.h
+++ b/sys/geom/cache/g_cache.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/cache/g_cache.h,v 1.1 2006/10/06 08:27:07 ru Exp $
  */
 
 #ifndef	_G_CACHE_H_
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index 9dae373bffd76..5f8db1ec8d2a1 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.29 2006/10/31 21:23:50 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/concat/g_concat.h b/sys/geom/concat/g_concat.h
index def0a9813a225..6e4f7ebc948c4 100644
--- a/sys/geom/concat/g_concat.h
+++ b/sys/geom/concat/g_concat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.12 2006/02/01 12:05:59 pjd Exp $
  */
 
 #ifndef	_G_CONCAT_H_
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index d9f74d200ccb5..73ee89c9aeffb 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.38 2007/06/05 00:00:51 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/eli/g_eli.h b/sys/geom/eli/g_eli.h
index 8079c9dd4a18e..b348bd25f26ad 100644
--- a/sys/geom/eli/g_eli.h
+++ b/sys/geom/eli/g_eli.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/eli/g_eli.h,v 1.13 2007/09/01 06:33:01 pjd Exp $
  */
 
 #ifndef	_G_ELI_H_
diff --git a/sys/geom/eli/g_eli_crypto.c b/sys/geom/eli/g_eli_crypto.c
index c26b3673441bd..96f150ecf25c4 100644
--- a/sys/geom/eli/g_eli_crypto.c
+++ b/sys/geom/eli/g_eli_crypto.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_crypto.c,v 1.5 2007/09/01 06:33:01 pjd Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c
index 558a4f278f162..bb9bc3029756d 100644
--- a/sys/geom/eli/g_eli_ctl.c
+++ b/sys/geom/eli/g_eli_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_ctl.c,v 1.13 2007/05/06 14:56:03 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/eli/g_eli_integrity.c b/sys/geom/eli/g_eli_integrity.c
index b9a3f31359add..77812ec4c02fa 100644
--- a/sys/geom/eli/g_eli_integrity.c
+++ b/sys/geom/eli/g_eli_integrity.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_integrity.c,v 1.4 2006/07/22 10:05:55 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/eli/g_eli_key.c b/sys/geom/eli/g_eli_key.c
index 3f7be95752c29..79d7623f2cad2 100644
--- a/sys/geom/eli/g_eli_key.c
+++ b/sys/geom/eli/g_eli_key.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_key.c,v 1.3 2006/06/05 21:38:54 pjd Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/eli/g_eli_privacy.c b/sys/geom/eli/g_eli_privacy.c
index 94cc4fca5647e..c55ee613a66c8 100644
--- a/sys/geom/eli/g_eli_privacy.c
+++ b/sys/geom/eli/g_eli_privacy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_privacy.c,v 1.1 2006/06/05 21:38:54 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/eli/pkcs5v2.c b/sys/geom/eli/pkcs5v2.c
index 05677c1b76f13..010ee979d23a4 100644
--- a/sys/geom/eli/pkcs5v2.c
+++ b/sys/geom/eli/pkcs5v2.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/eli/pkcs5v2.c,v 1.2 2006/02/01 12:05:59 pjd Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/eli/pkcs5v2.h b/sys/geom/eli/pkcs5v2.h
index 154616972e612..16906c05b7c2d 100644
--- a/sys/geom/eli/pkcs5v2.h
+++ b/sys/geom/eli/pkcs5v2.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/eli/pkcs5v2.h,v 1.2 2006/02/01 12:05:59 pjd Exp $
  */
 
 #ifndef _PKCS5V2_H_
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index 3737ee058689b..657be0e7fbc4d 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/gate/g_gate.c,v 1.26 2006/09/08 10:20:44 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/gate/g_gate.h b/sys/geom/gate/g_gate.h
index cd2564d937b2d..dace6bd73d6a3 100644
--- a/sys/geom/gate/g_gate.h
+++ b/sys/geom/gate/g_gate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/gate/g_gate.h,v 1.10 2006/09/08 10:20:44 pjd Exp $
  */
 
 #ifndef _G_GATE_H_
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index dea22720b09a1..26a88c3c32fa4 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom.h,v 1.100 2007/05/05 16:35:22 pjd Exp $
  */
 
 #ifndef _GEOM_GEOM_H_
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 50b85e6e58e36..d1e461a22fcea 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_aes.c,v 1.30 2005/11/30 22:15:00 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index 1a0bf2034176b..e2e31916915ba 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd.c,v 1.78.2.1 2007/12/18 01:24:27 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_bsd_enc.c b/sys/geom/geom_bsd_enc.c
index a526cac487199..c2b800b808d23 100644
--- a/sys/geom/geom_bsd_enc.c
+++ b/sys/geom/geom_bsd_enc.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_bsd_enc.c,v 1.6 2005/01/06 18:27:29 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index e31f23a48ae59..38aa6ba09fffe 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_ccd.c,v 1.155 2006/04/13 20:35:31 cracauer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index 25b9449bb0086..8e320725969d8 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_ctl.c,v 1.39 2007/03/30 16:32:08 delphij Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_ctl.h b/sys/geom/geom_ctl.h
index fd68bdaa428a3..32221cddbf0e8 100644
--- a/sys/geom/geom_ctl.h
+++ b/sys/geom/geom_ctl.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_ctl.h,v 1.5 2003/06/01 13:47:51 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_CTL_H_
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 5c7ac66cc6868..7b3e8e98b13e3 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.94 2007/05/05 17:02:19 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 725a7d0dc35d0..38bf4a879a67a 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.104 2007/05/05 18:09:17 pjd Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index 5e9d1aae6c2f6..09a36deaef91d 100644
--- a/sys/geom/geom_disk.h
+++ b/sys/geom/geom_disk.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_disk.h,v 1.7 2007/05/05 17:12:15 pjd Exp $
  */
 
 #ifndef _GEOM_GEOM_DISK_H_
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index 1f00db9de1718..84d94c49d6de2 100644
--- a/sys/geom/geom_dump.c
+++ b/sys/geom/geom_dump.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_dump.c,v 1.32 2005/11/12 20:02:02 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/sbuf.h>
diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c
index 98804549478b2..417080edb0bc9 100644
--- a/sys/geom/geom_event.c
+++ b/sys/geom/geom_event.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_event.c,v 1.56 2007/09/27 20:18:34 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/geom/geom_fox.c b/sys/geom/geom_fox.c
index d943d859340cf..1823a9935ed89 100644
--- a/sys/geom/geom_fox.c
+++ b/sys/geom/geom_fox.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_fox.c,v 1.11 2005/11/30 22:15:00 sobomax Exp $
  */
 
 /* This is a GEOM module for handling path selection for multi-path
diff --git a/sys/geom/geom_int.h b/sys/geom/geom_int.h
index cb69df3183ed4..50f3a2ab5b255 100644
--- a/sys/geom/geom_int.h
+++ b/sys/geom/geom_int.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_int.h,v 1.29 2004/10/25 12:28:28 phk Exp $
  */
 
 LIST_HEAD(class_list_head, g_class);
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index a69d764a66bff..e61e2a7c08407 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.75 2007/05/05 16:35:22 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index d32757928284d..f642229472599 100644
--- a/sys/geom/geom_kern.c
+++ b/sys/geom/geom_kern.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_kern.c,v 1.41 2007/06/05 00:00:51 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index 6b034ba833b50..a456664535c30 100644
--- a/sys/geom/geom_mbr.c
+++ b/sys/geom/geom_mbr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr.c,v 1.68 2005/11/30 22:15:00 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/geom/geom_mbr_enc.c b/sys/geom/geom_mbr_enc.c
index e3e3977582b41..07f14e5d772be 100644
--- a/sys/geom/geom_mbr_enc.c
+++ b/sys/geom/geom_mbr_enc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_mbr_enc.c,v 1.3 2005/01/06 18:27:29 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/diskmbr.h>
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index 4f89958dfc589..c712076ab503b 100644
--- a/sys/geom/geom_pc98.c
+++ b/sys/geom/geom_pc98.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_pc98.c,v 1.56 2005/11/30 22:15:00 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_pc98_enc.c b/sys/geom/geom_pc98_enc.c
index cf0f7f3fe7bc7..6e2fe2a28621c 100644
--- a/sys/geom/geom_pc98_enc.c
+++ b/sys/geom/geom_pc98_enc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_pc98_enc.c,v 1.3 2005/05/01 09:44:50 nyan Exp $");
 
 #include <sys/types.h>
 #include <sys/diskpc98.h>
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index 9462fdc060359..7425839b757b4 100644
--- a/sys/geom/geom_slice.c
+++ b/sys/geom/geom_slice.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.62 2007/05/05 17:52:22 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_slice.h b/sys/geom/geom_slice.h
index cb7fbab2de5b0..017cec54c9cc0 100644
--- a/sys/geom/geom_slice.h
+++ b/sys/geom/geom_slice.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_slice.h,v 1.18 2006/02/18 11:21:17 pjd Exp $
  */
 
 #ifndef _GEOM_GEOM_SLICE_H_
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index 1c0b3a4d432b6..df12ef94d1efa 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.91 2007/05/05 16:33:44 pjd Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index e9002de7fd6a9..abc2a273513b4 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.46 2005/11/30 22:15:00 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_sunlabel_enc.c b/sys/geom/geom_sunlabel_enc.c
index 7463e01172d8d..47183ccaa9e26 100644
--- a/sys/geom/geom_sunlabel_enc.c
+++ b/sys/geom/geom_sunlabel_enc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_sunlabel_enc.c,v 1.6 2005/03/30 09:33:09 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/endian.h>
diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c
index 4a33d2275a57c..3b5a59f83aa4e 100644
--- a/sys/geom/geom_vfs.c
+++ b/sys/geom/geom_vfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_vfs.c,v 1.11 2007/01/23 10:01:17 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/geom_vfs.h b/sys/geom/geom_vfs.h
index 806ec1ca089a7..4d5f8febbb6d8 100644
--- a/sys/geom/geom_vfs.h
+++ b/sys/geom/geom_vfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/geom_vfs.h,v 1.3 2005/02/10 12:10:35 phk Exp $
  */
 
 #ifndef _GEOM_GEOM_VFS_H_
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c
index c21b1b6c81f55..d658ab8656e6c 100644
--- a/sys/geom/geom_vol_ffs.c
+++ b/sys/geom/geom_vol_ffs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/geom_vol_ffs.c,v 1.16 2005/11/30 22:15:00 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index eff82935f2fac..ace8c8625be43 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/journal/g_journal.c,v 1.13 2007/06/05 00:00:52 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/journal/g_journal.h b/sys/geom/journal/g_journal.h
index 39f7dde982e82..b92ad2b37c5f4 100644
--- a/sys/geom/journal/g_journal.h
+++ b/sys/geom/journal/g_journal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/journal/g_journal.h,v 1.1 2006/10/31 21:31:00 pjd Exp $
  */
 
 #ifndef	_G_JOURNAL_H_
diff --git a/sys/geom/journal/g_journal_ufs.c b/sys/geom/journal/g_journal_ufs.c
index b3db6064aceb1..0729628656207 100644
--- a/sys/geom/journal/g_journal_ufs.c
+++ b/sys/geom/journal/g_journal_ufs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/journal/g_journal_ufs.c,v 1.1 2006/10/31 21:31:00 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index a6685e9d12c42..17eb950de0a99 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.21 2006/08/12 15:30:24 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index e2d7a5e053e1e..418b48a384de7 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/label/g_label.h,v 1.7 2006/02/01 12:06:00 pjd Exp $
  */
 
 #ifndef	_G_LABEL_H_
diff --git a/sys/geom/label/g_label_ext2fs.c b/sys/geom/label/g_label_ext2fs.c
index 379785f54558b..e253a0aebf6c4 100644
--- a/sys/geom/label/g_label_ext2fs.c
+++ b/sys/geom/label/g_label_ext2fs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ext2fs.c,v 1.2 2005/08/23 18:55:38 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_iso9660.c b/sys/geom/label/g_label_iso9660.c
index 7d29bcd864d98..7bf5061dc33ca 100644
--- a/sys/geom/label/g_label_iso9660.c
+++ b/sys/geom/label/g_label_iso9660.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_iso9660.c,v 1.5 2006/02/01 12:06:00 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_msdosfs.c b/sys/geom/label/g_label_msdosfs.c
index 5eae234b9f4ac..d88dc843c47ee 100644
--- a/sys/geom/label/g_label_msdosfs.c
+++ b/sys/geom/label/g_label_msdosfs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_msdosfs.c,v 1.6 2006/09/30 08:16:49 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_msdosfs.h b/sys/geom/label/g_label_msdosfs.h
index a04b87fe97066..f9e0cc882d351 100644
--- a/sys/geom/label/g_label_msdosfs.h
+++ b/sys/geom/label/g_label_msdosfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/label/g_label_msdosfs.h,v 1.2 2006/09/30 08:16:49 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/geom/label/g_label_ntfs.c b/sys/geom/label/g_label_ntfs.c
index 4781d7debbefc..c903919075e4c 100644
--- a/sys/geom/label/g_label_ntfs.c
+++ b/sys/geom/label/g_label_ntfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ntfs.c,v 1.6 2006/01/18 11:03:20 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_reiserfs.c b/sys/geom/label/g_label_reiserfs.c
index c2bee7165c45e..fe7f1dc03e42f 100644
--- a/sys/geom/label/g_label_reiserfs.c
+++ b/sys/geom/label/g_label_reiserfs.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_reiserfs.c,v 1.2 2005/08/23 18:55:38 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c
index a1801d5e8defe..c2a5f11376ca5 100644
--- a/sys/geom/label/g_label_ufs.c
+++ b/sys/geom/label/g_label_ufs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.11 2006/09/16 11:24:41 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index 24a2fad8f5c09..1e1ea633062e3 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.93 2007/06/05 00:00:52 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h
index eb67b6e08ba72..987f20990aa8d 100644
--- a/sys/geom/mirror/g_mirror.h
+++ b/sys/geom/mirror/g_mirror.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/mirror/g_mirror.h,v 1.24 2006/11/01 22:51:49 pjd Exp $
  */
 
 #ifndef	_G_MIRROR_H_
diff --git a/sys/geom/mirror/g_mirror_ctl.c b/sys/geom/mirror/g_mirror_ctl.c
index 27e58ceb31c2b..a2ac8cd7e40d3 100644
--- a/sys/geom/mirror/g_mirror_ctl.c
+++ b/sys/geom/mirror/g_mirror_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror_ctl.c,v 1.18 2006/11/01 22:51:49 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c
index 0398628e03d7a..f1abb9dbaf0b1 100644
--- a/sys/geom/multipath/g_multipath.c
+++ b/sys/geom/multipath/g_multipath.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/multipath/g_multipath.c,v 1.1 2007/02/27 04:01:58 mjacob Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/geom/multipath/g_multipath.h b/sys/geom/multipath/g_multipath.h
index 22d6157250ae3..cca439d95f117 100644
--- a/sys/geom/multipath/g_multipath.h
+++ b/sys/geom/multipath/g_multipath.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/multipath/g_multipath.h,v 1.1 2007/02/27 04:01:58 mjacob Exp $
  */
 /*
  * Based upon work by Pawel Jakub Dawidek <pjd@FreeBSD.org> for all of the
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index ffa32e3da5bff..787cbc9742711 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.19 2006/09/08 13:46:18 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/nop/g_nop.h b/sys/geom/nop/g_nop.h
index fa66f59721660..1b535d525dc6a 100644
--- a/sys/geom/nop/g_nop.h
+++ b/sys/geom/nop/g_nop.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/nop/g_nop.h,v 1.7 2006/09/30 08:16:49 pjd Exp $
  */
 
 #ifndef	_G_NOP_H_
diff --git a/sys/geom/notes b/sys/geom/notes
index 4fcacaefbc405..f160a355e57c0 100644
--- a/sys/geom/notes
+++ b/sys/geom/notes
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/geom/notes,v 1.5 2004/09/05 21:15:58 phk Exp $
 
 For the lack of a better place to put them, this file will contain
 notes on some of the more intricate details of geom.
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c
index 0a35f6a334c14..6007b499ef428 100644
--- a/sys/geom/part/g_part.c
+++ b/sys/geom/part/g_part.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.9.2.1 2007/10/29 00:11:39 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h
index 01bf65fa0d64b..9f73301af594d 100644
--- a/sys/geom/part/g_part.h
+++ b/sys/geom/part/g_part.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/part/g_part.h,v 1.3.2.1 2007/10/29 00:11:39 marcel Exp $
  */
 
 #ifndef _GEOM_PART_H_
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c
index 12746e34ee902..4c79579bae1f2 100644
--- a/sys/geom/part/g_part_apm.c
+++ b/sys/geom/part/g_part_apm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/part/g_part_apm.c,v 1.3.2.1 2007/10/29 00:11:39 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/apm.h>
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index 140c91aa8d41e..fc9acd363931c 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.3.2.1 2007/10/29 00:11:39 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/part/g_part_if.m b/sys/geom/part/g_part_if.m
index fa386d2850ad7..3469604483d72 100644
--- a/sys/geom/part/g_part_if.m
+++ b/sys/geom/part/g_part_if.m
@@ -23,7 +23,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.2 2007/02/08 04:02:56 rodrigc Exp $
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c
index b096b33d11aab..77395a7cc56b8 100644
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.2 2007/06/17 22:19:19 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index 98747eadd7b53..1d18f9f9b3d6c 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.81 2007/06/05 00:00:52 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h
index a375999993598..922862e265c65 100644
--- a/sys/geom/raid3/g_raid3.h
+++ b/sys/geom/raid3/g_raid3.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/raid3/g_raid3.h,v 1.19 2006/11/01 22:51:49 pjd Exp $
  */
 
 #ifndef	_G_RAID3_H_
diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c
index 952ac2bf9f762..a645b6a05d7ca 100644
--- a/sys/geom/raid3/g_raid3_ctl.c
+++ b/sys/geom/raid3/g_raid3_ctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3_ctl.c,v 1.21 2006/11/01 22:51:49 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index 96650cf5a839a..5d3ea8220d281 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/shsec/g_shsec.c,v 1.6 2006/11/01 12:30:51 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/shsec/g_shsec.h b/sys/geom/shsec/g_shsec.h
index 5927645f213da..c7210ffc9b6ed 100644
--- a/sys/geom/shsec/g_shsec.h
+++ b/sys/geom/shsec/g_shsec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/shsec/g_shsec.h,v 1.4 2006/02/01 12:06:01 pjd Exp $
  */
 
 #ifndef	_G_SHSEC_H_
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index c059df5e06455..b77cc07b65799 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/stripe/g_stripe.c,v 1.32 2007/06/04 18:25:06 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/stripe/g_stripe.h b/sys/geom/stripe/g_stripe.h
index 2720c6f779587..ac2ab58b8b143 100644
--- a/sys/geom/stripe/g_stripe.h
+++ b/sys/geom/stripe/g_stripe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/stripe/g_stripe.h,v 1.9 2006/02/01 12:06:01 pjd Exp $
  */
 
 #ifndef	_G_STRIPE_H_
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 99d7c222afe29..6e84aa88c828c 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.12 2007/04/24 06:30:06 simokawa Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 7ebe58f5d7951..d107438e7c3aa 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.21 2006/03/30 14:01:25 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum.h b/sys/geom/vinum/geom_vinum.h
index a4c3f5d8cecd5..2856f44795284 100644
--- a/sys/geom/vinum/geom_vinum.h
+++ b/sys/geom/vinum/geom_vinum.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum.h,v 1.13 2007/04/12 17:54:35 le Exp $
  */
 
 #ifndef	_GEOM_VINUM_H_
diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c
index 98b7c574cf6e4..e18f0898baaed 100644
--- a/sys/geom/vinum/geom_vinum_drive.c
+++ b/sys/geom/vinum/geom_vinum_drive.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.25 2006/01/06 18:03:17 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_init.c b/sys/geom/vinum/geom_vinum_init.c
index b3d744e3b00fa..bb9d0b5e1e303 100644
--- a/sys/geom/vinum/geom_vinum_init.c
+++ b/sys/geom/vinum/geom_vinum_init.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_init.c,v 1.11 2005/08/28 18:16:31 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_list.c b/sys/geom/vinum/geom_vinum_list.c
index cb4ccfa5a45f3..33f7e6006d431 100644
--- a/sys/geom/vinum/geom_vinum_list.c
+++ b/sys/geom/vinum/geom_vinum_list.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_list.c,v 1.3 2005/01/06 18:27:30 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_move.c b/sys/geom/vinum/geom_vinum_move.c
index 9a22684cb943d..1c99090478b6f 100644
--- a/sys/geom/vinum/geom_vinum_move.c
+++ b/sys/geom/vinum/geom_vinum_move.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_move.c,v 1.3 2006/02/08 21:32:45 le Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c
index bdcce213f7fbd..347ebaed079d7 100644
--- a/sys/geom/vinum/geom_vinum_plex.c
+++ b/sys/geom/vinum/geom_vinum_plex.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.17 2006/01/06 18:03:17 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_raid5.c b/sys/geom/vinum/geom_vinum_raid5.c
index 789db193ecbd4..d35e24053af28 100644
--- a/sys/geom/vinum/geom_vinum_raid5.c
+++ b/sys/geom/vinum/geom_vinum_raid5.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.10 2004/11/26 11:59:51 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/vinum/geom_vinum_raid5.h b/sys/geom/vinum/geom_vinum_raid5.h
index 804920eff434b..25b74d725df79 100644
--- a/sys/geom/vinum/geom_vinum_raid5.h
+++ b/sys/geom/vinum/geom_vinum_raid5.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.h,v 1.7 2006/08/17 22:50:33 imp Exp $
  */
 
 #ifndef _GEOM_VINUM_RAID5_H_
diff --git a/sys/geom/vinum/geom_vinum_rename.c b/sys/geom/vinum/geom_vinum_rename.c
index 3d66fce015d31..917ca8771121e 100644
--- a/sys/geom/vinum/geom_vinum_rename.c
+++ b/sys/geom/vinum/geom_vinum_rename.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rename.c,v 1.3 2005/11/20 12:14:18 le Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_rm.c b/sys/geom/vinum/geom_vinum_rm.c
index a6bc71b18c546..5745791198dfa 100644
--- a/sys/geom/vinum/geom_vinum_rm.c
+++ b/sys/geom/vinum/geom_vinum_rm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.13 2007/04/12 17:54:35 le Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c
index e87fd686b9f78..2c7bbd64022c5 100644
--- a/sys/geom/vinum/geom_vinum_share.c
+++ b/sys/geom/vinum/geom_vinum_share.c
@@ -41,7 +41,7 @@
 /* This file is shared between kernel and userland. */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_share.c,v 1.5 2007/04/12 17:40:44 le Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/geom/vinum/geom_vinum_share.h b/sys/geom/vinum/geom_vinum_share.h
index f15f45df667c6..b48952c47940e 100644
--- a/sys/geom/vinum/geom_vinum_share.h
+++ b/sys/geom/vinum/geom_vinum_share.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_share.h,v 1.2 2004/11/15 12:30:59 le Exp $
  */
 
 #ifndef _GEOM_VINUM_SHARE_H_
diff --git a/sys/geom/vinum/geom_vinum_state.c b/sys/geom/vinum/geom_vinum_state.c
index 549503f5573ee..bdde5e8d2b11e 100644
--- a/sys/geom/vinum/geom_vinum_state.c
+++ b/sys/geom/vinum/geom_vinum_state.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_state.c,v 1.8 2006/03/30 14:01:25 le Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index 1bd339cff3ea8..ed5ca542ba096 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_subr.c,v 1.16 2007/04/12 17:54:35 le Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index 8f746f0460cb8..45f8b6b6e1ade 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -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.
  *  
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/vinum/geom_vinum_var.h,v 1.11 2006/01/06 18:03:17 le Exp $
  */
 
 #ifndef	_GEOM_VINUM_VAR_H_
diff --git a/sys/geom/vinum/geom_vinum_volume.c b/sys/geom/vinum/geom_vinum_volume.c
index afc1f2a33b56f..e2951ff5b378f 100644
--- a/sys/geom/vinum/geom_vinum_volume.c
+++ b/sys/geom/vinum/geom_vinum_volume.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_volume.c,v 1.11 2006/01/06 18:03:17 le Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/geom/virstor/binstream.c b/sys/geom/virstor/binstream.c
index bbbafdb581edd..3de53dae1e7c3 100644
--- a/sys/geom/virstor/binstream.c
+++ b/sys/geom/virstor/binstream.c
@@ -27,7 +27,7 @@
 // $Id: binstream.c,v 1.1 2006/07/05 10:47:54 ivoras Exp $
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/virstor/binstream.c,v 1.1 2007/09/23 07:34:23 pjd Exp $");
 
 #include <sys/endian.h>
 #include <sys/param.h>
diff --git a/sys/geom/virstor/binstream.h b/sys/geom/virstor/binstream.h
index 4ff4e6b0287e1..1c434420b523d 100644
--- a/sys/geom/virstor/binstream.h
+++ b/sys/geom/virstor/binstream.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/virstor/binstream.h,v 1.1 2007/09/23 07:34:23 pjd Exp $
  */
 
 // $Id: binstream.h,v 1.1 2006/07/05 10:47:54 ivoras Exp $
diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c
index dfbe5c6aae3b5..267d1184056c0 100644
--- a/sys/geom/virstor/g_virstor.c
+++ b/sys/geom/virstor/g_virstor.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/virstor/g_virstor.c,v 1.3 2007/09/24 06:14:27 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/geom/virstor/g_virstor.h b/sys/geom/virstor/g_virstor.h
index 062ca94eb5788..44c853a41be8a 100644
--- a/sys/geom/virstor/g_virstor.h
+++ b/sys/geom/virstor/g_virstor.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/virstor/g_virstor.h,v 1.1 2007/09/23 07:34:23 pjd Exp $
  */
 
 #ifndef _G_VIRSTOR_H_
diff --git a/sys/geom/virstor/g_virstor_md.c b/sys/geom/virstor/g_virstor_md.c
index 59e8b98323452..2e55700a2657a 100644
--- a/sys/geom/virstor/g_virstor_md.c
+++ b/sys/geom/virstor/g_virstor_md.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/virstor/g_virstor_md.c,v 1.1 2007/09/23 07:34:23 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/geom/virstor/g_virstor_md.h b/sys/geom/virstor/g_virstor_md.h
index 4537478383a39..ac8bc09504efb 100644
--- a/sys/geom/virstor/g_virstor_md.h
+++ b/sys/geom/virstor/g_virstor_md.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/geom/virstor/g_virstor_md.h,v 1.1 2007/09/23 07:34:23 pjd Exp $
  */
 
 
diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index 638bd3250fbd6..b7d69384493b2 100644
--- a/sys/geom/zero/g_zero.c
+++ b/sys/geom/zero/g_zero.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/zero/g_zero.c,v 1.4 2006/02/01 12:06:01 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/gnu/dev/sound/pci/csaimg.h b/sys/gnu/dev/sound/pci/csaimg.h
index ba3ba14914f62..6d87f3ae834fc 100755
--- a/sys/gnu/dev/sound/pci/csaimg.h
+++ b/sys/gnu/dev/sound/pci/csaimg.h
@@ -19,7 +19,7 @@
  *     Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
  *     USA.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/dev/sound/pci/csaimg.h,v 1.2 2005/01/06 18:27:30 imp Exp $
  *
  ***************************************************************************/
 
diff --git a/sys/gnu/dev/sound/pci/emu10k1-alsa.h b/sys/gnu/dev/sound/pci/emu10k1-alsa.h
index 406aa26b642b0..e63d5f4327924 100644
--- a/sys/gnu/dev/sound/pci/emu10k1-alsa.h
+++ b/sys/gnu/dev/sound/pci/emu10k1-alsa.h
@@ -23,7 +23,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/emu10k1-alsa.h,v 1.3 2006/07/15 19:19:54 netchild Exp $ */
 
 #ifdef __KERNEL__
 
diff --git a/sys/gnu/dev/sound/pci/maestro3_dsp.h b/sys/gnu/dev/sound/pci/maestro3_dsp.h
index 908abca55a8b1..85fca1ad32b9c 100644
--- a/sys/gnu/dev/sound/pci/maestro3_dsp.h
+++ b/sys/gnu/dev/sound/pci/maestro3_dsp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/maestro3_dsp.h,v 1.5 2005/01/06 18:27:30 imp Exp $ */
 /*-
  *      ESS Technology allegro audio driver.
  *
diff --git a/sys/gnu/dev/sound/pci/maestro3_reg.h b/sys/gnu/dev/sound/pci/maestro3_reg.h
index 2e60a1c32af8d..39603a435f2cf 100644
--- a/sys/gnu/dev/sound/pci/maestro3_reg.h
+++ b/sys/gnu/dev/sound/pci/maestro3_reg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/maestro3_reg.h,v 1.5 2005/01/06 18:27:30 imp Exp $ */
 /*-
  *      ESS Technology allegro audio driver.
  *
diff --git a/sys/gnu/dev/sound/pci/p16v-alsa.h b/sys/gnu/dev/sound/pci/p16v-alsa.h
index 0f9f8e8d08f8c..09806029b0ae6 100644
--- a/sys/gnu/dev/sound/pci/p16v-alsa.h
+++ b/sys/gnu/dev/sound/pci/p16v-alsa.h
@@ -78,7 +78,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/p16v-alsa.h,v 1.1 2006/07/15 19:36:28 netchild Exp $ */
 
 /********************************************************************************************************/
 /* Audigy2 P16V pointer-offset register set, accessed through the PTR2 and DATA2 registers                     */
diff --git a/sys/gnu/dev/sound/pci/p17v-alsa.h b/sys/gnu/dev/sound/pci/p17v-alsa.h
index 3e27a17ebc80b..ba2f6558a68ba 100644
--- a/sys/gnu/dev/sound/pci/p17v-alsa.h
+++ b/sys/gnu/dev/sound/pci/p17v-alsa.h
@@ -19,7 +19,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/dev/sound/pci/p17v-alsa.h,v 1.1 2006/07/15 19:36:28 netchild Exp $ */
 
 /******************************************************************************/
 /* Audigy2Value Tina (P17V) pointer-offset register set,
diff --git a/sys/gnu/fs/ext2fs/COPYRIGHT.INFO b/sys/gnu/fs/ext2fs/COPYRIGHT.INFO
index 699f519c02a84..9364b7041c316 100644
--- a/sys/gnu/fs/ext2fs/COPYRIGHT.INFO
+++ b/sys/gnu/fs/ext2fs/COPYRIGHT.INFO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO,v 1.3 2000/01/01 11:27:50 bde Exp $
 
 Most of the files in this directory are written by Godmar Back or modified
 by him using the CSRG sources.  Those files are covered by the Berkeley-style
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 190a47264e57c..2e86985686d6d 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_alloc.c,v 1.45 2005/12/05 11:58:33 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index e46414c5bf99d..1d44d402db10a 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_balloc.c,v 1.22 2005/12/05 11:58:33 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bitops.h b/sys/gnu/fs/ext2fs/ext2_bitops.h
index 0ee54a1a76ede..bc8317432b8b2 100644
--- a/sys/gnu/fs/ext2fs/ext2_bitops.h
+++ b/sys/gnu/fs/ext2fs/ext2_bitops.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_bitops.h,v 1.3 2006/04/13 19:37:32 cracauer Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_BITOPS_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 85cfbf948bf69..88f3f307876b4 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_bmap.c,v 1.64 2007/06/01 01:12:43 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index 24c8f45729481..67330fdbeb60d 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_extern.h,v 1.35 2005/03/14 13:30:05 phk Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_fs.h b/sys/gnu/fs/ext2fs/ext2_fs.h
index 1b2f3c2de9af3..b7b9041039288 100644
--- a/sys/gnu/fs/ext2fs/ext2_fs.h
+++ b/sys/gnu/fs/ext2fs/ext2_fs.h
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_fs.h,v 1.15 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/include/linux/ext2_fs.h
diff --git a/sys/gnu/fs/ext2fs/ext2_fs_sb.h b/sys/gnu/fs/ext2fs/ext2_fs_sb.h
index 89d829e5539c0..7e50469082713 100644
--- a/sys/gnu/fs/ext2fs/ext2_fs_sb.h
+++ b/sys/gnu/fs/ext2fs/ext2_fs_sb.h
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_fs_sb.h,v 1.6 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/include/linux/ext2_fs_sb.h
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 04a9d46300cef..4a2beb43edb3a 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.5 (Berkeley) 12/30/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_inode.c,v 1.58 2006/09/26 04:15:58 tegge Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
index de30739fc51f3..0e50336dc0a9d 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
@@ -19,7 +19,7 @@
  * improvements that they make and grant CSL redistribution rights.
  *
  *      Utah $Hdr$
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c,v 1.15 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 /*
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index 2c9a6dabf205d..537cea666c4a8 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c,v 1.25 2005/06/16 06:51:38 imp Exp $
  */
 /*-
  *  linux/fs/ext2/balloc.c
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
index d6170149ab7ed..e21df5f27f184 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
@@ -4,7 +4,7 @@
  *  Aug 1995, Godmar Back (gback@cs.utah.edu)
  *  University of Utah, Department of Computer Science
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c,v 1.25 2005/12/04 10:06:05 ru Exp $
  */
 /*-
  *  linux/fs/ext2/ialloc.c
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index f2ac67956bc8a..b8e5e248d1041 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_lookup.c,v 1.52 2005/12/05 11:58:33 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 6be0c7d950fbb..d9e799b804444 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_mount.h,v 1.31 2005/01/06 18:27:30 imp Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_readwrite.c b/sys/gnu/fs/ext2fs/ext2_readwrite.c
index e533392fd2daa..243d25b36af38 100644
--- a/sys/gnu/fs/ext2fs/ext2_readwrite.c
+++ b/sys/gnu/fs/ext2fs/ext2_readwrite.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.7 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_readwrite.c,v 1.31 2005/01/06 18:27:30 imp Exp $
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 561784294b7be..3bf100714c36c 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_subr.c,v 1.30 2005/06/15 02:36:10 rodrigc Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index ace6823537414..8b8708c7641d0 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.165 2007/08/15 17:40:09 jhb Exp $
  */
 
 /*-
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 04afdeb13da1d..7ee042e50286d 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -39,7 +39,7 @@
  *
  *	@(#)ufs_vnops.c	8.7 (Berkeley) 2/3/94
  *	@(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vnops.c,v 1.110 2007/06/12 00:11:58 rwatson Exp $
  */
 
 #include "opt_suiddir.h"
diff --git a/sys/gnu/fs/ext2fs/fs.h b/sys/gnu/fs/ext2fs/fs.h
index 341371d531732..bd4b3a9278057 100644
--- a/sys/gnu/fs/ext2fs/fs.h
+++ b/sys/gnu/fs/ext2fs/fs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/fs.h,v 1.18 2005/09/08 06:30:05 truckman Exp $
  */
 
 /*
diff --git a/sys/gnu/fs/ext2fs/i386-bitops.h b/sys/gnu/fs/ext2fs/i386-bitops.h
index 001c51db7fb95..3764bd523a297 100644
--- a/sys/gnu/fs/ext2fs/i386-bitops.h
+++ b/sys/gnu/fs/ext2fs/i386-bitops.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/fs/ext2fs/i386-bitops.h,v 1.7 2005/06/16 06:51:38 imp Exp $ */
 /*
  * this is mixture of i386/bitops.h and asm/string.h
  * taken from the Linux source tree 
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 9ba55462ee5d6..75141b61c80fb 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/ext2fs/inode.h,v 1.44 2005/03/16 08:09:52 phk Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_INODE_H_
diff --git a/sys/gnu/fs/ext2fs/sparc64-bitops.h b/sys/gnu/fs/ext2fs/sparc64-bitops.h
index 26cb578358b71..664ee07d7e072 100644
--- a/sys/gnu/fs/ext2fs/sparc64-bitops.h
+++ b/sys/gnu/fs/ext2fs/sparc64-bitops.h
@@ -19,7 +19,7 @@
  *
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/gnu/fs/ext2fs/sparc64-bitops.h,v 1.3 2005/06/16 06:51:38 imp Exp $ */
 #ifndef _SPARC64_BITOPS_H
 #define _SPARC64_BITOPS_H
 
diff --git a/sys/gnu/fs/reiserfs/README b/sys/gnu/fs/reiserfs/README
index f3917c1be08a4..35ff09320f037 100644
--- a/sys/gnu/fs/reiserfs/README
+++ b/sys/gnu/fs/reiserfs/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/gnu/fs/reiserfs/README,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
 
 [LICENSING] 
 
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs.h b/sys/gnu/fs/reiserfs/reiserfs_fs.h
index b33995fa9fdd4..8b8c199e95f03 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs.h,v 1.5 2006/11/06 13:41:58 rwatson Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_FS_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs_i.h b/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
index a9aa7e53f2d77..3e3d73e01f6c9 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs_i.h,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_FS_I_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h b/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
index 184e01c85957b..b51708919e603 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_FS_SB_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_hashes.c b/sys/gnu/fs/reiserfs/reiserfs_hashes.c
index c42bbe2fd30c7..67eb163c01518 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_hashes.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_hashes.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_hashes.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_inode.c b/sys/gnu/fs/reiserfs/reiserfs_inode.c
index 3eddd840c024d..8ee1aa1417dd2 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_inode.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_inode.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_inode.c,v 1.3 2007/03/13 01:50:25 tegge Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_item_ops.c b/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
index 7b10183a79fb8..ebfced7d62ce5 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_item_ops.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_mount.h b/sys/gnu/fs/reiserfs/reiserfs_mount.h
index f47c97610fca4..9bb23da26d1cd 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_mount.h
+++ b/sys/gnu/fs/reiserfs/reiserfs_mount.h
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_mount.h,v 1.2 2005/06/21 10:11:13 dumbbell Exp $
  */
 
 #ifndef _GNU_REISERFS_REISERFS_MOUNT_H
diff --git a/sys/gnu/fs/reiserfs/reiserfs_namei.c b/sys/gnu/fs/reiserfs/reiserfs_namei.c
index f1a2c209d3a84..654ac00767d50 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_namei.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_namei.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_namei.c,v 1.4 2007/06/10 04:54:42 mjacob Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_prints.c b/sys/gnu/fs/reiserfs/reiserfs_prints.c
index e48433ba0014a..5f4e1e53ebd61 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_prints.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_prints.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_prints.c,v 1.1 2005/06/18 17:06:09 dumbbell Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_stree.c b/sys/gnu/fs/reiserfs/reiserfs_stree.c
index d786ad897915d..20ff055c1b6a4 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_stree.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_stree.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_stree.c,v 1.2 2007/06/10 04:54:42 mjacob Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
index ebfa6e5b0a11c..a385f686cbd01 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c,v 1.9 2007/06/01 14:33:11 kib Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/reiserfs/reiserfs_vnops.c b/sys/gnu/fs/reiserfs/reiserfs_vnops.c
index 14242464df9e7..e3331b559f303 100644
--- a/sys/gnu/fs/reiserfs/reiserfs_vnops.c
+++ b/sys/gnu/fs/reiserfs/reiserfs_vnops.c
@@ -4,7 +4,7 @@
  * 
  * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron@club-internet.fr>
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/reiserfs/reiserfs_vnops.c,v 1.2 2007/02/15 22:08:34 pjd Exp $
  */
 
 #include <gnu/fs/reiserfs/reiserfs_fs.h>
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c b/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
index 30aafc4626e0f..0b2e7b2fe5e64 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c,v 1.2 2006/06/09 06:04:05 rodrigc Exp $
  */
 
 #include "xfs.h"
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
index 8d3ba0ff6066b..a492a49f90385 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c,v 1.10 2007/08/20 15:33:22 cognet Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h b/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h
index c8a766d5155ff..5db6f9d0c01c4 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h,v 1.1 2005/12/12 01:04:32 rodrigc Exp $
  */
 #ifndef	_XFS_XFS_H_
 #define	_XFS_XFS_H_
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
index c894095bdd791..225dacb1f2ddf 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c,v 1.6 2007/02/15 22:08:34 pjd Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index baff9d679c3a9..3217fc4fb7728 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/Makefile,v 1.12 2007/05/13 18:21:54 mckusick Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/i386/acpica/Makefile b/sys/i386/acpica/Makefile
index 48d65eaa1aac8..6747339cfd974 100644
--- a/sys/i386/acpica/Makefile
+++ b/sys/i386/acpica/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/acpica/Makefile,v 1.8 2006/10/19 05:55:09 ru Exp $
 
 # Correct path for kernel builds
 # Don't rely on the kernel's .depend file
diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c
index 61f55326de67a..1b41e3e33a1cb 100644
--- a/sys/i386/acpica/OsdEnvironment.c
+++ b/sys/i386/acpica/OsdEnvironment.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/OsdEnvironment.c,v 1.12 2007/03/22 18:16:41 jkim Exp $");
 
 /*
  * 6.1 : Environmental support
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 40106905f2c5e..0c1cb1acf48ab 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.37 2007/07/07 17:54:33 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index 889a58a24c1e5..beaacc66c58dd 100644
--- a/sys/i386/acpica/acpi_wakecode.S
+++ b/sys/i386/acpica/acpi_wakecode.S
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.13 2006/06/10 08:20:03 njl Exp $
  */
 
 #define LOCORE
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index cc5803d8c0c1c..7e0afcbf0e20a 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.46 2007/03/14 22:30:02 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/acpica/genwakecode.sh b/sys/i386/acpica/genwakecode.sh
index caffbf8642ae2..c6c6771f6a06c 100644
--- a/sys/i386/acpica/genwakecode.sh
+++ b/sys/i386/acpica/genwakecode.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/acpica/genwakecode.sh,v 1.3 2004/12/12 06:59:14 njl Exp $
 #
 file2c 'static char wakecode[] = {' '};' <acpi_wakecode.bin
 
diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c
index b0eadcabdfeed..d7eaf1bafd8f8 100644
--- a/sys/i386/acpica/madt.c
+++ b/sys/i386/acpica/madt.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.28 2007/09/11 22:54:09 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 632fc51ddc262..6893cdff3c31b 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.147.2.1 2007/12/09 00:24:16 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/apm.h b/sys/i386/bios/apm.h
index 2b20e615ad5b3..8665e9112780d 100644
--- a/sys/i386/bios/apm.h
+++ b/sys/i386/bios/apm.h
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/bios/apm.h,v 1.6 2006/05/25 23:06:38 imp Exp $
  */
 
 #define APM_NEVENTS 16
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index 4b78c13693a9c..4fe94d1c9365e 100644
--- a/sys/i386/bios/mca_machdep.c
+++ b/sys/i386/bios/mca_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/mca_machdep.c,v 1.9 2004/08/31 21:51:51 mdodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/mca_machdep.h b/sys/i386/bios/mca_machdep.h
index c639b5b740445..b1d48581b8586 100644
--- a/sys/i386/bios/mca_machdep.h
+++ b/sys/i386/bios/mca_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/bios/mca_machdep.h,v 1.1 1999/09/03 02:04:28 mdodd Exp $
  */
 
 extern int	MCA_system;
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index a97e2a9221c96..4be43b1ccf7db 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/smapi.c,v 1.14 2007/03/20 20:21:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/smapi_bios.S b/sys/i386/bios/smapi_bios.S
index db4b2385dad05..b98cbf0629069 100644
--- a/sys/i386/bios/smapi_bios.S
+++ b/sys/i386/bios/smapi_bios.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/smapi_bios.S,v 1.5 2005/07/22 15:01:07 ru Exp $");
 
 /*
  * This is cribbed from the Linux thinkpad-4.1 driver by
diff --git a/sys/i386/bios/smbios.c b/sys/i386/bios/smbios.c
index f38d98573993c..ce64c5eb11397 100644
--- a/sys/i386/bios/smbios.c
+++ b/sys/i386/bios/smbios.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/smbios.c,v 1.6 2007/03/20 20:21:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/bios/vpd.c b/sys/i386/bios/vpd.c
index 246b76d35702c..c281df1d25ef4 100644
--- a/sys/i386/bios/vpd.c
+++ b/sys/i386/bios/vpd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/bios/vpd.c,v 1.6 2007/03/20 20:21:44 jhb Exp $");
 
 /*
  * VPD decoder for IBM systems (Thinkpads)
diff --git a/sys/i386/compile/.cvsignore b/sys/i386/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/i386/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/i386/conf/.cvsignore b/sys/i386/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/i386/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index a5f69a13725a8..fb6314d0c7b18 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/i386
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.10 2007/06/11 00:38:06 marcel Exp $
 
 machine		i386
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7c65c8ab4dc2f..28bb37453931a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.2.2.1 2008/02/06 03:24:28 scottl Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
diff --git a/sys/i386/conf/GENERIC.hints b/sys/i386/conf/GENERIC.hints
index ed1faa74b1aa3..2b488fba643b7 100644
--- a/sys/i386/conf/GENERIC.hints
+++ b/sys/i386/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.16 2006/05/17 21:25:22 marius Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
diff --git a/sys/i386/conf/MAC b/sys/i386/conf/MAC
index d208741191784..0392c159a9a19 100644
--- a/sys/i386/conf/MAC
+++ b/sys/i386/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/MAC,v 1.1 2005/09/18 03:15:35 csjp Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/i386/conf/Makefile b/sys/i386/conf/Makefile
index 2c006e9c2c80d..0284f84e82b54 100644
--- a/sys/i386/conf/Makefile
+++ b/sys/i386/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 8043ab3b294fd..befbc97919a77 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1244.2.3.2.1 2008/02/06 03:24:28 scottl Exp $
 #
 
 #
diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE
index 9cbe8329fe092..991b6453fdf36 100644
--- a/sys/i386/conf/PAE
+++ b/sys/i386/conf/PAE
@@ -1,7 +1,7 @@
 #
 # PAE -- Generic kernel configuration file for FreeBSD/i386 PAE
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/PAE,v 1.25.2.1 2007/12/15 02:57:30 scottl Exp $
 
 include GENERIC
 
diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX
index 4c749b2da0a24..17c01c68721d8 100644
--- a/sys/i386/conf/XBOX
+++ b/sys/i386/conf/XBOX
@@ -1,7 +1,7 @@
 #
 # XBOX -- kernel for an XBOX
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/conf/XBOX,v 1.7 2006/08/09 23:47:38 imp Exp $
 cpu		I686_CPU		# Celeron
 ident		XBOX
 
diff --git a/sys/i386/cpufreq/est.c b/sys/i386/cpufreq/est.c
index 32ee7bb403d81..75dd161ff575d 100644
--- a/sys/i386/cpufreq/est.c
+++ b/sys/i386/cpufreq/est.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/est.c,v 1.11 2006/05/11 17:35:44 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/cpufreq/p4tcc.c b/sys/i386/cpufreq/p4tcc.c
index 7a2eea1f2f114..ed8982187e444 100644
--- a/sys/i386/cpufreq/p4tcc.c
+++ b/sys/i386/cpufreq/p4tcc.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/p4tcc.c,v 1.12 2005/10/23 19:38:06 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/cpufreq/powernow.c b/sys/i386/cpufreq/powernow.c
index b9b6310f0af27..9b83ce175a0c7 100644
--- a/sys/i386/cpufreq/powernow.c
+++ b/sys/i386/cpufreq/powernow.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/powernow.c,v 1.4 2007/01/23 19:20:30 bruno Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/cpufreq/smist.c b/sys/i386/cpufreq/smist.c
index 2e41ed7d34442..b763c162375af 100644
--- a/sys/i386/cpufreq/smist.c
+++ b/sys/i386/cpufreq/smist.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/cpufreq/smist.c,v 1.2 2007/06/17 07:18:23 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index ccf4b44f13af7..97d5fb5f08a3e 100644
--- a/sys/i386/i386/apic_vector.s
+++ b/sys/i386/i386/apic_vector.s
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.113 2006/12/17 05:07:00 kmacy Exp $
  */
 
 /*
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index 1b4ff7eaa6937..983578a484b83 100644
--- a/sys/i386/i386/atomic.c
+++ b/sys/i386/i386/atomic.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/atomic.c,v 1.6 2003/08/25 09:48:46 obrien Exp $");
 
 /* This file creates publically callable functions to perform various
  * simple arithmetic on memory which is atomic in the presence of
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 029ed2ef9dbe0..d8b91a066134c 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/autoconf.c,v 1.181 2005/05/29 23:44:22 marcel Exp $");
 
 /*
  * Setup the system to run on the current machine.
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 525659b3762d7..3b77238d90ba8 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/bios.c,v 1.74 2007/04/19 09:18:51 phk Exp $");
 
 /*
  * Code for dealing with the BIOS in x86 PC systems.
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index 3af198adb5e91..34393c840e1cb 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/bioscall.s,v 1.11 2002/09/17 01:48:57 peter Exp $
  */
 
 /*
diff --git a/sys/i386/i386/bpf_jit_machdep.c b/sys/i386/i386/bpf_jit_machdep.c
index 362569ed900af..e978d154e2bbd 100644
--- a/sys/i386/i386/bpf_jit_machdep.c
+++ b/sys/i386/i386/bpf_jit_machdep.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $");
 
 #include "opt_bpf.h"
 
diff --git a/sys/i386/i386/bpf_jit_machdep.h b/sys/i386/i386/bpf_jit_machdep.h
index d0d4222ba5f16..43b2406e8d5bd 100644
--- a/sys/i386/i386/bpf_jit_machdep.h
+++ b/sys/i386/i386/bpf_jit_machdep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/bpf_jit_machdep.h,v 1.3 2005/12/06 20:11:07 jkim Exp $
  */
 
 #ifndef _BPF_JIT_MACHDEP_H_
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 90f8848d13fd4..a59f6cddb109a 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.89 2007/06/11 17:57:24 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 66a3c4bfcbc99..27af10b39cf71 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.29 2005/01/05 19:09:59 imp Exp $");
 
 /*
  * Instruction disassembler.
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 7079e5688b857..98888c1f1611f 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/db_interface.c,v 1.83 2005/01/05 19:09:59 imp Exp $");
 
 /*
  * Interface to new debugger.
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 2ac0fcf542d3b..6b90d16ae4dd3 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/db_trace.c,v 1.79 2007/02/19 10:57:47 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/dump_machdep.c b/sys/i386/i386/dump_machdep.c
index 5081051b0132a..8078a14e3854b 100644
--- a/sys/i386/i386/dump_machdep.c
+++ b/sys/i386/i386/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.12.4.1 2008/01/30 21:21:50 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index 45f7c3ac27ca0..2ffa95b429e33 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.35 2007/06/04 18:25:06 dwmalone Exp $");
 
 #include "opt_cpu.h"
 #include <sys/param.h>
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index dcc178ed71222..7db95f8cc696a 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.22 2007/05/22 02:22:58 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 259327d672073..d6040b89d7279 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/exception.s,v 1.117 2006/12/17 05:07:00 kmacy Exp $
  */
 
 #include "opt_apic.h"
diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c
index a42b2b63402dc..83b0171ff47c0 100644
--- a/sys/i386/i386/gdb_machdep.c
+++ b/sys/i386/i386/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/gdb_machdep.c,v 1.4 2005/01/05 19:09:59 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index dba5c50a0a4c5..b0eca6afe0d4b 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.160 2007/09/17 21:55:28 peter Exp $");
 
 #include "opt_apic.h"
 #include "opt_compat.h"
diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c
index c178d8b4d1156..3490b2f19fde2 100644
--- a/sys/i386/i386/geode.c
+++ b/sys/i386/i386/geode.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/geode.c,v 1.10 2007/09/18 09:19:44 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 453932969e062..84a3243d900ef 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/i686_mem.c,v 1.24 2004/07/01 07:46:28 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 234037ee13685..b3a657c3f6db5 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.180 2007/05/29 19:39:18 des Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index be7d8a37e364a..bcbc4a962a9c6 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.28.10.1 2007/10/26 07:15:04 bz Exp $");
 
 /*
  * MPsafe: alfred
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index d6ef32a86c8f6..bee1a442b2e42 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.56 2007/04/06 18:15:02 ru Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/intr_machdep.c b/sys/i386/i386/intr_machdep.c
index b1d8db9f662ef..d544f6dc73d5d 100644
--- a/sys/i386/i386/intr_machdep.c
+++ b/sys/i386/i386/intr_machdep.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.29.2.1 2007/11/26 15:06:49 scottl Exp $
  */
 
 /*
diff --git a/sys/i386/i386/io.c b/sys/i386/i386/io.c
index eb0deb67c5f46..a2726849332a4 100644
--- a/sys/i386/i386/io.c
+++ b/sys/i386/i386/io.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io.c,v 1.2 2006/11/06 13:41:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/i386/i386/io_apic.c b/sys/i386/i386/io_apic.c
index b0387248f098a..7db2afa52d163 100644
--- a/sys/i386/i386/io_apic.c
+++ b/sys/i386/i386/io_apic.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.35 2007/06/05 18:57:48 jhb Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index ac7a55a6a924b..e8ab3fbe3b915 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.11 2003/08/25 09:48:47 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index 142fc0a4784b3..38eb38a34dbf0 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/legacy.c,v 1.63 2007/09/30 11:05:16 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
diff --git a/sys/i386/i386/local_apic.c b/sys/i386/i386/local_apic.c
index 46f985e66ce4a..a536b6d9666b4 100644
--- a/sys/i386/i386/local_apic.c
+++ b/sys/i386/i386/local_apic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.44 2007/09/11 22:54:09 attilio Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index d922e1100f75b..38abac714a5e6 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/locore.s,v 1.188 2007/03/24 19:53:22 alc Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index 55724ffed7125..cb3dd212f31c1 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/longrun.c,v 1.3 2004/12/12 05:53:57 njl Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index d8129578af11c..49732caf01ea2 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.658.2.1.2.1 2008/01/19 18:15:03 kib Exp $");
 
 #include "opt_apic.h"
 #include "opt_atalk.h"
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 1a9ecdd836374..521d3d2f22f3c 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mem.c,v 1.117 2006/01/23 15:46:09 ups Exp $");
 
 /*
  * Memory special file
diff --git a/sys/i386/i386/minidump_machdep.c b/sys/i386/i386/minidump_machdep.c
index 826a74454a475..6de865646949e 100644
--- a/sys/i386/i386/minidump_machdep.c
+++ b/sys/i386/i386/minidump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.3.4.1 2008/01/30 21:21:50 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c
index 48264ce735333..f3dbcce92398f 100644
--- a/sys/i386/i386/mp_clock.c
+++ b/sys/i386/i386/mp_clock.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.20 2007/06/04 18:25:06 dwmalone Exp $");
 
 /*-
  * Just when we thought life were beautiful, reality pops its grim face over
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index ffc20331365e4..8b9bae6a5d7d4 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.281.2.2 2007/11/28 23:24:07 cperciva Exp $");
 
 #include "opt_apic.h"
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/mp_watchdog.c b/sys/i386/i386/mp_watchdog.c
index b6ac777316643..de89086eedf6b 100644
--- a/sys/i386/i386/mp_watchdog.c
+++ b/sys/i386/i386/mp_watchdog.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $
  */
 
 #include "opt_mp_watchdog.h"
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index 5effeb9b65c2d..bf010047dc465 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.24 2005/01/05 19:10:48 imp Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 2aae8ce235df1..6e100dfe26675 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.245 2007/05/08 22:01:03 jhb Exp $");
 
 #include "opt_mptable_force_htt.h"
 #include <sys/param.h>
diff --git a/sys/i386/i386/mptable_pci.c b/sys/i386/i386/mptable_pci.c
index 89c701ce8e2ae..bc9c815171572 100644
--- a/sys/i386/i386/mptable_pci.c
+++ b/sys/i386/i386/mptable_pci.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable_pci.c,v 1.8 2007/05/02 17:50:35 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/msi.c b/sys/i386/i386/msi.c
index 554f571598085..0bc976cbaea1d 100644
--- a/sys/i386/i386/msi.c
+++ b/sys/i386/i386/msi.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/msi.c,v 1.6.2.1 2007/10/30 18:00:56 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index f5fa4e05ad044..f8fe2aa0a3883 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/nexus.c,v 1.73 2007/05/08 21:29:14 jhb Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index d085261547c2d..5c95f84acbe35 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/perfmon.c,v 1.38 2004/06/16 09:47:07 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 3fe1c3793e185..4738d5f84f6b3 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.594.2.4.2.1 2008/01/19 18:15:03 kib Exp $");
 
 /*
  *	Manages physical address maps.
diff --git a/sys/i386/i386/ptrace_machdep.c b/sys/i386/i386/ptrace_machdep.c
index 409db160892ba..7b78b1834080a 100644
--- a/sys/i386/i386/ptrace_machdep.c
+++ b/sys/i386/i386/ptrace_machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/ptrace_machdep.c,v 1.6 2006/05/30 23:44:21 davidxu Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index d5c5096025c26..e99e6d240cc9d 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/support.s,v 1.119 2007/08/22 05:06:14 jkoshy Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 6ffd5d564dba5..d8f1fdd639ff5 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.156 2007/08/22 05:06:14 jkoshy Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index c15f5049cbd0f..0bb8b4d619d05 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
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/i386/symbols.raw,v 1.16 2004/06/10 20:30:57 jhb Exp $
 #
 
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 98e845aa97893..bf614e5b3302e 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.112 2007/07/08 18:17:42 attilio Exp $");
 
 #include "opt_kstack_pages.h"
 #include "opt_mac.h"
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 7be4d499813cf..be3edfd114260 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.307.2.1 2007/12/06 14:20:24 kib Exp $");
 
 /*
  * 386 Trap and System call handling
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index f841096e9b396..a2589c6b20dcc 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.208 2007/06/04 18:25:06 dwmalone Exp $");
 
 #include "opt_clock.h"
 
diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c
index 3558ec01377a4..a486934ac972b 100644
--- a/sys/i386/i386/uio_machdep.c
+++ b/sys/i386/i386/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/uio_machdep.c,v 1.8 2005/02/13 23:09:36 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 0bdbf9aa56f9c..6d7a1782e9b9d 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm86.c,v 1.62 2006/12/17 05:07:01 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index 36b5b1486e6ae..1840b1079d264 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/vm86bios.s,v 1.32 2006/12/17 05:07:01 kmacy Exp $
  */
 
 #include "opt_npx.h"
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index bbcdddfe500c2..0585d8472598b 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.283 2007/07/07 16:59:01 attilio Exp $");
 
 #include "opt_isa.h"
 #include "opt_npx.h"
diff --git a/sys/i386/ibcs2/Makefile b/sys/i386/ibcs2/Makefile
index 68e91fa17485b..256be8d6a26ee 100644
--- a/sys/i386/ibcs2/Makefile
+++ b/sys/i386/ibcs2/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/ibcs2/Makefile,v 1.4 2006/02/05 23:25:19 rwatson Exp $
 
 all:
 	@echo "make sysent, isc_sysent or xenix_sysent only"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index a0eecd97ba955..a9f89c26e7ad5 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/coff.h,v 1.5 1999/08/28 00:43:57 peter Exp $
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2_dirent.h b/sys/i386/ibcs2/ibcs2_dirent.h
index 918adf1adc8e1..2784790539f67 100644
--- a/sys/i386/ibcs2/ibcs2_dirent.h
+++ b/sys/i386/ibcs2/ibcs2_dirent.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_dirent.h,v 1.2 1994/10/26 02:52:51 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_dirent.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_errno.c b/sys/i386/ibcs2/ibcs2_errno.c
index c3b385af49b5e..87b666e879af4 100644
--- a/sys/i386/ibcs2/ibcs2_errno.c
+++ b/sys/i386/ibcs2/ibcs2_errno.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_errno.c,v 1.6 2005/01/06 23:22:04 imp Exp $");
 
 #include <sys/errno.h>
 #include <i386/ibcs2/ibcs2_errno.h>
diff --git a/sys/i386/ibcs2/ibcs2_errno.h b/sys/i386/ibcs2/ibcs2_errno.h
index 1e38f40ef4ba9..cf1a598d24703 100644
--- a/sys/i386/ibcs2/ibcs2_errno.h
+++ b/sys/i386/ibcs2/ibcs2_errno.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_errno.h,v 1.2 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef _IBCS2_ERRNO_H
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index fcdc714079c51..cc1d92b8b0473 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.28 2005/02/07 22:02:18 jhb Exp $");
 
 #include "opt_spx_hack.h"
 
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.h b/sys/i386/ibcs2/ibcs2_fcntl.h
index 75a2b62e3836d..76da232721e13 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.h
+++ b/sys/i386/ibcs2/ibcs2_fcntl.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_fcntl.h,v 1.2 1994/10/26 02:52:54 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index bbaab39194065..329afda1ef2bf 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.31 2005/01/06 23:22:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 5b6342af953bc..65dfa0b054a37 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_ipc.c,v 1.24 2006/07/08 19:54:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index 9f35e67c9ec20..b22a68874a845 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ipc.h,v 1.9 2006/07/08 19:52:49 jhb Exp $
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index adafc99d38c19..020bbce8fa908 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_isc.c,v 1.19 2006/07/28 19:05:27 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/i386/ibcs2/ibcs2_isc_syscall.h b/sys/i386/ibcs2/ibcs2_isc_syscall.h
index ac3085aea5b54..2fbe4a679e82d 100644
--- a/sys/i386/ibcs2/ibcs2_isc_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_isc_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_isc_syscall.h,v 1.15 2006/08/15 17:37:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.12 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index ca76a8ca464a5..5f34e13034ad8 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_isc_sysent.c,v 1.18 2006/08/15 17:37:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.12 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index f6375c3c52ee6..094081c7356ae 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.67 2007/03/26 15:39:49 jhb Exp $");
 
 /*
  * IBCS2 compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_mount.h b/sys/i386/ibcs2/ibcs2_mount.h
index 67161482c1147..aab82540e4fcf 100644
--- a/sys/i386/ibcs2/ibcs2_mount.h
+++ b/sys/i386/ibcs2/ibcs2_mount.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_mount.h,v 1.2 1994/10/26 02:53:00 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_mount.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index 0492beff74eb4..1178bdbb6f99d 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_msg.c,v 1.13 2006/07/06 21:29:05 jhb Exp $");
 
 /*
  * IBCS2 message compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 9013af423caff..fcce5d31e866f 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_other.c,v 1.18 2006/07/08 20:05:04 jhb Exp $");
 
 /*
  * IBCS2 compatibility module.
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index f0140306293fa..57b49078a20d3 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.31 2006/11/11 16:26:56 trhodes Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index b2f339338fc6c..32bfe251af1d0 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_signal.c,v 1.35 2005/02/13 17:37:18 sobomax Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_signal.h b/sys/i386/ibcs2/ibcs2_signal.h
index 59070aa0640f7..74d41639798ed 100644
--- a/sys/i386/ibcs2/ibcs2_signal.h
+++ b/sys/i386/ibcs2/ibcs2_signal.h
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_signal.h,v 1.8 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef	_IBCS2_SIGNAL_H
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index f4939cf49efbe..c1d6a19318bbe 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.22 2006/11/06 13:41:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h
index 533a4827b8d9a..45724ce3ebcae 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.h
+++ b/sys/i386/ibcs2/ibcs2_socksys.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.h,v 1.9 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef	_I386_IBCS2_IBCS2_SOCKSYS_H_
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 925307156354f..97bf49611fcdf 100644
--- a/sys/i386/ibcs2/ibcs2_stat.c
+++ b/sys/i386/ibcs2/ibcs2_stat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_stat.c,v 1.26 2005/02/07 22:02:18 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_stat.h b/sys/i386/ibcs2/ibcs2_stat.h
index 1ab76fb97e476..5610ec6dff276 100644
--- a/sys/i386/ibcs2/ibcs2_stat.h
+++ b/sys/i386/ibcs2/ibcs2_stat.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_stat.h,v 1.2 1994/10/26 02:53:03 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_stat.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_statfs.h b/sys/i386/ibcs2/ibcs2_statfs.h
index 51eb84413fd88..fbb68276e46c3 100644
--- a/sys/i386/ibcs2/ibcs2_statfs.h
+++ b/sys/i386/ibcs2/ibcs2_statfs.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_statfs.h,v 1.2 1994/10/26 02:53:06 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_statfs.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_stropts.h b/sys/i386/ibcs2/ibcs2_stropts.h
index 7623da3531200..f4bcb9488ff05 100644
--- a/sys/i386/ibcs2/ibcs2_stropts.h
+++ b/sys/i386/ibcs2/ibcs2_stropts.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_stropts.h,v 1.2 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef _IBCS2_STROPTS_H
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index c988532d804c4..427f9d1b57aa2 100644
--- a/sys/i386/ibcs2/ibcs2_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.27 2006/08/15 17:37:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index fceaf3f39e673..7a7f0ce027233 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.32 2006/08/15 17:37:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 4d762186141c7..cfc2dc261df9e 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_sysi86.c,v 1.23 2006/11/06 13:41:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index e32441369cfb6..af0dad771d7e8 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_sysvec.c,v 1.32 2007/01/17 15:05:52 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/ibcs2/ibcs2_termios.h b/sys/i386/ibcs2/ibcs2_termios.h
index bce259fcb3744..f1251d2b028ef 100644
--- a/sys/i386/ibcs2/ibcs2_termios.h
+++ b/sys/i386/ibcs2/ibcs2_termios.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_termios.h,v 1.3 1994/10/26 02:53:07 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_termios.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_time.h b/sys/i386/ibcs2/ibcs2_time.h
index 15b23fa587b29..766d06ca7c5f2 100644
--- a/sys/i386/ibcs2/ibcs2_time.h
+++ b/sys/i386/ibcs2/ibcs2_time.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_time.h,v 1.2 1994/10/26 02:53:08 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_time.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_types.h b/sys/i386/ibcs2/ibcs2_types.h
index f80a83c6cc7b6..811f6d9817e11 100644
--- a/sys/i386/ibcs2/ibcs2_types.h
+++ b/sys/i386/ibcs2/ibcs2_types.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_types.h,v 1.5 1995/08/14 01:11:54 mycroft Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_types.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_unistd.h b/sys/i386/ibcs2/ibcs2_unistd.h
index 77e5afd2738e4..d7be86ee04e23 100644
--- a/sys/i386/ibcs2/ibcs2_unistd.h
+++ b/sys/i386/ibcs2/ibcs2_unistd.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_unistd.h,v 1.2 1994/10/26 02:53:11 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_unistd.h,v 1.2 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_ustat.h b/sys/i386/ibcs2/ibcs2_ustat.h
index 19af5bb638c85..6367e5eff3acf 100644
--- a/sys/i386/ibcs2/ibcs2_ustat.h
+++ b/sys/i386/ibcs2/ibcs2_ustat.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_ustat.h,v 1.2 1994/10/26 02:53:13 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_ustat.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 298fb8417a857..512c3093cfb93 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_util.c,v 1.19 2005/02/07 22:02:18 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h
index be43fa6f4be68..b1f69e32a3552 100644
--- a/sys/i386/ibcs2/ibcs2_util.h
+++ b/sys/i386/ibcs2/ibcs2_util.h
@@ -29,7 +29,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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_util.h,v 1.20 2006/07/10 17:59:26 jhb Exp $
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_utime.h b/sys/i386/ibcs2/ibcs2_utime.h
index b0a43498188f1..94329bf013ec4 100644
--- a/sys/i386/ibcs2/ibcs2_utime.h
+++ b/sys/i386/ibcs2/ibcs2_utime.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_utime.h,v 1.3 2005/01/06 23:22:04 imp Exp $
  */
 
 #ifndef	_IBCS2_UTIME_H
diff --git a/sys/i386/ibcs2/ibcs2_utsname.h b/sys/i386/ibcs2/ibcs2_utsname.h
index 748c17b4c6968..9466b3ba10d23 100644
--- a/sys/i386/ibcs2/ibcs2_utsname.h
+++ b/sys/i386/ibcs2/ibcs2_utsname.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ibcs2_utsname.h,v 1.2 1994/10/26 02:53:14 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/ibcs2/ibcs2_utsname.h,v 1.3 2005/01/06 23:22:04 imp Exp $ */
 
 /*-
  * Copyright (c) 1994 Scott Bartram
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 5b418c4330110..f2b48d7d2980f 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.42 2007/07/05 05:32:44 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index 3d35f66a9138c..1c2ed4166e8da 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.h,v 1.22 2006/11/11 16:26:56 trhodes Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.14 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_syscall.h b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
index fbf7ecaa4dd92..18e5beb07d659 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix_syscall.h,v 1.17 2006/08/15 17:37:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.14 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index 86b4ea71c64e7..3bb1b161e9ae0 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix_sysent.c,v 1.19 2006/08/15 17:37:00 jhb Exp $
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.14 2006/07/28 19:05:27 jhb Exp 
  */
 
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 74a01f4c4a9ce..9475ace1532ad 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.67.4.1 2008/01/19 18:15:03 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index 77532c28570d4..ee30caf30aa56 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.conf,v 1.8 2006/08/15 17:25:54 jhb Exp $
 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 b6f87f984a730..f67a02c9d732d 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.12 2006/07/28 19:05:27 jhb Exp $
 
 #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 fd232c0cdf7f4..8220649c1cb1f 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.isc.conf,v 1.7 2006/08/15 17:25:54 jhb Exp $
 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 274a829c06232..91ba21afe79d9 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp $
 
 ;	@(#)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 bb43c189e7d05..d0463346a7008 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.14 2006/07/28 19:05:27 jhb Exp $
 
 #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 3f8616253e74d..3890b90c38fdf 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf $FreeBSD$
+#	syscalls.conf $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix.conf,v 1.7 2006/08/15 17:25:54 jhb Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_xenix.h"
 sysproto_h=_IBCS2_XENIX_H_
diff --git a/sys/i386/include/_bus.h b/sys/i386/include/_bus.h
index 49bdd5a307577..f1de6b211a1cb 100644
--- a/sys/i386/include/_bus.h
+++ b/sys/i386/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef I386_INCLUDE__BUS_H
diff --git a/sys/i386/include/_inttypes.h b/sys/i386/include/_inttypes.h
index 7da589d8a7710..ccc41f2f6e5e4 100644
--- a/sys/i386/include/_inttypes.h
+++ b/sys/i386/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index f3289511e4c84..0e72d2c4d0b9b 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_limits.h,v 1.28 2005/08/20 16:44:40 stefanf Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/i386/include/_stdint.h b/sys/i386/include/_stdint.h
index 0d8aedfff5d68..7b94f833e9164 100644
--- a/sys/i386/include/_stdint.h
+++ b/sys/i386/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/i386/include/_types.h b/sys/i386/include/_types.h
index b272cf0f3f8fc..7450b8195d422 100644
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/_types.h,v 1.14 2006/01/09 06:05:56 imp Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/i386/include/acpica_machdep.h b/sys/i386/include/acpica_machdep.h
index f90b213eb54bf..5d63e3e51e2ad 100644
--- a/sys/i386/include/acpica_machdep.h
+++ b/sys/i386/include/acpica_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/acpica_machdep.h,v 1.8 2007/03/22 18:16:42 jkim Exp $
  */
 
 /******************************************************************************
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index d5d5dc39ac67d..b7ff0a54baf08 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.28 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_
diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h
index 30e360626538b..b711c625a6c75 100644
--- a/sys/i386/include/apicvar.h
+++ b/sys/i386/include/apicvar.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.25 2007/05/08 22:01:04 jhb Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 5f0bafa8f038e..512cf0aa9e6b0 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)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apm_bios.h,v 1.32 2005/04/03 23:26:05 imp Exp $
  */
 
 #ifndef	_MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 2d04b9bd8e15f..4296968aa5fd5 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)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apm_segments.h,v 1.9 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index 3148bb7839944..dd4febe61eed7 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asm.h,v 1.14 2007/08/22 04:26:07 jkoshy Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index fbc93b7d69d55..b06616dfed173 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/asmacros.h,v 1.30 2007/08/22 04:26:07 jkoshy Exp $
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index d7465f9a5db27..38cd8acb42e65 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/atomic.h,v 1.47 2006/12/29 15:48:18 bde Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 09b4e2cc351ce..096d02b55a051 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/bootinfo.h,v 1.15.22.1 2007/11/01 18:19:19 jhb Exp $
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index bfbc6a7b4599e..348f71b4c2d71 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/bus.h,v 1.14 2005/12/05 11:58:33 ru Exp $
  */
 
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 95e98a7e43c23..765e805756164 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.28 2005/03/14 16:46:27 scottl Exp $ */
 
 #ifndef _I386_BUS_DMA_H_
 #define _I386_BUS_DMA_H_
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 9bdd421bf1860..49a9ae069e09f 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/clock.h,v 1.56.2.1 2007/10/29 22:26:35 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 6bba9e8c62508..99193ae823804 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cpu.h,v 1.76 2006/05/11 17:29:24 phk Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index f3f671503a3bd..e4c072f0ef025 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.145 2007/08/09 20:14:35 njl Exp $
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 58d460ddc56e8..f5ad637601a7b 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cputypes.h,v 1.19 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/cserial.h b/sys/i386/include/cserial.h
index 1fcb611700e6b..6ca28beed673a 100644
--- a/sys/i386/include/cserial.h
+++ b/sys/i386/include/cserial.h
@@ -18,7 +18,7 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cserial.h,v 1.4.2.2 2005/11/09 13:01:35 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/cserial.h,v 1.3 2006/01/30 13:34:57 rik Exp $
  */
 
 /*
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index 27207a8d336bc..227c3aa363b8a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.20 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/elan_mmcr.h b/sys/i386/include/elan_mmcr.h
index a02d4b2c90ff7..38ec2a4553910 100644
--- a/sys/i386/include/elan_mmcr.h
+++ b/sys/i386/include/elan_mmcr.h
@@ -32,7 +32,7 @@
  * bytes. Ignore fields with the 'pad' prefix - they are only present for
  * alignment purposes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/elan_mmcr.h,v 1.2 2005/01/06 22:05:28 imp Exp $
  */
 
 #ifndef _MACHINE_ELAN_MMCR_H_
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index cf2a2d27daf43..450847c1499f4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/elf.h,v 1.17 2006/10/04 21:37:09 jb Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 59fa4a5e9cc5e..0f5b42f54c83f 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/endian.h,v 1.41 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 8d07887be252b..bd7bac207f27f 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/exec.h,v 1.10 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index 52b899f6e4ce1..bafe449d4ada5 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/float.h,v 1.15 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index cda9e46230cab..a1d874445e374 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/floatingpoint.h,v 1.14 2005/04/02 17:31:42 netchild Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 3558b98d14c1c..6162eb64e7512 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/frame.h,v 1.27 2005/12/22 22:16:07 jhb Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/gdb_machdep.h b/sys/i386/include/gdb_machdep.h
index 95af8d4a8f1f5..6b9a2f5c1bdbc 100644
--- a/sys/i386/include/gdb_machdep.h
+++ b/sys/i386/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/gdb_machdep.h,v 1.3 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index b22d99e0bf55a..66d1ce8b0761b 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.11 2005/03/15 15:53:39 das Exp $
  */
 
 /*
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index c917681313940..02690d6f7a0c0 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/if_wl_wavelan.h,v 1.7 2005/01/06 22:18:15 imp Exp $ */
 /*-
  * 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/in_cksum.h b/sys/i386/include/in_cksum.h
index 7e7f81583dd02..97ee7b5b5a42b 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -29,7 +29,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
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.17.10.1 2007/10/26 07:15:04 bz Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h
index 4e6d07013fb4f..04304fd36d6f7 100644
--- a/sys/i386/include/intr_machdep.h
+++ b/sys/i386/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.20 2007/05/08 21:29:14 jhb Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index ca83a36cdb5a4..b8c0bc3432f8d 100644
--- a/sys/i386/include/ioctl_bt848.h
+++ b/sys/i386/include/ioctl_bt848.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_bt848.h,v 1.31 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_BT848_H_
diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h
index 0322f1ede2c17..965480d791561 100644
--- a/sys/i386/include/ioctl_meteor.h
+++ b/sys/i386/include/ioctl_meteor.h
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.16 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_METEOR_H_
diff --git a/sys/i386/include/iodev.h b/sys/i386/include/iodev.h
index 2273620ccba43..3927fba07e37f 100644
--- a/sys/i386/include/iodev.h
+++ b/sys/i386/include/iodev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/iodev.h,v 1.1 2004/08/01 11:40:53 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/i386/include/kdb.h b/sys/i386/include/kdb.h
index 1b407cbc5e7d0..87910abc4ece6 100644
--- a/sys/i386/include/kdb.h
+++ b/sys/i386/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/kdb.h,v 1.4 2007/06/09 21:55:17 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/i386/include/legacyvar.h b/sys/i386/include/legacyvar.h
index 5ab7b35672383..82e80b849b18f 100644
--- a/sys/i386/include/legacyvar.h
+++ b/sys/i386/include/legacyvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/legacyvar.h,v 1.8 2007/09/30 11:05:16 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index 35eea1f619dee..eb2c4b54f14de 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/limits.h,v 1.27 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 4f8b96d4514f7..316d7f9ce566a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/md_var.h,v 1.76 2006/07/12 19:46:08 mr Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/memdev.h b/sys/i386/include/memdev.h
index 4443e3605cbe9..402e595c82222 100644
--- a/sys/i386/include/memdev.h
+++ b/sys/i386/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/memdev.h,v 1.1 2004/08/01 11:40:53 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/i386/include/metadata.h b/sys/i386/include/metadata.h
index 84e6f87399704..7bd215cc13044 100644
--- a/sys/i386/include/metadata.h
+++ b/sys/i386/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/metadata.h,v 1.2 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/i386/include/minidump.h b/sys/i386/include/minidump.h
index 55508a370e70c..64659b08f2748 100644
--- a/sys/i386/include/minidump.h
+++ b/sys/i386/include/minidump.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/minidump.h,v 1.1 2006/04/21 04:28:43 peter Exp $
  */
 
 #ifndef	_MACHINE_MINIDUMP_H_
diff --git a/sys/i386/include/mp_watchdog.h b/sys/i386/include/mp_watchdog.h
index bcec051a942fd..cfc0cd22a7811 100644
--- a/sys/i386/include/mp_watchdog.h
+++ b/sys/i386/include/mp_watchdog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mp_watchdog.h,v 1.1 2004/08/15 18:02:09 rwatson Exp $
  */
 
 #ifndef	_MACHINE_MP_WATCHDOG_H_
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 451d9ce14d556..46abbd4035320 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mptable.h,v 1.223 2006/02/22 21:38:33 sam Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__
diff --git a/sys/i386/include/mutex.h b/sys/i386/include/mutex.h
index 651e226c8cbd1..9601fb38c371c 100644
--- a/sys/i386/include/mutex.h
+++ b/sys/i386/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mutex.h,v 1.37 2006/05/19 18:53:50 sobomax Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 11f103458eb76..b48c3524dde82 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/npx.h,v 1.32 2006/05/30 23:44:20 davidxu Exp $
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 0f67c271a7a1b..bbed55d0a06da 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/param.h,v 1.81 2006/01/09 06:05:56 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index 4533de75acdca..b25bfa9b91ec8 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/bios.h,v 1.18 2005/07/21 09:48:37 phk Exp $
  */
 
 #ifndef _MACHINE_PC_BIOS_H_
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index cd2d5ff35b73f..d4aab5b739c46 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/display.h,v 1.7 2005/04/13 13:12:12 nyan Exp $
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index 06f1c1180b0bc..cf679c6b4c54b 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pc/vesa.h,v 1.10 2007/07/11 22:34:34 mjacob Exp $
  */
 
 #ifndef _MACHINE_PC_VESA_H
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index 969f910f7f81a..0b4e57bfc1e5a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcaudioio.h,v 1.10 1999/08/28 00:44:20 peter Exp $
  */
 
 #ifndef	_MACHINE_PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index ff6ff5af691bf..a9288aeea0089 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcb.h,v 1.56 2005/12/29 13:23:48 davidxu Exp $
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 81e1bed513b43..06bc0fd364747 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.10 2005/09/15 17:30:08 jhb Exp $
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index b246993aa6d70..2ed4719f1eb29 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pci_cfgreg.h,v 1.14 2005/04/03 23:26:44 imp Exp $
  *
  */
 
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 67cb5309fa005..168283e8808a6 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.50 2007/06/04 21:38:46 attilio Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/i386/include/pecoff_machdep.h b/sys/i386/include/pecoff_machdep.h
index b20cb711dc695..d1056a5637a2f 100644
--- a/sys/i386/include/pecoff_machdep.h
+++ b/sys/i386/include/pecoff_machdep.h
@@ -1,5 +1,5 @@
 /* $NetBSD: pecoff_machdep.h,v 1.5 2000/01/10 03:03:54 matt Exp $	 */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/pecoff_machdep.h,v 1.1 2000/12/20 12:50:50 takawata Exp $ */
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index 891c05eb1f057..ecb31f6fb367a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/perfmon.h,v 1.9 2005/01/06 22:18:15 imp Exp $
  */
 
 /*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 761be980a68eb..11d7053d8b625 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -38,7 +38,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pmap.h,v 1.128 2007/04/12 17:00:56 alc Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h
index 2d4c4a363de7e..874c979a1c860 100644
--- a/sys/i386/include/pmc_mdep.h
+++ b/sys/i386/include/pmc_mdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.5 2005/06/09 19:45:07 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H
diff --git a/sys/i386/include/ppireg.h b/sys/i386/include/ppireg.h
index 5774757ce67a7..9c67557839e3c 100644
--- a/sys/i386/include/ppireg.h
+++ b/sys/i386/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ppireg.h,v 1.1 2005/05/14 09:10:01 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/i386/include/privatespace.h b/sys/i386/include/privatespace.h
index 5eb54c224f9a2..a7da6268e4e05 100644
--- a/sys/i386/include/privatespace.h
+++ b/sys/i386/include/privatespace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/privatespace.h,v 1.4 2006/05/12 22:38:53 peter Exp $
  */
 
 #ifndef _MACHINE_PRIVATESPACE_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index 368c0a430e841..43cce42084428 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/proc.h,v 1.26 2007/05/20 22:03:57 jeff Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index fe036d8a0751f..5668027aadcb9 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/profile.h,v 1.42 2006/10/28 11:03:03 bde Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 12d05c5cfdbcd..427102b88f2e5 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/psl.h,v 1.12 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index 24eb41128c474..052bc41a4b0d2 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ptrace.h,v 1.14 2005/05/31 09:43:04 dfr Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index a1e5f664474a4..4e2275f06990d 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/reg.h,v 1.33 2006/11/17 19:20:32 jhb Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index 1883193233997..942c956e24605 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/reloc.h,v 1.8 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/resource.h b/sys/i386/include/resource.h
index edde5eb299085..09886cb97ec12 100644
--- a/sys/i386/include/resource.h
+++ b/sys/i386/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/include/resource.h,v 1.4 2005/01/06 22:18:15 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/i386/include/runq.h b/sys/i386/include/runq.h
index e906fa192c6c1..5643b36dd408e 100644
--- a/sys/i386/include/runq.h
+++ b/sys/i386/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/runq.h,v 1.3 2005/01/06 22:18:15 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 351ff5dff8fec..6f785d79e3123 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/segments.h,v 1.38 2005/04/13 22:57:17 peter Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index dd0daaa316fe4..510a4c7745ac6 100644
--- a/sys/i386/include/setjmp.h
+++ b/sys/i386/include/setjmp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/setjmp.h,v 1.8 2007/01/12 07:24:35 imp Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/i386/include/sf_buf.h b/sys/i386/include/sf_buf.h
index 9076260e01163..120ee761bc783 100644
--- a/sys/i386/include/sf_buf.h
+++ b/sys/i386/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/sf_buf.h,v 1.4 2005/02/13 06:23:13 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/i386/include/sigframe.h b/sys/i386/include/sigframe.h
index 98be731d8f102..5f658dcac3f42 100644
--- a/sys/i386/include/sigframe.h
+++ b/sys/i386/include/sigframe.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/sigframe.h,v 1.8 2002/10/25 19:10:56 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 8d6b935a77f52..c4382e3410a85 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/signal.h,v 1.23 2005/08/20 16:44:41 stefanf Exp $
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/smapi.h b/sys/i386/include/smapi.h
index 63b9927016b21..1d30c1683b78b 100644
--- a/sys/i386/include/smapi.h
+++ b/sys/i386/include/smapi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smapi.h,v 1.2 2003/03/24 20:44:39 mdodd Exp $
  */
 
 #ifndef _MACHINE_SMAPI_H_
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 264fb7ffe6592..0221d6014dd85 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/smp.h,v 1.90 2007/09/20 20:38:43 attilio Exp $
  *
  */
 
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 2950b4760feb5..0ad9a87c59b52 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/speaker.h,v 1.8 2005/11/11 09:57:31 ru Exp $
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index 24b686b17a8ff..c3656ea8e8c5b 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.42 2007/08/15 19:26:02 des Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 1945d1a42e444..275fc1e3be565 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.21 2006/09/21 01:37:02 kan Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 454d64cb6d63c..a32f440d08848 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/sysarch.h,v 1.23 2005/04/13 22:57:17 peter Exp $
  */
 
 /*
diff --git a/sys/i386/include/timerreg.h b/sys/i386/include/timerreg.h
index 0ab7d40510a74..2ab41f4aaf27f 100644
--- a/sys/i386/include/timerreg.h
+++ b/sys/i386/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/timerreg.h,v 1.2 2005/05/28 13:40:26 nyan Exp $
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index f0176b2c97e7d..744747bd86a1d 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/trap.h,v 1.15 2005/10/14 03:01:14 davidxu Exp $
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index 29907d4204981..8dc2910ff8012 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/tss.h,v 1.14 2004/04/07 20:46:05 imp Exp $
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/ucontext.h b/sys/i386/include/ucontext.h
index c992495fedf85..4677645f18b1a 100644
--- a/sys/i386/include/ucontext.h
+++ b/sys/i386/include/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/ucontext.h,v 1.11 2005/09/12 03:34:05 obrien Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index a71b2ffc8a047..ddf3ff0c62074 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/varargs.h,v 1.14 2005/03/02 21:33:26 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 041504abab18c..2b1d233031e62 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/vm86.h,v 1.17 2002/11/07 01:34:23 davidxu Exp $
  */
 
 #ifndef _MACHINE_VM86_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 2aa2848a1100d..31ced309e6d94 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/vmparam.h,v 1.45 2007/09/25 06:25:05 alc Exp $
  */
 
 
diff --git a/sys/i386/include/xbox.h b/sys/i386/include/xbox.h
index 50822f1e5e1e6..0cd5fb01ed575 100644
--- a/sys/i386/include/xbox.h
+++ b/sys/i386/include/xbox.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/xbox.h,v 1.3 2006/03/03 14:52:56 rink Exp $
  */
 #ifndef _MACHINE_XBOX_H_
 #define _MACHINE_XBOX_H_
diff --git a/sys/i386/isa/atpic.c b/sys/i386/isa/atpic.c
index bb05837510c44..336626840433d 100644
--- a/sys/i386/isa/atpic.c
+++ b/sys/i386/isa/atpic.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.28 2007/05/08 21:29:14 jhb Exp $");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s
index 0e4e1b6ffda19..031017710ca03 100644
--- a/sys/i386/isa/atpic_vector.s
+++ b/sys/i386/isa/atpic_vector.s
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.50 2006/12/17 05:07:01 kmacy Exp $
  */
 
 /*
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h
index 72375b087db1e..c84757e8b40e6 100644
--- a/sys/i386/isa/ccbque.h
+++ b/sys/i386/isa/ccbque.h
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.10 2005/01/06 22:18:16 imp Exp $
  */
 /*
  * Common command control queue funcs.
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index a67db3173a5ba..ad1a05c7c51d9 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.239.2.1 2007/10/29 22:26:35 peter Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/i386/isa/elcr.c b/sys/i386/isa/elcr.c
index 266d78396db96..95ffec08a4b61 100644
--- a/sys/i386/isa/elcr.c
+++ b/sys/i386/isa/elcr.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/elcr.c,v 1.2 2005/01/18 20:24:47 jhb Exp $");
 
 /*
  * The ELCR is a register that controls the trigger mode and polarity of
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 5fbfd363192bf..184d450c7e879 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/elink.c,v 1.13 2005/01/06 22:18:16 imp Exp $");
 
 /*
  * Common code for dealing with 3COM ethernet cards.
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 9b27088e78995..24413c2cf9996 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/elink.h,v 1.9 2005/01/06 22:18:16 imp Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index bd9df08505290..7fac9e871dc7e 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/icu.h,v 1.35 2006/12/17 05:07:01 kmacy Exp $
  */
 
 /*
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index a62c658136f31..b57816d21fc26 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/isa.c,v 1.151 2007/09/01 12:18:28 nyan Exp $");
 
 /*-
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index ac493b2d84354..30b9742f6fa93 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/isa.h,v 1.30 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c
index ccfb9c54c77e9..7ec18c602f3bb 100644
--- a/sys/i386/isa/isa_dma.c
+++ b/sys/i386/isa/isa_dma.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.19 2005/05/14 10:14:56 nyan Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index db5550c63423a..1b56e767ffa3b 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/nmi.c,v 1.79 2004/04/07 20:46:06 imp Exp $");
 
 #include "opt_mca.h"
 
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index c5d381e34df1b..23c8fd5c3ef61 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.172 2007/06/05 00:00:52 jeff Exp $");
 
 #include "opt_cpu.h"
 #include "opt_isa.h"
diff --git a/sys/i386/isa/pmtimer.c b/sys/i386/isa/pmtimer.c
index 87eda2d4b0a2b..1ab027a2d7e00 100644
--- a/sys/i386/isa/pmtimer.c
+++ b/sys/i386/isa/pmtimer.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.6 2006/10/02 12:59:57 phk Exp $");
 
 /*
  * Timer device driver for power management events.
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 855745f1d2f8f..601e9373015b5 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.30 2007/03/26 18:03:29 njl Exp $");
 
 #ifdef GUPROF
 #include "opt_i586_guprof.h"
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index adf1a552d5725..3019195b0bce5 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/spic.c,v 1.17 2006/05/16 14:32:16 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/spicreg.h b/sys/i386/isa/spicreg.h
index cbbff1a7d0818..1ab8023d5f31f 100644
--- a/sys/i386/isa/spicreg.h
+++ b/sys/i386/isa/spicreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/isa/spicreg.h,v 1.4 2005/01/06 22:18:16 imp Exp $
  *
  */
 
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 2fe79bf0f5000..8ed59a9749f03 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/vesa.c,v 1.53 2005/12/05 11:58:33 ru Exp $");
 
 #include "opt_vga.h"
 #include "opt_vesa.h"
diff --git a/sys/i386/linux/Makefile b/sys/i386/linux/Makefile
index bd6b32a7d4a84..0b123724fc75b 100644
--- a/sys/i386/linux/Makefile
+++ b/sys/i386/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/linux/Makefile,v 1.5 2000/11/01 08:47:33 obrien Exp $
 
 all:
 	@echo "make sysent only"
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index ce067d5480272..b14772f1a1bf1 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.55.4.1 2008/01/19 18:15:04 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index e68947572e612..3e3140f558e5e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux.h,v 1.78 2007/09/18 19:50:33 dwmalone Exp $
  */
 
 #ifndef _I386_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index fec4f6539573a..6c105c01bd9b4 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_dummy.c,v 1.46 2007/03/29 02:11:46 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c
index 3a36432174b10..dd714850d7159 100644
--- a/sys/i386/linux/linux_genassym.c
+++ b/sys/i386/linux/linux_genassym.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_genassym.c,v 1.18 2003/06/02 16:56:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/i386/linux/linux_ipc64.h b/sys/i386/linux/linux_ipc64.h
index 04ff5f45f91b7..ea27e72daaeb8 100644
--- a/sys/i386/linux/linux_ipc64.h
+++ b/sys/i386/linux/linux_ipc64.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_ipc64.h,v 1.1 2002/10/11 11:43:09 sobomax Exp $
  */
 
 #ifndef _I386_LINUX_LINUX_IPC64_H_
diff --git a/sys/i386/linux/linux_locore.s b/sys/i386/linux/linux_locore.s
index 1c23b3a370e89..61b9dad2ed455 100644
--- a/sys/i386/linux/linux_locore.s
+++ b/sys/i386/linux/linux_locore.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/linux/linux_locore.s,v 1.11 2001/02/25 06:29:01 jake Exp $ */
 
 #include "linux_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index a92c751fcd19f..3fe2ea07f4ff7 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.78.2.1 2007/12/05 13:31:57 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 4807553b8384f..a55ba6821ff92 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.95 2007/09/18 19:51:49 dwmalone Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.89 2007/09/18 19:50:33 dwmalone Exp 
  */
 
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index daee9e55b69bc..8ee72a37c00a4 100644
--- a/sys/i386/linux/linux_ptrace.c
+++ b/sys/i386/linux/linux_ptrace.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.18 2007/09/17 05:27:20 jeff Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/linux/linux_support.s b/sys/i386/linux/linux_support.s
index 171d6e739595c..93262f2a37a01 100644
--- a/sys/i386/linux/linux_support.s
+++ b/sys/i386/linux/linux_support.s
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_support.s,v 1.1 2007/05/23 08:33:06 kib Exp $
  */
 
 #include "linux_assym.h"		/* system definitions */
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index ec222e063409e..cfc6598474353 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.87 2007/09/18 19:51:49 dwmalone Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.89 2007/09/18 19:50:33 dwmalone Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index b56c19ae63851..46adc59369bf9 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.94 2007/09/18 19:51:49 dwmalone Exp $
  * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.89 2007/09/18 19:50:33 dwmalone Exp 
  */
 
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 177691c93551b..59e1eac8237e6 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.150 2007/09/20 13:46:26 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index 87dfbfe7589ac..3d924f3c52933 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/i386/linux/syscalls.conf,v 1.7 2006/08/15 17:25:55 jhb Exp $
 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 9692fe4e0e8f9..cb35fcf884ab3 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.89 2007/09/18 19:50:33 dwmalone Exp $
 
 ;	@(#)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 e0c8fbdcdc329..a6059755693d5 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.128 2007/09/30 11:05:16 marius Exp $");
 
 #include "opt_cpu.h"
 
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index e8be30547ec1f..f119952aacba8 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.124.2.2 2007/12/06 08:25:43 jhb Exp $");
 
 #include "opt_xbox.h"
 
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 3dd10c194efdd..24f44e4ac5e25 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_pir.c,v 1.120 2006/11/09 18:03:36 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/svr4/svr4_genassym.c b/sys/i386/svr4/svr4_genassym.c
index 76e1cc7eb3a95..a96ee6337dc78 100644
--- a/sys/i386/svr4/svr4_genassym.c
+++ b/sys/i386/svr4/svr4_genassym.c
@@ -1,6 +1,6 @@
 /* Derived from:  Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_genassym.c,v 1.9 2003/06/10 05:05:54 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s
index 6274ad2012b34..1baa65d9f71e1 100644
--- a/sys/i386/svr4/svr4_locore.s
+++ b/sys/i386/svr4/svr4_locore.s
@@ -3,7 +3,7 @@
 
 #include <compat/svr4/svr4_syscall.h>		/* system call numbers */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/i386/svr4/svr4_locore.s,v 1.14 2003/04/21 16:30:12 obrien Exp $ */
 	
 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 79a7cbce2e705..b068f81c8d787 100644
--- a/sys/i386/svr4/svr4_machdep.c
+++ b/sys/i386/svr4/svr4_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.38 2005/10/19 14:59:54 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/i386/svr4/svr4_machdep.h b/sys/i386/svr4/svr4_machdep.h
index 231ed4c5e6909..534e34bd2920d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/svr4/svr4_machdep.h,v 1.10 2005/01/06 22:18:17 imp Exp $
  */
 
 #ifndef	_I386_SVR4_MACHDEP_H_
diff --git a/sys/i386/xbox/pic16l.s b/sys/i386/xbox/pic16l.s
index 612c306e59426..91557c89cf5ba 100644
--- a/sys/i386/xbox/pic16l.s
+++ b/sys/i386/xbox/pic16l.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/xbox/pic16l.s,v 1.1 2005/11/09 03:55:40 imp Exp $
  */
 #include <machine/asmacros.h>
 
diff --git a/sys/i386/xbox/xbox.c b/sys/i386/xbox/xbox.c
index af546827b30c2..f700dd32ad835 100644
--- a/sys/i386/xbox/xbox.c
+++ b/sys/i386/xbox/xbox.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/xbox/xbox.c,v 1.4 2006/08/15 20:10:49 pav Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/xbox/xboxfb.c b/sys/i386/xbox/xboxfb.c
index fa9decb4b4e49..d898b86cd6f65 100644
--- a/sys/i386/xbox/xboxfb.c
+++ b/sys/i386/xbox/xboxfb.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/xbox/xboxfb.c,v 1.5 2007/06/16 21:31:53 marius Exp $");
 
 /*
  * This is the syscon(4)-ized version of the Xbox Frame Buffer driver. It
diff --git a/sys/i4b/capi/README b/sys/i4b/capi/README
index 91685258e1611..0ecebabccfcfd 100644
--- a/sys/i4b/capi/README
+++ b/sys/i4b/capi/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/i4b/capi/README,v 1.1 2001/05/25 08:39:31 hm Exp $
 
 Message-ID: <3AF56886.7D92609A@cubical.fi>
 Date: Sun, 06 May 2001 18:06:47 +0300
diff --git a/sys/i4b/capi/capi.h b/sys/i4b/capi/capi.h
index c6dc9e87edd9b..51b080758d91d 100644
--- a/sys/i4b/capi/capi.h
+++ b/sys/i4b/capi/capi.h
@@ -25,7 +25,7 @@
 
 /* capi/capi.h		The CAPI device interface.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/capi.h,v 1.2 2005/01/06 22:18:18 imp Exp $
  */
 
 #ifndef _I4B_CAPI_H_
diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index ef652640cfeb2..78ccabcbea602 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.8 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/capi_llif.c b/sys/i4b/capi/capi_llif.c
index 2eda986904a3a..c2c2d2227365b 100644
--- a/sys/i4b/capi/capi_llif.c
+++ b/sys/i4b/capi/capi_llif.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.5 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/capi_msgs.c b/sys/i4b/capi/capi_msgs.c
index 78eae2944ce30..3d5610f143115 100644
--- a/sys/i4b/capi/capi_msgs.c
+++ b/sys/i4b/capi/capi_msgs.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.6 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/capi_msgs.h b/sys/i4b/capi/capi_msgs.h
index 5d8b3ab1527f9..b446d984356ed 100644
--- a/sys/i4b/capi/capi_msgs.h
+++ b/sys/i4b/capi/capi_msgs.h
@@ -25,7 +25,7 @@
 
 /* capi/capi_msgs.h	The CAPI i4b message and handler declarations.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/capi_msgs.h,v 1.2 2005/01/06 22:18:18 imp Exp $
  */
 
 #ifndef _I4B_CAPI_MSGS_H_
diff --git a/sys/i4b/capi/iavc/iavc.h b/sys/i4b/capi/iavc/iavc.h
index cfe60a9950038..29985add7036b 100644
--- a/sys/i4b/capi/iavc/iavc.h
+++ b/sys/i4b/capi/iavc/iavc.h
@@ -25,7 +25,7 @@
 
 /* capi/iavc/iavc.h	The AVM ISDN controllers' common declarations.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/capi/iavc/iavc.h,v 1.3 2005/01/06 22:18:18 imp Exp $
  */
 
 #ifndef _CAPI_IAVC_H_
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index c0649504cd49b..1dde6a7da6718 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.7 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index e1f6142613ede..d424ef6b92912 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.12 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index 7fff48b0c22cd..b173107b84661 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.10 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index 8f1053539909b..5780dad79ebb7 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.13 2007/07/06 07:17:17 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index 4b391706b24c8..c375c4d2603e8 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.27 2007/07/06 07:17:18 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/ioccom.h>
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index 4c3aa6ace0c51..bd7826d4b300b 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.26 2007/07/06 07:17:18 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index b42380f67677f..23b7f59eebbb4 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -55,7 +55,7 @@
  *---------------------------------------------------------------------------*/ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.40 2007/07/06 07:17:18 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index e971f33b1027d..8a5b43e50841d 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.33 2007/07/06 07:17:18 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 7ccca77ad8f4b..f1c2d5fd9658d 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.36 2007/07/06 07:17:18 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 6692fe36ef1e1..9920addda299c 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.37 2007/07/06 07:17:18 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 80f9b6e534a2e..c30c53b17fd6d 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.33 2007/07/06 07:17:18 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/include/i4b_cause.h b/sys/i4b/include/i4b_cause.h
index 0e94483d48b01..cd36f3c74ec3f 100644
--- a/sys/i4b/include/i4b_cause.h
+++ b/sys/i4b/include/i4b_cause.h
@@ -28,7 +28,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_cause.h,v 1.10 2007/07/05 21:52:43 bz Exp $
  *
  *      last edit-date: [Sun Mar 17 10:08:21 2002]
  *
diff --git a/sys/i4b/include/i4b_debug.h b/sys/i4b/include/i4b_debug.h
index 38ae5ad6230ef..4e7deba0f96e7 100644
--- a/sys/i4b/include/i4b_debug.h
+++ b/sys/i4b/include/i4b_debug.h
@@ -28,7 +28,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_debug.h,v 1.13 2007/07/05 21:52:43 bz Exp $
  *
  *      last edit-date: [Sun Mar 17 10:08:41 2002]
  *
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index c7bcf319e0e0d..95a852ef95a40 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -28,7 +28,7 @@
  *	i4b_global.h - i4b global include file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_global.h,v 1.13 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sun Mar 17 09:55:26 2002]
  *
diff --git a/sys/i4b/include/i4b_ioctl.h b/sys/i4b/include/i4b_ioctl.h
index 5c8e4fee3b29f..46e4bb781136c 100644
--- a/sys/i4b/include/i4b_ioctl.h
+++ b/sys/i4b/include/i4b_ioctl.h
@@ -28,7 +28,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_ioctl.h,v 1.24 2007/07/05 21:52:43 bz Exp $
  *
  *      last edit-date: [Sun Aug 11 19:19:08 2002]
  *
diff --git a/sys/i4b/include/i4b_isdnq931.h b/sys/i4b/include/i4b_isdnq931.h
index e5a8a2d143e9c..fe92d0ff4a5ea 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -28,7 +28,7 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_isdnq931.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:53:49 2002]
  *
diff --git a/sys/i4b/include/i4b_l1l2.h b/sys/i4b/include/i4b_l1l2.h
index b804ea7ecc98f..c7d1cc9ecc91e 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -28,7 +28,7 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.10 2007/07/06 07:17:18 bz Exp $
  *
  *	last edit-date: [Sat Mar  9 15:54:49 2002]
  *
diff --git a/sys/i4b/include/i4b_l2l3.h b/sys/i4b/include/i4b_l2l3.h
index e866073f9ac51..50339bb860ef3 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -28,7 +28,7 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l2l3.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:55:16 2002]
  *
diff --git a/sys/i4b/include/i4b_l3l4.h b/sys/i4b/include/i4b_l3l4.h
index 08a7c5dc0f5c6..8feb4b4d4a37a 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -28,7 +28,7 @@
  *	i4b_l3l4.h - layer 3 / layer 4 interface
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_l3l4.h,v 1.14 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sun Aug 11 12:52:41 2002]
  *
diff --git a/sys/i4b/include/i4b_mbuf.h b/sys/i4b/include/i4b_mbuf.h
index dbca59067daf8..29fba71daad9b 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -28,7 +28,7 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_mbuf.h,v 1.9 2005/01/06 22:18:18 imp Exp $
  *
  *	last edit-date: [Sat Mar  9 15:58:11 2002]
  *
diff --git a/sys/i4b/include/i4b_rbch_ioctl.h b/sys/i4b/include/i4b_rbch_ioctl.h
index 334aa9dc93055..a392b1823b6b5 100644
--- a/sys/i4b/include/i4b_rbch_ioctl.h
+++ b/sys/i4b/include/i4b_rbch_ioctl.h
@@ -28,7 +28,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_rbch_ioctl.h,v 1.7 2007/07/05 21:52:43 bz Exp $
  *
  *      last edit-date: [Sun Mar 17 10:10:25 2002]
  *
diff --git a/sys/i4b/include/i4b_tel_ioctl.h b/sys/i4b/include/i4b_tel_ioctl.h
index 47ffc7075f91c..1f4a6b5cbc512 100644
--- a/sys/i4b/include/i4b_tel_ioctl.h
+++ b/sys/i4b/include/i4b_tel_ioctl.h
@@ -28,7 +28,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_tel_ioctl.h,v 1.11 2007/07/05 21:52:43 bz Exp $
  *
  *      last edit-date: [Sun Mar 17 10:10:39 2002]
  *
diff --git a/sys/i4b/include/i4b_trace.h b/sys/i4b/include/i4b_trace.h
index fbd40afc2444a..b4c5f55c57034 100644
--- a/sys/i4b/include/i4b_trace.h
+++ b/sys/i4b/include/i4b_trace.h
@@ -28,7 +28,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/include/i4b_trace.h,v 1.10 2007/07/05 21:52:43 bz Exp $
  *
  *      last edit-date: [Sun Mar 17 10:10:52 2002]
  *
diff --git a/sys/i4b/layer1/i4b_hdlc.c b/sys/i4b/layer1/i4b_hdlc.c
index 15c22b2f821ce..e64eba530185c 100644
--- a/sys/i4b/layer1/i4b_hdlc.c
+++ b/sys/i4b/layer1/i4b_hdlc.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_hdlc.c,v 1.3 2005/01/06 22:18:19 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/i4b/layer1/i4b_hdlc.h b/sys/i4b/layer1/i4b_hdlc.h
index 83aaf35efc34e..6370ce67509ea 100644
--- a/sys/i4b/layer1/i4b_hdlc.h
+++ b/sys/i4b/layer1/i4b_hdlc.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_hdlc.h,v 1.5 2000/08/28 07:41:19 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_hdlc.h,v 1.6 2005/01/06 22:18:19 imp Exp $
  *
  *	last edit-date: [Wed Jul 19 09:41:13 2000]
  *
diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index ac6a67162d2c8..6b406a8aaea62 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -28,7 +28,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/i4b_l1.h,v 1.14 2005/01/06 22:18:19 imp Exp $
  *
  *      last edit-date: [Tue Jan 23 17:04:57 2001]
  *
diff --git a/sys/i4b/layer1/i4b_l1dmux.c b/sys/i4b/layer1/i4b_l1dmux.c
index 15f3783f1fbba..55109adfa1bce 100644
--- a/sys/i4b/layer1/i4b_l1dmux.c
+++ b/sys/i4b/layer1/i4b_l1dmux.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.9 2007/07/06 07:17:18 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/i4b_l1lib.c b/sys/i4b/layer1/i4b_l1lib.c
index abce3bd0b31e2..e2173dae48c51 100644
--- a/sys/i4b/layer1/i4b_l1lib.c
+++ b/sys/i4b/layer1/i4b_l1lib.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.6 2007/07/06 07:17:18 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h b/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
index 127f1e30cb987..e4ac9ffc6e70a 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_ifpi_ext.h,v 1.2 2000/06/02 16:14:36 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *      last edit-date: [Fri Jun  2 14:53:31 2000]
  *
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index e97b2dfaaccfb..9b8c630c2fec2 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.9 2007/07/06 07:17:19 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index da63967a3a42e..a9d17f0519681 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.9 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index b0532065412c9..1cef148da7b23 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.9 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 2b674320495e1..97d1e35861702 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.19 2007/07/06 07:17:19 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h b/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
index 84f44de94bfdf..dee201b503718 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h
@@ -30,7 +30,7 @@
  *
  *	$Id$
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *
  *---------------------------------------------------------------------------*/
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index f0a31820de5e5..5475f89833df0 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.6 2007/07/06 07:17:19 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
index 4d6690546bdcd..359721be95619 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h
@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *
  *---------------------------------------------------------------------------*/
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
index 33defe3483947..5eb6d800c3d27 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c,v 1.7 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
index 58b87e7897b58..63b7f3819c38a 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c,v 1.6 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index e8dbbde58e05d..e6762d784d65a 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.19 2007/07/06 07:17:19 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index fc06acfc27c6e..3ddc1423b39f9 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.15 2007/07/06 07:17:19 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h b/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
index e89dacf0e545e..911669af1fd3c 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h
@@ -31,7 +31,7 @@
  *	$Id: i4b_ifpnp_ext.h,v 1.2 2000/06/02 16:14:36 hm Exp $
  *	$Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_ext.h,v 1.4 2000/04/18 08:03:05 ust Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *      last edit-date: [Fri Jun  2 14:54:57 2000]
  *
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
index 4a9494087a298..18b21788aa907 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.8 2007/07/06 07:17:19 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
index e0cfc502db15b..cd39346f00800 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c,v 1.8 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
index 6a26c0e747526..898dee799f467 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c,v 1.8 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc.h b/sys/i4b/layer1/ihfc/i4b_ihfc.h
index f4d724125b7c1..d685d231c608f 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc.h
@@ -32,7 +32,7 @@
  *
  *	$Id: i4b_ihfc.h,v 1.9 2000/09/19 13:50:36 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 630aa6716dab7..e5c9e9f2ed3ad 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -35,7 +35,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.17 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
index 9ea6720ecdc19..da3d51da2f9e4 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h
@@ -32,7 +32,7 @@
  *
  *	$Id: i4b_ihfc_drv.h,v 1.7 2000/09/19 13:50:36 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 #ifndef	I4B_IHFC_DRV_H_
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h b/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
index fde0c87a8cc19..5b3c08e43c71f 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h
@@ -32,7 +32,7 @@
  *
  *      $Id: i4b_ihfc_ext.h,v 1.6 2000/08/20 07:14:08 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h,v 1.2 2005/01/06 22:18:19 imp Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index 2ed4c46cce49f..ae532eb932f9c 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.14 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
index b305f90b611a0..0d4e0a777021c 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@@ -36,7 +36,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.13 2007/07/06 07:17:19 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
index 16cf38327b15a..04b2614ab5787 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -46,7 +46,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index 45a92de7c0941..edfb9c87aa1ae 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_avm_a1.c,v 1.12 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index 5dbffca2ac62a..139adcdd5cb55 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_bchan.c,v 1.14 2007/07/06 07:17:20 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index afa665dd15c60..50a3f2d4bc9e8 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -39,7 +39,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.12 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_diva.c b/sys/i4b/layer1/isic/i4b_diva.c
index c189f1c08cb3d..07ed93e83f394 100644
--- a/sys/i4b/layer1/isic/i4b_diva.c
+++ b/sys/i4b/layer1/isic/i4b_diva.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_diva.c,v 1.5 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index 8a1764ce80525..0310c311b1f10 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_drn_ngo.c,v 1.10 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index 798e8755f4072..66aecc043e287 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_dynalink.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 /*	NOTES:
 	
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index e2af2ea6c2e67..62b6066b83397 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.12 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
index d17cdfd1defd5..168efd8405660 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index 6a929221cb2ac..cdb17656cad05 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -34,7 +34,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.16 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index c947a7a2bf47f..9088499be6e49 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.c,v 1.12 2007/07/06 07:17:20 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_hscx.h b/sys/i4b/layer1/isic/i4b_hscx.h
index 890d6b73b6b43..965f429a75403 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.h
+++ b/sys/i4b/layer1/isic/i4b_hscx.h
@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:09:51 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_ipac.h b/sys/i4b/layer1/isic/i4b_ipac.h
index 6361b351f6a37..1ae2fa99a6170 100644
--- a/sys/i4b/layer1/isic/i4b_ipac.h
+++ b/sys/i4b/layer1/isic/i4b_ipac.h
@@ -28,7 +28,7 @@
  *	i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
  *	==========================================================
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_ipac.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:10:09 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c
index 8a50efcf91385..c2b0fd6557d51 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isac.h b/sys/i4b/layer1/isic/i4b_isac.h
index 7435104eee038..037fcb7541bef 100644
--- a/sys/i4b/layer1/isic/i4b_isac.h
+++ b/sys/i4b/layer1/isic/i4b_isac.h
@@ -31,7 +31,7 @@
 
 /*---------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:10:42 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isic.c b/sys/i4b/layer1/isic/i4b_isic.c
index cb871f1177191..dc806b29eae6e 100644
--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.c,v 1.8 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isic.h b/sys/i4b/layer1/isic/i4b_isic.h
index d4c3bcec22a6d..6acb3fa77f1a2 100644
--- a/sys/i4b/layer1/isic/i4b_isic.h
+++ b/sys/i4b/layer1/isic/i4b_isic.h
@@ -28,7 +28,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.h,v 1.5 2005/04/08 03:37:20 nyan Exp $
  *
  *      last edit-date: [Fri Jan 26 13:55:12 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isic_ext.h b/sys/i4b/layer1/isic/i4b_isic_ext.h
index ad99114f71efb..8745cc617312d 100644
--- a/sys/i4b/layer1/isic/i4b_isic_ext.h
+++ b/sys/i4b/layer1/isic/i4b_isic_ext.h
@@ -28,7 +28,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_ext.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 24 09:11:12 2001]
  *
diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c
index 6d88caad42b51..9a719d926d324 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_isa.c,v 1.10 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c
index 2a45427747457..82ec3fc1f0841 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -42,7 +42,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_pnp.c,v 1.15 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index e1a0e33c49ec8..f358bf8864292 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -59,7 +59,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_itk_ix1.c,v 1.13 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index 5af7edab26353..7129fe2156e70 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_l1.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c
index d996c9bab6ca0..4d25d4cb1a3b3 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_l1fsm.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
index 1a845662957be..0897a32055212 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -41,7 +41,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index 6f73f90d8b230..44a596b0f7cde 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -49,7 +49,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_sws.c,v 1.9 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index e64a1f3c8cd40..c3da7a1f6214e 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s016.c,v 1.13 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 8da8135b4fbc6..ad359b8c6b132 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s0163.c,v 1.12 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index df3163e1cb4c9..3b739b916dc1d 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s08.c,v 1.12 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index cbdfbc9000f7b..fc436c3e39d1e 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.11 2007/07/06 07:17:20 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/itjc/i4b_hdlc.h b/sys/i4b/layer1/itjc/i4b_hdlc.h
index 09c8ddd762b78..ae918928098ac 100644
--- a/sys/i4b/layer1/itjc/i4b_hdlc.h
+++ b/sys/i4b/layer1/itjc/i4b_hdlc.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_hdlc.h,v 1.5 2000/08/28 07:41:19 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_hdlc.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *	last edit-date: [Thu Jan 11 11:31:01 2001]
  *
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_ext.h b/sys/i4b/layer1/itjc/i4b_itjc_ext.h
index 4009dde5a6512..e4fd7831fd08a 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_ext.h
+++ b/sys/i4b/layer1/itjc/i4b_itjc_ext.h
@@ -28,7 +28,7 @@
  *      i4b_itjc - NetJet PCI for split layers
  *      ------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_ext.h,v 1.2 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Wed Jan 10 17:15:31 2001]
  *
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
index ab267b7887326..0f8aee2cc7163 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.7 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1.c b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
index 9df9bcc02382c..1b57e903c0556 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1.c,v 1.7 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
index 4a43e4bfbe121..6402664dff466 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c,v 1.7 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index 6d255af43be1e..0056959e83d02 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -38,7 +38,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.20 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic.h b/sys/i4b/layer1/iwic/i4b_iwic.h
index f48811f798957..98df9039ae544 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic.h
+++ b/sys/i4b/layer1/iwic/i4b_iwic.h
@@ -28,7 +28,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic.h,v 1.3 2005/01/06 22:18:20 imp Exp $
  *
  *      last edit-date: [Sun Jan 21 11:08:44 2001]
  *
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 66b1b537d6b8b..912ef1b0a0573 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -33,7 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.15 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
index d6ffa667eeb60..a565258dd9f94 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c,v 1.9 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_ext.h b/sys/i4b/layer1/iwic/i4b_iwic_ext.h
index 0b4389b5982ec..0b249df588745 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_ext.h
+++ b/sys/i4b/layer1/iwic/i4b_iwic_ext.h
@@ -28,7 +28,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_ext.h,v 1.3 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sun Jan 21 11:09:14 2001]
  *
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
index 983535445a3c3..b90d2db27c82a 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.9 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
index fbea743ecb993..5065079e26fb2 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c,v 1.10 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index e1e2076ee0c49..94ed4e2f697f5 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.16 2007/07/06 07:17:21 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer1/iwic/i4b_w6692.h b/sys/i4b/layer1/iwic/i4b_w6692.h
index 46e21631857d3..49821fd1ac871 100644
--- a/sys/i4b/layer1/iwic/i4b_w6692.h
+++ b/sys/i4b/layer1/iwic/i4b_w6692.h
@@ -28,7 +28,7 @@
  *      i4b_iwic - isdn4bsd Winbond W6692 driver
  *      ----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_w6692.h,v 1.3 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sun Jan 21 11:09:46 2001]
  *
diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index a670582e4f6ad..de20957e22056 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_iframe.c,v 1.15 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index f752ba6ad9649..2ec7c7e21c4f2 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2.c,v 1.21 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_l2.h b/sys/i4b/layer2/i4b_l2.h
index cb44c93041373..6cdf4c7ec3acd 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -28,7 +28,7 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 16:12:20 2002]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index 8e2721b5ada47..072ab3a28e287 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.c,v 1.18 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_l2fsm.h b/sys/i4b/layer2/i4b_l2fsm.h
index fe47089f2a190..80c353cc14ec0 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -28,7 +28,7 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 17:47:53 2002]
  *
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index b129619977380..009877e08f442 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_l2timer.c,v 1.16 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index 19d45ea750ecf..39e97ce6bfe95 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_lme.c,v 1.16 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 9bc0b686090e9..87f6ed828636c 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.17 2005/01/06 22:18:21 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index afe59eb7d2759..5da88b10a6c7b 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_sframe.c,v 1.16 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index 0e55bc244547b..bda509d374c8f 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.17 2007/07/06 07:17:21 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index 55331a0cabfb1..ba8c11599f45c 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_uframe.c,v 1.16 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index 9121648defbcd..80629dbea240a 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer2/i4b_util.c,v 1.17 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c
index 4c23dbdaa995b..342fe9287493b 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.17 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_l3.h b/sys/i4b/layer3/i4b_l3.h
index 22029934efd61..e0f4553720757 100644
--- a/sys/i4b/layer3/i4b_l3.h
+++ b/sys/i4b/layer3/i4b_l3.h
@@ -30,7 +30,7 @@
  *
  *	$Id: i4b_l3.h,v 1.11 2000/04/27 09:25:21 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3.h,v 1.8 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Thu Apr 27 11:07:01 2000]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c
index 1ec06787ba0e7..271641e926a26 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.c,v 1.19 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_l3fsm.h b/sys/i4b/layer3/i4b_l3fsm.h
index b2a510212b0ae..dc24c7e134685 100644
--- a/sys/i4b/layer3/i4b_l3fsm.h
+++ b/sys/i4b/layer3/i4b_l3fsm.h
@@ -28,7 +28,7 @@
  *      i4b_l3fsm.c - layer 3 FSM
  *      -------------------------
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 19:34:51 2002]
  *
diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c
index 33abab4140399..a0015043f2b3c 100644
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l3timer.c,v 1.14 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c
index e2acee36085d5..a2515ead9be16 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_l4if.c,v 1.16 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c
index 3f1eb2b9d8a74..e13da0aac0297 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.19 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h
index 99dc6efaffb3c..8a8d332943ba9 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -28,7 +28,7 @@
  *	i4b_q931.h - Q931 handling header file
  *	--------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q931.h,v 1.11 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Tue Mar 26 15:04:33 2002]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c
index 22a2f9f16f132..b94ddadd8bb39 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer3/i4b_q932fac.c,v 1.15 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer3/i4b_q932fac.h b/sys/i4b/layer3/i4b_q932fac.h
index ae79155308004..a065f7d2875c9 100644
--- a/sys/i4b/layer3/i4b_q932fac.h
+++ b/sys/i4b/layer3/i4b_q932fac.h
@@ -28,7 +28,7 @@
  *	i4b_q932fac.h - Q932 facility handling header file
  *	--------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer3/i4b_q932fac.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Sat Mar  9 19:37:46 2002]
  *
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index ef73ce162be17..942c61e3110b8 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.46 2007/07/06 07:17:22 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 9ca64e2a845c4..77e4c3c659479 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.22 2007/07/06 07:17:22 bz Exp $");
 
 #include "opt_i4b.h"
 
diff --git a/sys/i4b/layer4/i4b_l4.h b/sys/i4b/layer4/i4b_l4.h
index b02d9ac7c97aa..519eaf37f7797 100644
--- a/sys/i4b/layer4/i4b_l4.h
+++ b/sys/i4b/layer4/i4b_l4.h
@@ -28,7 +28,7 @@
  *	i4b_l4.h - kernel interface to userland header file
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/i4b/layer4/i4b_l4.h,v 1.9 2005/01/06 22:18:21 imp Exp $
  *
  *      last edit-date: [Thu Oct 18 10:11:51 2001]
  *
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index 1f3e9e3ca94de..b8744bd2876af 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -32,7 +32,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.19 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c
index 90d564db5b02e..f199c892f22f9 100644
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@@ -31,7 +31,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i4b/layer4/i4b_l4timer.c,v 1.14 2007/07/06 07:17:22 bz Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index 9345effcd762a..6dfb266fedd1e 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/acpica/OsdEnvironment.c,v 1.10 2007/03/22 18:16:42 jkim Exp $");
 
 #include <sys/types.h>
 #include <sys/linker_set.h>
diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c
index 9426dd0c032ce..29fece8c1064a 100644
--- a/sys/ia64/acpica/acpi_machdep.c
+++ b/sys/ia64/acpica/acpi_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/acpica/acpi_machdep.c,v 1.6 2005/09/11 18:39:03 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c
index 3003a57f27c42..bc47b74093d74 100644
--- a/sys/ia64/acpica/acpi_wakeup.c
+++ b/sys/ia64/acpica/acpi_wakeup.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/acpica/acpi_wakeup.c,v 1.3 2005/09/11 18:39:03 obrien Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/acpica/madt.c b/sys/ia64/acpica/madt.c
index 50b53b8850443..0a5b0929eb45d 100644
--- a/sys/ia64/acpica/madt.c
+++ b/sys/ia64/acpica/madt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/acpica/madt.c,v 1.20 2007/03/22 18:16:42 jkim Exp $
  */
 
 #include <contrib/dev/acpica/acpi.h>
diff --git a/sys/ia64/compile/.cvsignore b/sys/ia64/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/ia64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/ia64/conf/.cvsignore b/sys/ia64/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/ia64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index 8ac4e78ae1717..481d355bf15ce 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/ia64
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.11 2007/06/13 05:07:41 marcel Exp $
 
 machine		ia64
 
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 2fa5086405b67..46c59dcd6f7a1 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.92 2007/09/26 20:05:07 brueffer Exp $
 
 cpu		ITANIUM
 ident		GENERIC
diff --git a/sys/ia64/conf/GENERIC.hints b/sys/ia64/conf/GENERIC.hints
index ee222500e0d70..8de10ee51c818 100644
--- a/sys/ia64/conf/GENERIC.hints
+++ b/sys/ia64/conf/GENERIC.hints
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.8 2004/11/14 23:42:48 marcel Exp $
 hw.uart.console="io:0x3f8"
diff --git a/sys/ia64/conf/MAC b/sys/ia64/conf/MAC
index a4acaeba92882..b5d029e9bd643 100644
--- a/sys/ia64/conf/MAC
+++ b/sys/ia64/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/MAC,v 1.1 2005/09/18 03:15:35 csjp Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/ia64/conf/Makefile b/sys/ia64/conf/Makefile
index 2c006e9c2c80d..be768e7ffbc9c 100644
--- a/sys/ia64/conf/Makefile
+++ b/sys/ia64/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/Makefile,v 1.1 2003/08/23 21:47:32 marcel Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/ia64/conf/NOTES b/sys/ia64/conf/NOTES
index de9eae2309223..7e594046b6949 100644
--- a/sys/ia64/conf/NOTES
+++ b/sys/ia64/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/NOTES,v 1.14 2006/10/23 13:23:13 ru Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index 6e2a4baba996c..40580655ddcdf 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -17,7 +17,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check
 # first in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/ia64/conf/SKI,v 1.24 2006/06/15 19:58:53 netchild Exp $
 
 cpu		ITANIUM
 ident		SKI
diff --git a/sys/ia64/disasm/disasm.h b/sys/ia64/disasm/disasm.h
index 7f4498a32d061..a34db9a922819 100644
--- a/sys/ia64/disasm/disasm.h
+++ b/sys/ia64/disasm/disasm.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/disasm/disasm.h,v 1.5 2006/06/24 19:21:11 marcel Exp $
  */
 
 #ifndef _DISASM_H_
diff --git a/sys/ia64/disasm/disasm_decode.c b/sys/ia64/disasm/disasm_decode.c
index 0359e44e8e56c..8841bb2203322 100644
--- a/sys/ia64/disasm/disasm_decode.c
+++ b/sys/ia64/disasm/disasm_decode.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/disasm/disasm_decode.c,v 1.5 2006/06/24 19:21:11 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/disasm/disasm_extract.c b/sys/ia64/disasm/disasm_extract.c
index 1cec07e980f51..430d6a7ae8b3d 100644
--- a/sys/ia64/disasm/disasm_extract.c
+++ b/sys/ia64/disasm/disasm_extract.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/disasm/disasm_extract.c,v 1.4 2006/06/24 19:21:11 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/disasm/disasm_format.c b/sys/ia64/disasm/disasm_format.c
index 37a3650915708..2bc0d71ce89e8 100644
--- a/sys/ia64/disasm/disasm_format.c
+++ b/sys/ia64/disasm/disasm_format.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/disasm/disasm_format.c,v 1.4 2006/06/24 19:21:11 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/disasm/disasm_int.h b/sys/ia64/disasm/disasm_int.h
index e1410c135c16f..e490b1c2b4ca0 100644
--- a/sys/ia64/disasm/disasm_int.h
+++ b/sys/ia64/disasm/disasm_int.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/disasm/disasm_int.h,v 1.4 2006/06/24 19:21:11 marcel Exp $
  */
 
 #ifndef _DISASM_INT_H_
diff --git a/sys/ia64/ia32/ia32_reg.c b/sys/ia64/ia32/ia32_reg.c
index 2066f18733313..6c46f0f142dd8 100644
--- a/sys/ia64/ia32/ia32_reg.c
+++ b/sys/ia64/ia32/ia32_reg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_reg.c,v 1.2 2005/09/10 01:13:33 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia32/ia32_signal.c b/sys/ia64/ia32/ia32_signal.c
index a981c8444cde1..9f38b82af3a60 100644
--- a/sys/ia64/ia32/ia32_signal.c
+++ b/sys/ia64/ia32/ia32_signal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_signal.c,v 1.11 2006/10/06 19:33:44 marcel Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/ia64/ia32/ia32_trap.c b/sys/ia64/ia32/ia32_trap.c
index ba2bceb1d4629..3113c008e5548 100644
--- a/sys/ia64/ia32/ia32_trap.c
+++ b/sys/ia64/ia32/ia32_trap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.14 2007/06/04 21:38:46 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c
index 5a380516320b7..079d11a9e9fd4 100644
--- a/sys/ia64/ia64/autoconf.c
+++ b/sys/ia64/ia64/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/autoconf.c,v 1.23 2005/05/29 23:44:22 marcel Exp $
  */
 
 #include "opt_bootp.h"
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 5ef2e53619860..09c24cc86de79 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/busdma_machdep.c,v 1.45 2007/05/29 06:30:25 yongari Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
index dcfc6e8a5d5db..603ecfb808b24 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.32 2007/08/04 19:28:19 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/context.S b/sys/ia64/ia64/context.S
index 77a1821f789a8..07e549c462d7e 100644
--- a/sys/ia64/ia64/context.S
+++ b/sys/ia64/ia64/context.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/context.S,v 1.4 2005/01/06 22:18:22 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/db_machdep.c b/sys/ia64/ia64/db_machdep.c
index b60d9d779f145..72762115dbabb 100644
--- a/sys/ia64/ia64/db_machdep.c
+++ b/sys/ia64/ia64/db_machdep.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/db_machdep.c,v 1.4 2007/07/30 22:42:33 marcel Exp $");
 
 #include <opt_xtrace.h>
 
diff --git a/sys/ia64/ia64/dump_machdep.c b/sys/ia64/ia64/dump_machdep.c
index bc84c49bf5e25..3a2213ff13afe 100644
--- a/sys/ia64/ia64/dump_machdep.c
+++ b/sys/ia64/ia64/dump_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.13.14.1 2008/01/30 21:21:50 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/efi.c b/sys/ia64/ia64/efi.c
index a10c208c41727..f64df7fe50cc6 100644
--- a/sys/ia64/ia64/efi.c
+++ b/sys/ia64/ia64/efi.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/efi.c,v 1.5 2004/09/19 03:50:46 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/elf_machdep.c b/sys/ia64/ia64/elf_machdep.c
index 4c7463016052b..87536397cd077 100644
--- a/sys/ia64/ia64/elf_machdep.c
+++ b/sys/ia64/ia64/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/elf_machdep.c,v 1.24 2007/05/22 02:22:58 kan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/emulate.c b/sys/ia64/ia64/emulate.c
index 37fcf5595e7d8..8f1876a7087cc 100644
--- a/sys/ia64/ia64/emulate.c
+++ b/sys/ia64/ia64/emulate.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/emulate.c,v 1.1 2006/06/29 19:59:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/exception.S b/sys/ia64/ia64/exception.S
index aa96357e19cd4..53f58ae7ef979 100644
--- a/sys/ia64/ia64/exception.S
+++ b/sys/ia64/ia64/exception.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/exception.S,v 1.62 2007/08/06 05:11:00 marcel Exp $");
 
 #include <opt_xtrace.h>
 
diff --git a/sys/ia64/ia64/gdb_machdep.c b/sys/ia64/ia64/gdb_machdep.c
index a30c4aa004a92..bc13fd2562c28 100644
--- a/sys/ia64/ia64/gdb_machdep.c
+++ b/sys/ia64/ia64/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/gdb_machdep.c,v 1.4 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index 8e988b6754521..96df28cec4fdb 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.44 2006/11/18 21:48:13 marcel Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/ia64/ia64/in_cksum.c b/sys/ia64/ia64/in_cksum.c
index 6c9959fe9fa13..afd1439d3bc64 100644
--- a/sys/ia64/ia64/in_cksum.c
+++ b/sys/ia64/ia64/in_cksum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/ia64/in_cksum.c,v 1.4 2005/01/06 22:18:22 imp Exp $ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*-
diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c
index 5d30566e8b98a..98e39a1ca0753 100644
--- a/sys/ia64/ia64/interrupt.c
+++ b/sys/ia64/ia64/interrupt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.61.2.1 2007/11/26 15:06:49 scottl Exp $ */
 /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
 
 /*-
diff --git a/sys/ia64/ia64/locore.S b/sys/ia64/ia64/locore.S
index e52c76a48cb6a..fbd81357bd937 100644
--- a/sys/ia64/ia64/locore.S
+++ b/sys/ia64/ia64/locore.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/locore.S,v 1.40 2007/05/27 19:02:46 marcel Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index 2980d61ed93fe..149315c2195d6 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.225.4.2 2008/02/14 22:51:51 marcel Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
index bba0bfbe7e1de..f79c7b3478645 100644
--- a/sys/ia64/ia64/mca.c
+++ b/sys/ia64/ia64/mca.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/mca.c,v 1.12 2007/05/19 12:50:12 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c
index 6c5cbe7a9a790..fa61685783e47 100644
--- a/sys/ia64/ia64/mem.c
+++ b/sys/ia64/ia64/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/mem.c,v 1.21 2004/08/02 18:37:55 marcel Exp $");
 
 /*
  * Memory special file
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 7886a0bf1d7c0..b0aedfb890511 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.67 2007/08/06 05:15:57 marcel Exp $");
 
 #include "opt_kstack_pages.h"
 
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
index ac184b4c29154..220bace61b0e5 100644
--- a/sys/ia64/ia64/nexus.c
+++ b/sys/ia64/ia64/nexus.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.18 2007/07/30 22:29:32 marcel Exp $
  */
 
 /*
diff --git a/sys/ia64/ia64/pal.S b/sys/ia64/ia64/pal.S
index eca57accf4046..df223ca34f19f 100644
--- a/sys/ia64/ia64/pal.S
+++ b/sys/ia64/ia64/pal.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/ia64/pal.S,v 1.8 2003/07/02 12:57:07 ru Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 820f914ff8b5f..17514e9d1e74e 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.191.4.2 2008/02/14 22:51:52 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/ptrace_machdep.c b/sys/ia64/ia64/ptrace_machdep.c
index c7c510480494f..90e02decf903d 100644
--- a/sys/ia64/ia64/ptrace_machdep.c
+++ b/sys/ia64/ia64/ptrace_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/ptrace_machdep.c,v 1.4 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/sal.c b/sys/ia64/ia64/sal.c
index 251c1ee825772..0cf41c5227388 100644
--- a/sys/ia64/ia64/sal.c
+++ b/sys/ia64/ia64/sal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/sal.c,v 1.15 2005/08/13 21:08:32 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/sapic.c b/sys/ia64/ia64/sapic.c
index 86bb00f40d02b..479fe1e314f4f 100644
--- a/sys/ia64/ia64/sapic.c
+++ b/sys/ia64/ia64/sapic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.14 2007/07/30 22:29:33 marcel Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/ia64/ia64/setjmp.S b/sys/ia64/ia64/setjmp.S
index 82d02194e2384..3b02a6f651bc3 100644
--- a/sys/ia64/ia64/setjmp.S
+++ b/sys/ia64/ia64/setjmp.S
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/sys/ia64/ia64/setjmp.S,v 1.3 2005/01/06 22:18:22 imp Exp $
 
 //-
 // Copyright (c) 1999, 2000
diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c
index 274cc0da24de0..e334b173a6f55 100644
--- a/sys/ia64/ia64/ssc.c
+++ b/sys/ia64/ia64/ssc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/ia64/ssc.c,v 1.30 2006/11/06 17:43:10 rwatson Exp $
  */
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index 72597d756620c..af7cb99031eb8 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/sscdisk.c,v 1.33 2005/10/31 15:41:24 rwatson Exp $
  *
  */
 
diff --git a/sys/ia64/ia64/support.S b/sys/ia64/ia64/support.S
index bc9ef91d280aa..ef45420b683d6 100644
--- a/sys/ia64/ia64/support.S
+++ b/sys/ia64/ia64/support.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/support.S,v 1.27 2006/10/17 02:24:46 davidxu Exp $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/ia64/ia64/sys_machdep.c b/sys/ia64/ia64/sys_machdep.c
index d4dcc1fd536a1..d6d280525de6f 100644
--- a/sys/ia64/ia64/sys_machdep.c
+++ b/sys/ia64/ia64/sys_machdep.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/sys_machdep.c,v 1.8 2003/10/27 22:54:34 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ia64/ia64/syscall.S b/sys/ia64/ia64/syscall.S
index 73f8da67b8306..af1be0010b8ed 100644
--- a/sys/ia64/ia64/syscall.S
+++ b/sys/ia64/ia64/syscall.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/syscall.S,v 1.15 2007/07/16 16:47:35 marcel Exp $
  */
 
 #include <sys/syscall.h>
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 373a46a20e011..34bebf9be765c 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.128 2007/06/04 21:38:46 attilio Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
diff --git a/sys/ia64/ia64/uio_machdep.c b/sys/ia64/ia64/uio_machdep.c
index 30f6250b0e2ee..0de5ea9f3d6b1 100644
--- a/sys/ia64/ia64/uio_machdep.c
+++ b/sys/ia64/ia64/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/uio_machdep.c,v 1.5 2005/01/06 22:18:22 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ia64/ia64/uma_machdep.c b/sys/ia64/ia64/uma_machdep.c
index c8084ba0cb82c..211a545525b43 100644
--- a/sys/ia64/ia64/uma_machdep.c
+++ b/sys/ia64/ia64/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/ia64/ia64/unaligned.c b/sys/ia64/ia64/unaligned.c
index 2635a9605adb7..dc05afc52990b 100644
--- a/sys/ia64/ia64/unaligned.c
+++ b/sys/ia64/ia64/unaligned.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/unaligned.c,v 1.13 2005/09/28 07:03:03 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/ia64/ia64/unwind.c b/sys/ia64/ia64/unwind.c
index 6343ed848e1d7..b273a85a7ce48 100644
--- a/sys/ia64/ia64/unwind.c
+++ b/sys/ia64/ia64/unwind.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.14 2005/04/16 05:38:59 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kdb.h>
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index 40708c4ea8dc3..31097f2270d92 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/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$
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.94 2007/06/04 23:57:31 jeff Exp $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/ia64/include/_bus.h b/sys/ia64/include/_bus.h
index 95d94b40387fe..5c6afeb37d64f 100644
--- a/sys/ia64/include/_bus.h
+++ b/sys/ia64/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $
  */
 
 #ifndef IA64_INCLUDE__BUS_H
diff --git a/sys/ia64/include/_inttypes.h b/sys/ia64/include/_inttypes.h
index e6b2536ff379b..f4069c5eee848 100644
--- a/sys/ia64/include/_inttypes.h
+++ b/sys/ia64/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/ia64/include/_limits.h b/sys/ia64/include/_limits.h
index cb26d9795985a..bdee80691501b 100644
--- a/sys/ia64/include/_limits.h
+++ b/sys/ia64/include/_limits.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/_limits.h,v 1.14 2005/08/20 16:44:41 stefanf Exp $ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/_regset.h b/sys/ia64/include/_regset.h
index 1abe2ab061636..42a1ca300b774 100644
--- a/sys/ia64/include/_regset.h
+++ b/sys/ia64/include/_regset.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_regset.h,v 1.5 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_REGSET_H_
diff --git a/sys/ia64/include/_stdint.h b/sys/ia64/include/_stdint.h
index 1aed3e3b4efc1..f44eb8ba4667e 100644
--- a/sys/ia64/include/_stdint.h
+++ b/sys/ia64/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h
index 8fc1be2f3873a..184c6d6517565 100644
--- a/sys/ia64/include/_types.h
+++ b/sys/ia64/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/_types.h,v 1.11 2006/01/09 06:05:57 imp Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/ia64/include/acpica_machdep.h b/sys/ia64/include/acpica_machdep.h
index 26191c0a52751..8ff8c0aae2836 100644
--- a/sys/ia64/include/acpica_machdep.h
+++ b/sys/ia64/include/acpica_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.5 2007/03/22 18:16:42 jkim Exp $
  */
 
 /******************************************************************************
diff --git a/sys/ia64/include/asm.h b/sys/ia64/include/asm.h
index 0e50d47ae5e82..0795ebbea58d3 100644
--- a/sys/ia64/include/asm.h
+++ b/sys/ia64/include/asm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/asm.h,v 1.13 2005/01/31 08:16:12 imp Exp $ */
 /* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
 
 /*-
diff --git a/sys/ia64/include/atomic.h b/sys/ia64/include/atomic.h
index 3ff05214cfcc5..656e9ccc1a699 100644
--- a/sys/ia64/include/atomic.h
+++ b/sys/ia64/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/atomic.h,v 1.11 2007/07/30 22:07:01 marcel Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/ia64/include/bootinfo.h b/sys/ia64/include/bootinfo.h
index 2a065e913e6f7..437aeff96234c 100644
--- a/sys/ia64/include/bootinfo.h
+++ b/sys/ia64/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.8 2005/01/06 22:18:23 imp Exp $ */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/ia64/include/bus.h b/sys/ia64/include/bus.h
index 02fe8bee10567..986e5e90b0657 100644
--- a/sys/ia64/include/bus.h
+++ b/sys/ia64/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.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/bus.h,v 1.22 2005/05/29 04:42:28 nyan Exp $ */
 
 #ifndef _MACHINE_BUS_H_
 #define _MACHINE_BUS_H_
diff --git a/sys/ia64/include/bus_dma.h b/sys/ia64/include/bus_dma.h
index 0a80f2fd56d88..16f79b5894b13 100644
--- a/sys/ia64/include/bus_dma.h
+++ b/sys/ia64/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/bus_dma.h,v 1.1 2005/03/14 16:46:27 scottl Exp $ */
 
 #ifndef _IA64_BUS_DMA_H_
 #define _IA64_BUS_DMA_H_
diff --git a/sys/ia64/include/clock.h b/sys/ia64/include/clock.h
index 31a8ed2f8fc85..d4f11af952240 100644
--- a/sys/ia64/include/clock.h
+++ b/sys/ia64/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/clock.h,v 1.11 2006/10/02 12:59:57 phk Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/ia64/include/cpu.h b/sys/ia64/include/cpu.h
index 9d7a936097a82..d8b5fd1956f15 100644
--- a/sys/ia64/include/cpu.h
+++ b/sys/ia64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.49 2006/05/11 22:49:31 marcel Exp $ */
 /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
 
 /*-
diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h
index 339bd95801a50..19fcd9468a183 100644
--- a/sys/ia64/include/cpufunc.h
+++ b/sys/ia64/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.23 2007/06/10 16:53:01 marcel Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/ia64/include/db_machdep.h b/sys/ia64/include/db_machdep.h
index cbf01a70e59f2..29fcccb90415a 100644
--- a/sys/ia64/include/db_machdep.h
+++ b/sys/ia64/include/db_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/db_machdep.h,v 1.12 2005/07/02 23:52:36 marcel Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/ia64/include/dig64.h b/sys/ia64/include/dig64.h
index e8362ad735cd8..184a310f38e6b 100644
--- a/sys/ia64/include/dig64.h
+++ b/sys/ia64/include/dig64.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/dig64.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_DIG64_H_
diff --git a/sys/ia64/include/efi.h b/sys/ia64/include/efi.h
index fe0052367f334..81de6014605e4 100644
--- a/sys/ia64/include/efi.h
+++ b/sys/ia64/include/efi.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/efi.h,v 1.8 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_EFI_H_
diff --git a/sys/ia64/include/elf.h b/sys/ia64/include/elf.h
index ec225124b5f07..04be7faf0f0ea 100644
--- a/sys/ia64/include/elf.h
+++ b/sys/ia64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/elf.h,v 1.15 2006/10/04 21:37:09 jb Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/ia64/include/endian.h b/sys/ia64/include/endian.h
index 5b3d9788fe695..80fae3790d67b 100644
--- a/sys/ia64/include/endian.h
+++ b/sys/ia64/include/endian.h
@@ -28,7 +28,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/endian.h,v 1.14 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/ia64/include/exec.h b/sys/ia64/include/exec.h
index 0386728c7d3d9..337c4775e107f 100644
--- a/sys/ia64/include/exec.h
+++ b/sys/ia64/include/exec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/exec.h,v 1.4 2007/01/12 07:24:36 imp Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/ia64/include/float.h b/sys/ia64/include/float.h
index 6f7baa2ec2cc4..13b436190b758 100644
--- a/sys/ia64/include/float.h
+++ b/sys/ia64/include/float.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/float.h,v 1.8 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*-
diff --git a/sys/ia64/include/floatingpoint.h b/sys/ia64/include/floatingpoint.h
index 22be759195cb1..1f18dfc7344a9 100644
--- a/sys/ia64/include/floatingpoint.h
+++ b/sys/ia64/include/floatingpoint.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/floatingpoint.h,v 1.3 2007/01/12 07:24:36 imp Exp $
  */
 
 #include <machine/ieeefp.h>
diff --git a/sys/ia64/include/fpu.h b/sys/ia64/include/fpu.h
index 7a068ddf0fcd1..84b5dc90e74e5 100644
--- a/sys/ia64/include/fpu.h
+++ b/sys/ia64/include/fpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/fpu.h,v 1.3 2004/12/11 06:15:12 marcel Exp $
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/ia64/include/frame.h b/sys/ia64/include/frame.h
index 262a8bfd6457b..f31bc24100481 100644
--- a/sys/ia64/include/frame.h
+++ b/sys/ia64/include/frame.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/frame.h,v 1.5 2003/05/16 21:26:41 marcel Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/ia64/include/gdb_machdep.h b/sys/ia64/include/gdb_machdep.h
index bc6ec4c66a2ea..74420664ab72e 100644
--- a/sys/ia64/include/gdb_machdep.h
+++ b/sys/ia64/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/gdb_machdep.h,v 1.4 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/ia64/include/ia64_cpu.h b/sys/ia64/include/ia64_cpu.h
index 44926e71b3a22..4278ba0df9ac6 100644
--- a/sys/ia64/include/ia64_cpu.h
+++ b/sys/ia64/include/ia64_cpu.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/ia64_cpu.h,v 1.23 2007/08/05 18:19:38 marcel Exp $
  */
 
 #ifndef _MACHINE_IA64_CPU_H_
diff --git a/sys/ia64/include/ieee.h b/sys/ia64/include/ieee.h
index 0b1f6312bead4..891bcf84bf18a 100644
--- a/sys/ia64/include/ieee.h
+++ b/sys/ia64/include/ieee.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/ieee.h,v 1.3 2005/01/06 22:18:23 imp Exp $ */
 /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/ieeefp.h b/sys/ia64/include/ieeefp.h
index 3b0cd4b9b7810..ad4d1744f120f 100644
--- a/sys/ia64/include/ieeefp.h
+++ b/sys/ia64/include/ieeefp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/ieeefp.h,v 1.5 2006/07/05 06:10:21 bde Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/ia64/include/in_cksum.h b/sys/ia64/include/in_cksum.h
index 09920062a0ae9..e62a1163e3078 100644
--- a/sys/ia64/include/in_cksum.h
+++ b/sys/ia64/include/in_cksum.h
@@ -29,7 +29,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
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/in_cksum.h,v 1.3 2005/03/02 21:33:27 joerg Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/ia64/include/intr.h b/sys/ia64/include/intr.h
index 7d59ef217d612..be88a489b7055 100644
--- a/sys/ia64/include/intr.h
+++ b/sys/ia64/include/intr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/intr.h,v 1.5 2007/07/30 22:29:33 marcel Exp $
  */
 
 #ifndef _MACHINE_INTR_H_
diff --git a/sys/ia64/include/intrcnt.h b/sys/ia64/include/intrcnt.h
index c4f73c014306d..efaadb418a28e 100644
--- a/sys/ia64/include/intrcnt.h
+++ b/sys/ia64/include/intrcnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/intrcnt.h,v 1.6 2005/01/06 22:18:23 imp Exp $ */
 /* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
 
 /*-
diff --git a/sys/ia64/include/kdb.h b/sys/ia64/include/kdb.h
index d8a12e037b4cc..fd2e84c380de6 100644
--- a/sys/ia64/include/kdb.h
+++ b/sys/ia64/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/kdb.h,v 1.5 2007/06/09 21:55:17 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/ia64/include/limits.h b/sys/ia64/include/limits.h
index 62772bcc48b16..816bccf1573e8 100644
--- a/sys/ia64/include/limits.h
+++ b/sys/ia64/include/limits.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/limits.h,v 1.13 2005/03/02 21:33:27 joerg Exp $ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/mca.h b/sys/ia64/include/mca.h
index 997c2212bd9d0..894d1e3f30d7a 100644
--- a/sys/ia64/include/mca.h
+++ b/sys/ia64/include/mca.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/mca.h,v 1.6 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_MCA_H_
diff --git a/sys/ia64/include/md_var.h b/sys/ia64/include/md_var.h
index 738fefa08d9e1..0a36d0341f2b9 100644
--- a/sys/ia64/include/md_var.h
+++ b/sys/ia64/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.26 2007/08/06 05:11:01 marcel Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/ia64/include/memdev.h b/sys/ia64/include/memdev.h
index 32cc1fc1f4222..6c293f847d252 100644
--- a/sys/ia64/include/memdev.h
+++ b/sys/ia64/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/memdev.h,v 1.2 2004/08/01 18:51:44 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/ia64/include/mutex.h b/sys/ia64/include/mutex.h
index 96d8f3d48a826..83ec78609cc67 100644
--- a/sys/ia64/include/mutex.h
+++ b/sys/ia64/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/mutex.h,v 1.16 2001/12/18 00:27:16 jhb Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/ia64/include/nexusvar.h b/sys/ia64/include/nexusvar.h
index be38f33a0753f..a942bfe5cabf1 100644
--- a/sys/ia64/include/nexusvar.h
+++ b/sys/ia64/include/nexusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/nexusvar.h,v 1.2 2002/08/22 19:47:10 mux Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_
diff --git a/sys/ia64/include/pal.h b/sys/ia64/include/pal.h
index 6cb865d60ed72..7d792ac2bd9dd 100644
--- a/sys/ia64/include/pal.h
+++ b/sys/ia64/include/pal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/pal.h,v 1.5 2001/10/21 05:52:54 marcel Exp $
  */
 
 #ifndef _MACHINE_PAL_H_
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index c71c6e5a7bf3b..bd2b2e1fe76c4 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/param.h,v 1.24 2006/01/09 06:05:57 imp Exp $ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*-
diff --git a/sys/ia64/include/pc/display.h b/sys/ia64/include/pc/display.h
index fad568c0cb815..b622d88c18852 100644
--- a/sys/ia64/include/pc/display.h
+++ b/sys/ia64/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pc/display.h,v 1.1 2000/09/29 13:48:14 dfr Exp $
  *	from: i386/include/pc display.h,v 1.4
  */
 
diff --git a/sys/ia64/include/pcb.h b/sys/ia64/include/pcb.h
index 5d250bfeefdc2..60bd6c5508d7e 100644
--- a/sys/ia64/include/pcb.h
+++ b/sys/ia64/include/pcb.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/pcb.h,v 1.16 2004/08/16 19:05:08 marcel Exp $
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/ia64/include/pci_cfgreg.h b/sys/ia64/include/pci_cfgreg.h
index b4d2702b54eea..121298df073f3 100644
--- a/sys/ia64/include/pci_cfgreg.h
+++ b/sys/ia64/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pci_cfgreg.h,v 1.2 2005/01/06 22:18:23 imp Exp $
  *
  */
 
diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h
index d641816d1f958..ede383b5ecfc5 100644
--- a/sys/ia64/include/pcpu.h
+++ b/sys/ia64/include/pcpu.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pcpu.h,v 1.20 2007/06/04 21:38:47 attilio Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/ia64/include/pmap.h b/sys/ia64/include/pmap.h
index 49ffe91ccaa92..bee29eade1c2b 100644
--- a/sys/ia64/include/pmap.h
+++ b/sys/ia64/include/pmap.h
@@ -39,7 +39,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
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.28 2006/11/13 06:26:57 ru Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/ia64/include/pmc_mdep.h b/sys/ia64/include/pmc_mdep.h
index cf643c7b4f399..6a87d300c9bb2 100644
--- a/sys/ia64/include/pmc_mdep.h
+++ b/sys/ia64/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/ia64/include/proc.h b/sys/ia64/include/proc.h
index 5cbc0bf89f52b..88a1cdbe55225 100644
--- a/sys/ia64/include/proc.h
+++ b/sys/ia64/include/proc.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/proc.h,v 1.15 2005/08/06 20:28:19 marcel Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/ia64/include/profile.h b/sys/ia64/include/profile.h
index 73ce5782ee8ff..b0648c93ca955 100644
--- a/sys/ia64/include/profile.h
+++ b/sys/ia64/include/profile.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/profile.h,v 1.12 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/ia64/include/pte.h b/sys/ia64/include/pte.h
index f57cb4dd17ae5..644a498c696fe 100644
--- a/sys/ia64/include/pte.h
+++ b/sys/ia64/include/pte.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/pte.h,v 1.5 2004/11/21 21:40:08 marcel Exp $
  */
 
 #ifndef _MACHINE_PTE_H_
diff --git a/sys/ia64/include/ptrace.h b/sys/ia64/include/ptrace.h
index d73077dabf21b..0ec25e471550a 100644
--- a/sys/ia64/include/ptrace.h
+++ b/sys/ia64/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/ptrace.h,v 1.6 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/ia64/include/reg.h b/sys/ia64/include/reg.h
index 453c9b8314125..ea7725deeea59 100644
--- a/sys/ia64/include/reg.h
+++ b/sys/ia64/include/reg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/ia64/include/reg.h,v 1.13 2004/03/20 05:27:14 marcel Exp $
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/ia64/include/reloc.h b/sys/ia64/include/reloc.h
index 0e4155dac4cf7..e98ff3b1e3ed0 100644
--- a/sys/ia64/include/reloc.h
+++ b/sys/ia64/include/reloc.h
@@ -26,5 +26,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/reloc.h,v 1.3 2007/01/12 07:24:36 imp Exp $
  */
diff --git a/sys/ia64/include/resource.h b/sys/ia64/include/resource.h
index edde5eb299085..ee64c27fbecbd 100644
--- a/sys/ia64/include/resource.h
+++ b/sys/ia64/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/resource.h,v 1.2 2005/01/06 22:18:23 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/ia64/include/runq.h b/sys/ia64/include/runq.h
index f5189a15a9707..9ff4fba8bc92b 100644
--- a/sys/ia64/include/runq.h
+++ b/sys/ia64/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/runq.h,v 1.5 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/ia64/include/sal.h b/sys/ia64/include/sal.h
index 759cc9fb18542..f133096152866 100644
--- a/sys/ia64/include/sal.h
+++ b/sys/ia64/include/sal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sal.h,v 1.6 2004/09/19 03:50:46 marcel Exp $
  */
 
 #ifndef _MACHINE_SAL_H_
diff --git a/sys/ia64/include/sapicreg.h b/sys/ia64/include/sapicreg.h
index 8f7dfbd34a265..41467b8cbab1e 100644
--- a/sys/ia64/include/sapicreg.h
+++ b/sys/ia64/include/sapicreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sapicreg.h,v 1.1 2001/10/05 10:30:08 dfr Exp $
  */
 
 #ifndef _MACHINE_SAPICREG_H_
diff --git a/sys/ia64/include/sapicvar.h b/sys/ia64/include/sapicvar.h
index 30a353cb6dd17..ade1122daf9f2 100644
--- a/sys/ia64/include/sapicvar.h
+++ b/sys/ia64/include/sapicvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sapicvar.h,v 1.5 2007/07/30 22:29:33 marcel Exp $
  */
 
 #ifndef _MACHINE_SAPICVAR_H_
diff --git a/sys/ia64/include/setjmp.h b/sys/ia64/include/setjmp.h
index 0e7641eea4034..a335bdc472e11 100644
--- a/sys/ia64/include/setjmp.h
+++ b/sys/ia64/include/setjmp.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.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.12 2003/07/26 08:03:43 marcel Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/ia64/include/sf_buf.h b/sys/ia64/include/sf_buf.h
index 8d67542e0e576..bfe3094695411 100644
--- a/sys/ia64/include/sf_buf.h
+++ b/sys/ia64/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sf_buf.h,v 1.2 2004/04/18 07:11:12 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/ia64/include/sigframe.h b/sys/ia64/include/sigframe.h
index d0e886e9bc900..022686a12598a 100644
--- a/sys/ia64/include/sigframe.h
+++ b/sys/ia64/include/sigframe.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sigframe.h,v 1.3 2002/10/25 19:10:57 peter Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/ia64/include/signal.h b/sys/ia64/include/signal.h
index d99013c362028..923d72b8c7760 100644
--- a/sys/ia64/include/signal.h
+++ b/sys/ia64/include/signal.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/signal.h,v 1.14 2005/08/20 16:44:41 stefanf Exp $ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*-
diff --git a/sys/ia64/include/smp.h b/sys/ia64/include/smp.h
index cf1fab31f317c..c036676c47168 100644
--- a/sys/ia64/include/smp.h
+++ b/sys/ia64/include/smp.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/smp.h,v 1.10 2005/08/06 20:28:19 marcel Exp $
  */
 #ifndef _MACHINE_SMP_H_
 #define _MACHINE_SMP_H_
diff --git a/sys/ia64/include/stdarg.h b/sys/ia64/include/stdarg.h
index e6d0988e65eab..93aa3a6bbfabd 100644
--- a/sys/ia64/include/stdarg.h
+++ b/sys/ia64/include/stdarg.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/stdarg.h,v 1.9 2006/09/21 01:37:02 kan Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/ia64/include/sysarch.h b/sys/ia64/include/sysarch.h
index a7f39de2ffe8e..5cf9bddb965d8 100644
--- a/sys/ia64/include/sysarch.h
+++ b/sys/ia64/include/sysarch.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/sysarch.h,v 1.4 2004/01/09 16:52:08 nectar Exp $
  */
 
 #ifndef _MACHINE_SYSARCH_H_
diff --git a/sys/ia64/include/ucontext.h b/sys/ia64/include/ucontext.h
index 5619d59068c9a..fd3f17787c06b 100644
--- a/sys/ia64/include/ucontext.h
+++ b/sys/ia64/include/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/ucontext.h,v 1.7 2003/12/07 20:47:33 marcel Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/ia64/include/unwind.h b/sys/ia64/include/unwind.h
index b1d512c349e40..6cf30357ff994 100644
--- a/sys/ia64/include/unwind.h
+++ b/sys/ia64/include/unwind.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/unwind.h,v 1.7 2005/01/06 22:18:23 imp Exp $
  */
 
 #ifndef _MACHINE_UNWIND_H_
diff --git a/sys/ia64/include/varargs.h b/sys/ia64/include/varargs.h
index 3ed42315c8c84..96ead78d5d1f8 100644
--- a/sys/ia64/include/varargs.h
+++ b/sys/ia64/include/varargs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/include/varargs.h,v 1.5 2003/09/28 05:34:07 marcel Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/ia64/include/vmparam.h b/sys/ia64/include/vmparam.h
index c7dac2c8e3d31..0cb8de8662a8c 100644
--- a/sys/ia64/include/vmparam.h
+++ b/sys/ia64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/ia64/include/vmparam.h,v 1.17 2007/09/25 06:25:05 alc Exp $ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_MACHINE_VMPARAM_H
 #define	_MACHINE_VMPARAM_H
diff --git a/sys/ia64/isa/isa.c b/sys/ia64/isa/isa.c
index 889b90721b030..9aa199e16ef24 100644
--- a/sys/ia64/isa/isa.c
+++ b/sys/ia64/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/isa/isa.c,v 1.4 2007/02/24 16:56:22 piso Exp $
  */
 
 /*
diff --git a/sys/ia64/isa/isa_dma.c b/sys/ia64/isa/isa_dma.c
index 0f4fddb8eef81..884895b0de4e5 100644
--- a/sys/ia64/isa/isa_dma.c
+++ b/sys/ia64/isa/isa_dma.c
@@ -31,7 +31,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 $
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/isa/isa_dma.c,v 1.10 2007/07/09 04:58:16 marcel Exp $
  */
 
 /*
diff --git a/sys/ia64/pci/pci_cfgreg.c b/sys/ia64/pci/pci_cfgreg.c
index cef743b89f7aa..945dc3d120074 100644
--- a/sys/ia64/pci/pci_cfgreg.c
+++ b/sys/ia64/pci/pci_cfgreg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/pci/pci_cfgreg.c,v 1.2 2001/10/03 08:25:58 dfr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 05f6a5c92993b..ffc502f868d7c 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/isa_common.c,v 1.46 2007/04/17 15:14:23 jhb Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 4d61d463462d7..efa344bdd5fff 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isa_common.h,v 1.15 2007/02/23 12:19:01 piso Exp $
  */
 
 /*
diff --git a/sys/isa/isa_dmareg.h b/sys/isa/isa_dmareg.h
index 33c768f5c3bf8..bdcafb4ace6a2 100644
--- a/sys/isa/isa_dmareg.h
+++ b/sys/isa/isa_dmareg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isa_dmareg.h,v 1.1 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _ISA_ISA_DMAREG_H_
diff --git a/sys/isa/isa_if.m b/sys/isa/isa_if.m
index dc64fc568b94b..dcb1726eb9412 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/isa/isa_if.m,v 1.7 2005/01/06 22:18:23 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index 01f88233a338e..9a82d1389aefd 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/isahint.c,v 1.18 2006/07/08 16:50:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index 534d76a59493f..caefa4afb66d0 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isareg.h,v 1.13 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifdef PC98
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 86641ced4050d..7d312d4cb6fc0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/isavar.h,v 1.29 2005/04/13 03:26:24 mdodd Exp $
  */
 
 #ifndef _ISA_ISAVAR_H_
diff --git a/sys/isa/orm.c b/sys/isa/orm.c
index f25312fbe305d..ace75e499d3b6 100644
--- a/sys/isa/orm.c
+++ b/sys/isa/orm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/orm.c,v 1.5 2004/07/05 17:26:04 imp Exp $");
 
 /*
  * Driver to take care of holes in ISA I/O memory occupied
diff --git a/sys/isa/pnp.c b/sys/isa/pnp.c
index 2b9db6b69741c..ad36fde5c749f 100644
--- a/sys/isa/pnp.c
+++ b/sys/isa/pnp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/pnp.c,v 1.21 2005/09/28 15:01:58 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c
index 7f051d6da1ff9..f3b53bbd4e777 100644
--- a/sys/isa/pnpparse.c
+++ b/sys/isa/pnpparse.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/pnpparse.c,v 1.15 2006/12/30 11:55:47 ceri Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/isa/pnpreg.h b/sys/isa/pnpreg.h
index abd181198d412..a2b27bda92b7b 100644
--- a/sys/isa/pnpreg.h
+++ b/sys/isa/pnpreg.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/isa/pnpreg.h,v 1.6 2005/01/06 22:18:23 imp Exp $
  *      from: pnp.h,v 1.7 1998/09/13 22:15:44 eivind Exp
  */
 
diff --git a/sys/isa/pnpvar.h b/sys/isa/pnpvar.h
index 291c8130a83db..5cedec089540e 100644
--- a/sys/isa/pnpvar.h
+++ b/sys/isa/pnpvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/isa/pnpvar.h,v 1.8 2004/12/24 22:08:57 imp Exp $
  */
 
 #ifndef _ISA_PNPVAR_H_
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index 35bef94e08e9a..aa40fb51e4505 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/isa/rtc.h,v 1.13 2004/04/07 20:46:09 imp Exp $
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 6d8cefa137fdf..b351327905498 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/syscons_isa.c,v 1.29 2007/02/27 17:22:30 jhb Exp $");
 
 #include "opt_syscons.h"
 
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index d69236d11b85f..b3cf88f27a441 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/isa/vga_isa.c,v 1.34 2005/12/04 02:12:43 ru Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 6578853e6ed3b..25bd209922ab7 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.20 2007/07/05 08:55:14 bz Exp $
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
 
 SYS?=	${.CURDIR}/..
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index 56920580680fc..34724b4b0da06 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/21/94
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/Makefile,v 1.14 2007/06/25 05:06:56 rafan Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index 59838dbce78b3..770ac50369012 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/bus_if.m,v 1.34 2007/02/23 12:19:01 piso Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/clock_if.m b/sys/kern/clock_if.m
index cb1179aed203a..fbca6132708b3 100644
--- a/sys/kern/clock_if.m
+++ b/sys/kern/clock_if.m
@@ -22,7 +22,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/clock_if.m,v 1.2 2005/01/06 23:35:38 imp Exp $
 
 #include <sys/bus.h>
 #include <sys/time.h>
diff --git a/sys/kern/cpufreq_if.m b/sys/kern/cpufreq_if.m
index 8b1213e2b3d8f..866165f6c75a9 100644
--- a/sys/kern/cpufreq_if.m
+++ b/sys/kern/cpufreq_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/cpufreq_if.m,v 1.2 2005/02/18 00:23:36 njl Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/device_if.m b/sys/kern/device_if.m
index 2931c0a5cd2f5..9e9b230d54e51 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/device_if.m,v 1.12 2005/01/06 23:35:38 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/genassym.sh b/sys/kern/genassym.sh
index 70ad69ebd1d49..6da45023d4f08 100644
--- a/sys/kern/genassym.sh
+++ b/sys/kern/genassym.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/genassym.sh,v 1.4 2002/02/11 03:54:30 obrien Exp $
 
 # Grrr, this should use stdin and stdout, but is encrufted for compatibility.
 
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 45b39c2ebb5bd..5b46c84be8755 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_aout.c,v 1.101.4.1 2008/01/19 18:15:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 1b8639fc98972..f1af721ea972a 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.178.2.2.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c
index b286f315e1ba7..477bb83363bf2 100644
--- a/sys/kern/imgact_elf32.c
+++ b/sys/kern/imgact_elf32.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf32.c,v 1.3 2003/06/11 00:56:54 obrien Exp $");
 
 #define __ELF_WORD_SIZE 32
 #include <kern/imgact_elf.c>
diff --git a/sys/kern/imgact_elf64.c b/sys/kern/imgact_elf64.c
index db2470dd915a5..f5d0f2a2dfe8b 100644
--- a/sys/kern/imgact_elf64.c
+++ b/sys/kern/imgact_elf64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf64.c,v 1.3 2003/06/11 00:56:54 obrien Exp $");
 
 #define __ELF_WORD_SIZE 64
 #include <kern/imgact_elf.c>
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 3cd1dab4dc094..6e211e9497dac 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_gzip.c,v 1.55.4.1 2008/01/19 18:15:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 2f8b133e16853..4adbac335fe14 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_shell.c,v 1.35 2005/06/19 02:21:03 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 383ebc478ed34..f5f36ae78d18e 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/inflate.c,v 1.20 2005/10/31 15:41:25 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/inflate.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 50737539e83d8..f6715ed6fa643 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.283.2.2 2007/12/14 13:41:08 rrs Exp $");
 
 #include "opt_ddb.h"
 #include "opt_init_path.h"
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 551c2573b8d74..2423586ddb86b 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.230 2007/08/16 05:32:25 davidxu Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp 
  */
 
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 1c3fba0ebf336..e9fe58f28ff43 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.95 2007/08/31 13:56:26 dds Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c
index a141034577fe8..68a15d7f5c32e 100644
--- a/sys/kern/kern_alq.c
+++ b/sys/kern/kern_alq.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.19 2007/06/01 14:33:11 kib Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 210f5d3f2c461..def1ad08c1339 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.202 2007/09/17 05:27:20 jeff Exp $");
 
 #include "opt_kdb.h"
 #include "opt_device_polling.h"
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index 5d3403acc5110..164e06ed399ec 100644
--- a/sys/kern/kern_condvar.c
+++ b/sys/kern/kern_condvar.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.62 2007/06/04 23:50:56 jeff Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 1cc8a1553ac19..13e00dcdac507 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.208.2.1 2007/12/07 03:45:16 thompsa Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c
index f951fca4da966..825d47a90f9a5 100644
--- a/sys/kern/kern_context.c
+++ b/sys/kern/kern_context.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_context.c,v 1.9 2007/03/05 13:10:57 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c
index f8f8c3670fac3..3f65396cf6318 100644
--- a/sys/kern/kern_cpu.c
+++ b/sys/kern/kern_cpu.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_cpu.c,v 1.27.4.1 2008/01/19 20:30:59 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 8532c8772ed1f..1e21022a8b50d 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.313.4.1 2008/02/14 11:45:41 simon Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 9737f355fb697..7005d4f6fbe24 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.47 2007/03/05 13:10:57 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index aa446b6079f79..2754d76709a8f 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.113 2007/07/14 21:23:30 rodrigc Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index ec5723b25e26c..5ed43c1da171b 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.308.2.1.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 696a1017e16aa..fd0d4bc7c96d3 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.304 2007/06/13 20:01:42 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 711fba2b61144..170eb29d0999f 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.282.2.1.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c
index 7d0925ee95791..460708c51c4ae 100644
--- a/sys/kern/kern_idle.c
+++ b/sys/kern/kern_idle.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_idle.c,v 1.48 2007/06/05 00:00:53 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index d754440c3c158..078dd198eb0b6 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.147 2007/06/05 00:00:54 jeff Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index f61b301912154..5095a0dbecab9 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.70 2007/04/13 23:54:22 pjd Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index b044605bd0414..49ced1446ef35 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.235.4.1 2008/01/19 18:15:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 03f7f47020b33..7295f205d0b3a 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_kthread.c,v 1.38 2007/06/05 00:00:54 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c
index 721cc528e3b90..31c69ca9f3edc 100644
--- a/sys/kern/kern_ktr.c
+++ b/sys/kern/kern_ktr.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktr.c,v 1.53 2006/09/09 16:09:01 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktr.h"
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 2b7ee33a9cd75..5a7b2677e1ada 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.121 2007/08/29 21:17:11 jhb Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 764033418ec71..2164a952b412d 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.149 2007/05/31 11:51:51 kib Exp $");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 2203c215a1895..9a02fa5060126 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.110 2007/05/18 15:04:59 jhb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_global.h"
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 51fbc301363c0..bd28cf307b539 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.57 2007/08/07 09:04:50 kib Exp $");
 
 #include "opt_debug_lockf.h"
 
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index ee5d3708b3ecb..3d89243bbce82 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.162 2007/06/27 13:39:38 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_vm.h"
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 04a93b47d2025..ea0d92a94c97b 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.32.2.1 2007/12/15 23:16:04 rrs Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index c405adf5b3b34..54f6790d9a378 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mib.c,v 1.84.2.1 2007/12/06 14:19:42 kib Exp $");
 
 #include "opt_posix.h"
 #include "opt_config.h"
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 9a1f159e30606..e27cc7eef9cdd 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -27,7 +27,7 @@
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_module.c,v 1.52.2.1 2007/12/19 20:37:53 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c
index aab28b6fba40a..c254f2f9b28bc 100644
--- a/sys/kern/kern_mtxpool.c
+++ b/sys/kern/kern_mtxpool.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mtxpool.c,v 1.12 2007/05/27 20:50:23 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index d37d05709ebe8..10df79ad6fb74 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.198.2.1 2007/12/01 11:28:37 attilio Exp $");
 
 #include "opt_adaptive_mutexes.h"
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 30cb4b1ca7013..90e91c693a7de 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.64 2007/06/14 18:37:58 rwatson Exp $");
 
 #include "opt_ntp.h"
 
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index d6be6e7c087e2..d5e03824a5eb4 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_physio.c,v 1.68 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_pmc.c b/sys/kern/kern_pmc.c
index 6d5d7af803e1b..3ab6296559aca 100644
--- a/sys/kern/kern_pmc.c
+++ b/sys/kern/kern_pmc.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_pmc.c,v 1.6 2005/12/04 02:12:43 ru Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index a908f00955919..1d044aaf6b2df 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.31 2007/08/06 14:26:00 rwatson Exp $");
 
 #include "opt_device_polling.h"
 
diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c
index 1190cd42e5bb5..72d34b9d130f6 100644
--- a/sys/kern/kern_priv.c
+++ b/sys/kern/kern_priv.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/kern_priv.c,v 1.4 2007/07/02 14:03:29 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index fab10fdd98d05..5f898b3712229 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.252.2.2.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 18d3b2a0f0e18..33962a4a5e6f8 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.211 2007/06/12 00:11:59 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 4e22054c34bc2..d775a5f04b627 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.180.2.1 2007/12/20 07:15:40 davidxu Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index 76a8aa45c2570..d8143dee2e234 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.28.4.2 2007/12/01 11:28:37 attilio Exp $");
 
 #include "opt_ddb.h"
 #include "opt_no_adaptive_rwlocks.h"
diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c
index f09099e4b2e03..1ad0fbf22452c 100644
--- a/sys/kern/kern_sema.c
+++ b/sys/kern/kern_sema.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sema.c,v 1.6 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index d15bd7b670ea8..e694b8c22fb2b 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.182.4.1 2008/01/30 21:21:50 ru Exp $");
 
 #include "opt_kdb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index e629f03c8ddfe..6f08d551eb2c9 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.349.2.1.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 2101026ce5e4e..e7cdefca75956 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.103 2007/06/05 00:00:54 jeff Exp $");
 
 #include "opt_zero.h"
 
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index 994e604b9fac7..414fae9cf9d8a 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -26,7 +26,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.137 2007/10/08 23:37:28 jeff Exp $");
 
 #include "opt_sched.h"
 
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
index 23dd4b620ed2a..b4bbc98c51219 100644
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -40,7 +40,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.55 2007/10/02 14:48:48 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/ktr.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 71d5c27bd3b8c..204123f0d1fb0 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.302 2007/10/08 23:40:40 jeff Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index 6452d968696e5..2675e1424ff4f 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.12 2006/08/01 16:32:20 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index dc64f31b88fd0..6baa54af90771 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.177 2007/09/02 09:59:33 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index bda9fb7be9efa..34121648db4e6 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.178 2007/06/04 18:25:07 dwmalone Exp $");
 
 #include "opt_ntp.h"
 
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 6bf0dedfe425d..8c44f549572ec 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.62.4.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_posix.h"
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index bcf2d32e989d7..2661af0a7ecc4 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.255.2.1.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index e220cd6e5a4ac..b5d7aa35d6659 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.142 2007/06/09 21:48:44 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index d173359a2f11b..2f68d5c1ed234 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.106 2007/09/15 12:33:23 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 5b09fd32714d2..4452816f1af7b 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.61.2.1 2007/12/20 07:15:40 davidxu Exp $");
 
 #include "opt_compat.h"
 #include <sys/param.h>
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 8613b180e4262..44eb30fa7a5ba 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index b701372b2c756..dfdf1a78abdfe 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.49 2007/03/05 13:10:57 rwatson Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/ksched.c b/sys/kern/ksched.c
index 192034fec9cd2..d513dff09c52f 100644
--- a/sys/kern/ksched.c
+++ b/sys/kern/ksched.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/ksched.c,v 1.36 2007/06/05 00:00:54 jeff Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 5e9480c025dcf..5ac3908ac2655 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.93 2007/05/31 11:51:51 kib Exp $");
 
 #include "opt_gdb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 6426fc06ed045..0962323db734e 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.95 2007/05/31 11:51:51 kib Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/linker_if.m b/sys/kern/linker_if.m
index 84d56d2d6f7e1..a4c2bb605e771 100644
--- a/sys/kern/linker_if.m
+++ b/sys/kern/linker_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/linker_if.m,v 1.6 2005/01/06 23:35:39 imp Exp $
 #
 
 #include <sys/linker.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 6a0967d4368b2..5aea2cea57fd3 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
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.68 2007/07/04 22:38:28 peter Exp $
 
 set -e
 
diff --git a/sys/kern/md4c.c b/sys/kern/md4c.c
index 84a294aaf533c..d5562af631ae7 100644
--- a/sys/kern/md4c.c
+++ b/sys/kern/md4c.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/md4c.c,v 1.3 2005/01/06 23:35:39 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index 50e2022154ac4..4672925422e86 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -30,7 +30,7 @@
  * This file should be kept in sync with src/lib/libmd/md5c.c
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/md5c.c,v 1.27 2006/03/30 18:45:50 pjd Exp $");
 
 #include <sys/types.h>
 
diff --git a/sys/kern/p1003_1b.c b/sys/kern/p1003_1b.c
index e998385dca2a0..38a3a2d1750cc 100644
--- a/sys/kern/p1003_1b.c
+++ b/sys/kern/p1003_1b.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/p1003_1b.c,v 1.36 2007/10/08 23:45:23 jeff Exp $");
 
 #include "opt_posix.h"
 
diff --git a/sys/kern/posix4_mib.c b/sys/kern/posix4_mib.c
index 5242b316ee773..5bd21b2090bfb 100644
--- a/sys/kern/posix4_mib.c
+++ b/sys/kern/posix4_mib.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/posix4_mib.c,v 1.12 2006/11/12 03:34:03 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 480d5c4319368..8ed782da4bcc3 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.106.2.1 2007/12/20 07:15:40 davidxu Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 1ef177f7247d8..bca2a6b80101c 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.214.2.2 2007/12/20 07:15:40 davidxu Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
diff --git a/sys/kern/serdev_if.m b/sys/kern/serdev_if.m
index fbf4363c093bb..2f6ae6f33d78e 100644
--- a/sys/kern/serdev_if.m
+++ b/sys/kern/serdev_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/serdev_if.m,v 1.2 2006/04/23 22:12:39 marcel Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c
index d3f944d3afe1a..db864d50ab4ec 100644
--- a/sys/kern/subr_acl_posix1e.c
+++ b/sys/kern/subr_acl_posix1e.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_acl_posix1e.c,v 1.52 2007/06/12 00:11:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 067e15566ddf7..4dc0860a48d6d 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.23 2006/07/19 18:53:56 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 2c83499072de1..91047fd1a177a 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_blist.c,v 1.17 2004/06/04 04:03:25 alc Exp $");
 
 #ifdef _KERNEL
 
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 3e45743ffd6f6..1affaffdcf988 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.201.4.1 2008/02/06 03:35:40 iwasaki Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c
index b2f7827b5877d..38bf641ab3a4c 100644
--- a/sys/kern/subr_clock.c
+++ b/sys/kern/subr_clock.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.12 2007/07/23 09:42:31 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 8a7eff58e5a1d..527d28df4a6f3 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_devstat.c,v 1.51 2005/05/03 10:58:05 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index c8ed9ced60726..d2f7b98043977 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_disk.c,v 1.88 2006/10/31 21:11:21 pjd Exp $");
 
 #include "opt_geom.h"
 
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index 885c01344e87b..a65f003dac60b 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_eventhandler.c,v 1.23 2005/02/23 19:32:29 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_fattime.c b/sys/kern/subr_fattime.c
index c3669ada2b819..42212d425cf5e 100644
--- a/sys/kern/subr_fattime.c
+++ b/sys/kern/subr_fattime.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_fattime.c,v 1.2 2006/10/24 10:27:23 phk Exp $
  *
  * Convert MS-DOS FAT format timestamps to and from unix timespecs
  *
diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c
index 388a331121a06..c20d443fa38f8 100644
--- a/sys/kern/subr_firmware.c
+++ b/sys/kern/subr_firmware.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_firmware.c,v 1.9 2007/02/15 17:21:31 luigi Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
index a46b938ef37e6..b9b2b330764fa 100644
--- a/sys/kern/subr_hints.c
+++ b/sys/kern/subr_hints.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_hints.c,v 1.13 2006/07/09 21:42:58 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 0ab79fbc2af10..c37e81b27b3ce 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.24 2007/09/17 05:27:20 jeff Exp $");
 
 #include "opt_kdb.h"
 
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c
index 4e2f096499b83..4ffc0a3f1493b 100644
--- a/sys/kern/subr_kobj.c
+++ b/sys/kern/subr_kobj.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_kobj.c,v 1.10 2005/12/29 18:00:42 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c
index 33e2bdd92f041..dee8535f26d32 100644
--- a/sys/kern/subr_lock.c
+++ b/sys/kern/subr_lock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.17 2007/09/14 01:12:39 attilio Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mprof.h"
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index cd9a70abf12c3..0201a82426dfc 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_log.c,v 1.64 2005/02/27 22:01:09 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_mbpool.c b/sys/kern/subr_mbpool.c
index ab80a5e4572f5..fac7f5e0f8563 100644
--- a/sys/kern/subr_mbpool.c
+++ b/sys/kern/subr_mbpool.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_mbpool.c,v 1.4 2007/05/27 17:38:36 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/kern/subr_mchain.c b/sys/kern/subr_mchain.c
index dc70af2928c1c..f9e346ba544ad 100644
--- a/sys/kern/subr_mchain.c
+++ b/sys/kern/subr_mchain.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_mchain.c,v 1.18 2005/07/29 13:22:36 imura Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 1517129c81a1c..2db107054ade2 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_module.c,v 1.8 2003/06/11 00:56:57 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_msgbuf.c b/sys/kern/subr_msgbuf.c
index 14cd39dd83167..52c326496a15f 100644
--- a/sys/kern/subr_msgbuf.c
+++ b/sys/kern/subr_msgbuf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_msgbuf.c,v 1.3 2005/01/06 23:35:39 imp Exp $
  */
 
 /*
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 833842b68c962..3626898ed8f60 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.73 2005/10/16 03:58:10 kris Exp $");
 
 #include "opt_param.h"
 #include "opt_maxusers.h"
diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c
index bf9b0c71df725..5ba196803a079 100644
--- a/sys/kern/subr_pcpu.c
+++ b/sys/kern/subr_pcpu.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_pcpu.c,v 1.8 2005/11/03 21:06:29 jhb Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index ac6cd7194eca7..cdf8d16be009d 100644
--- a/sys/kern/subr_power.c
+++ b/sys/kern/subr_power.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_power.c,v 1.8 2005/11/09 16:22:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index a0605abe45fe3..36717241fec1f 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_prf.c,v 1.130 2007/03/08 06:44:34 julian Exp $");
 
 #include "opt_ddb.h"
 #include "opt_printf.h"
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 8da12ac9e5592..d385352a2e80f 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.79 2007/06/05 00:00:54 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index cdac3ef3fd6aa..9b6d50f13b338 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -58,7 +58,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_rman.c,v 1.57 2007/04/28 07:37:49 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_rtc.c b/sys/kern/subr_rtc.c
index df0df32d6023d..295f75bc5ed74 100644
--- a/sys/kern/subr_rtc.c
+++ b/sys/kern/subr_rtc.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.9 2006/10/02 18:23:37 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index b340ee05eabb6..219954b7f9ccd 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30 2005/12/23 11:49:53 phk Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 0814953424cea..457c34b6078ac 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_scanf.c,v 1.17 2004/04/05 21:03:35 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index 08c9ede9bc361..db1990f057c4f 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.39.4.1 2008/01/29 16:37:04 jhb Exp $");
 
 #include "opt_sleepqueue_profiling.h"
 #include "opt_ddb.h"
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index a88428802aa73..0a2a4ab0ad08d 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.201 2007/09/11 22:54:09 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_stack.c b/sys/kern/subr_stack.c
index 705c21baefdfb..f0eca2ee0c7af 100644
--- a/sys/kern/subr_stack.c
+++ b/sys/kern/subr_stack.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_stack.c,v 1.3 2006/05/28 22:15:28 kris Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 3e210ccbf23fe..21af695c3cbd1 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.39 2007/06/05 00:00:54 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 2a45e7d109805..97962c3de9aec 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.299 2007/09/17 05:27:20 jeff Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 245240b57f611..9dd08b8991c06 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.169 2007/06/12 23:27:31 jeff Exp $");
 
 #include "opt_ddb.h"
 #include "opt_turnstile_profiling.h"
diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 4cd77b052ca53..de240db2acda5 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/subr_unit.c,v 1.9 2007/07/04 06:56:57 kib Exp $
  *
  *
  * Unit number allocation functions.
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 4a4a7ad51104e..f8563348bb2e0 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.236.2.1 2007/11/27 13:18:54 attilio Exp $");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 16bd19509cc90..698ae4cd8bd54 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.158 2007/07/04 22:57:21 peter Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index c1e9546795264..2ebeca534c9fd 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.191.2.1 2007/11/25 11:11:28 dumbbell Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index ff9640a12703d..bd230eb8ceb84 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.145 2007/10/09 00:03:39 jeff Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 9229658ed96bf..afd108fcf40c7 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.73 2007/08/06 14:26:00 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index ea43744902b81..0e0630ea4bdcc 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.214 2007/08/16 05:32:26 davidxu Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp 
  */
 
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 1189f2c8ab36c..c4b08e2c64a06 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
- $FreeBSD$
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.233 2007/08/16 05:26:41 davidxu Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index cc5f1b01f7ce5..20a2459d3b2e1 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/systrace_args.c,v 1.14 2007/08/16 05:32:26 davidxu Exp $
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index 0cbb4bbe8c42f..96868e10a614d 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_ipc.c,v 1.34 2007/06/12 00:11:59 rwatson Exp $");
 
 #include "opt_sysvipc.h"
 
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index bd5ca90686066..31bb5e01abe94 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_msg.c,v 1.70 2007/06/12 00:11:59 rwatson Exp $");
 
 #include "opt_sysvipc.h"
 #include "opt_mac.h"
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 48548a2149179..18afa01032171 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_sem.c,v 1.89 2007/07/03 15:58:47 kib Exp $");
 
 #include "opt_sysvipc.h"
 #include "opt_mac.h"
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 574c3dee6a616..402b13fff401e 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.111 2007/03/05 13:10:57 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_sysvipc.h"
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 932f87a814857..775390641a689 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.273.4.1 2008/01/12 00:20:06 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_tty.h"
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 4e2c16fe88718..734de0c17f7c4 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.39 2006/01/10 09:19:09 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index 77a95937547fd..60c0c957f11c1 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_conf.c,v 1.24 2004/07/15 20:47:40 phk Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 9460725135732..53354e6e0590f 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_cons.c,v 1.139 2007/05/31 11:51:51 kib Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c
index 8aff29e0d905a..efe40a55f1f23 100644
--- a/sys/kern/tty_pts.c
+++ b/sys/kern/tty_pts.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.16 2007/07/05 05:54:47 peter Exp $");
 
 /*
  * Pseudo-teletype Driver
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 0e1bc2659956a..1da34f493cd5b 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.152.2.2.2.2 2008/01/28 12:47:56 kib Exp $");
 
 /*
  * Pseudo-teletype Driver
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index f0dc88d616c01..b556313db46e9 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_subr.c,v 1.43 2005/01/06 23:35:40 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 0b10f83a3f49d..72a92a4e8220f 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/tty_tty.c,v 1.60 2007/07/03 17:46:37 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 4449b5bc5c684..4bd7d395e3e1c 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.19 2005/06/11 11:59:47 maxim Exp $");
 
 #define ACCEPT_FILTER_MOD
 
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c
index b4773d1e399e9..e384b84d68fe0 100644
--- a/sys/kern/uipc_cow.c
+++ b/sys/kern/uipc_cow.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_cow.c,v 1.26 2005/10/23 07:41:56 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c
index 48103c5b53f96..42b4dca61e0c2 100644
--- a/sys/kern/uipc_debug.c
+++ b/sys/kern/uipc_debug.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_debug.c,v 1.2 2007/05/03 14:42:41 rwatson Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 4c326d309d3ad..f770d562d8e6d 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.51 2007/08/06 14:26:00 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 3fefecc17b832..60e389aabd66e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.174 2007/10/06 21:42:39 kmacy Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index c8363f81488ec..bc5f5c321f66f 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.33 2006/10/22 11:52:13 rwatson Exp $");
 
 /*#define PULLDOWN_DEBUG*/
 
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 1c5cadbc3311a..5f041e5147974 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.25 2007/06/12 00:11:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index 426859c02de9b..99b789effdd0b 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.28.4.1 2008/01/17 19:52:01 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_posix.h"
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index be4c0a2507936..a0944f2f4dbd7 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_sockbuf.c,v 1.171.2.1.2.1 2008/02/02 12:44:13 rwatson Exp $");
 
 #include "opt_param.h"
 
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 9c83b04a15654..b5d122be1b31a 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.302.4.1 2008/02/02 12:44:13 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index cb382c61f476f..466a5dd2ab867 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.259.4.2 2008/02/14 11:45:41 simon Exp $");
 
 #include "opt_sctp.h"
 #include "opt_compat.h"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index a0a54285b8980..5e9b26ac29e99 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.206.4.1 2008/01/23 12:08:12 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index c2456be6ce8c8..2c86327d6aa0c 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_acl.c,v 1.53 2007/03/05 13:26:07 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 611c3c115e1db..23005282691b7 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.233.4.1 2008/01/28 10:43:10 dumbbell Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index d3344597f418c..097fcfbe90a3b 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.528 2007/09/26 11:22:23 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 7c1e42836396f..3aa600d1c6841 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.114 2007/09/21 10:16:56 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 7770bc43a01b5..cb46b455c0b23 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_cluster.c,v 1.176 2007/06/01 01:12:44 jeff Exp $");
 
 #include "opt_debug_cluster.h"
 
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 171ac20136a5c..a0431ddc72b9c 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_default.c,v 1.138 2007/05/18 13:02:13 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index e1d618756318f..2974eafb957d1 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.341 2007/02/15 22:08:35 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 48bfd662cbe7b..16ebe37bdcf2b 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_extattr.c,v 1.431 2006/12/23 00:30:03 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vfs_hash.c b/sys/kern/vfs_hash.c
index cfdab1b9595e3..a4e632eee499d 100644
--- a/sys/kern/vfs_hash.c
+++ b/sys/kern/vfs_hash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_hash.c,v 1.13 2007/03/13 01:50:26 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 3ce65ed900dec..f60818992616e 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_init.c,v 1.85 2007/02/16 17:32:41 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 6349c368f4f48..6e1c5a86d84ed 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.102 2007/09/21 10:16:56 pjd Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 00cfcf6211009..bc3aaf80c79f0 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.265.2.1.2.1 2008/01/20 02:38:42 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 50842eb6bda89..638fc178a73a5 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.707.2.1 2007/12/13 11:58:00 kib Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 07a8de1f96125..2f12557d34594 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.443 2007/09/10 00:00:16 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 4f5305e6b06f6..a705b7308fa36 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.252 2007/07/26 16:58:09 pjd Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 6bd98aa2fd68a..e52338e5ff4a3 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.12 (Berkeley) 5/14/95
-# $FreeBSD$
+# $FreeBSD: src/sys/kern/vnode_if.src,v 1.87 2007/05/31 11:51:52 kib Exp $
 #
 
 #
diff --git a/sys/libkern/arc4random.c b/sys/libkern/arc4random.c
index 3a3227cd211f0..12b5d383d2ab1 100644
--- a/sys/libkern/arc4random.c
+++ b/sys/libkern/arc4random.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arc4random.c,v 1.12 2003/08/15 06:34:47 silby Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/libkern/arm/divsi3.S b/sys/libkern/arm/divsi3.S
index 00bacfac0224e..0320da852fdfd 100644
--- a/sys/libkern/arm/divsi3.S
+++ b/sys/libkern/arm/divsi3.S
@@ -15,7 +15,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arm/divsi3.S,v 1.4 2005/01/07 00:24:33 imp Exp $");
 
 /* 
  * stack is aligned as there's a possibility of branching to L_overflow
diff --git a/sys/libkern/arm/ffs.S b/sys/libkern/arm/ffs.S
index 933b91f900b7f..7d2d3ff5aac2b 100644
--- a/sys/libkern/arm/ffs.S
+++ b/sys/libkern/arm/ffs.S
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arm/ffs.S,v 1.4 2005/01/07 00:24:33 imp Exp $");
 
 
 /*
diff --git a/sys/libkern/arm/muldi3.c b/sys/libkern/arm/muldi3.c
index 8cdb478be9b62..c7bd3bed48b15 100644
--- a/sys/libkern/arm/muldi3.c
+++ b/sys/libkern/arm/muldi3.c
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
 #else
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/arm/muldi3.c,v 1.1 2004/05/14 12:28:31 cognet Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 435a35af79d81..3969ffa121f88 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ashldi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 1eab1d60d99f2..86f5aa9a0b9e9 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ashrdi3.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/bcd.c b/sys/libkern/bcd.c
index b68f63fa0e508..dc1212ee639a0 100644
--- a/sys/libkern/bcd.c
+++ b/sys/libkern/bcd.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/bcd.c,v 1.7 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index 90576c6d4c62c..f19f2da855646 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/bcmp.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 #include <machine/endian.h>
diff --git a/sys/libkern/bsearch.c b/sys/libkern/bsearch.c
index 298f32735dfc2..b1fec4ddc1d2b 100644
--- a/sys/libkern/bsearch.c
+++ b/sys/libkern/bsearch.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/bsearch.c,v 1.8 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/crc32.c b/sys/libkern/crc32.c
index 2bfc11efbe578..b51e5a2e1b20d 100644
--- a/sys/libkern/crc32.c
+++ b/sys/libkern/crc32.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.5 2005/04/28 05:50:18 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index 27b1cf0a04294..353f36d57fbd4 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/divdi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 057ee3defc141..bddfd59ca348e 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ffs.c,v 1.11 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/ffsl.c b/sys/libkern/ffsl.c
index 0aa005c63f99f..c53a44f43bb6d 100644
--- a/sys/libkern/ffsl.c
+++ b/sys/libkern/ffsl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ffsl.c,v 1.4 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/fls.c b/sys/libkern/fls.c
index 202d9524de192..296bdad89d22a 100644
--- a/sys/libkern/fls.c
+++ b/sys/libkern/fls.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/fls.c,v 1.4 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/flsl.c b/sys/libkern/flsl.c
index 73533c4b32b58..bbad6d0ed6465 100644
--- a/sys/libkern/flsl.c
+++ b/sys/libkern/flsl.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/flsl.c,v 1.4 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/fnmatch.c b/sys/libkern/fnmatch.c
index d6cdc85ff6fde..031d4e02b5141 100644
--- a/sys/libkern/fnmatch.c
+++ b/sys/libkern/fnmatch.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/fnmatch.c,v 1.20 2006/01/22 00:46:40 rwatson Exp $");
 
 /*
  * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
diff --git a/sys/libkern/gets.c b/sys/libkern/gets.c
index 4834da0f5b769..bdb4c1e313bef 100644
--- a/sys/libkern/gets.c
+++ b/sys/libkern/gets.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/gets.c,v 1.4 2006/01/14 20:45:02 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/cons.h>
diff --git a/sys/libkern/ia64/__divdi3.S b/sys/libkern/ia64/__divdi3.S
index 9465c9c97d0b8..0f098f5e5757c 100644
--- a/sys/libkern/ia64/__divdi3.S
+++ b/sys/libkern/ia64/__divdi3.S
@@ -1,6 +1,6 @@
 .file "__divdi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__divdi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__divsi3.S b/sys/libkern/ia64/__divsi3.S
index f7edd97abe2ee..d951e311a0e1d 100644
--- a/sys/libkern/ia64/__divsi3.S
+++ b/sys/libkern/ia64/__divsi3.S
@@ -1,6 +1,6 @@
 .file "__divsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__divsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__moddi3.S b/sys/libkern/ia64/__moddi3.S
index e731adc23bac7..df03a2c693535 100644
--- a/sys/libkern/ia64/__moddi3.S
+++ b/sys/libkern/ia64/__moddi3.S
@@ -1,6 +1,6 @@
 .file "__moddi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__moddi3.S,v 1.4 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__modsi3.S b/sys/libkern/ia64/__modsi3.S
index 568b20b1b3fc1..69c0981622786 100644
--- a/sys/libkern/ia64/__modsi3.S
+++ b/sys/libkern/ia64/__modsi3.S
@@ -1,6 +1,6 @@
 .file "__modsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__modsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__udivdi3.S b/sys/libkern/ia64/__udivdi3.S
index 91c94294b93d9..c4be01103ee23 100644
--- a/sys/libkern/ia64/__udivdi3.S
+++ b/sys/libkern/ia64/__udivdi3.S
@@ -1,6 +1,6 @@
 .file "__udivdi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__udivdi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__udivsi3.S b/sys/libkern/ia64/__udivsi3.S
index 9597abdc05415..dafed4e4a7505 100644
--- a/sys/libkern/ia64/__udivsi3.S
+++ b/sys/libkern/ia64/__udivsi3.S
@@ -1,6 +1,6 @@
 .file "__udivsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__udivsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__umoddi3.S b/sys/libkern/ia64/__umoddi3.S
index 98708e43b7eba..8873278ccca30 100644
--- a/sys/libkern/ia64/__umoddi3.S
+++ b/sys/libkern/ia64/__umoddi3.S
@@ -1,6 +1,6 @@
 .file "__umoddi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__umoddi3.S,v 1.4 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/__umodsi3.S b/sys/libkern/ia64/__umodsi3.S
index 7df61a65a3517..eccf21ffd50c3 100644
--- a/sys/libkern/ia64/__umodsi3.S
+++ b/sys/libkern/ia64/__umodsi3.S
@@ -1,6 +1,6 @@
 .file "__umodsi3.s"
 
-// $FreeBSD$
+// $FreeBSD: src/sys/libkern/ia64/__umodsi3.S,v 1.2 2005/01/07 00:24:33 imp Exp $
 
 //-
 // Copyright (c) 2000, Intel Corporation
diff --git a/sys/libkern/ia64/bswap16.S b/sys/libkern/ia64/bswap16.S
index d3adc2e92141c..81b1f667886b7 100644
--- a/sys/libkern/ia64/bswap16.S
+++ b/sys/libkern/ia64/bswap16.S
@@ -27,7 +27,7 @@
  *	from: NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd
  *	from: src/sys/libkern/ia64/htons.S,v 1.2 2002/02/18 20:35:21
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ia64/bswap16.S,v 1.2 2005/01/07 00:24:33 imp Exp $
  */
 
 #define	NAME	__bswap16
diff --git a/sys/libkern/ia64/bswap32.S b/sys/libkern/ia64/bswap32.S
index c1c76d188494a..84791faf367cf 100644
--- a/sys/libkern/ia64/bswap32.S
+++ b/sys/libkern/ia64/bswap32.S
@@ -27,7 +27,7 @@
  *	from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd
  *	from: src/sys/libkern/ia64/htonl.S,v 1.2 2002/02/18 20:35:21
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/ia64/bswap32.S,v 1.2 2005/01/07 00:24:33 imp Exp $
  */
 
 #define	NAME	__bswap32
diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S
index 74ad5f79248eb..753a79238d445 100644
--- a/sys/libkern/ia64/byte_swap_2.S
+++ b/sys/libkern/ia64/byte_swap_2.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/libkern/ia64/byte_swap_2.S,v 1.5 2005/01/07 00:24:33 imp Exp $ */
 /*	$NetBSD: byte_swap_2.S,v 1.2 1996/10/17 03:08:08 cgd Exp $	*/
 
 /*-
diff --git a/sys/libkern/ia64/byte_swap_4.S b/sys/libkern/ia64/byte_swap_4.S
index 9aba08d325dba..6be6cce69e5f0 100644
--- a/sys/libkern/ia64/byte_swap_4.S
+++ b/sys/libkern/ia64/byte_swap_4.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/libkern/ia64/byte_swap_4.S,v 1.5 2005/01/07 00:24:33 imp Exp $ */
 /*	$NetBSD: byte_swap_4.S,v 1.2 1996/10/17 03:08:09 cgd Exp $	*/
 
 /*-
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 401252a9dad83..1a3c47ed4c7a4 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/iconv.c,v 1.12 2005/10/31 15:41:26 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/iconv_converter_if.m b/sys/libkern/iconv_converter_if.m
index c366884b115c6..affcfd22d9fde 100644
--- a/sys/libkern/iconv_converter_if.m
+++ b/sys/libkern/iconv_converter_if.m
@@ -29,7 +29,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/libkern/iconv_converter_if.m,v 1.3 2005/01/07 00:24:32 imp Exp $
 #
 
 #include <sys/iconv.h>
diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c
index 8ab4d6c2b3bed..d0492d73e1e25 100644
--- a/sys/libkern/iconv_xlat.c
+++ b/sys/libkern/iconv_xlat.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/iconv_xlat.c,v 1.5 2003/09/26 20:26:24 fjoe Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/iconv_xlat16.c b/sys/libkern/iconv_xlat16.c
index 78e764a86b90b..0dd6543eb7ee9 100644
--- a/sys/libkern/iconv_xlat16.c
+++ b/sys/libkern/iconv_xlat16.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/iconv_xlat16.c,v 1.3 2005/05/24 15:38:08 imura Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index a12d70616c431..f61c89778223d 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/index.c,v 1.10 2007/04/10 21:42:12 wkoszek Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/inet_ntoa.c b/sys/libkern/inet_ntoa.c
index 767b2d9df1755..e99727325301e 100644
--- a/sys/libkern/inet_ntoa.c
+++ b/sys/libkern/inet_ntoa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/inet_ntoa.c,v 1.6 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index 4701394196534..7199335d1146e 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/lshrdi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index e26f6fab3428d..95ee0a2366751 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/mcount.c,v 1.24 2007/06/13 06:17:48 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/gmon.h>
diff --git a/sys/libkern/memset.c b/sys/libkern/memset.c
index 39ad12069607b..c47bfc41f3e68 100644
--- a/sys/libkern/memset.c
+++ b/sys/libkern/memset.c
@@ -24,7 +24,7 @@
  */
 #include <sys/cdefs.h>
 #include <sys/types.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/memset.c,v 1.2 2007/04/06 00:06:26 kan Exp $");
 
 void *memset(void *, int, size_t);
 
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index 050d47e255be3..34f11bf31de0c 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/moddi3.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index c014f028d6c02..7858703873f81 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/qdivrem.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c
index bb0baee73c9f8..746cea85905c0 100644
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/qsort.c,v 1.15 2004/07/15 23:58:23 glebius Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/qsort_r.c b/sys/libkern/qsort_r.c
index 00f9f056048df..b5f6aa2008f7b 100644
--- a/sys/libkern/qsort_r.c
+++ b/sys/libkern/qsort_r.c
@@ -2,7 +2,7 @@
  * This file is in the public domain.  Originally written by Garrett
  * A. Wollman.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/qsort_r.c,v 1.2 2005/01/07 00:24:32 imp Exp $
  */
 #define I_AM_QSORT_R
 #include "libkern/qsort.c"
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 5100bef033a52..9dd1d0ef75f87 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/libkern/quad.h,v 1.18 2004/05/05 15:12:55 bde Exp $
  */
 
 #ifndef _LIBKERN_QUAD_H_
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 360ff81cf35d5..79ba5cf70e408 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/random.c,v 1.13 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index 19bed70344f94..081911ef0b4e1 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/rindex.c,v 1.12 2007/04/10 21:42:12 wkoszek Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 28a5b7ec1f140..d6d401e189b2a 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/scanc.c,v 1.11 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 9f4124bde2602..bd1589babaf73 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/skpc.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcasecmp.c b/sys/libkern/strcasecmp.c
index a0586549ff562..f08e5c4a89244 100644
--- a/sys/libkern/strcasecmp.c
+++ b/sys/libkern/strcasecmp.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcasecmp.c,v 1.2 2005/08/08 19:38:00 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/ctype.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 13738f97e26cd..1bfd9b3d632b3 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcat.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 7313e6011c044..042a589952cf5 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcmp.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 4b902c281b232..72dd51fd328ab 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strcpy.c,v 1.12 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strdup.c b/sys/libkern/strdup.c
index 5922f569b20f0..d506932f117dd 100644
--- a/sys/libkern/strdup.c
+++ b/sys/libkern/strdup.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strdup.c,v 1.5 2003/06/11 05:23:04 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/libkern/strlcat.c b/sys/libkern/strlcat.c
index 74d3bcc87d547..3acddfe0b07f3 100644
--- a/sys/libkern/strlcat.c
+++ b/sys/libkern/strlcat.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strlcat.c,v 1.10 2005/02/03 15:51:39 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strlcpy.c b/sys/libkern/strlcpy.c
index 45d760c9f3cf4..04fa19d0e583a 100644
--- a/sys/libkern/strlcpy.c
+++ b/sys/libkern/strlcpy.c
@@ -31,7 +31,7 @@
 static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strlcpy.c,v 1.8 2005/02/03 15:51:39 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 4a2e6454ba5b9..f015e1f5bfbe3 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strlen.c,v 1.9 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index 5758d249980ba..7553c6091c8c2 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strncmp.c,v 1.11 2005/01/07 00:24:32 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 7daaaea3dc1da..c63ad8f923b03 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strncpy.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/libkern.h>
 
diff --git a/sys/libkern/strsep.c b/sys/libkern/strsep.c
index 46122697e8bbb..0d583d13148f4 100644
--- a/sys/libkern/strsep.c
+++ b/sys/libkern/strsep.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strsep.c,v 1.7 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strspn.c b/sys/libkern/strspn.c
index 18327b7bd4b7a..9284415b45557 100644
--- a/sys/libkern/strspn.c
+++ b/sys/libkern/strspn.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strspn.c,v 1.2 2005/04/02 18:52:44 das Exp $");
 
 #include <sys/libkern.h>
 #include <sys/limits.h>
diff --git a/sys/libkern/strstr.c b/sys/libkern/strstr.c
index 12c2a9189aab5..f57666e65dbae 100644
--- a/sys/libkern/strstr.c
+++ b/sys/libkern/strstr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strstr.c,v 1.1 2006/08/12 15:28:39 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/strtol.c b/sys/libkern/strtol.c
index 3d734ab18dc88..e5606f4799e06 100644
--- a/sys/libkern/strtol.c
+++ b/sys/libkern/strtol.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtol.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strtoq.c b/sys/libkern/strtoq.c
index ea4e7edbc02e4..9399244799483 100644
--- a/sys/libkern/strtoq.c
+++ b/sys/libkern/strtoq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtoq.c,v 1.6 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strtoul.c b/sys/libkern/strtoul.c
index 5c97ca9125796..0fc92a70ecbc8 100644
--- a/sys/libkern/strtoul.c
+++ b/sys/libkern/strtoul.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtoul.c,v 1.6 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strtouq.c b/sys/libkern/strtouq.c
index 4ed72a18f29e8..6b04b0a8d973f 100644
--- a/sys/libkern/strtouq.c
+++ b/sys/libkern/strtouq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strtouq.c,v 1.6 2004/04/07 20:46:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/libkern/strvalid.c b/sys/libkern/strvalid.c
index 3761b074348c5..2fad4b071e7ea 100644
--- a/sys/libkern/strvalid.c
+++ b/sys/libkern/strvalid.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/strvalid.c,v 1.5 2005/01/29 13:34:22 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/libkern.h>
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 376d9c4e6cbd4..c215bfe3765d4 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/ucmpdi2.c,v 1.10 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index 71c9272364d88..27090cfb29bd7 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/udivdi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index e3776413722ce..0460beea15e85 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/libkern/umoddi3.c,v 1.8 2004/04/07 20:46:10 imp Exp $");
 
 #include <libkern/quad.h>
 
diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile
index ac7730b276ee4..5004f30b1b6e1 100644
--- a/sys/modules/3dfx/Makefile
+++ b/sys/modules/3dfx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/3dfx/Makefile,v 1.13 2006/03/03 21:37:37 yar Exp $
 
 MAINTAINER=	cokane@FreeBSD.org
 
diff --git a/sys/modules/3dfx_linux/Makefile b/sys/modules/3dfx_linux/Makefile
index 8376037c954b4..bdd09022ac228 100644
--- a/sys/modules/3dfx_linux/Makefile
+++ b/sys/modules/3dfx_linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/3dfx_linux/Makefile,v 1.1 2006/03/03 21:37:38 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/tdfx
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 1be521fc8302d..b5c0c8fe18db6 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile,v 1.540.2.5.2.1 2008/02/06 03:24:27 scottl Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index 9dc38af9623f0..ce95b7e8ebfa4 100644
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/Makefile.inc,v 1.4 2002/11/06 13:46:58 nyan Exp $
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile
index 6964defc82038..34eb3263b5eac 100644
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/Makefile,v 1.8 2004/08/30 03:35:17 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/aac
 
diff --git a/sys/modules/aac/Makefile.inc b/sys/modules/aac/Makefile.inc
index 265f86d1ed55a..f8121d40d4fa9 100644
--- a/sys/modules/aac/Makefile.inc
+++ b/sys/modules/aac/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile
index 4247a2280878c..752b8cade4d7f 100644
--- a/sys/modules/aac/aac_linux/Makefile
+++ b/sys/modules/aac/aac_linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aac/aac_linux/Makefile,v 1.1 2002/09/25 05:00:25 scottl Exp $
 
 .PATH: ${.CURDIR}/../../../dev/aac
 
diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_data/Makefile
index 6c5216c07a656..31b0c4f55a151 100644
--- a/sys/modules/accf_data/Makefile
+++ b/sys/modules/accf_data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/accf_data/Makefile,v 1.2 2001/01/06 13:59:38 obrien Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_http/Makefile
index b942d3e7639e0..72d2b5da83e79 100644
--- a/sys/modules/accf_http/Makefile
+++ b/sys/modules/accf_http/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/accf_http/Makefile,v 1.2 2001/01/06 13:59:38 obrien Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index 7bc565b9d9995..f363aa0ccc675 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.53 2007/03/22 18:16:42 jkim Exp $
 
 .if ${MACHINE} == "i386"
 SUBDIR=		acpi
diff --git a/sys/modules/acpi/Makefile.inc b/sys/modules/acpi/Makefile.inc
index 265f86d1ed55a..a3cda978c916e 100644
--- a/sys/modules/acpi/Makefile.inc
+++ b/sys/modules/acpi/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/Makefile.inc,v 1.1 2004/01/13 13:08:27 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 31c57dca1cd83..62cef172995bc 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.19 2007/09/24 16:59:06 njl Exp $
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
 .error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
diff --git a/sys/modules/acpi/acpi_aiboost/Makefile b/sys/modules/acpi/acpi_aiboost/Makefile
index e33b6d34184dd..ef2c6bbba2f56 100644
--- a/sys/modules/acpi/acpi_aiboost/Makefile
+++ b/sys/modules/acpi/acpi_aiboost/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_aiboost/Makefile,v 1.1 2006/10/30 05:38:48 takawata Exp $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile
index da7bcf8c10baf..ef5efba76d2bc 100644
--- a/sys/modules/acpi/acpi_asus/Makefile
+++ b/sys/modules/acpi/acpi_asus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_asus/Makefile,v 1.8 2006/05/30 09:38:53 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_dock/Makefile b/sys/modules/acpi/acpi_dock/Makefile
index f7287a4d82bea..7309300bc6967 100644
--- a/sys/modules/acpi/acpi_dock/Makefile
+++ b/sys/modules/acpi/acpi_dock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_dock/Makefile,v 1.1 2006/04/15 12:31:34 iwasaki Exp $
 
 .PATH:		${.CURDIR}/../../../dev/acpica
 KMOD=		acpi_dock
diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile
index 03bf3c7ea6743..2be081c8eb105 100644
--- a/sys/modules/acpi/acpi_fujitsu/Makefile
+++ b/sys/modules/acpi/acpi_fujitsu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_fujitsu/Makefile,v 1.1 2005/03/18 08:48:10 philip Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile
index 75c22e7a2ea0e..343eb3e894502 100644
--- a/sys/modules/acpi/acpi_ibm/Makefile
+++ b/sys/modules/acpi/acpi_ibm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_ibm/Makefile,v 1.3 2004/12/13 04:59:35 imp Exp $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 KMOD=		acpi_ibm
diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile
index 663d3c2ca49f0..d59952c5d4699 100644
--- a/sys/modules/acpi/acpi_panasonic/Makefile
+++ b/sys/modules/acpi/acpi_panasonic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_panasonic/Makefile,v 1.4 2006/05/30 09:38:53 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile
index 3974094ea136d..8d4202c26789a 100644
--- a/sys/modules/acpi/acpi_sony/Makefile
+++ b/sys/modules/acpi/acpi_sony/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_sony/Makefile,v 1.1 2004/11/15 05:54:14 imp Exp $
 
 .PATH:		${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile
index 24df0915fcce7..b327c2cd6f763 100644
--- a/sys/modules/acpi/acpi_toshiba/Makefile
+++ b/sys/modules/acpi/acpi_toshiba/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/acpi/acpi_toshiba/Makefile,v 1.5 2006/05/30 09:38:53 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpi_support
 
diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile
index 77794eea5626e..7aef9beadd571 100644
--- a/sys/modules/acpi/acpi_video/Makefile
+++ b/sys/modules/acpi/acpi_video/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/sys/modules/acpi/acpi_video/Makefile,v 1.7 2007/06/24 20:36:51 njl Exp $
 
 .PATH:	${.CURDIR}/../../../dev/acpica
 
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index 8e2427114d217..1c47c3a588c56 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/agp/Makefile,v 1.18 2006/09/05 16:55:13 anholt Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile
index 36c7359d2aa65..0f54c30af6a8f 100644
--- a/sys/modules/aha/Makefile
+++ b/sys/modules/aha/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aha/Makefile,v 1.9 2005/10/14 23:30:06 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/aha
 
diff --git a/sys/modules/ahb/Makefile b/sys/modules/ahb/Makefile
index d015237b3bf41..e418247277062 100644
--- a/sys/modules/ahb/Makefile
+++ b/sys/modules/ahb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ahb/Makefile,v 1.2 2005/10/14 23:30:07 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/ahb
 
diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile
index 860d9a8a94993..66702941b85c0 100644
--- a/sys/modules/aic/Makefile
+++ b/sys/modules/aic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic/Makefile,v 1.6 2004/05/26 00:53:00 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/aic
 
diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile
index 47550f0de2c46..f59b32b58bc81 100644
--- a/sys/modules/aic7xxx/Makefile
+++ b/sys/modules/aic7xxx/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/Makefile,v 1.1 2002/08/01 01:36:38 scottl Exp $
 
 SUBDIR= aicasm ahc ahd
 
diff --git a/sys/modules/aic7xxx/Makefile.inc b/sys/modules/aic7xxx/Makefile.inc
index 265f86d1ed55a..80ad4daaa915e 100644
--- a/sys/modules/aic7xxx/Makefile.inc
+++ b/sys/modules/aic7xxx/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile
index 66780d8ccaad2..a8dca272fa960 100644
--- a/sys/modules/aic7xxx/ahc/Makefile
+++ b/sys/modules/aic7xxx/ahc/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile,v 1.6 2004/10/24 07:54:44 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahc
diff --git a/sys/modules/aic7xxx/ahc/Makefile.inc b/sys/modules/aic7xxx/ahc/Makefile.inc
index 265f86d1ed55a..0556c73c0df48 100644
--- a/sys/modules/aic7xxx/ahc/Makefile.inc
+++ b/sys/modules/aic7xxx/ahc/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile b/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
index 5e5d9c2088579..bbe2d1d0cb224 100644
--- a/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile,v 1.3 2004/08/17 00:14:31 gibbs Exp $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=		ahc_eisa
diff --git a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
index 965e74db9c328..23f263229b6a1 100644
--- a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_isa/Makefile,v 1.1 2004/08/17 02:32:30 gibbs Exp $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=		ahc_isa
diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
index 9a595806500df..2e1178fb6e1d0 100644
--- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
+++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahc/ahc_pci/Makefile,v 1.1 2002/08/01 01:36:38 scottl Exp $
 
 .PATH:	${.CURDIR}/../../../../dev/aic7xxx
 KMOD=	ahc_pci
diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile
index 25f312fcd8425..08cb0e2a9c396 100644
--- a/sys/modules/aic7xxx/ahd/Makefile
+++ b/sys/modules/aic7xxx/ahd/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/ahd/Makefile,v 1.6 2005/01/26 16:23:34 imp Exp $
 
 .PATH:	${.CURDIR}/../../../dev/aic7xxx
 KMOD=	ahd
diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile
index b1b2cf7a293fd..874974b190728 100644
--- a/sys/modules/aic7xxx/aicasm/Makefile
+++ b/sys/modules/aic7xxx/aicasm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aic7xxx/aicasm/Makefile,v 1.8 2005/01/03 07:27:17 njl Exp $
 
 MAKESRCPATH=	${.CURDIR}/../../../dev/aic7xxx/aicasm
 
diff --git a/sys/modules/aio/Makefile b/sys/modules/aio/Makefile
index c73f65169f749..9343b2ced8f56 100644
--- a/sys/modules/aio/Makefile
+++ b/sys/modules/aio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aio/Makefile,v 1.2 2006/10/15 14:22:13 netchild Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/amd/Makefile b/sys/modules/amd/Makefile
index fbaae5c7b7f66..9ec22ac150423 100644
--- a/sys/modules/amd/Makefile
+++ b/sys/modules/amd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/amd/Makefile,v 1.1 2002/12/13 22:59:18 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/amd
 
diff --git a/sys/modules/amr/Makefile b/sys/modules/amr/Makefile
index c87f9681cdd18..3237e906d1cd6 100644
--- a/sys/modules/amr/Makefile
+++ b/sys/modules/amr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/amr/Makefile,v 1.10 2006/01/25 18:11:59 ambrisko Exp $
 
 .PATH: ${.CURDIR}/../../dev/amr
 
diff --git a/sys/modules/amr/amr_linux/Makefile b/sys/modules/amr/amr_linux/Makefile
index 3df7eed5e446b..b2656da357f98 100644
--- a/sys/modules/amr/amr_linux/Makefile
+++ b/sys/modules/amr/amr_linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/amr/amr_linux/Makefile,v 1.1 2006/01/24 21:13:49 ambrisko Exp $
 
 .PATH: ${.CURDIR}/../../../dev/amr
 
diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile
index 7b7ad7898a5b3..f70b26ace6580 100644
--- a/sys/modules/an/Makefile
+++ b/sys/modules/an/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/an/Makefile,v 1.8 2005/10/14 23:30:07 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/an
 
diff --git a/sys/modules/aout/Makefile b/sys/modules/aout/Makefile
index 203d9cfca3ddb..356f6f4886b30 100644
--- a/sys/modules/aout/Makefile
+++ b/sys/modules/aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aout/Makefile,v 1.3 2002/09/11 18:03:03 peter Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/apm/Makefile b/sys/modules/apm/Makefile
index 96703b15fab60..374a44e83c200 100644
--- a/sys/modules/apm/Makefile
+++ b/sys/modules/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/apm/Makefile,v 1.9 2005/04/20 12:28:20 nyan Exp $
 
 .PATH: ${.CURDIR}/../../i386/bios
 .if ${MACHINE} == "pc98"
diff --git a/sys/modules/ar/Makefile b/sys/modules/ar/Makefile
index 78fe22e758b7c..f38b9cd65e1b6 100644
--- a/sys/modules/ar/Makefile
+++ b/sys/modules/ar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ar/Makefile,v 1.5 2005/10/14 23:30:07 yar Exp $
 
 .PATH:  ${.CURDIR}/../../dev/ar
 KMOD    = if_ar
diff --git a/sys/modules/arcmsr/Makefile b/sys/modules/arcmsr/Makefile
index 0a186f883b6d6..b4090fbee9ace 100644
--- a/sys/modules/arcmsr/Makefile
+++ b/sys/modules/arcmsr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/arcmsr/Makefile,v 1.1 2005/03/31 18:19:55 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/arcmsr
 
diff --git a/sys/modules/arcnet/Makefile b/sys/modules/arcnet/Makefile
index 281793f9fcdd2..03dda3e00774b 100644
--- a/sys/modules/arcnet/Makefile
+++ b/sys/modules/arcnet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/arcnet/Makefile,v 1.5 2006/02/07 18:13:56 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/arl/Makefile b/sys/modules/arl/Makefile
index 011a66e214b38..2218e786ded9a 100644
--- a/sys/modules/arl/Makefile
+++ b/sys/modules/arl/Makefile
@@ -1,5 +1,5 @@
 # $RISS: if_arl/modules/if_arl/Makefile,v 1.3 2003/01/13 08:05:29 frol Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/arl/Makefile,v 1.4 2005/10/14 23:30:07 yar Exp $
 
 .PATH:	${.CURDIR}/../../dev/arl
 
diff --git a/sys/modules/asr/Makefile b/sys/modules/asr/Makefile
index 7addf52974f0d..0620e24bcacd1 100644
--- a/sys/modules/asr/Makefile
+++ b/sys/modules/asr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/asr/Makefile,v 1.6 2006/07/27 19:12:48 marcel Exp $
 
 .PATH: ${.CURDIR}/../../dev/asr
 
diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile
index c67ade9d2c0d4..280dafa3b5023 100644
--- a/sys/modules/ata/Makefile
+++ b/sys/modules/ata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/Makefile,v 1.2 2005/04/05 02:05:01 scottl Exp $
 
 SUBDIR = ata
 SUBDIR += atacard
diff --git a/sys/modules/ata/Makefile.inc b/sys/modules/ata/Makefile.inc
index 265f86d1ed55a..69a55e68cb139 100644
--- a/sys/modules/ata/Makefile.inc
+++ b/sys/modules/ata/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/Makefile.inc,v 1.1 2005/03/30 12:03:38 sos Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/ata/ata/Makefile b/sys/modules/ata/ata/Makefile
index 262984e35e275..dd2f954a7f686 100644
--- a/sys/modules/ata/ata/Makefile
+++ b/sys/modules/ata/ata/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/ata/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atacam/Makefile b/sys/modules/ata/atacam/Makefile
index dcaf847a3561a..258f2f83852ba 100644
--- a/sys/modules/ata/atacam/Makefile
+++ b/sys/modules/ata/atacam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atacam/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atacard/Makefile b/sys/modules/ata/atacard/Makefile
index 1bb8b5bcddb2a..cd0270d072968 100644
--- a/sys/modules/ata/atacard/Makefile
+++ b/sys/modules/ata/atacard/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atacard/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atacbus/Makefile b/sys/modules/ata/atacbus/Makefile
index 2b11a89137eee..477cb6cdc4652 100644
--- a/sys/modules/ata/atacbus/Makefile
+++ b/sys/modules/ata/atacbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atacbus/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atadisk/Makefile b/sys/modules/ata/atadisk/Makefile
index c64cd3f79a07a..9bf2822943a4d 100644
--- a/sys/modules/ata/atadisk/Makefile
+++ b/sys/modules/ata/atadisk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atadisk/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile
index b43fd2e348882..8f70f11203f20 100644
--- a/sys/modules/ata/ataisa/Makefile
+++ b/sys/modules/ata/ataisa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/ataisa/Makefile,v 1.1 2005/03/30 12:03:39 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile
index 00d188bb9a8dd..07de058f30a1d 100644
--- a/sys/modules/ata/atapci/Makefile
+++ b/sys/modules/ata/atapci/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapci/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapicam/Makefile b/sys/modules/ata/atapicam/Makefile
index 6dbaffe1e7160..d0ae8e939e55d 100644
--- a/sys/modules/ata/atapicam/Makefile
+++ b/sys/modules/ata/atapicam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapicam/Makefile,v 1.1 2005/04/05 02:04:30 scottl Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapicd/Makefile b/sys/modules/ata/atapicd/Makefile
index bcc23199d6535..9cc7b3cd32caa 100644
--- a/sys/modules/ata/atapicd/Makefile
+++ b/sys/modules/ata/atapicd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapicd/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapifd/Makefile b/sys/modules/ata/atapifd/Makefile
index f5637480a26db..e0a6c95fc4b15 100644
--- a/sys/modules/ata/atapifd/Makefile
+++ b/sys/modules/ata/atapifd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapifd/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atapist/Makefile b/sys/modules/ata/atapist/Makefile
index 86c19b5f7b89d..90c7cfe09bc4f 100644
--- a/sys/modules/ata/atapist/Makefile
+++ b/sys/modules/ata/atapist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atapist/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/ataraid/Makefile b/sys/modules/ata/ataraid/Makefile
index 8f41bd7425b1d..5770e9aaccb0b 100644
--- a/sys/modules/ata/ataraid/Makefile
+++ b/sys/modules/ata/ataraid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/ataraid/Makefile,v 1.1 2005/03/30 12:03:40 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ata/atausb/Makefile b/sys/modules/ata/atausb/Makefile
index 3f4d8d08bb46f..bb82ab94be7d9 100644
--- a/sys/modules/ata/atausb/Makefile
+++ b/sys/modules/ata/atausb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ata/atausb/Makefile,v 1.2 2006/03/11 08:42:08 sos Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ata
 
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 678e6a57325dc..c4a6680b8c41a 100644
--- a/sys/modules/ath/Makefile
+++ b/sys/modules/ath/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath/Makefile,v 1.5 2007/01/28 04:38:35 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath
diff --git a/sys/modules/ath_hal/Makefile b/sys/modules/ath_hal/Makefile
index 42837fc03d6e4..786ecb39d54c4 100644
--- a/sys/modules/ath_hal/Makefile
+++ b/sys/modules/ath_hal/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_hal/Makefile,v 1.8 2006/09/18 16:49:15 sam Exp $
 #
 
 #
diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile
index 5523815cd96fa..b6a49bda65d3c 100644
--- a/sys/modules/ath_rate_amrr/Makefile
+++ b/sys/modules/ath_rate_amrr/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_rate_amrr/Makefile,v 1.5 2007/06/29 19:52:31 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr
diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile
index c111e2644da3c..6e33248b378bc 100644
--- a/sys/modules/ath_rate_onoe/Makefile
+++ b/sys/modules/ath_rate_onoe/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_rate_onoe/Makefile,v 1.4 2007/06/29 19:52:31 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe
diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile
index fc91e2b8562eb..10f637d2ab198 100644
--- a/sys/modules/ath_rate_sample/Makefile
+++ b/sys/modules/ath_rate_sample/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ath_rate_sample/Makefile,v 1.4 2007/01/28 04:36:05 sam Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample
diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
index c8b3890db2b09..cd0f78db0a339 100644
--- a/sys/modules/aue/Makefile
+++ b/sys/modules/aue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/aue/Makefile,v 1.8 2005/09/27 18:10:32 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/auxio/Makefile b/sys/modules/auxio/Makefile
index ead878cce503d..531d1eb68f3f0 100644
--- a/sys/modules/auxio/Makefile
+++ b/sys/modules/auxio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/auxio/Makefile,v 1.2 2005/02/25 06:59:56 yongari Exp $
 
 .PATH: ${.CURDIR}/../../dev/auxio
 
diff --git a/sys/modules/awi/Makefile b/sys/modules/awi/Makefile
index 228d9c13023be..7dbf9bde5c731 100644
--- a/sys/modules/awi/Makefile
+++ b/sys/modules/awi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/awi/Makefile,v 1.4 2005/10/14 23:30:07 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/awi
 
diff --git a/sys/modules/axe/Makefile b/sys/modules/axe/Makefile
index 4d82d5ab6a7f6..a71ed76596d3a 100644
--- a/sys/modules/axe/Makefile
+++ b/sys/modules/axe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/axe/Makefile,v 1.3 2005/09/27 18:10:33 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/bce/Makefile b/sys/modules/bce/Makefile
index 1be2a3f98ce2a..a8cd620f37c76 100644
--- a/sys/modules/bce/Makefile
+++ b/sys/modules/bce/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bce/Makefile,v 1.1 2006/04/10 19:55:23 ps Exp $
 .PATH:	${.CURDIR}/../../dev/bce
 KMOD=	if_bce
 SRCS=	opt_bce.h if_bce.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h
diff --git a/sys/modules/bfe/Makefile b/sys/modules/bfe/Makefile
index 19413f7d994d9..2b962ffe39f3c 100644
--- a/sys/modules/bfe/Makefile
+++ b/sys/modules/bfe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bfe/Makefile,v 1.2 2005/09/27 18:10:33 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/bfe
 
diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile
index f8ebf42fd8d1b..4427f11297850 100644
--- a/sys/modules/bge/Makefile
+++ b/sys/modules/bge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bge/Makefile,v 1.6 2007/06/10 00:58:41 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../dev/bge
 
diff --git a/sys/modules/bios/Makefile b/sys/modules/bios/Makefile
index d150806c045d3..d76e4b7225856 100644
--- a/sys/modules/bios/Makefile
+++ b/sys/modules/bios/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/Makefile,v 1.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 SUBDIR=	smapi smbios vpd
diff --git a/sys/modules/bios/smapi/Makefile b/sys/modules/bios/smapi/Makefile
index a845c0adc9705..c32bc6f36b429 100644
--- a/sys/modules/bios/smapi/Makefile
+++ b/sys/modules/bios/smapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/smapi/Makefile,v 1.2 2005/01/26 16:24:55 imp Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bios/smbios/Makefile b/sys/modules/bios/smbios/Makefile
index 40df8e80db470..412bc01601efb 100644
--- a/sys/modules/bios/smbios/Makefile
+++ b/sys/modules/bios/smbios/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/smbios/Makefile,v 1.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bios/vpd/Makefile b/sys/modules/bios/vpd/Makefile
index d1dd8f1d92152..29905cea3e75b 100644
--- a/sys/modules/bios/vpd/Makefile
+++ b/sys/modules/bios/vpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bios/vpd/Makefile,v 1.1 2003/03/29 15:20:44 mdodd Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
diff --git a/sys/modules/bktr/Makefile b/sys/modules/bktr/Makefile
index 1a9e0376921fc..97178d2b12d50 100644
--- a/sys/modules/bktr/Makefile
+++ b/sys/modules/bktr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/Makefile,v 1.13 2000/09/10 15:40:15 roger Exp $
 
 SUBDIR =
 SUBDIR += bktr
diff --git a/sys/modules/bktr/Makefile.inc b/sys/modules/bktr/Makefile.inc
index 265f86d1ed55a..c91b77b49aecd 100644
--- a/sys/modules/bktr/Makefile.inc
+++ b/sys/modules/bktr/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile
index f48f3e7f68b0e..8d541a53deb12 100644
--- a/sys/modules/bktr/bktr/Makefile
+++ b/sys/modules/bktr/bktr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/bktr/Makefile,v 1.9 2006/01/27 09:08:32 jmg Exp $
 
 # Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
 
diff --git a/sys/modules/bktr/bktr_mem/Makefile b/sys/modules/bktr/bktr_mem/Makefile
index d5f619041b8da..dd74a2e0a86d8 100644
--- a/sys/modules/bktr/bktr_mem/Makefile
+++ b/sys/modules/bktr/bktr_mem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bktr/bktr_mem/Makefile,v 1.4 2006/07/01 10:51:54 markm Exp $
 
 .PATH: ${.CURDIR}/../../../dev/bktr
 
diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile
index 3cfc6e376df29..e78c2476fcf85 100644
--- a/sys/modules/bridgestp/Makefile
+++ b/sys/modules/bridgestp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/bridgestp/Makefile,v 1.1 2006/07/26 22:07:39 thompsa Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index 6f88b35c830a2..2ec17a6a6ef2c 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cam/Makefile,v 1.15 2007/04/07 19:40:57 scottl Exp $
 
 S=	${.CURDIR}/../..
 
diff --git a/sys/modules/canbepm/Makefile b/sys/modules/canbepm/Makefile
index 0eb911243eee9..630e601a4e645 100644
--- a/sys/modules/canbepm/Makefile
+++ b/sys/modules/canbepm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/canbepm/Makefile,v 1.1 2003/02/03 14:46:26 nyan Exp $
 
 .PATH:	${.CURDIR}/../../pc98/pc98
 KMOD	= canbepm
diff --git a/sys/modules/canbus/Makefile b/sys/modules/canbus/Makefile
index 19487e01ef3dc..4e576f77ec73a 100644
--- a/sys/modules/canbus/Makefile
+++ b/sys/modules/canbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/canbus/Makefile,v 1.1 2003/02/03 14:46:26 nyan Exp $
 
 .PATH:	${.CURDIR}/../../pc98/pc98
 KMOD	= canbus
diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile
index b57f3f76fa8f9..677639fd0ebf4 100644
--- a/sys/modules/cardbus/Makefile
+++ b/sys/modules/cardbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cardbus/Makefile,v 1.11 2005/12/29 01:43:46 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/cardbus
 
diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile
index a071485ccd734..32d241e18c30e 100644
--- a/sys/modules/cbb/Makefile
+++ b/sys/modules/cbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cbb/Makefile,v 1.10 2004/08/16 15:24:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/pccbb
 
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 5fbc1b7fe2f55..a33d2de33f6f0 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cd9660/Makefile,v 1.16 2007/02/11 14:01:31 rodrigc Exp $
 
 .PATH: ${.CURDIR}/../../fs/cd9660
 
diff --git a/sys/modules/cd9660_iconv/Makefile b/sys/modules/cd9660_iconv/Makefile
index 48ddb56427ba9..2835c1465467f 100644
--- a/sys/modules/cd9660_iconv/Makefile
+++ b/sys/modules/cd9660_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cd9660_iconv/Makefile,v 1.2 2007/02/11 14:01:31 rodrigc Exp $
 
 .PATH:	${.CURDIR}/../../fs/cd9660
 KMOD=	cd9660_iconv
diff --git a/sys/modules/cdce/Makefile b/sys/modules/cdce/Makefile
index 9942ded5c9617..fb9f4a4c44e61 100644
--- a/sys/modules/cdce/Makefile
+++ b/sys/modules/cdce/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cdce/Makefile,v 1.2 2005/09/27 18:10:33 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ce/Makefile b/sys/modules/ce/Makefile
index f8ac9a84734ac..cb3a47ce5f65d 100644
--- a/sys/modules/ce/Makefile
+++ b/sys/modules/ce/Makefile
@@ -1,5 +1,5 @@
 # $Cronyx: sys.modules.ce.Makefile,v 1.2 2005/04/23 20:10:22 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ce/Makefile,v 1.3 2006/03/16 15:18:17 ru Exp $
 
 .PATH:  ${.CURDIR}/../../dev/ce
 KMOD	= if_ce
diff --git a/sys/modules/ciss/Makefile b/sys/modules/ciss/Makefile
index 2ea619c5786c2..696124a8e1c42 100644
--- a/sys/modules/ciss/Makefile
+++ b/sys/modules/ciss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ciss/Makefile,v 1.2 2002/10/27 12:09:51 mux Exp $
 
 KMOD		=  ciss
 .PATH:		${.CURDIR}/../../dev/${KMOD}
diff --git a/sys/modules/cm/Makefile b/sys/modules/cm/Makefile
index 3f2067b469853..beb64e50171a3 100644
--- a/sys/modules/cm/Makefile
+++ b/sys/modules/cm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cm/Makefile,v 1.1 2002/01/08 20:03:13 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../dev/cm
 
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index 8e008121bbf2a..ddd6ad00fa894 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda/Makefile,v 1.17 2007/07/12 21:04:58 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../fs/coda
 
diff --git a/sys/modules/coda5/Makefile b/sys/modules/coda5/Makefile
index b0e7d72951c83..9402a3095246f 100644
--- a/sys/modules/coda5/Makefile
+++ b/sys/modules/coda5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coda5/Makefile,v 1.8 2007/07/12 21:04:58 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../fs/coda
 
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index 95956e5c9784f..ecae7161d9957 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coff/Makefile,v 1.15 2002/01/11 15:48:38 ru Exp $
 
 .PATH: ${.CURDIR}/../../i386/ibcs2
 
diff --git a/sys/modules/coretemp/Makefile b/sys/modules/coretemp/Makefile
index dd540ba4a6f02..00137ac8ac5a1 100644
--- a/sys/modules/coretemp/Makefile
+++ b/sys/modules/coretemp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/coretemp/Makefile,v 1.1 2007/08/15 19:26:02 des Exp $
 
 .PATH: ${.CURDIR}/../../dev/coretemp
 
diff --git a/sys/modules/cp/Makefile b/sys/modules/cp/Makefile
index bb3a0ffc80d1d..521697c725991 100644
--- a/sys/modules/cp/Makefile
+++ b/sys/modules/cp/Makefile
@@ -1,5 +1,5 @@
 # $Cronyx: sys.modules.cp.Makefile,v 1.1.2.3 2004/04/28 16:17:57 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cp/Makefile,v 1.5 2006/03/16 15:18:17 ru Exp $
 
 .PATH:  ${.CURDIR}/../../dev/cp
 KMOD	= if_cp
diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile
index 4e820080a30bc..081cd88fe137e 100644
--- a/sys/modules/cpufreq/Makefile
+++ b/sys/modules/cpufreq/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cpufreq/Makefile,v 1.9 2006/05/30 09:38:54 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/cpufreq		\
 	${.CURDIR}/../../${MACHINE_ARCH}/cpufreq
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 891f7e4734743..6e9abb753b968 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/crypto/Makefile,v 1.6 2007/05/09 19:37:01 gnn Exp $
 
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile
index 903bfbc52c3ff..23e4914861516 100644
--- a/sys/modules/cryptodev/Makefile
+++ b/sys/modules/cryptodev/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cryptodev/Makefile,v 1.2 2007/03/31 23:15:11 sam Exp $
 
 .PATH:	${.CURDIR}/../../opencrypto
 KMOD	= cryptodev
diff --git a/sys/modules/cs/Makefile b/sys/modules/cs/Makefile
index 39da53044b3fa..18e3ed8ab6194 100644
--- a/sys/modules/cs/Makefile
+++ b/sys/modules/cs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cs/Makefile,v 1.3 2004/09/04 03:32:15 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/cs
 
diff --git a/sys/modules/ctau/Makefile b/sys/modules/ctau/Makefile
index 2f210f8918cbf..083615af4b2c7 100644
--- a/sys/modules/ctau/Makefile
+++ b/sys/modules/ctau/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sys.modules.ct.Makefile,v 1.1.2.2 2003/12/08 15:39:01 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ctau/Makefile,v 1.4 2005/10/14 23:30:08 yar Exp $
 .PATH:  ${.CURDIR}/../../dev/ctau
 KMOD=   if_ct
 SRCS=   if_ct.c ctddk.c ctau.c opt_netgraph.h opt_ng_cronyx.h \
diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile
index ae31329ad9565..f1a43e37d96d7 100644
--- a/sys/modules/cue/Makefile
+++ b/sys/modules/cue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cue/Makefile,v 1.7 2005/09/27 18:10:33 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/cx/Makefile b/sys/modules/cx/Makefile
index 0716f9055b93e..d1e78f08fedf6 100644
--- a/sys/modules/cx/Makefile
+++ b/sys/modules/cx/Makefile
@@ -1,5 +1,5 @@
 # Cronyx Id: sys.modules.cx.Makefile,v 1.1.2.2 2003/01/21 15:15:49 rik Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cx/Makefile,v 1.5 2005/10/14 23:30:08 yar Exp $
 
 .PATH:  ${.CURDIR}/../../dev/cx
 KMOD=   if_cx
diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile
index 99a6a3e58a87c..2267d0a1115f0 100644
--- a/sys/modules/cxgb/Makefile
+++ b/sys/modules/cxgb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.10 2007/09/09 01:28:02 kmacy Exp $
 
 CXGB = ${.CURDIR}/../../dev/cxgb
 .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile
index d0a5abb39a102..c205d048e7dc2 100644
--- a/sys/modules/dc/Makefile
+++ b/sys/modules/dc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dc/Makefile,v 1.8 2005/10/18 06:11:08 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/dc
 
diff --git a/sys/modules/dcons/Makefile b/sys/modules/dcons/Makefile
index 604242503971c..041725a66bf67 100644
--- a/sys/modules/dcons/Makefile
+++ b/sys/modules/dcons/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dcons/Makefile,v 1.5 2007/06/01 00:23:34 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
diff --git a/sys/modules/dcons_crom/Makefile b/sys/modules/dcons_crom/Makefile
index 258beaddf14b8..517583aa14f0b 100644
--- a/sys/modules/dcons_crom/Makefile
+++ b/sys/modules/dcons_crom/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/10/24 15:43:24 simokawa Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dcons_crom/Makefile,v 1.2 2004/10/13 05:41:09 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
diff --git a/sys/modules/de/Makefile b/sys/modules/de/Makefile
index 6af4c7ad58793..c32d564b70abb 100644
--- a/sys/modules/de/Makefile
+++ b/sys/modules/de/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/de/Makefile,v 1.7 2006/02/26 17:51:22 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/de
 
diff --git a/sys/modules/digi/Makefile b/sys/modules/digi/Makefile
index 9d9aea61da703..c881da1445db5 100755
--- a/sys/modules/digi/Makefile
+++ b/sys/modules/digi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/Makefile,v 1.1 2001/05/02 01:08:06 brian Exp $
 
 SUBDIR=	digi
 SUBDIR+=digi_CX
diff --git a/sys/modules/digi/Makefile.inc b/sys/modules/digi/Makefile.inc
index 265f86d1ed55a..b11eaf0d7213d 100755
--- a/sys/modules/digi/Makefile.inc
+++ b/sys/modules/digi/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/Makefile.inc,v 1.1 2001/05/02 01:08:06 brian Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/digi/digi/Makefile b/sys/modules/digi/digi/Makefile
index a9bd010682c9f..5117afd11e5c3 100644
--- a/sys/modules/digi/digi/Makefile
+++ b/sys/modules/digi/digi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi/Makefile,v 1.5 2006/09/27 19:57:00 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi
diff --git a/sys/modules/digi/digi_CX/Makefile b/sys/modules/digi/digi_CX/Makefile
index 2d833dec8fffd..7d7135340c3dc 100644
--- a/sys/modules/digi/digi_CX/Makefile
+++ b/sys/modules/digi/digi_CX/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_CX/Makefile,v 1.1 2001/05/02 01:08:07 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_CX
diff --git a/sys/modules/digi/digi_CX_PCI/Makefile b/sys/modules/digi/digi_CX_PCI/Makefile
index 65afb17f2d6ce..3279f3ec48c3a 100644
--- a/sys/modules/digi/digi_CX_PCI/Makefile
+++ b/sys/modules/digi/digi_CX_PCI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_CX_PCI/Makefile,v 1.1 2001/05/02 01:08:07 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_CX_PCI
diff --git a/sys/modules/digi/digi_EPCX/Makefile b/sys/modules/digi/digi_EPCX/Makefile
index e9d95b01d1478..7692ee6ec9348 100644
--- a/sys/modules/digi/digi_EPCX/Makefile
+++ b/sys/modules/digi/digi_EPCX/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_EPCX/Makefile,v 1.1 2001/05/02 01:08:07 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_EPCX
diff --git a/sys/modules/digi/digi_EPCX_PCI/Makefile b/sys/modules/digi/digi_EPCX_PCI/Makefile
index d1119cc0bb543..2fbc877f6c272 100644
--- a/sys/modules/digi/digi_EPCX_PCI/Makefile
+++ b/sys/modules/digi/digi_EPCX_PCI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_EPCX_PCI/Makefile,v 1.1 2001/05/02 01:08:08 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_EPCX_PCI
diff --git a/sys/modules/digi/digi_Xe/Makefile b/sys/modules/digi/digi_Xe/Makefile
index 4c8f9e53c62c7..a8234b2b2e6dd 100644
--- a/sys/modules/digi/digi_Xe/Makefile
+++ b/sys/modules/digi/digi_Xe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_Xe/Makefile,v 1.1 2001/05/02 01:08:08 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xe
diff --git a/sys/modules/digi/digi_Xem/Makefile b/sys/modules/digi/digi_Xem/Makefile
index 0a49ddd07f75f..1b5294ea06f5c 100644
--- a/sys/modules/digi/digi_Xem/Makefile
+++ b/sys/modules/digi/digi_Xem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_Xem/Makefile,v 1.1 2001/05/02 01:08:08 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xem
diff --git a/sys/modules/digi/digi_Xr/Makefile b/sys/modules/digi/digi_Xr/Makefile
index 786ce79a1c606..2bf16d71aa679 100644
--- a/sys/modules/digi/digi_Xr/Makefile
+++ b/sys/modules/digi/digi_Xr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/digi/digi_Xr/Makefile,v 1.1 2001/05/02 01:08:09 brian Exp $
 
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi_Xr
diff --git a/sys/modules/dpt/Makefile b/sys/modules/dpt/Makefile
index 6f66d44888106..577f5a3c2b7af 100644
--- a/sys/modules/dpt/Makefile
+++ b/sys/modules/dpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dpt/Makefile,v 1.2 2007/04/10 20:33:31 marius Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/dpt
diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index a953b3700ebb4..7203fd7424410 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/Makefile,v 1.6 2005/12/03 01:23:50 anholt Exp $
 
 SUBDIR = \
 	drm \
diff --git a/sys/modules/drm/Makefile.inc b/sys/modules/drm/Makefile.inc
index 265f86d1ed55a..922d96595e673 100644
--- a/sys/modules/drm/Makefile.inc
+++ b/sys/modules/drm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/drm/drm/Makefile b/sys/modules/drm/drm/Makefile
index faa30097553da..dfa4b3a3f8422 100644
--- a/sys/modules/drm/drm/Makefile
+++ b/sys/modules/drm/drm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/drm/Makefile,v 1.1 2005/04/16 03:44:47 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= drm
diff --git a/sys/modules/drm/i915/Makefile b/sys/modules/drm/i915/Makefile
index a34695ad78705..49e613c883310 100644
--- a/sys/modules/drm/i915/Makefile
+++ b/sys/modules/drm/i915/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/i915/Makefile,v 1.1 2005/11/28 23:13:56 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= i915
diff --git a/sys/modules/drm/mach64/Makefile b/sys/modules/drm/mach64/Makefile
index 4d5069c1e5eb2..3b31e0727452a 100644
--- a/sys/modules/drm/mach64/Makefile
+++ b/sys/modules/drm/mach64/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/mach64/Makefile,v 1.1 2005/04/16 03:44:47 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= mach64
diff --git a/sys/modules/drm/mga/Makefile b/sys/modules/drm/mga/Makefile
index d88d12c78d03a..0b15554ddfd64 100644
--- a/sys/modules/drm/mga/Makefile
+++ b/sys/modules/drm/mga/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/mga/Makefile,v 1.5 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= mga
diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile
index e80a0d803f8bb..cb20f2431baa3 100644
--- a/sys/modules/drm/r128/Makefile
+++ b/sys/modules/drm/r128/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/r128/Makefile,v 1.5 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= r128
diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile
index ba59b7273f178..32cc64bc74e12 100644
--- a/sys/modules/drm/radeon/Makefile
+++ b/sys/modules/drm/radeon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/radeon/Makefile,v 1.6 2005/07/20 21:10:57 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= radeon
diff --git a/sys/modules/drm/savage/Makefile b/sys/modules/drm/savage/Makefile
index f1c9b42a5f337..26111a3e4e33a 100644
--- a/sys/modules/drm/savage/Makefile
+++ b/sys/modules/drm/savage/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/savage/Makefile,v 1.1 2005/11/28 23:13:57 anholt Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD= 	savage
diff --git a/sys/modules/drm/sis/Makefile b/sys/modules/drm/sis/Makefile
index 885ce2863bb4e..fcfc28c81bb18 100644
--- a/sys/modules/drm/sis/Makefile
+++ b/sys/modules/drm/sis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/sis/Makefile,v 1.2 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD= 	sis
diff --git a/sys/modules/drm/tdfx/Makefile b/sys/modules/drm/tdfx/Makefile
index 2e015a7cead71..0c071cd76731c 100644
--- a/sys/modules/drm/tdfx/Makefile
+++ b/sys/modules/drm/tdfx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/drm/tdfx/Makefile,v 1.3 2004/01/13 11:28:48 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/drm
 KMOD	= tdfx
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 5da69b271f547..63471545b7634 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/dummynet/Makefile,v 1.6 2006/03/17 18:54:36 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile
index 723df349904a1..68cec97f0e081 100644
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ed/Makefile,v 1.11 2005/10/05 05:26:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ed
 
diff --git a/sys/modules/elink/Makefile b/sys/modules/elink/Makefile
index a7776578931bf..518e70bd3b8ea 100644
--- a/sys/modules/elink/Makefile
+++ b/sys/modules/elink/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/elink/Makefile,v 1.1 2003/03/29 13:42:20 mdodd Exp $
 #
 
 .PATH:	${.CURDIR}/../../i386/isa
diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile
index 401f448e63a47..4e943a9830ff5 100644
--- a/sys/modules/em/Makefile
+++ b/sys/modules/em/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/em/Makefile,v 1.9 2007/05/07 09:55:25 le Exp $
 .PATH:  ${.CURDIR}/../../dev/em
 KMOD    = if_em
 SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
diff --git a/sys/modules/en/Makefile b/sys/modules/en/Makefile
index 8f342e32fb3b9..d882202e6f5a4 100644
--- a/sys/modules/en/Makefile
+++ b/sys/modules/en/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/en/Makefile,v 1.4 2005/10/14 23:30:09 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/en
 
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index f0e132fea9267..6d44da87c142b 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ep/Makefile,v 1.9 2005/07/13 14:53:59 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ep
 
diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile
index 2685b09ed2986..3d7723f1feb18 100644
--- a/sys/modules/esp/Makefile
+++ b/sys/modules/esp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/esp/Makefile,v 1.5 2005/05/19 14:51:10 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/esp ${.CURDIR}/../../sparc64/sbus
 
diff --git a/sys/modules/ex/Makefile b/sys/modules/ex/Makefile
index 5c394aa5e11f1..abe0b4f10f2f3 100644
--- a/sys/modules/ex/Makefile
+++ b/sys/modules/ex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ex/Makefile,v 1.2 2004/05/26 00:53:02 imp Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ex
diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile
index b7a8d522b283d..9bec941b0c07a 100644
--- a/sys/modules/exca/Makefile
+++ b/sys/modules/exca/Makefile
@@ -1,4 +1,4 @@
- # $FreeBSD$
+ # $FreeBSD: src/sys/modules/exca/Makefile,v 1.2 2004/05/26 00:53:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/exca
 
diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile
index 1ce8ab87aa287..8ea80f461d8c4 100644
--- a/sys/modules/ext2fs/Makefile
+++ b/sys/modules/ext2fs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ext2fs/Makefile,v 1.6 2005/06/15 02:36:11 rodrigc Exp $
 
 .PATH:	${.CURDIR}/../../gnu/fs/ext2fs
 KMOD=	ext2fs
diff --git a/sys/modules/fatm/Makefile b/sys/modules/fatm/Makefile
index c77ea7109e34e..e570443348a99 100644
--- a/sys/modules/fatm/Makefile
+++ b/sys/modules/fatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fatm/Makefile,v 1.3 2005/10/14 23:30:09 yar Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index d61a3073944b7..b12d962ec39b9 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fdc/Makefile,v 1.15 2006/05/30 09:38:54 ru Exp $
 
 KMOD=	fdc
 
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index eead3ec0862bd..0c454763b11b7 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fdescfs/Makefile,v 1.12 2002/01/11 15:48:39 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/fdescfs
 
diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile
index 77af85bfd63b3..32aedc41ddb62 100644
--- a/sys/modules/fe/Makefile
+++ b/sys/modules/fe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fe/Makefile,v 1.3 2004/05/26 00:53:04 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/fe
 
diff --git a/sys/modules/firewire/Makefile b/sys/modules/firewire/Makefile
index 379ad58ba0ea9..13592482db91b 100644
--- a/sys/modules/firewire/Makefile
+++ b/sys/modules/firewire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/Makefile,v 1.5 2004/07/12 13:13:17 dfr Exp $
 
 SUBDIR=	firewire \
 	fwe \
diff --git a/sys/modules/firewire/Makefile.inc b/sys/modules/firewire/Makefile.inc
index 265f86d1ed55a..cf896c7280782 100644
--- a/sys/modules/firewire/Makefile.inc
+++ b/sys/modules/firewire/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/Makefile.inc,v 1.3 2004/02/13 10:11:00 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/firewire/firewire/Makefile b/sys/modules/firewire/firewire/Makefile
index de418b14432d5..47e76fd688405 100644
--- a/sys/modules/firewire/firewire/Makefile
+++ b/sys/modules/firewire/firewire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/firewire/Makefile,v 1.8 2006/02/18 23:49:26 yar Exp $
 
 # Makefile for the IEEE1394 OHCI chipset
 
diff --git a/sys/modules/firewire/fwe/Makefile b/sys/modules/firewire/fwe/Makefile
index 746eb65b449ac..8e7ec22201aab 100644
--- a/sys/modules/firewire/fwe/Makefile
+++ b/sys/modules/firewire/fwe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/fwe/Makefile,v 1.4 2006/02/18 23:49:26 yar Exp $
 
 # Makefile for the fwe(4) module (Ethernet over IEEE1394)
 
diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile
index ed2ca4a02b913..73443e33b1faf 100644
--- a/sys/modules/firewire/fwip/Makefile
+++ b/sys/modules/firewire/fwip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/fwip/Makefile,v 1.2 2005/10/14 23:30:09 yar Exp $
 
 # Makefile for the fwip(4) module (IP over IEEE1394)
 
diff --git a/sys/modules/firewire/sbp/Makefile b/sys/modules/firewire/sbp/Makefile
index 94218c46763a5..1df5e35c1c57d 100644
--- a/sys/modules/firewire/sbp/Makefile
+++ b/sys/modules/firewire/sbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/sbp/Makefile,v 1.4 2006/02/18 23:49:26 yar Exp $
 
 # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394)
 
diff --git a/sys/modules/firewire/sbp_targ/Makefile b/sys/modules/firewire/sbp_targ/Makefile
index 98ca9571b20ad..92bc01a900645 100644
--- a/sys/modules/firewire/sbp_targ/Makefile
+++ b/sys/modules/firewire/sbp_targ/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firewire/sbp_targ/Makefile,v 1.3 2006/02/18 23:49:27 yar Exp $
 
 # Makefile for the SBP-II Target mode
 
diff --git a/sys/modules/firmware/Makefile b/sys/modules/firmware/Makefile
index 82ed1026e47e0..0cc4f40de4112 100644
--- a/sys/modules/firmware/Makefile
+++ b/sys/modules/firmware/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/firmware/Makefile,v 1.1 2006/01/29 02:52:41 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index b80c3ec435580..4b3cad52d9795 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/fxp/Makefile,v 1.18 2005/09/27 18:10:34 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/fxp
 
diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile
index 4352bd636f86a..b6830fe7d7965 100644
--- a/sys/modules/gem/Makefile
+++ b/sys/modules/gem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/gem/Makefile,v 1.1 2003/01/08 20:40:29 tmm Exp $
 
 .PATH: ${.CURDIR}/../../dev/gem
 
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index 332486b0fb4c2..7231df2f69ab5 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/Makefile,v 1.19.4.1 2008/01/24 20:28:27 lulf Exp $
 
 SUBDIR=	geom_bde \
 	geom_bsd \
diff --git a/sys/modules/geom/Makefile.inc b/sys/modules/geom/Makefile.inc
index 265f86d1ed55a..b985b59dd6e92 100644
--- a/sys/modules/geom/Makefile.inc
+++ b/sys/modules/geom/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/Makefile.inc,v 1.1 2003/06/15 04:27:22 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/geom/geom_apple/Makefile b/sys/modules/geom/geom_apple/Makefile
index 4ec59a6292890..e97c3b3d90b83 100644
--- a/sys/modules/geom/geom_apple/Makefile
+++ b/sys/modules/geom/geom_apple/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_apple/Makefile,v 1.1 2003/05/31 18:36:40 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile
index 089126e9a3eb9..9a25fe04241a3 100644
--- a/sys/modules/geom/geom_bde/Makefile
+++ b/sys/modules/geom/geom_bde/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_bde/Makefile,v 1.2 2006/06/09 17:36:50 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/bde
 .PATH: ${.CURDIR}/../../../crypto/rijndael
diff --git a/sys/modules/geom/geom_bsd/Makefile b/sys/modules/geom/geom_bsd/Makefile
index b605df95d4f8c..d44c36bd73a24 100644
--- a/sys/modules/geom/geom_bsd/Makefile
+++ b/sys/modules/geom/geom_bsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_bsd/Makefile,v 1.2 2005/09/20 11:16:05 imura Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_cache/Makefile b/sys/modules/geom/geom_cache/Makefile
index 7ccbe98fdac9c..b7d413fd223ce 100644
--- a/sys/modules/geom/geom_cache/Makefile
+++ b/sys/modules/geom/geom_cache/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_cache/Makefile,v 1.1 2006/10/06 08:27:07 ru Exp $
 
 .PATH: ${.CURDIR}/../../../geom/cache
 
diff --git a/sys/modules/geom/geom_ccd/Makefile b/sys/modules/geom/geom_ccd/Makefile
index 18d6eeb04718b..dde3fdca07283 100644
--- a/sys/modules/geom/geom_ccd/Makefile
+++ b/sys/modules/geom/geom_ccd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_ccd/Makefile,v 1.1 2003/06/09 21:49:54 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_concat/Makefile b/sys/modules/geom/geom_concat/Makefile
index 3de201a79b487..15ad249321641 100644
--- a/sys/modules/geom/geom_concat/Makefile
+++ b/sys/modules/geom/geom_concat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_concat/Makefile,v 1.1 2004/02/19 15:43:58 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/concat
 
diff --git a/sys/modules/geom/geom_eli/Makefile b/sys/modules/geom/geom_eli/Makefile
index 7b4c506de62f2..7fc3ff35a9702 100644
--- a/sys/modules/geom/geom_eli/Makefile
+++ b/sys/modules/geom/geom_eli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_eli/Makefile,v 1.4 2006/06/05 21:42:25 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/eli
 
diff --git a/sys/modules/geom/geom_fox/Makefile b/sys/modules/geom/geom_fox/Makefile
index adf8c2e8e8bf7..3f1b6f51fe6c6 100644
--- a/sys/modules/geom/geom_fox/Makefile
+++ b/sys/modules/geom/geom_fox/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_fox/Makefile,v 1.1 2003/06/18 09:29:27 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_gate/Makefile b/sys/modules/geom/geom_gate/Makefile
index 783a58ac2d824..56b3a0e30f3c7 100644
--- a/sys/modules/geom/geom_gate/Makefile
+++ b/sys/modules/geom/geom_gate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_gate/Makefile,v 1.1 2004/04/30 16:09:28 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/gate
 
diff --git a/sys/modules/geom/geom_gpt/Makefile b/sys/modules/geom/geom_gpt/Makefile
index ca074bda369c8..2b6febd07eda2 100644
--- a/sys/modules/geom/geom_gpt/Makefile
+++ b/sys/modules/geom/geom_gpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_gpt/Makefile,v 1.1 2003/05/31 18:36:41 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_journal/Makefile b/sys/modules/geom/geom_journal/Makefile
index 0288b4810ce93..7598731978346 100644
--- a/sys/modules/geom/geom_journal/Makefile
+++ b/sys/modules/geom/geom_journal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_journal/Makefile,v 1.1 2006/10/31 22:21:47 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/journal
 
diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile
index e6e7d421590d3..e5a9693e48c85 100644
--- a/sys/modules/geom/geom_label/Makefile
+++ b/sys/modules/geom/geom_label/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_label/Makefile,v 1.3 2005/08/26 11:35:10 takawata Exp $
 
 .PATH: ${.CURDIR}/../../../geom/label
 
diff --git a/sys/modules/geom/geom_mbr/Makefile b/sys/modules/geom/geom_mbr/Makefile
index 1820f3bc3bdd8..b50bfe4c5a5e9 100644
--- a/sys/modules/geom/geom_mbr/Makefile
+++ b/sys/modules/geom/geom_mbr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_mbr/Makefile,v 1.2 2003/07/05 08:11:43 jmg Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_mirror/Makefile b/sys/modules/geom/geom_mirror/Makefile
index 3e653ce540c4b..5c3def41be22b 100644
--- a/sys/modules/geom/geom_mirror/Makefile
+++ b/sys/modules/geom/geom_mirror/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_mirror/Makefile,v 1.1 2004/07/30 23:13:44 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/mirror
 
diff --git a/sys/modules/geom/geom_multipath/Makefile b/sys/modules/geom/geom_multipath/Makefile
index d036fe0dec7bd..3f9d6ab06c404 100644
--- a/sys/modules/geom/geom_multipath/Makefile
+++ b/sys/modules/geom/geom_multipath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_multipath/Makefile,v 1.1 2007/02/27 04:01:58 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../geom/multipath
 
diff --git a/sys/modules/geom/geom_nop/Makefile b/sys/modules/geom/geom_nop/Makefile
index 139e12422ea23..71c983e4c866f 100644
--- a/sys/modules/geom/geom_nop/Makefile
+++ b/sys/modules/geom/geom_nop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_nop/Makefile,v 1.1 2004/05/20 10:27:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/nop
 
diff --git a/sys/modules/geom/geom_pc98/Makefile b/sys/modules/geom/geom_pc98/Makefile
index 2c5952d3e4f03..0ad176ccecb24 100644
--- a/sys/modules/geom/geom_pc98/Makefile
+++ b/sys/modules/geom/geom_pc98/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_pc98/Makefile,v 1.1 2003/05/31 18:36:41 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_raid3/Makefile b/sys/modules/geom/geom_raid3/Makefile
index b202237a611fa..29df04423437a 100644
--- a/sys/modules/geom/geom_raid3/Makefile
+++ b/sys/modules/geom/geom_raid3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_raid3/Makefile,v 1.1 2004/08/16 06:23:14 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/raid3
 
diff --git a/sys/modules/geom/geom_shsec/Makefile b/sys/modules/geom/geom_shsec/Makefile
index f229203ad87aa..c7f57212fa012 100644
--- a/sys/modules/geom/geom_shsec/Makefile
+++ b/sys/modules/geom/geom_shsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_shsec/Makefile,v 1.1 2005/01/11 18:06:44 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/shsec
 
diff --git a/sys/modules/geom/geom_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile
index 278d3accfdc6f..4968df58a61ea 100644
--- a/sys/modules/geom/geom_stripe/Makefile
+++ b/sys/modules/geom/geom_stripe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_stripe/Makefile,v 1.1 2004/05/20 10:27:20 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/stripe
 
diff --git a/sys/modules/geom/geom_sunlabel/Makefile b/sys/modules/geom/geom_sunlabel/Makefile
index 840395aaf1dee..4ff6266c420e8 100644
--- a/sys/modules/geom/geom_sunlabel/Makefile
+++ b/sys/modules/geom/geom_sunlabel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_sunlabel/Makefile,v 1.1 2003/05/31 18:36:41 phk Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile
index 3efeb809527b7..1b07293347672 100644
--- a/sys/modules/geom/geom_uzip/Makefile
+++ b/sys/modules/geom/geom_uzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_uzip/Makefile,v 1.3 2005/09/29 11:56:16 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../../geom/uzip ${.CURDIR}/../../../net
 
diff --git a/sys/modules/geom/geom_vinum/Makefile b/sys/modules/geom/geom_vinum/Makefile
index fe14515d108fb..f965cff63d259 100644
--- a/sys/modules/geom/geom_vinum/Makefile
+++ b/sys/modules/geom/geom_vinum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_vinum/Makefile,v 1.4 2005/11/24 15:11:41 le Exp $
 
 .PATH: ${.CURDIR}/../../../geom/vinum
 
diff --git a/sys/modules/geom/geom_virstor/Makefile b/sys/modules/geom/geom_virstor/Makefile
index 3a099f2c3c175..a94f4263ecbef 100644
--- a/sys/modules/geom/geom_virstor/Makefile
+++ b/sys/modules/geom/geom_virstor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_virstor/Makefile,v 1.1 2007/09/23 07:34:23 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/virstor
 
diff --git a/sys/modules/geom/geom_vol_ffs/Makefile b/sys/modules/geom/geom_vol_ffs/Makefile
index de9b75806dfe6..aee68421fade2 100644
--- a/sys/modules/geom/geom_vol_ffs/Makefile
+++ b/sys/modules/geom/geom_vol_ffs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_vol_ffs/Makefile,v 1.1 2003/06/03 20:32:13 gordon Exp $
 
 .PATH: ${.CURDIR}/../../../geom
 
diff --git a/sys/modules/geom/geom_zero/Makefile b/sys/modules/geom/geom_zero/Makefile
index 43dae09d33333..2a2f7ae7c6652 100644
--- a/sys/modules/geom/geom_zero/Makefile
+++ b/sys/modules/geom/geom_zero/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/geom/geom_zero/Makefile,v 1.1 2005/07/25 10:03:16 pjd Exp $
 
 .PATH: ${.CURDIR}/../../../geom/zero
 
diff --git a/sys/modules/harp/Makefile b/sys/modules/harp/Makefile
index e6d75ed1d5558..e64b32de59a57 100644
--- a/sys/modules/harp/Makefile
+++ b/sys/modules/harp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/harp/Makefile,v 1.2 2004/02/13 10:11:00 ru Exp $
 #
 # Author: Harti Brandt <brandt@fokus.gmd.de>
 #
diff --git a/sys/modules/hatm/Makefile b/sys/modules/hatm/Makefile
index 5dcf113924e6f..9bf5b766a457e 100644
--- a/sys/modules/hatm/Makefile
+++ b/sys/modules/hatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hatm/Makefile,v 1.3 2005/10/14 23:30:09 yar Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/hfa/Makefile b/sys/modules/hfa/Makefile
index 9640830904424..3593245182329 100644
--- a/sys/modules/hfa/Makefile
+++ b/sys/modules/hfa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/Makefile,v 1.1 2002/04/17 00:24:57 mdodd Exp $
 
 SUBDIR=	hfa pci
 
diff --git a/sys/modules/hfa/Makefile.inc b/sys/modules/hfa/Makefile.inc
index 265f86d1ed55a..deafde7d2385d 100644
--- a/sys/modules/hfa/Makefile.inc
+++ b/sys/modules/hfa/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/hfa/eisa/Makefile b/sys/modules/hfa/eisa/Makefile
index bc4f30de70cda..28707a17063bf 100644
--- a/sys/modules/hfa/eisa/Makefile
+++ b/sys/modules/hfa/eisa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/eisa/Makefile,v 1.1 2002/04/17 00:25:08 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
 
diff --git a/sys/modules/hfa/hfa/Makefile b/sys/modules/hfa/hfa/Makefile
index 3c8694ca06843..27088531c1145 100644
--- a/sys/modules/hfa/hfa/Makefile
+++ b/sys/modules/hfa/hfa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/hfa/Makefile,v 1.1 2002/04/17 00:25:44 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
 
diff --git a/sys/modules/hfa/pci/Makefile b/sys/modules/hfa/pci/Makefile
index 3e62752b31cd1..00faf2ee0a133 100644
--- a/sys/modules/hfa/pci/Makefile
+++ b/sys/modules/hfa/pci/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/pci/Makefile,v 1.1 2002/04/17 00:26:01 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
   
diff --git a/sys/modules/hfa/sbus/Makefile b/sys/modules/hfa/sbus/Makefile
index 3862c296624a9..3c3f918687b84 100644
--- a/sys/modules/hfa/sbus/Makefile
+++ b/sys/modules/hfa/sbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hfa/sbus/Makefile,v 1.1 2002/04/17 00:26:09 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../../dev/hfa
 
diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile
index 9dfd04ae0b02d..d7d8ca9311676 100644
--- a/sys/modules/hifn/Makefile
+++ b/sys/modules/hifn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hifn/Makefile,v 1.6 2007/03/21 03:42:50 sam Exp $
 
 .PATH:	${.CURDIR}/../../dev/hifn
 KMOD	= hifn
diff --git a/sys/modules/hme/Makefile b/sys/modules/hme/Makefile
index 8f403710ce138..85e0d9f936848 100644
--- a/sys/modules/hme/Makefile
+++ b/sys/modules/hme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hme/Makefile,v 1.3 2004/08/14 22:40:16 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/hme
 
diff --git a/sys/modules/hpfs/Makefile b/sys/modules/hpfs/Makefile
index 750fda00dae08..ba7bce3bb0bac 100644
--- a/sys/modules/hpfs/Makefile
+++ b/sys/modules/hpfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hpfs/Makefile,v 1.8 2005/03/28 09:41:25 jeff Exp $
 
 .PATH: ${.CURDIR}/../../fs/hpfs
 
diff --git a/sys/modules/hptiop/Makefile b/sys/modules/hptiop/Makefile
index 66f11c287ac4a..6f3126bffd751 100644
--- a/sys/modules/hptiop/Makefile
+++ b/sys/modules/hptiop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hptiop/Makefile,v 1.1 2007/05/09 07:07:26 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/hptiop
 
diff --git a/sys/modules/hptmv/Makefile b/sys/modules/hptmv/Makefile
index 05ceac7bb1f6e..a9fe8095482c7 100644
--- a/sys/modules/hptmv/Makefile
+++ b/sys/modules/hptmv/Makefile
@@ -2,7 +2,7 @@
 # Makefile for RR182x FreeBSD driver
 # Copyright (c)  2004-2005 HighPoint Technologies, Inc. All rights reserved
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hptmv/Makefile,v 1.4 2005/09/07 23:33:26 scottl Exp $
 
 HPTMV= ${.CURDIR}/../../dev/hptmv
 .PATH: ${HPTMV}
diff --git a/sys/modules/hptrr/Makefile b/sys/modules/hptrr/Makefile
index 038c5a45f464f..43f72b212c02f 100644
--- a/sys/modules/hptrr/Makefile
+++ b/sys/modules/hptrr/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile.def,v 1.18 2007/03/22 11:20:15 gmm Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hptrr/Makefile,v 1.1.2.1 2007/12/15 02:57:31 scottl Exp $
 
 HPTRR=  ${.CURDIR}/../../dev/hptrr
 .PATH: ${HPTRR}
diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile
index f46f765766386..e9ec5eafeab4c 100644
--- a/sys/modules/hwpmc/Makefile
+++ b/sys/modules/hwpmc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/hwpmc/Makefile,v 1.4 2006/07/27 19:12:49 marcel Exp $
 #
 
 .PATH: ${.CURDIR}/../../dev/hwpmc
diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile
index 7ba1f436f4951..c234a5490000e 100644
--- a/sys/modules/i2c/Makefile
+++ b/sys/modules/i2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/Makefile,v 1.1 2002/03/23 15:48:36 nsouch Exp $
 
 SUBDIR =
 SUBDIR += controllers if_ic smbus iicbus iicbb iicsmb iic smb
diff --git a/sys/modules/i2c/Makefile.inc b/sys/modules/i2c/Makefile.inc
index 265f86d1ed55a..03593a43aa7d8 100644
--- a/sys/modules/i2c/Makefile.inc
+++ b/sys/modules/i2c/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/Makefile.inc,v 1.1 2002/11/06 13:41:39 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile
index c9d9fbbbc73bc..70c08295b668b 100644
--- a/sys/modules/i2c/controllers/Makefile
+++ b/sys/modules/i2c/controllers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/Makefile,v 1.5 2005/12/21 15:49:50 ru Exp $
 
 .if ${MACHINE} == "pc98"
 SUBDIR = lpbb
diff --git a/sys/modules/i2c/controllers/Makefile.inc b/sys/modules/i2c/controllers/Makefile.inc
index 265f86d1ed55a..607c6327d0111 100644
--- a/sys/modules/i2c/controllers/Makefile.inc
+++ b/sys/modules/i2c/controllers/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/Makefile.inc,v 1.1 2002/11/06 13:41:40 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile
index 885b983a89987..784acb6f80259 100644
--- a/sys/modules/i2c/controllers/alpm/Makefile
+++ b/sys/modules/i2c/controllers/alpm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.2 2007/06/24 20:35:58 njl Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= alpm
diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile
index 5f6d7ed295ba3..5c3930ef2967a 100644
--- a/sys/modules/i2c/controllers/amdpm/Makefile
+++ b/sys/modules/i2c/controllers/amdpm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/amdpm/Makefile,v 1.1 2002/03/23 15:48:41 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= amdpm
diff --git a/sys/modules/i2c/controllers/amdsmb/Makefile b/sys/modules/i2c/controllers/amdsmb/Makefile
index d7306cebf6892..d434bb9d5c1de 100644
--- a/sys/modules/i2c/controllers/amdsmb/Makefile
+++ b/sys/modules/i2c/controllers/amdsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/amdsmb/Makefile,v 1.1 2005/12/21 15:49:51 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../pci
 
diff --git a/sys/modules/i2c/controllers/ichsmb/Makefile b/sys/modules/i2c/controllers/ichsmb/Makefile
index 7cb9957384f5a..dbdbf769825f5 100644
--- a/sys/modules/i2c/controllers/ichsmb/Makefile
+++ b/sys/modules/i2c/controllers/ichsmb/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/i2c/controllers/ichsmb/Makefile,v 1.1 2005/06/05 11:55:29 takawata Exp $
 
 .PATH:		${.CURDIR}/../../../../dev/ichsmb
 KMOD		= ichsmb
diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile
index 7cef578707b91..4c108735c307d 100644
--- a/sys/modules/i2c/controllers/intpm/Makefile
+++ b/sys/modules/i2c/controllers/intpm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/intpm/Makefile,v 1.1 2002/03/23 15:48:42 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= intpm
diff --git a/sys/modules/i2c/controllers/lpbb/Makefile b/sys/modules/i2c/controllers/lpbb/Makefile
index 77e84d2caf22e..ce4f50d40a069 100644
--- a/sys/modules/i2c/controllers/lpbb/Makefile
+++ b/sys/modules/i2c/controllers/lpbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/lpbb/Makefile,v 1.2 2003/06/14 20:43:33 jmg Exp $
 
 .PATH:		${.CURDIR}/../../../../dev/ppbus
 KMOD		= lpbb
diff --git a/sys/modules/i2c/controllers/nfsmb/Makefile b/sys/modules/i2c/controllers/nfsmb/Makefile
index 21b67f3196f93..4768617cf29c3 100644
--- a/sys/modules/i2c/controllers/nfsmb/Makefile
+++ b/sys/modules/i2c/controllers/nfsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/nfsmb/Makefile,v 1.1 2005/12/21 15:49:51 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../pci
 
diff --git a/sys/modules/i2c/controllers/pcf/Makefile b/sys/modules/i2c/controllers/pcf/Makefile
index 4714cfd9c1c2e..38d678327bd7b 100644
--- a/sys/modules/i2c/controllers/pcf/Makefile
+++ b/sys/modules/i2c/controllers/pcf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/pcf/Makefile,v 1.4 2005/11/22 17:32:51 marius Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/pcf
 
diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile
index 37100301b84a3..3a777218d07d3 100644
--- a/sys/modules/i2c/controllers/viapm/Makefile
+++ b/sys/modules/i2c/controllers/viapm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.3 2007/06/24 20:35:59 njl Exp $
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= viapm
diff --git a/sys/modules/i2c/if_ic/Makefile b/sys/modules/i2c/if_ic/Makefile
index 67dd7344585bd..b9da2d9b140de 100644
--- a/sys/modules/i2c/if_ic/Makefile
+++ b/sys/modules/i2c/if_ic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/if_ic/Makefile,v 1.1 2002/03/23 15:48:48 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= if_ic
diff --git a/sys/modules/i2c/iic/Makefile b/sys/modules/i2c/iic/Makefile
index 0ac8678c6d00d..89ad521d003e6 100644
--- a/sys/modules/i2c/iic/Makefile
+++ b/sys/modules/i2c/iic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iic/Makefile,v 1.1 2002/03/23 15:48:51 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iic
diff --git a/sys/modules/i2c/iicbb/Makefile b/sys/modules/i2c/iicbb/Makefile
index ea991e082e064..d40cf2466d75f 100644
--- a/sys/modules/i2c/iicbb/Makefile
+++ b/sys/modules/i2c/iicbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iicbb/Makefile,v 1.1 2002/03/23 15:48:53 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicbb
diff --git a/sys/modules/i2c/iicbus/Makefile b/sys/modules/i2c/iicbus/Makefile
index c3fc8e3f52258..63d3b89e2674c 100644
--- a/sys/modules/i2c/iicbus/Makefile
+++ b/sys/modules/i2c/iicbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iicbus/Makefile,v 1.1 2002/03/23 15:48:55 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicbus
diff --git a/sys/modules/i2c/iicsmb/Makefile b/sys/modules/i2c/iicsmb/Makefile
index d0c676482e5c4..fe470383b59d7 100644
--- a/sys/modules/i2c/iicsmb/Makefile
+++ b/sys/modules/i2c/iicsmb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/iicsmb/Makefile,v 1.1 2002/03/23 15:48:56 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/iicbus
 KMOD		= iicsmb
diff --git a/sys/modules/i2c/smb/Makefile b/sys/modules/i2c/smb/Makefile
index f6f960c02126e..b90de9ff1068e 100644
--- a/sys/modules/i2c/smb/Makefile
+++ b/sys/modules/i2c/smb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/smb/Makefile,v 1.1 2002/03/23 15:48:58 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/smbus
 KMOD		= smb
diff --git a/sys/modules/i2c/smbus/Makefile b/sys/modules/i2c/smbus/Makefile
index 24462d0385123..9a5683f12baed 100644
--- a/sys/modules/i2c/smbus/Makefile
+++ b/sys/modules/i2c/smbus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/i2c/smbus/Makefile,v 1.1 2002/03/23 15:48:59 nsouch Exp $
 
 .PATH:		${.CURDIR}/../../../dev/smbus
 KMOD		= smbus
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index f258fa9019335..87255d8bb3a7b 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ibcs2/Makefile,v 1.34 2002/08/12 07:20:15 alfred Exp $
 
 .PATH: ${.CURDIR}/../../i386/ibcs2
 
diff --git a/sys/modules/ichwd/Makefile b/sys/modules/ichwd/Makefile
index 880ec82a28ef2..b3f73f248a46f 100644
--- a/sys/modules/ichwd/Makefile
+++ b/sys/modules/ichwd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ichwd/Makefile,v 1.1 2004/05/11 18:21:38 des Exp $
 
 .PATH: ${.CURDIR}/../../dev/ichwd
 
diff --git a/sys/modules/ida/Makefile b/sys/modules/ida/Makefile
index e97ac69db1238..e51ebdfd8204d 100644
--- a/sys/modules/ida/Makefile
+++ b/sys/modules/ida/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ida/Makefile,v 1.2 2004/01/11 07:01:30 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../dev/ida
 
diff --git a/sys/modules/idt/Makefile b/sys/modules/idt/Makefile
index 8f1a08ee225b9..45748d9c021bb 100644
--- a/sys/modules/idt/Makefile
+++ b/sys/modules/idt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/idt/Makefile,v 1.1 2002/09/30 05:12:39 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../dev/idt
   
diff --git a/sys/modules/ie/Makefile b/sys/modules/ie/Makefile
index d6c611de34808..c4dccf2306412 100644
--- a/sys/modules/ie/Makefile
+++ b/sys/modules/ie/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ie/Makefile,v 1.2 2005/01/26 16:26:06 imp Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/ie
diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile
index 1ddb4c87ef081..ccd8f40bc90df 100644
--- a/sys/modules/if_bridge/Makefile
+++ b/sys/modules/if_bridge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_bridge/Makefile,v 1.6 2006/07/26 22:15:14 thompsa Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 9dc5742eaa0b5..dad6ac5f7113c 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_disc/Makefile,v 1.18 2005/10/14 23:30:10 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_edsc/Makefile b/sys/modules/if_edsc/Makefile
index af2704b942a94..fb660b35c1161 100644
--- a/sys/modules/if_edsc/Makefile
+++ b/sys/modules/if_edsc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_edsc/Makefile,v 1.1 2007/03/26 04:39:18 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile
index dc40213c7181c..7d5c897b09f06 100644
--- a/sys/modules/if_ef/Makefile
+++ b/sys/modules/if_ef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ef/Makefile,v 1.14 2006/08/14 13:28:52 des Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_faith/Makefile b/sys/modules/if_faith/Makefile
index a46d5fd399d69..cef7604a3a4cd 100644
--- a/sys/modules/if_faith/Makefile
+++ b/sys/modules/if_faith/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_faith/Makefile,v 1.3 2005/10/14 23:30:10 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index b608f559b061b..706c33e7c3e12 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_gif/Makefile,v 1.10 2006/03/17 18:54:37 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/if_gre/Makefile b/sys/modules/if_gre/Makefile
index 87da7b037d034..d2a056f69c0a9 100644
--- a/sys/modules/if_gre/Makefile
+++ b/sys/modules/if_gre/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_gre/Makefile,v 1.6 2005/10/14 23:30:11 yar Exp $
 
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile
index 4d84c92d17020..b7666025af4a8 100644
--- a/sys/modules/if_lagg/Makefile
+++ b/sys/modules/if_lagg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_lagg/Makefile,v 1.1 2007/04/17 00:35:10 thompsa Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile
index 0830aec1c694e..dd9281a3c850e 100644
--- a/sys/modules/if_ndis/Makefile
+++ b/sys/modules/if_ndis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ndis/Makefile,v 1.6 2005/09/27 18:10:35 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/if_ndis
 
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index ce7bdb0719ac8..25f4e623cff0c 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.37 2006/11/11 15:02:04 ume Exp $
 
 .PATH:  ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 800a9847943cf..9ba2a53df56a1 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_sl/Makefile,v 1.20 2005/10/14 23:30:11 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile
index c231b002229cf..67c433b4e1c94 100644
--- a/sys/modules/if_stf/Makefile
+++ b/sys/modules/if_stf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_stf/Makefile,v 1.4 2005/10/14 23:30:11 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_tap/Makefile b/sys/modules/if_tap/Makefile
index c138e7105598c..7957c8aca9533 100644
--- a/sys/modules/if_tap/Makefile
+++ b/sys/modules/if_tap/Makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_tap/Makefile,v 1.6 2006/09/27 19:57:00 ru Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 17dbf33b9dd9c..015cf3368d74c 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.29 2005/10/14 23:30:11 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 9842619b35da9..5f2781906f65b 100644
--- a/sys/modules/if_vlan/Makefile
+++ b/sys/modules/if_vlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/if_vlan/Makefile,v 1.5 2007/03/19 17:34:31 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/iir/Makefile b/sys/modules/iir/Makefile
index 591fef8c0e88f..568a16bbca632 100644
--- a/sys/modules/iir/Makefile
+++ b/sys/modules/iir/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iir/Makefile,v 1.1 2002/01/20 08:51:08 msmith Exp $
 
 KMOD		=  iir
 .PATH:		${.CURDIR}/../../dev/${KMOD}
diff --git a/sys/modules/io/Makefile b/sys/modules/io/Makefile
index d90a8e473b103..0c603c02c4c12 100644
--- a/sys/modules/io/Makefile
+++ b/sys/modules/io/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/io/Makefile,v 1.2 2004/12/29 08:44:03 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/io
 .PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH}
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index 5b3330fd513ca..e9fe32dd0ea6e 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ip_mroute_mod/Makefile,v 1.16 2007/06/13 02:08:03 sepotvin Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile
index 203b4bf6871d2..7c8c32e02f910 100644
--- a/sys/modules/ipdivert/Makefile
+++ b/sys/modules/ipdivert/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipdivert/Makefile,v 1.1 2004/10/19 21:14:57 andre Exp $
 
 .PATH: ${.CURDIR}/../../netinet
 
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index 9cfb0f6ad5fc5..16ada5ab81eb5 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ipfilter/Makefile,v 1.20 2006/03/17 18:54:37 ru Exp $ 
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index e208e1dccb8ba..166f2570d40e9 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.26 2007/07/03 12:46:06 mlaier Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile
index 3f45c73361eff..8a065a51e5480 100644
--- a/sys/modules/ipmi/Makefile
+++ b/sys/modules/ipmi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipmi/Makefile,v 1.2 2006/09/22 22:11:29 jhb Exp $
 
 .PATH: ${.CURDIR}/../../dev/ipmi
 
diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile
index 4ec20a3d05ba9..c8ab489401ba6 100644
--- a/sys/modules/ips/Makefile
+++ b/sys/modules/ips/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ips/Makefile,v 1.1 2003/05/11 06:36:49 scottl Exp $
 
 .PATH:		${.CURDIR}/../../dev/ips
 KMOD		= ips
diff --git a/sys/modules/ipw/Makefile b/sys/modules/ipw/Makefile
index 741d85240dc12..1e2bf15b146cf 100644
--- a/sys/modules/ipw/Makefile
+++ b/sys/modules/ipw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipw/Makefile,v 1.2 2005/09/27 18:10:35 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/ipw
 
diff --git a/sys/modules/ipwfw/Makefile b/sys/modules/ipwfw/Makefile
index 83f4e67702394..fdc9874b4f12a 100644
--- a/sys/modules/ipwfw/Makefile
+++ b/sys/modules/ipwfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipwfw/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 SUBDIR=	ipw_bss	\
 	ipw_ibss \
diff --git a/sys/modules/ipwfw/ipw_bss/Makefile b/sys/modules/ipwfw/ipw_bss/Makefile
index 2f57711a3c975..8a366a206d810 100644
--- a/sys/modules/ipwfw/ipw_bss/Makefile
+++ b/sys/modules/ipwfw/ipw_bss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipwfw/ipw_bss/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/ipw
 
diff --git a/sys/modules/ipwfw/ipw_ibss/Makefile b/sys/modules/ipwfw/ipw_ibss/Makefile
index 10281b114a922..bcb7a581c1088 100644
--- a/sys/modules/ipwfw/ipw_ibss/Makefile
+++ b/sys/modules/ipwfw/ipw_ibss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipwfw/ipw_ibss/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/ipw
 
diff --git a/sys/modules/ipwfw/ipw_monitor/Makefile b/sys/modules/ipwfw/ipw_monitor/Makefile
index cdc28b22a9bb6..f5cc24bf55bcf 100644
--- a/sys/modules/ipwfw/ipw_monitor/Makefile
+++ b/sys/modules/ipwfw/ipw_monitor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ipwfw/ipw_monitor/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/ipw
 
diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile
index 625e3be978378..b3656ff851f25 100644
--- a/sys/modules/iscsi/Makefile
+++ b/sys/modules/iscsi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iscsi/Makefile,v 1.1 2007/07/24 15:35:02 scottl Exp $
 
 SUBDIR= initiator
 
diff --git a/sys/modules/iscsi/initiator/Makefile b/sys/modules/iscsi/initiator/Makefile
index 3295c7b6f517f..68b162ca15eb6 100644
--- a/sys/modules/iscsi/initiator/Makefile
+++ b/sys/modules/iscsi/initiator/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iscsi/initiator/Makefile,v 1.1 2007/07/24 15:35:02 scottl Exp $
 
 .PATH: ${.CURDIR}/../../../dev/iscsi/initiator
 KMOD=iscsi_initiator
diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile
index fbdf1b4c2cc5c..8c6c058eaca7c 100644
--- a/sys/modules/isp/Makefile
+++ b/sys/modules/isp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/isp/Makefile,v 1.3 2006/12/10 05:51:27 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../dev/isp
 
diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile
index 62bbb2e6bc1d7..6796012b66363 100644
--- a/sys/modules/ispfw/Makefile
+++ b/sys/modules/ispfw/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/ispfw/Makefile,v 1.4 2006/08/26 18:40:25 mjacob Exp $ 
 
 
 SUBDIR = ispfw
diff --git a/sys/modules/ispfw/isp_1000/Makefile b/sys/modules/ispfw/isp_1000/Makefile
index ef2189dff738e..d4fcad80d72b5 100644
--- a/sys/modules/ispfw/isp_1000/Makefile
+++ b/sys/modules/ispfw/isp_1000/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_1000/Makefile,v 1.1 2006/07/09 17:50:18 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_1040/Makefile b/sys/modules/ispfw/isp_1040/Makefile
index 4227704816a26..3413d0daff656 100644
--- a/sys/modules/ispfw/isp_1040/Makefile
+++ b/sys/modules/ispfw/isp_1040/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_1040/Makefile,v 1.1 2006/07/09 17:50:18 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_1040_it/Makefile b/sys/modules/ispfw/isp_1040_it/Makefile
index cdccc05dc1bf6..a6289fe6a107e 100644
--- a/sys/modules/ispfw/isp_1040_it/Makefile
+++ b/sys/modules/ispfw/isp_1040_it/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_1040_it/Makefile,v 1.1 2006/07/09 17:50:18 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_1080/Makefile b/sys/modules/ispfw/isp_1080/Makefile
index 0e383bfde72ce..8061fd7c39495 100644
--- a/sys/modules/ispfw/isp_1080/Makefile
+++ b/sys/modules/ispfw/isp_1080/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_1080/Makefile,v 1.1 2006/07/09 17:50:18 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_1080_it/Makefile b/sys/modules/ispfw/isp_1080_it/Makefile
index 9d688fc63bb67..73e6d23a25052 100644
--- a/sys/modules/ispfw/isp_1080_it/Makefile
+++ b/sys/modules/ispfw/isp_1080_it/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_1080_it/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_12160/Makefile b/sys/modules/ispfw/isp_12160/Makefile
index 7c28442f91946..04b55d8ffa4e4 100644
--- a/sys/modules/ispfw/isp_12160/Makefile
+++ b/sys/modules/ispfw/isp_12160/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_12160/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_12160_it/Makefile b/sys/modules/ispfw/isp_12160_it/Makefile
index d5526e69104fc..63e090aa1639a 100644
--- a/sys/modules/ispfw/isp_12160_it/Makefile
+++ b/sys/modules/ispfw/isp_12160_it/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_12160_it/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_2100/Makefile b/sys/modules/ispfw/isp_2100/Makefile
index 178f090bdea48..7b336eba9c576 100644
--- a/sys/modules/ispfw/isp_2100/Makefile
+++ b/sys/modules/ispfw/isp_2100/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_2100/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_2200/Makefile b/sys/modules/ispfw/isp_2200/Makefile
index 64a41f128c8c5..50561c7660ed2 100644
--- a/sys/modules/ispfw/isp_2200/Makefile
+++ b/sys/modules/ispfw/isp_2200/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_2200/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_2300/Makefile b/sys/modules/ispfw/isp_2300/Makefile
index 4acceda7d4c36..c8fb938363778 100644
--- a/sys/modules/ispfw/isp_2300/Makefile
+++ b/sys/modules/ispfw/isp_2300/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_2300/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_2322/Makefile b/sys/modules/ispfw/isp_2322/Makefile
index 3ebb30f0a177a..0cffc923697c2 100644
--- a/sys/modules/ispfw/isp_2322/Makefile
+++ b/sys/modules/ispfw/isp_2322/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_2322/Makefile,v 1.1 2006/07/09 17:50:19 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/isp_2400/Makefile b/sys/modules/ispfw/isp_2400/Makefile
index 2655fd000e9ee..10bb14a0f1c39 100644
--- a/sys/modules/ispfw/isp_2400/Makefile
+++ b/sys/modules/ispfw/isp_2400/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/isp_2400/Makefile,v 1.1 2006/08/26 18:40:25 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/ispfw/ispfw/Makefile b/sys/modules/ispfw/ispfw/Makefile
index f3b869403d274..b340b641aeefb 100644
--- a/sys/modules/ispfw/ispfw/Makefile
+++ b/sys/modules/ispfw/ispfw/Makefile
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ispfw/ispfw/Makefile,v 1.1 2006/07/09 17:50:20 mjacob Exp $
 
 .PATH: ${.CURDIR}/../../../dev/ispfw
 
diff --git a/sys/modules/iwi/Makefile b/sys/modules/iwi/Makefile
index 60c60519bd905..d72820c376dfa 100644
--- a/sys/modules/iwi/Makefile
+++ b/sys/modules/iwi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iwi/Makefile,v 1.4 2006/03/12 19:06:06 damien Exp $
 
 .PATH: ${.CURDIR}/../../dev/iwi
 
diff --git a/sys/modules/iwifw/Makefile b/sys/modules/iwifw/Makefile
index 55434c2ce60fc..18eca89a395b8 100644
--- a/sys/modules/iwifw/Makefile
+++ b/sys/modules/iwifw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iwifw/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 SUBDIR=	iwi_bss	\
 	iwi_ibss \
diff --git a/sys/modules/iwifw/iwi_bss/Makefile b/sys/modules/iwifw/iwi_bss/Makefile
index 5bb7a466091b8..f6a06f972c3b8 100644
--- a/sys/modules/iwifw/iwi_bss/Makefile
+++ b/sys/modules/iwifw/iwi_bss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iwifw/iwi_bss/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/iwi
 
diff --git a/sys/modules/iwifw/iwi_ibss/Makefile b/sys/modules/iwifw/iwi_ibss/Makefile
index 35d06565c4891..ba0522e4dc076 100644
--- a/sys/modules/iwifw/iwi_ibss/Makefile
+++ b/sys/modules/iwifw/iwi_ibss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iwifw/iwi_ibss/Makefile,v 1.1 2007/03/02 11:42:55 flz Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/iwi
 
diff --git a/sys/modules/iwifw/iwi_monitor/Makefile b/sys/modules/iwifw/iwi_monitor/Makefile
index c05c6f1ee8973..df7e7b117c52b 100644
--- a/sys/modules/iwifw/iwi_monitor/Makefile
+++ b/sys/modules/iwifw/iwi_monitor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/iwifw/iwi_monitor/Makefile,v 1.1 2007/03/02 11:42:56 flz Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/dev/iwi
 
diff --git a/sys/modules/ixgb/Makefile b/sys/modules/ixgb/Makefile
index 16e597591e5e8..e2d34d78c89a6 100644
--- a/sys/modules/ixgb/Makefile
+++ b/sys/modules/ixgb/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/ixgb/Makefile,v 1.3 2005/09/27 18:10:35 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/ixgb
 
diff --git a/sys/modules/ixgbe/Makefile b/sys/modules/ixgbe/Makefile
index ae31c151a1e72..16a92534a6dc7 100644
--- a/sys/modules/ixgbe/Makefile
+++ b/sys/modules/ixgbe/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/ixgbe/Makefile,v 1.1 2007/09/04 02:31:35 jfv Exp $
 .PATH:  ${.CURDIR}/../../dev/ixgbe
 KMOD    = ixgbe
 SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 71ba7f14692db..44a5557356615 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/joy/Makefile,v 1.23 2004/05/26 00:53:04 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/joy
 
diff --git a/sys/modules/kbdmux/Makefile b/sys/modules/kbdmux/Makefile
index 70b39a05a9cf7..2d7afdeb3a57e 100644
--- a/sys/modules/kbdmux/Makefile
+++ b/sys/modules/kbdmux/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2005/06/23 00:30:50 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/kbdmux/Makefile,v 1.4 2006/09/27 19:57:00 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/kbdmux
 
diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile
index d5271d1f16b2d..37ee2f5860ade 100644
--- a/sys/modules/kue/Makefile
+++ b/sys/modules/kue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/kue/Makefile,v 1.7 2005/09/27 18:10:36 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile
index d3101e175152b..8ab0f4e8c9706 100644
--- a/sys/modules/le/Makefile
+++ b/sys/modules/le/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/le/Makefile,v 1.3 2007/01/20 12:53:30 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/le
 
diff --git a/sys/modules/lge/Makefile b/sys/modules/lge/Makefile
index 810e220ca14ce..0d3c1e8f62c67 100644
--- a/sys/modules/lge/Makefile
+++ b/sys/modules/lge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lge/Makefile,v 1.2 2005/09/27 18:10:36 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/lge
 
diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile
index e4296e1dfa15c..4ef8bbe315b2f 100644
--- a/sys/modules/libalias/Makefile
+++ b/sys/modules/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/Makefile,v 1.4 2006/09/27 12:30:27 ru Exp $
 
 SUBDIR=	libalias modules
 
diff --git a/sys/modules/libalias/libalias/Makefile b/sys/modules/libalias/libalias/Makefile
index a3b5347e926d7..4f1730bb80b78 100644
--- a/sys/modules/libalias/libalias/Makefile
+++ b/sys/modules/libalias/libalias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/libalias/Makefile,v 1.2 2007/04/09 17:08:27 piso Exp $
 
 .PATH: ${.CURDIR}/../../../netinet/libalias
 
diff --git a/sys/modules/libalias/modules/Makefile b/sys/modules/libalias/modules/Makefile
index 201b3badf3b07..27e97abd88798 100644
--- a/sys/modules/libalias/modules/Makefile
+++ b/sys/modules/libalias/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/Makefile,v 1.2 2006/09/27 12:30:27 ru Exp $
 
 .include "${.CURDIR}/modules.inc"
 
diff --git a/sys/modules/libalias/modules/Makefile.inc b/sys/modules/libalias/modules/Makefile.inc
index 78391c597b866..5d3eba6226b80 100644
--- a/sys/modules/libalias/modules/Makefile.inc
+++ b/sys/modules/libalias/modules/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/Makefile.inc,v 1.1 2006/09/26 23:26:51 piso Exp $
 
 .PATH: ${.CURDIR}/../../../../netinet/libalias
diff --git a/sys/modules/libalias/modules/cuseeme/Makefile b/sys/modules/libalias/modules/cuseeme/Makefile
index dfb5a83d27902..8806d82998fe2 100644
--- a/sys/modules/libalias/modules/cuseeme/Makefile
+++ b/sys/modules/libalias/modules/cuseeme/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_cuseeme
 SRCS=	alias_cuseeme.c
diff --git a/sys/modules/libalias/modules/dummy/Makefile b/sys/modules/libalias/modules/dummy/Makefile
index ded455a8dfe71..82abcee7af5dc 100644
--- a/sys/modules/libalias/modules/dummy/Makefile
+++ b/sys/modules/libalias/modules/dummy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_dummy
 SRCS=	alias_dummy.c
diff --git a/sys/modules/libalias/modules/ftp/Makefile b/sys/modules/libalias/modules/ftp/Makefile
index 07e700b40956f..d82c4f9585861 100644
--- a/sys/modules/libalias/modules/ftp/Makefile
+++ b/sys/modules/libalias/modules/ftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_ftp
 SRCS=	alias_ftp.c
diff --git a/sys/modules/libalias/modules/irc/Makefile b/sys/modules/libalias/modules/irc/Makefile
index b6e330d9e1b88..c1651974970b9 100644
--- a/sys/modules/libalias/modules/irc/Makefile
+++ b/sys/modules/libalias/modules/irc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_irc
 SRCS=	alias_irc.c
diff --git a/sys/modules/libalias/modules/modules.inc b/sys/modules/libalias/modules/modules.inc
index 9582ab53828cd..4ce0c1bcee47e 100644
--- a/sys/modules/libalias/modules/modules.inc
+++ b/sys/modules/libalias/modules/modules.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/modules.inc,v 1.1 2006/09/26 23:26:51 piso Exp $
 
 MODULES		 =
 MODULES		+= cuseeme
diff --git a/sys/modules/libalias/modules/nbt/Makefile b/sys/modules/libalias/modules/nbt/Makefile
index 6d6dd8728b6a1..ca96908001d49 100644
--- a/sys/modules/libalias/modules/nbt/Makefile
+++ b/sys/modules/libalias/modules/nbt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_nbt
 SRCS=	alias_nbt.c
diff --git a/sys/modules/libalias/modules/pptp/Makefile b/sys/modules/libalias/modules/pptp/Makefile
index 748f356e9fa74..5d92759475c24 100644
--- a/sys/modules/libalias/modules/pptp/Makefile
+++ b/sys/modules/libalias/modules/pptp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_pptp
 SRCS=	alias_pptp.c
diff --git a/sys/modules/libalias/modules/skinny/Makefile b/sys/modules/libalias/modules/skinny/Makefile
index 8560f5ed131f7..d36938fb198f3 100644
--- a/sys/modules/libalias/modules/skinny/Makefile
+++ b/sys/modules/libalias/modules/skinny/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_skinny
 SRCS=	alias_skinny.c
diff --git a/sys/modules/libalias/modules/smedia/Makefile b/sys/modules/libalias/modules/smedia/Makefile
index 245a63e8cfec3..65f7a1804e6b8 100644
--- a/sys/modules/libalias/modules/smedia/Makefile
+++ b/sys/modules/libalias/modules/smedia/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:53 piso Exp $
 
 KMOD=	alias_smedia
 SRCS=	alias_smedia.c
diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile
index 66460642104e9..8744290150967 100644
--- a/sys/modules/libiconv/Makefile
+++ b/sys/modules/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libiconv/Makefile,v 1.4 2003/09/26 20:26:24 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../libkern ${.CURDIR}/../../sys
 
diff --git a/sys/modules/libmbpool/Makefile b/sys/modules/libmbpool/Makefile
index efd15ec759c70..e78f00920a595 100644
--- a/sys/modules/libmbpool/Makefile
+++ b/sys/modules/libmbpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libmbpool/Makefile,v 1.1 2003/07/15 08:59:38 harti Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/libmchain/Makefile b/sys/modules/libmchain/Makefile
index fd151ec6ab725..4ba8a3bebd02f 100644
--- a/sys/modules/libmchain/Makefile
+++ b/sys/modules/libmchain/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libmchain/Makefile,v 1.3 2002/12/14 00:01:51 tjr Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index 9b89c96aa56d6..c815248f74d58 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linprocfs/Makefile,v 1.14 2006/08/15 13:01:36 netchild Exp $
 
 .PATH: ${.CURDIR}/../../compat/linprocfs
 
diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile
index 1320212004ffb..9c24872c698f6 100644
--- a/sys/modules/linsysfs/Makefile
+++ b/sys/modules/linsysfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linsysfs/Makefile,v 1.2 2006/08/15 13:01:36 netchild Exp $
 
 .PATH: ${.CURDIR}/../../compat/linsysfs
 
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 58d5b11c555c1..862b996d38125 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/linux/Makefile,v 1.72 2007/05/23 15:45:52 kib Exp $
 
 .if ${MACHINE_ARCH} == "amd64"
 SFX= 32
diff --git a/sys/modules/lmc/Makefile b/sys/modules/lmc/Makefile
index 70e27b50eddd9..1d5c2baf328ef 100644
--- a/sys/modules/lmc/Makefile
+++ b/sys/modules/lmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lmc/Makefile,v 1.3 2005/10/05 10:07:27 glebius Exp $
 
 KMOD  = if_lmc
 .PATH: ${.CURDIR}/../../dev/lmc
diff --git a/sys/modules/lpt/Makefile b/sys/modules/lpt/Makefile
index b57960d572f4a..37ce2843092d9 100644
--- a/sys/modules/lpt/Makefile
+++ b/sys/modules/lpt/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/lpt/Makefile,v 1.2 2002/01/11 15:48:50 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	lpt
diff --git a/sys/modules/mac_biba/Makefile b/sys/modules/mac_biba/Makefile
index 76ae8e8265cea..0c1214ab4bce6 100644
--- a/sys/modules/mac_biba/Makefile
+++ b/sys/modules/mac_biba/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_biba/Makefile,v 1.2 2002/10/22 17:10:14 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_biba
 
diff --git a/sys/modules/mac_bsdextended/Makefile b/sys/modules/mac_bsdextended/Makefile
index 93388fe03eb14..8156c689a1319 100644
--- a/sys/modules/mac_bsdextended/Makefile
+++ b/sys/modules/mac_bsdextended/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_bsdextended/Makefile,v 1.1 2002/08/01 17:41:26 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_bsdextended
 
diff --git a/sys/modules/mac_ifoff/Makefile b/sys/modules/mac_ifoff/Makefile
index fc1a60037fc40..0669b6aff32e1 100644
--- a/sys/modules/mac_ifoff/Makefile
+++ b/sys/modules/mac_ifoff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_ifoff/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_ifoff
 
diff --git a/sys/modules/mac_lomac/Makefile b/sys/modules/mac_lomac/Makefile
index 6216a578483c8..f5e413dd018e4 100644
--- a/sys/modules/mac_lomac/Makefile
+++ b/sys/modules/mac_lomac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_lomac/Makefile,v 1.1 2002/11/26 17:35:44 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_lomac
 
diff --git a/sys/modules/mac_mls/Makefile b/sys/modules/mac_mls/Makefile
index d4aa5cec7e30a..b4b2b694df6bb 100644
--- a/sys/modules/mac_mls/Makefile
+++ b/sys/modules/mac_mls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_mls/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_mls
 
diff --git a/sys/modules/mac_none/Makefile b/sys/modules/mac_none/Makefile
index b180f718794ff..fb98d46799e73 100644
--- a/sys/modules/mac_none/Makefile
+++ b/sys/modules/mac_none/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_none/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_none
 
diff --git a/sys/modules/mac_partition/Makefile b/sys/modules/mac_partition/Makefile
index b04d181777e53..b39fa3215031b 100644
--- a/sys/modules/mac_partition/Makefile
+++ b/sys/modules/mac_partition/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_partition/Makefile,v 1.1 2002/10/24 02:04:03 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_partition
 
diff --git a/sys/modules/mac_portacl/Makefile b/sys/modules/mac_portacl/Makefile
index f9bbe2355ef32..1840c931f5a7b 100644
--- a/sys/modules/mac_portacl/Makefile
+++ b/sys/modules/mac_portacl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_portacl/Makefile,v 1.2 2004/12/30 13:49:01 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_portacl
 
diff --git a/sys/modules/mac_seeotheruids/Makefile b/sys/modules/mac_seeotheruids/Makefile
index d27aefb947b9f..c821df4c46196 100644
--- a/sys/modules/mac_seeotheruids/Makefile
+++ b/sys/modules/mac_seeotheruids/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_seeotheruids/Makefile,v 1.1 2002/08/01 17:41:27 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_seeotheruids
 
diff --git a/sys/modules/mac_stub/Makefile b/sys/modules/mac_stub/Makefile
index 3b98cb00e62df..64ff542ffddbe 100644
--- a/sys/modules/mac_stub/Makefile
+++ b/sys/modules/mac_stub/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_stub/Makefile,v 1.4 2003/11/11 21:23:54 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_stub
 
diff --git a/sys/modules/mac_test/Makefile b/sys/modules/mac_test/Makefile
index 94b5aa87198f4..96486494cd32a 100644
--- a/sys/modules/mac_test/Makefile
+++ b/sys/modules/mac_test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_test/Makefile,v 1.2 2002/10/22 17:10:15 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_test
 
diff --git a/sys/modules/mcd/Makefile b/sys/modules/mcd/Makefile
index 1602c0304c7f6..24019ba586f65 100644
--- a/sys/modules/mcd/Makefile
+++ b/sys/modules/mcd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mcd/Makefile,v 1.2 2003/03/29 16:13:11 mdodd Exp $
 
 .PATH: ${.CURDIR}/../../dev/mcd
 
diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile
index 19851e648eadf..464a25e07aa4f 100644
--- a/sys/modules/md/Makefile
+++ b/sys/modules/md/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/md/Makefile,v 1.14 2005/11/11 11:31:22 pjd Exp $
 
 .PATH: ${.CURDIR}/../../dev/md
 
diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile
index f803994ba9471..bfad60b4a06f4 100644
--- a/sys/modules/mem/Makefile
+++ b/sys/modules/mem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mem/Makefile,v 1.5 2006/10/16 22:09:48 jb Exp $
 
 .PATH: ${.CURDIR}/../../dev/mem
 .PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE}
diff --git a/sys/modules/mfi/Makefile b/sys/modules/mfi/Makefile
index a58e968ffd4ee..e438430b51004 100644
--- a/sys/modules/mfi/Makefile
+++ b/sys/modules/mfi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mfi/Makefile,v 1.5 2007/05/16 17:19:47 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/mfi
 
diff --git a/sys/modules/mfi/mfi_linux/Makefile b/sys/modules/mfi/mfi_linux/Makefile
index 05d074572d697..04002bbe96dc7 100644
--- a/sys/modules/mfi/mfi_linux/Makefile
+++ b/sys/modules/mfi/mfi_linux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mfi/mfi_linux/Makefile,v 1.1 2006/05/18 23:30:48 ambrisko Exp $
 
 .PATH: ${.CURDIR}/../../../dev/mfi
 
diff --git a/sys/modules/mfi/mfip/Makefile b/sys/modules/mfi/mfip/Makefile
index 2a97d7057a758..c3bf2db2e20cb 100644
--- a/sys/modules/mfi/mfip/Makefile
+++ b/sys/modules/mfi/mfip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mfi/mfip/Makefile,v 1.1 2007/05/16 17:19:47 scottl Exp $
 
 .PATH: ${.CURDIR}/../../../dev/mfi
 
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 1b91db56fdd51..00de5134fff4d 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mii/Makefile,v 1.30 2007/06/11 02:07:08 yongari Exp $
 
 .PATH: ${.CURDIR}/../../dev/mii
 
diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile
index ba0951ac4e67c..5135ae0c4725e 100644
--- a/sys/modules/mlx/Makefile
+++ b/sys/modules/mlx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mlx/Makefile,v 1.7 2001/01/06 13:59:55 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/mlx
 
diff --git a/sys/modules/mly/Makefile b/sys/modules/mly/Makefile
index e8773def4b9ae..0999eed615728 100644
--- a/sys/modules/mly/Makefile
+++ b/sys/modules/mly/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mly/Makefile,v 1.3 2001/07/14 00:12:23 msmith Exp $
 
 .PATH: ${.CURDIR}/../../dev/mly
 
diff --git a/sys/modules/mmc/Makefile b/sys/modules/mmc/Makefile
index b97e2a3e5891f..06d2c1517b210 100644
--- a/sys/modules/mmc/Makefile
+++ b/sys/modules/mmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mmc/Makefile,v 1.1 2006/10/20 06:52:59 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/mmc
 
diff --git a/sys/modules/mmcsd/Makefile b/sys/modules/mmcsd/Makefile
index 7a02cb2fe300d..f44fe703866a3 100644
--- a/sys/modules/mmcsd/Makefile
+++ b/sys/modules/mmcsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mmcsd/Makefile,v 1.1 2006/10/20 06:52:59 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/mmc
 
diff --git a/sys/modules/mpt/Makefile b/sys/modules/mpt/Makefile
index 82f5e54f32093..04a7f5b5b678f 100644
--- a/sys/modules/mpt/Makefile
+++ b/sys/modules/mpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mpt/Makefile,v 1.2 2005/07/10 15:07:57 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/mpt
 
diff --git a/sys/modules/mqueue/Makefile b/sys/modules/mqueue/Makefile
index 8ef38a62ebce4..487cffca61b39 100644
--- a/sys/modules/mqueue/Makefile
+++ b/sys/modules/mqueue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mqueue/Makefile,v 1.2 2005/11/27 08:30:12 davidxu Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index a0fe95f0b6ec2..c48f711a0a148 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msdosfs/Makefile,v 1.24 2007/02/01 04:21:03 avatar Exp $
 
 .PATH: ${.CURDIR}/../../fs/msdosfs
 
diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile
index 8d2e41da121e5..f4ff99f3dbb07 100644
--- a/sys/modules/msdosfs_iconv/Makefile
+++ b/sys/modules/msdosfs_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msdosfs_iconv/Makefile,v 1.1 2003/09/26 20:26:25 fjoe Exp $
 
 .PATH:	${.CURDIR}/../../fs/msdosfs
 KMOD=	msdosfs_iconv
diff --git a/sys/modules/mse/Makefile b/sys/modules/mse/Makefile
index 4cc68c1f9c6d9..dbb39e3542e1a 100644
--- a/sys/modules/mse/Makefile
+++ b/sys/modules/mse/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mse/Makefile,v 1.1 2004/12/12 20:05:49 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/mse
 
diff --git a/sys/modules/msk/Makefile b/sys/modules/msk/Makefile
index 48a7649fec3c7..a26388d621418 100644
--- a/sys/modules/msk/Makefile
+++ b/sys/modules/msk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/msk/Makefile,v 1.1 2006/12/13 02:33:33 yongari Exp $
 
 .PATH: ${.CURDIR}/../../dev/msk
 
diff --git a/sys/modules/mxge/Makefile b/sys/modules/mxge/Makefile
index d9f341bb35eaa..71abb01438e49 100644
--- a/sys/modules/mxge/Makefile
+++ b/sys/modules/mxge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mxge/Makefile,v 1.2 2006/06/13 13:53:52 gallatin Exp $
 
 SUBDIR= mxge
 SUBDIR+=mxge_eth_z8e
diff --git a/sys/modules/mxge/mxge/Makefile b/sys/modules/mxge/mxge/Makefile
index 4bba55ac1c23f..160ab3838ae4e 100644
--- a/sys/modules/mxge/mxge/Makefile
+++ b/sys/modules/mxge/mxge/Makefile
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/modules/mxge/mxge/Makefile,v 1.3 2007/05/22 14:38:17 gallatin Exp $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 
diff --git a/sys/modules/mxge/mxge_eth_z8e/Makefile b/sys/modules/mxge/mxge_eth_z8e/Makefile
index 3454581d21d40..7546b6260632e 100644
--- a/sys/modules/mxge/mxge_eth_z8e/Makefile
+++ b/sys/modules/mxge/mxge_eth_z8e/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mxge/mxge_eth_z8e/Makefile,v 1.3 2007/07/19 16:16:00 gallatin Exp $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_eth_z8e
diff --git a/sys/modules/mxge/mxge_ethp_z8e/Makefile b/sys/modules/mxge/mxge_ethp_z8e/Makefile
index e9f9b31725b24..15d9a1e24f5bc 100644
--- a/sys/modules/mxge/mxge_ethp_z8e/Makefile
+++ b/sys/modules/mxge/mxge_ethp_z8e/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mxge/mxge_ethp_z8e/Makefile,v 1.3 2007/07/19 16:16:00 gallatin Exp $
 
 .PATH: ${.CURDIR}/../../../dev/mxge
 KMOD=	mxge_ethp_z8e
diff --git a/sys/modules/my/Makefile b/sys/modules/my/Makefile
index 596284ee9dd9f..c01d6225762dd 100644
--- a/sys/modules/my/Makefile
+++ b/sys/modules/my/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/my/Makefile,v 1.3 2007/03/11 15:20:04 brueffer Exp $
 
 .PATH: ${.CURDIR}/../../dev/my
 
diff --git a/sys/modules/ncp/Makefile b/sys/modules/ncp/Makefile
index fb9d9937c83ce..ee494c727b082 100644
--- a/sys/modules/ncp/Makefile
+++ b/sys/modules/ncp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ncp/Makefile,v 1.10 2004/01/19 14:00:26 ru Exp $
 
 .PATH: ${.CURDIR}/../../netncp
 
diff --git a/sys/modules/ncv/Makefile b/sys/modules/ncv/Makefile
index 0181db8c09586..877b3c8e47088 100644
--- a/sys/modules/ncv/Makefile
+++ b/sys/modules/ncv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ncv/Makefile,v 1.3 2005/09/27 18:10:36 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/ncv
 
diff --git a/sys/modules/ndis/Makefile b/sys/modules/ndis/Makefile
index 2d14b180bdec8..b0d0837d76a86 100644
--- a/sys/modules/ndis/Makefile
+++ b/sys/modules/ndis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ndis/Makefile,v 1.11 2005/09/27 18:10:36 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../compat/ndis
 
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index a95cfff4e1813..67ce1dba447fc 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -1,5 +1,5 @@
 # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.49 2007/05/15 16:24:49 mav Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/netgraph/Makefile.inc b/sys/modules/netgraph/Makefile.inc
index 3d2fd195b5ce1..471949a71dd23 100644
--- a/sys/modules/netgraph/Makefile.inc
+++ b/sys/modules/netgraph/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/Makefile.inc,v 1.4 2005/05/16 08:25:55 glebius Exp $
 # $Whistle: Makefile.inc,v 1.4 1999/01/19 23:46:16 archie Exp $
 
 .PATH:		${.CURDIR}/../../../netgraph
diff --git a/sys/modules/netgraph/UI/Makefile b/sys/modules/netgraph/UI/Makefile
index 413308c138128..52bbf2937a586 100644
--- a/sys/modules/netgraph/UI/Makefile
+++ b/sys/modules/netgraph/UI/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/UI/Makefile,v 1.9 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_UI
diff --git a/sys/modules/netgraph/async/Makefile b/sys/modules/netgraph/async/Makefile
index 921eabcf27270..e07a852c73a1d 100644
--- a/sys/modules/netgraph/async/Makefile
+++ b/sys/modules/netgraph/async/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/async/Makefile,v 1.9 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_async
diff --git a/sys/modules/netgraph/atm/Makefile b/sys/modules/netgraph/atm/Makefile
index a8847787ee71d..a6750a94b763a 100644
--- a/sys/modules/netgraph/atm/Makefile
+++ b/sys/modules/netgraph/atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/Makefile,v 1.7 2007/07/14 21:49:23 rwatson Exp $
 
 SUBDIR=			\
 	atm 		\
diff --git a/sys/modules/netgraph/atm/Makefile.inc b/sys/modules/netgraph/atm/Makefile.inc
index 265f86d1ed55a..4bdab85286274 100644
--- a/sys/modules/netgraph/atm/Makefile.inc
+++ b/sys/modules/netgraph/atm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/Makefile.inc,v 1.1 2003/06/25 13:20:18 harti Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/netgraph/atm/atm/Makefile b/sys/modules/netgraph/atm/atm/Makefile
index ebd94e13f40e7..ea2d9bc050083 100644
--- a/sys/modules/netgraph/atm/atm/Makefile
+++ b/sys/modules/netgraph/atm/atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/atm/Makefile,v 1.1 2003/06/25 13:20:19 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/atmbase/Makefile b/sys/modules/netgraph/atm/atmbase/Makefile
index 1ad4bb6b60798..046c70e45b9cc 100644
--- a/sys/modules/netgraph/atm/atmbase/Makefile
+++ b/sys/modules/netgraph/atm/atmbase/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/atmbase/Makefile,v 1.2 2003/11/03 09:18:52 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/atmpif/Makefile b/sys/modules/netgraph/atm/atmpif/Makefile
index 324fbdfc922ec..05b66709e3e4c 100644
--- a/sys/modules/netgraph/atm/atmpif/Makefile
+++ b/sys/modules/netgraph/atm/atmpif/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/atmpif/Makefile,v 1.1 2003/08/11 08:40:02 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/ccatm/Makefile b/sys/modules/netgraph/atm/ccatm/Makefile
index 562653611a2d2..113fab3f354d0 100644
--- a/sys/modules/netgraph/atm/ccatm/Makefile
+++ b/sys/modules/netgraph/atm/ccatm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/ccatm/Makefile,v 1.1 2004/08/12 14:58:46 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/sscfu/Makefile b/sys/modules/netgraph/atm/sscfu/Makefile
index 278159f267974..9d9244eeba48a 100644
--- a/sys/modules/netgraph/atm/sscfu/Makefile
+++ b/sys/modules/netgraph/atm/sscfu/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/sscfu/Makefile,v 1.1 2003/10/24 07:42:08 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atm/sscop/Makefile b/sys/modules/netgraph/atm/sscop/Makefile
index b9334dd98ab39..53ef9f95c2af0 100644
--- a/sys/modules/netgraph/atm/sscop/Makefile
+++ b/sys/modules/netgraph/atm/sscop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/sscop/Makefile,v 1.1 2003/10/24 07:42:08 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/sys/modules/netgraph/atm/uni/Makefile b/sys/modules/netgraph/atm/uni/Makefile
index 57c20b0265e34..fad8415a6ac23 100644
--- a/sys/modules/netgraph/atm/uni/Makefile
+++ b/sys/modules/netgraph/atm/uni/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atm/uni/Makefile,v 1.1 2003/11/07 09:15:14 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/netgraph/atmllc/Makefile b/sys/modules/netgraph/atmllc/Makefile
index fd47b5c029589..d98eb1fcba072 100644
--- a/sys/modules/netgraph/atmllc/Makefile
+++ b/sys/modules/netgraph/atmllc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/atmllc/Makefile,v 1.1 2004/03/08 10:54:35 benno Exp $
 
 KMOD=	ng_atmllc
 SRCS= 	ng_atmllc.c
diff --git a/sys/modules/netgraph/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/Makefile
index 2c7ae7a58132b..ffd90d5fb97f9 100644
--- a/sys/modules/netgraph/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/04/27 00:22:11 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/Makefile,v 1.5 2007/08/13 17:19:28 emax Exp $
 
 SUBDIR=	\
 	bluetooth \
diff --git a/sys/modules/netgraph/bluetooth/Makefile.inc b/sys/modules/netgraph/bluetooth/Makefile.inc
index 265f86d1ed55a..41ddd24578950 100644
--- a/sys/modules/netgraph/bluetooth/Makefile.inc
+++ b/sys/modules/netgraph/bluetooth/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/Makefile.inc,v 1.1 2002/12/01 16:07:53 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/netgraph/bluetooth/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
index 35c3ead6e5c2f..105fa47786ecf 100644
--- a/sys/modules/netgraph/bluetooth/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:39:57 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/bluetooth/Makefile,v 1.6 2006/02/18 23:49:27 yar Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/common
 
diff --git a/sys/modules/netgraph/bluetooth/bt3c/Makefile b/sys/modules/netgraph/bluetooth/bt3c/Makefile
index 36514b136f41c..b588156a58fff 100644
--- a/sys/modules/netgraph/bluetooth/bt3c/Makefile
+++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2002/11/24 20:50:56 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/bt3c/Makefile,v 1.7 2006/02/18 23:49:27 yar Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 
diff --git a/sys/modules/netgraph/bluetooth/h4/Makefile b/sys/modules/netgraph/bluetooth/h4/Makefile
index f8dfc96d6dabc..4f86a01dc616d 100644
--- a/sys/modules/netgraph/bluetooth/h4/Makefile
+++ b/sys/modules/netgraph/bluetooth/h4/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:40:04 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/h4/Makefile,v 1.6 2006/02/18 23:49:27 yar Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4
 
diff --git a/sys/modules/netgraph/bluetooth/hci/Makefile b/sys/modules/netgraph/bluetooth/hci/Makefile
index 729ea7b5b234c..3a31ff4816870 100644
--- a/sys/modules/netgraph/bluetooth/hci/Makefile
+++ b/sys/modules/netgraph/bluetooth/hci/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:40:05 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/hci/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/hci
 
diff --git a/sys/modules/netgraph/bluetooth/l2cap/Makefile b/sys/modules/netgraph/bluetooth/l2cap/Makefile
index 5b66e0988f72f..a436f77724f4d 100644
--- a/sys/modules/netgraph/bluetooth/l2cap/Makefile
+++ b/sys/modules/netgraph/bluetooth/l2cap/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2002/11/24 20:40:11 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/l2cap/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/l2cap
 
diff --git a/sys/modules/netgraph/bluetooth/socket/Makefile b/sys/modules/netgraph/bluetooth/socket/Makefile
index 5342c2aaba88e..caf06e7bd8de2 100644
--- a/sys/modules/netgraph/bluetooth/socket/Makefile
+++ b/sys/modules/netgraph/bluetooth/socket/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/01/12 23:37:31 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/socket/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/socket
 
diff --git a/sys/modules/netgraph/bluetooth/ubt/Makefile b/sys/modules/netgraph/bluetooth/ubt/Makefile
index 7feb967ad8faa..04d9b2a650996 100644
--- a/sys/modules/netgraph/bluetooth/ubt/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubt/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubt/Makefile,v 1.8 2006/02/18 23:49:27 yar Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt
 
diff --git a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
index e9f414f640740..64617d994bb72 100644
--- a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
+++ b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile,v 1.6 2006/02/18 23:49:28 yar Exp $
 
 .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw
 
diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile
index adef38f81e17a..37409072173ad 100644
--- a/sys/modules/netgraph/bpf/Makefile
+++ b/sys/modules/netgraph/bpf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bpf/Makefile,v 1.11 2005/12/07 21:30:46 jkim Exp $
 # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
 
 .PATH: ${.CURDIR}/../../../net
diff --git a/sys/modules/netgraph/bridge/Makefile b/sys/modules/netgraph/bridge/Makefile
index 318142900c91e..4badb78f6c17c 100644
--- a/sys/modules/netgraph/bridge/Makefile
+++ b/sys/modules/netgraph/bridge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/bridge/Makefile,v 1.3 2002/01/11 15:48:51 ru Exp $
 
 KMOD=	ng_bridge
 SRCS= 	ng_bridge.c
diff --git a/sys/modules/netgraph/car/Makefile b/sys/modules/netgraph/car/Makefile
index 915a28bbdfdba..8a1cc0de61e30 100644
--- a/sys/modules/netgraph/car/Makefile
+++ b/sys/modules/netgraph/car/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/car/Makefile,v 1.1 2007/05/15 16:24:50 mav Exp $
 
 KMOD=	ng_car
 SRCS= 	ng_car.c
diff --git a/sys/modules/netgraph/cisco/Makefile b/sys/modules/netgraph/cisco/Makefile
index 2e3000dd3bf53..dd23f2cf7e416 100644
--- a/sys/modules/netgraph/cisco/Makefile
+++ b/sys/modules/netgraph/cisco/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/cisco/Makefile,v 1.11 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_cisco
diff --git a/sys/modules/netgraph/deflate/Makefile b/sys/modules/netgraph/deflate/Makefile
index 607d6d3cb7760..5ea87780d5293 100644
--- a/sys/modules/netgraph/deflate/Makefile
+++ b/sys/modules/netgraph/deflate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/deflate/Makefile,v 1.1 2006/12/29 13:16:42 glebius Exp $
 
 KMOD=		ng_deflate
 SRCS= 		ng_deflate.c
diff --git a/sys/modules/netgraph/device/Makefile b/sys/modules/netgraph/device/Makefile
index 92eaa9807ae30..f2de14c7f406a 100644
--- a/sys/modules/netgraph/device/Makefile
+++ b/sys/modules/netgraph/device/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/device/Makefile,v 1.2 2004/10/18 20:13:57 glebius Exp $
 KMOD=   ng_device
 SRCS=   ng_device.c
 
diff --git a/sys/modules/netgraph/echo/Makefile b/sys/modules/netgraph/echo/Makefile
index d7cce8d461ef7..a6bda8d93f3e5 100644
--- a/sys/modules/netgraph/echo/Makefile
+++ b/sys/modules/netgraph/echo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/echo/Makefile,v 1.9 2002/01/11 15:48:51 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:20 archie Exp $
 
 KMOD=	ng_echo
diff --git a/sys/modules/netgraph/eiface/Makefile b/sys/modules/netgraph/eiface/Makefile
index 6e8b800c8ec48..fff0ffd3d0e29 100644
--- a/sys/modules/netgraph/eiface/Makefile
+++ b/sys/modules/netgraph/eiface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/eiface/Makefile,v 1.2 2002/01/11 15:48:52 ru Exp $
 
 KMOD=	ng_eiface
 SRCS= 	ng_eiface.c
diff --git a/sys/modules/netgraph/etf/Makefile b/sys/modules/netgraph/etf/Makefile
index d807bc91c848b..c654584de7f19 100644
--- a/sys/modules/netgraph/etf/Makefile
+++ b/sys/modules/netgraph/etf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/etf/Makefile,v 1.3 2003/11/10 12:54:54 ru Exp $
 # Ethertype filter
 
 KMOD=	ng_etf
diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile
index 7a3950edae75e..da6cd0706c805 100644
--- a/sys/modules/netgraph/ether/Makefile
+++ b/sys/modules/netgraph/ether/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ether/Makefile,v 1.4 2005/02/12 12:35:56 ru Exp $
 
 KMOD=	ng_ether
 SRCS= 	ng_ether.c
diff --git a/sys/modules/netgraph/fec/Makefile b/sys/modules/netgraph/fec/Makefile
index 1d437f58d8694..5310f5c96e4b6 100644
--- a/sys/modules/netgraph/fec/Makefile
+++ b/sys/modules/netgraph/fec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/fec/Makefile,v 1.4 2004/01/13 11:30:37 ru Exp $
 
 KMOD=		ng_fec
 SRCS= 		ng_fec.c opt_inet.h opt_inet6.h
diff --git a/sys/modules/netgraph/frame_relay/Makefile b/sys/modules/netgraph/frame_relay/Makefile
index 81a2a96aeeb9c..f48efb56725bb 100644
--- a/sys/modules/netgraph/frame_relay/Makefile
+++ b/sys/modules/netgraph/frame_relay/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/frame_relay/Makefile,v 1.9 2002/01/11 15:48:52 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_frame_relay
diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile
index acf4373f26bfd..4f3bfc7147164 100644
--- a/sys/modules/netgraph/gif/Makefile
+++ b/sys/modules/netgraph/gif/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/gif/Makefile,v 1.3 2005/10/14 23:30:12 yar Exp $
 
 KMOD=	ng_gif
 SRCS= 	ng_gif.c opt_inet.h opt_inet6.h
diff --git a/sys/modules/netgraph/gif_demux/Makefile b/sys/modules/netgraph/gif_demux/Makefile
index 56de5adf8ed0a..1be3ec0a51794 100644
--- a/sys/modules/netgraph/gif_demux/Makefile
+++ b/sys/modules/netgraph/gif_demux/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/gif_demux/Makefile,v 1.2 2001/09/27 03:14:16 brooks Exp $
 
 KMOD=	ng_gif_demux
 SRCS= 	ng_gif_demux.c
diff --git a/sys/modules/netgraph/hole/Makefile b/sys/modules/netgraph/hole/Makefile
index c7502bfccf85b..4c62e1a6127fa 100644
--- a/sys/modules/netgraph/hole/Makefile
+++ b/sys/modules/netgraph/hole/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/hole/Makefile,v 1.9 2002/01/11 15:48:52 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_hole
diff --git a/sys/modules/netgraph/hub/Makefile b/sys/modules/netgraph/hub/Makefile
index 9ebb54de8f2c3..bfbeafa62f114 100644
--- a/sys/modules/netgraph/hub/Makefile
+++ b/sys/modules/netgraph/hub/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/hub/Makefile,v 1.1 2004/04/17 12:42:17 ru Exp $
 
 KMOD=	ng_hub
 SRCS=	ng_hub.c
diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index 2a6819bb709d7..ea3b6084a60f5 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/iface/Makefile,v 1.16 2005/10/14 23:30:13 yar Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_iface
diff --git a/sys/modules/netgraph/ip_input/Makefile b/sys/modules/netgraph/ip_input/Makefile
index 7a40c45c2dc84..5af1eb966d7f9 100644
--- a/sys/modules/netgraph/ip_input/Makefile
+++ b/sys/modules/netgraph/ip_input/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ip_input/Makefile,v 1.2 2002/01/11 15:48:53 ru Exp $
 
 KMOD=	ng_ip_input
 SRCS= 	ng_ip_input.c
diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile
index b40abcfbf57c2..9568873a69a31 100644
--- a/sys/modules/netgraph/ipfw/Makefile
+++ b/sys/modules/netgraph/ipfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ipfw/Makefile,v 1.1 2005/02/05 12:09:38 glebius Exp $
 
 KMOD=	ng_ipfw
 SRCS= 	ng_ipfw.c
diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index f8fd73f875685..e9ec420df72ee 100644
--- a/sys/modules/netgraph/ksocket/Makefile
+++ b/sys/modules/netgraph/ksocket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ksocket/Makefile,v 1.9 2002/01/11 15:48:53 ru Exp $
 
 KMOD=	ng_ksocket
 SRCS= 	ng_ksocket.c
diff --git a/sys/modules/netgraph/l2tp/Makefile b/sys/modules/netgraph/l2tp/Makefile
index 799437c4e70a7..dbac0b26f33fb 100644
--- a/sys/modules/netgraph/l2tp/Makefile
+++ b/sys/modules/netgraph/l2tp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/l2tp/Makefile,v 1.1 2002/08/20 22:03:57 archie Exp $
 
 KMOD=	ng_l2tp
 SRCS= 	ng_l2tp.c
diff --git a/sys/modules/netgraph/lmi/Makefile b/sys/modules/netgraph/lmi/Makefile
index e1b08876d1b1d..775b7142daa78 100644
--- a/sys/modules/netgraph/lmi/Makefile
+++ b/sys/modules/netgraph/lmi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/lmi/Makefile,v 1.9 2002/01/11 15:48:53 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_lmi
diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile
index 40b3717136f48..08b83a58774e2 100644
--- a/sys/modules/netgraph/mppc/Makefile
+++ b/sys/modules/netgraph/mppc/Makefile
@@ -1,5 +1,5 @@
 # $Whistle: Makefile,v 1.1 1999/12/08 20:20:39 archie Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/mppc/Makefile,v 1.14 2006/08/14 13:28:53 des Exp $
 
 KMOD=	ng_mppc
 SRCS= 	ng_mppc.c opt_netgraph.h
diff --git a/sys/modules/netgraph/nat/Makefile b/sys/modules/netgraph/nat/Makefile
index f51bbe0b139f1..9cf90b12f7805 100644
--- a/sys/modules/netgraph/nat/Makefile
+++ b/sys/modules/netgraph/nat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/nat/Makefile,v 1.1 2005/05/05 23:41:21 glebius Exp $
 
 KMOD=	ng_nat
 SRCS= 	ng_nat.c
diff --git a/sys/modules/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile
index b1b9ba517f774..9bd1d22a781f4 100644
--- a/sys/modules/netgraph/netflow/Makefile
+++ b/sys/modules/netgraph/netflow/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/netflow/Makefile,v 1.1 2004/09/16 20:35:27 glebius Exp $
 #
 # Author: Gleb Smirnoff <glebius@freebsd.org>
 #
diff --git a/sys/modules/netgraph/netgraph/Makefile b/sys/modules/netgraph/netgraph/Makefile
index a34d6164c9083..2614beaf7d8d0 100644
--- a/sys/modules/netgraph/netgraph/Makefile
+++ b/sys/modules/netgraph/netgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/netgraph/Makefile,v 1.8 2002/01/11 15:48:53 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	netgraph
diff --git a/sys/modules/netgraph/one2many/Makefile b/sys/modules/netgraph/one2many/Makefile
index 74a0a6c6273e9..ffe7fcce93873 100644
--- a/sys/modules/netgraph/one2many/Makefile
+++ b/sys/modules/netgraph/one2many/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/one2many/Makefile,v 1.3 2002/01/11 15:48:54 ru Exp $
 
 KMOD=	ng_one2many
 SRCS= 	ng_one2many.c
diff --git a/sys/modules/netgraph/ppp/Makefile b/sys/modules/netgraph/ppp/Makefile
index 6ce720ab95878..a2869cc1474ff 100644
--- a/sys/modules/netgraph/ppp/Makefile
+++ b/sys/modules/netgraph/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/ppp/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 02:52:12 archie Exp $
 
 KMOD=	ng_ppp
diff --git a/sys/modules/netgraph/pppoe/Makefile b/sys/modules/netgraph/pppoe/Makefile
index 642dbdde21067..9b35abccb1325 100644
--- a/sys/modules/netgraph/pppoe/Makefile
+++ b/sys/modules/netgraph/pppoe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pppoe/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
 
 KMOD=	ng_pppoe
diff --git a/sys/modules/netgraph/pptpgre/Makefile b/sys/modules/netgraph/pptpgre/Makefile
index 34cbbf6e28675..c7016618d0ded 100644
--- a/sys/modules/netgraph/pptpgre/Makefile
+++ b/sys/modules/netgraph/pptpgre/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pptpgre/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
 
 KMOD=	ng_pptpgre
diff --git a/sys/modules/netgraph/pred1/Makefile b/sys/modules/netgraph/pred1/Makefile
index a3ecec9c6cc65..08f1c662a40e3 100644
--- a/sys/modules/netgraph/pred1/Makefile
+++ b/sys/modules/netgraph/pred1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/pred1/Makefile,v 1.1 2006/12/29 13:16:43 glebius Exp $
 
 KMOD=		ng_pred1
 SRCS= 		ng_pred1.c
diff --git a/sys/modules/netgraph/rfc1490/Makefile b/sys/modules/netgraph/rfc1490/Makefile
index 6ba065345129e..77d8ff1d77219 100644
--- a/sys/modules/netgraph/rfc1490/Makefile
+++ b/sys/modules/netgraph/rfc1490/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/rfc1490/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_rfc1490
diff --git a/sys/modules/netgraph/sample/Makefile b/sys/modules/netgraph/sample/Makefile
index 701752662ed57..bc0e17c01d43c 100644
--- a/sys/modules/netgraph/sample/Makefile
+++ b/sys/modules/netgraph/sample/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sample/Makefile,v 1.2 2002/01/11 15:48:54 ru Exp $
 
 KMOD=	ng_sample
 SRCS= 	ng_sample.c
diff --git a/sys/modules/netgraph/socket/Makefile b/sys/modules/netgraph/socket/Makefile
index a44ba0ff6330d..b5e3a6ad476b0 100644
--- a/sys/modules/netgraph/socket/Makefile
+++ b/sys/modules/netgraph/socket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/socket/Makefile,v 1.9 2002/01/11 15:48:54 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_socket
diff --git a/sys/modules/netgraph/source/Makefile b/sys/modules/netgraph/source/Makefile
index c70a6bb748f66..1723ba66f7315 100644
--- a/sys/modules/netgraph/source/Makefile
+++ b/sys/modules/netgraph/source/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/source/Makefile,v 1.1 2002/10/31 23:03:09 julian Exp $
 
 KMOD=		ng_source
 SRCS= 		ng_source.c
diff --git a/sys/modules/netgraph/split/Makefile b/sys/modules/netgraph/split/Makefile
index 2eb4fa399b4a4..778b76414bd65 100644
--- a/sys/modules/netgraph/split/Makefile
+++ b/sys/modules/netgraph/split/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/split/Makefile,v 1.2 2002/01/11 15:48:54 ru Exp $
 #
 
 KMOD=	ng_split
diff --git a/sys/modules/netgraph/sppp/Makefile b/sys/modules/netgraph/sppp/Makefile
index 203e83e437ae5..0b08fb0821d9b 100644
--- a/sys/modules/netgraph/sppp/Makefile
+++ b/sys/modules/netgraph/sppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sppp/Makefile,v 1.1 2004/03/24 17:24:01 rik Exp $
 # Cronyx Id: ng_sppp.Makefile,v 1.1.2.1 2002/12/25 08:37:25 rik Exp $
 
 KMOD=	ng_sppp
diff --git a/sys/modules/netgraph/sync_ar/Makefile b/sys/modules/netgraph/sync_ar/Makefile
index 11136c2a3bd7d..ef49b6784547c 100644
--- a/sys/modules/netgraph/sync_ar/Makefile
+++ b/sys/modules/netgraph/sync_ar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sync_ar/Makefile,v 1.3 2005/10/14 23:30:13 yar Exp $
  
 .PATH:  ${.CURDIR}/../../../dev/ar
 KMOD    = ng_sync_ar
diff --git a/sys/modules/netgraph/sync_sr/Makefile b/sys/modules/netgraph/sync_sr/Makefile
index ae49a3a40bbc6..ddcdf35a40e86 100644
--- a/sys/modules/netgraph/sync_sr/Makefile
+++ b/sys/modules/netgraph/sync_sr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/sync_sr/Makefile,v 1.2 2005/10/14 23:30:13 yar Exp $
  
 .PATH:  ${.CURDIR}/../../../dev/sr
 KMOD    = ng_sync_sr
diff --git a/sys/modules/netgraph/tag/Makefile b/sys/modules/netgraph/tag/Makefile
index 3862c18518b67..b5a5d3c535864 100644
--- a/sys/modules/netgraph/tag/Makefile
+++ b/sys/modules/netgraph/tag/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tag/Makefile,v 1.1 2006/06/27 12:45:28 glebius Exp $
 
 KMOD=	ng_tag
 SRCS= 	ng_tag.c
diff --git a/sys/modules/netgraph/tcpmss/Makefile b/sys/modules/netgraph/tcpmss/Makefile
index 0379c88cec7d6..6134548fb254c 100644
--- a/sys/modules/netgraph/tcpmss/Makefile
+++ b/sys/modules/netgraph/tcpmss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tcpmss/Makefile,v 1.1 2005/06/10 08:05:13 glebius Exp $
 
 KMOD=	ng_tcpmss
 SRCS= 	ng_tcpmss.c
diff --git a/sys/modules/netgraph/tee/Makefile b/sys/modules/netgraph/tee/Makefile
index 7d5115831a49d..c64fb10ebcefc 100644
--- a/sys/modules/netgraph/tee/Makefile
+++ b/sys/modules/netgraph/tee/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tee/Makefile,v 1.9 2002/01/11 15:48:55 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tee
diff --git a/sys/modules/netgraph/tty/Makefile b/sys/modules/netgraph/tty/Makefile
index 3f19a7cd4e41c..dac2a0cc90cf1 100644
--- a/sys/modules/netgraph/tty/Makefile
+++ b/sys/modules/netgraph/tty/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/tty/Makefile,v 1.12 2002/01/11 15:48:55 ru Exp $
 # $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
 
 KMOD=	ng_tty
diff --git a/sys/modules/netgraph/vjc/Makefile b/sys/modules/netgraph/vjc/Makefile
index 4921ac953bb28..1277ae9653ef9 100644
--- a/sys/modules/netgraph/vjc/Makefile
+++ b/sys/modules/netgraph/vjc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/vjc/Makefile,v 1.10 2002/01/11 15:48:55 ru Exp $
 # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $
 
 .PATH: ${.CURDIR}/../../../net
diff --git a/sys/modules/netgraph/vlan/Makefile b/sys/modules/netgraph/vlan/Makefile
index e6cdf0dbbc160..4ea9df0aab017 100644
--- a/sys/modules/netgraph/vlan/Makefile
+++ b/sys/modules/netgraph/vlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/netgraph/vlan/Makefile,v 1.1 2004/03/01 17:22:16 ru Exp $
 
 KMOD=	ng_vlan
 SRCS=	ng_vlan.c
diff --git a/sys/modules/nfe/Makefile b/sys/modules/nfe/Makefile
index 6fe8bc3c1cdc7..9a3df3d180278 100644
--- a/sys/modules/nfe/Makefile
+++ b/sys/modules/nfe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfe/Makefile,v 1.2 2006/11/03 21:41:19 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/nfe
 
diff --git a/sys/modules/nfs4client/Makefile b/sys/modules/nfs4client/Makefile
index bdc272f5ff278..608d9cc445108 100644
--- a/sys/modules/nfs4client/Makefile
+++ b/sys/modules/nfs4client/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfs4client/Makefile,v 1.6 2006/02/18 23:49:28 yar Exp $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs4client \
 	${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 180420130701b..a28d26003ca7d 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfsclient/Makefile,v 1.33 2006/02/18 23:49:28 yar Exp $
 
 .PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs4client \
 	${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 8e33c46cef316..16f58f21b7a26 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nfsserver/Makefile,v 1.26 2005/10/14 23:30:13 yar Exp $
 
 .PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
 KMOD=	nfsserver
diff --git a/sys/modules/nge/Makefile b/sys/modules/nge/Makefile
index 4bb68cd5d0dba..294495349edf2 100644
--- a/sys/modules/nge/Makefile
+++ b/sys/modules/nge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nge/Makefile,v 1.4 2005/09/27 18:10:36 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/nge
 
diff --git a/sys/modules/nmdm/Makefile b/sys/modules/nmdm/Makefile
index b788334869f0c..30e1ce015e11b 100644
--- a/sys/modules/nmdm/Makefile
+++ b/sys/modules/nmdm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nmdm/Makefile,v 1.3 2005/10/14 23:30:14 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/nmdm
 
diff --git a/sys/modules/nsp/Makefile b/sys/modules/nsp/Makefile
index 1773286a7bca2..ff102c0786d56 100644
--- a/sys/modules/nsp/Makefile
+++ b/sys/modules/nsp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nsp/Makefile,v 1.3 2005/09/27 18:10:37 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/nsp
 
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 367af98792d24..87daf45dcef53 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ntfs/Makefile,v 1.11 2003/09/26 20:26:25 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../fs/ntfs
 
diff --git a/sys/modules/ntfs_iconv/Makefile b/sys/modules/ntfs_iconv/Makefile
index 33e6d42a155e2..0e799051940fc 100644
--- a/sys/modules/ntfs_iconv/Makefile
+++ b/sys/modules/ntfs_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ntfs_iconv/Makefile,v 1.1 2003/09/26 20:26:25 fjoe Exp $
 
 .PATH:	${.CURDIR}/../../fs/ntfs
 KMOD=	ntfs_iconv
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 22cbf003afbd8..75740c372f672 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nullfs/Makefile,v 1.16 2002/01/11 15:48:55 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/nullfs
 
diff --git a/sys/modules/nve/Makefile b/sys/modules/nve/Makefile
index 33d5c2d9f804a..8289d3c53f484 100644
--- a/sys/modules/nve/Makefile
+++ b/sys/modules/nve/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nve/Makefile,v 1.2 2005/03/12 08:02:06 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/nve
 
diff --git a/sys/modules/nvram/Makefile b/sys/modules/nvram/Makefile
index 7af468d041fe0..7a1e6b25de829 100644
--- a/sys/modules/nvram/Makefile
+++ b/sys/modules/nvram/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nvram/Makefile,v 1.1.2.1 2007/10/29 22:26:36 peter Exp $
 
 .PATH: ${.CURDIR}/../../dev/nvram
 
diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile
index 97396119e5209..5c3a2d7cb3588 100644
--- a/sys/modules/nwfs/Makefile
+++ b/sys/modules/nwfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nwfs/Makefile,v 1.15 2006/01/26 19:21:27 alc Exp $
 
 .PATH: ${.CURDIR}/../../fs/nwfs
 
diff --git a/sys/modules/nxge/Makefile b/sys/modules/nxge/Makefile
index 4994b90127d68..f6a27e4c91576 100644
--- a/sys/modules/nxge/Makefile
+++ b/sys/modules/nxge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/nxge/Makefile,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../dev/nxge
 VPATH = ${.CURDIR}/../../dev/nxge/xgehal
diff --git a/sys/modules/oltr/Makefile b/sys/modules/oltr/Makefile
index 75c5cda042589..ede160a835251 100644
--- a/sys/modules/oltr/Makefile
+++ b/sys/modules/oltr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/oltr/Makefile,v 1.5 2005/02/03 23:01:01 mdodd Exp $
 
 .PATH:	${.CURDIR}/../../contrib/dev/oltr
 KMOD=	if_oltr
diff --git a/sys/modules/padlock/Makefile b/sys/modules/padlock/Makefile
index 14a8b56563fb2..e4fb1f17dc1ce 100644
--- a/sys/modules/padlock/Makefile
+++ b/sys/modules/padlock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/padlock/Makefile,v 1.3 2007/03/21 17:37:13 sam Exp $
 
 .PATH: ${.CURDIR}/../../crypto/via
 
diff --git a/sys/modules/patm/Makefile b/sys/modules/patm/Makefile
index 7e33a36c03486..57d28b3633b6d 100644
--- a/sys/modules/patm/Makefile
+++ b/sys/modules/patm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/patm/Makefile,v 1.3 2005/10/14 23:30:14 yar Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile
index 95bcf3fc344c1..bce31b15cc18c 100644
--- a/sys/modules/pccard/Makefile
+++ b/sys/modules/pccard/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pccard/Makefile,v 1.12 2005/09/20 06:48:08 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/pccard
 
diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile
index 107a0674ba21e..fb9e181d9e27a 100644
--- a/sys/modules/pcfclock/Makefile
+++ b/sys/modules/pcfclock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pcfclock/Makefile,v 1.4 2001/01/06 14:00:10 obrien Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 
diff --git a/sys/modules/pcn/Makefile b/sys/modules/pcn/Makefile
index c09af2d758e68..4b6a3f4e97a42 100644
--- a/sys/modules/pcn/Makefile
+++ b/sys/modules/pcn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pcn/Makefile,v 1.3 2005/09/27 18:10:37 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/pecoff/Makefile b/sys/modules/pecoff/Makefile
index 0f02f73bd94c7..81c78eb51428f 100644
--- a/sys/modules/pecoff/Makefile
+++ b/sys/modules/pecoff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pecoff/Makefile,v 1.7 2005/06/03 15:35:36 imp Exp $
 
 .PATH: ${.CURDIR}/../../compat/pecoff
 
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index ce674142757e8..662cd73e52b1a 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pf/Makefile,v 1.13 2007/07/03 12:46:06 mlaier Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile
index 12ead1287a775..eb263e8cc41a9 100644
--- a/sys/modules/pflog/Makefile
+++ b/sys/modules/pflog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pflog/Makefile,v 1.6 2006/03/17 18:54:37 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile
index 9aa5bd41c3781..cf6c3ec9be6ec 100644
--- a/sys/modules/plip/Makefile
+++ b/sys/modules/plip/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/plip/Makefile,v 1.2 2002/01/11 15:48:56 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	plip
diff --git a/sys/modules/pmc/Makefile b/sys/modules/pmc/Makefile
index 60dd3503dfcd3..5a29a6d49c165 100644
--- a/sys/modules/pmc/Makefile
+++ b/sys/modules/pmc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pmc/Makefile,v 1.3 2005/05/10 12:02:15 nyan Exp $
 
 .PATH: ${.CURDIR}/../../pc98/cbus
 
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index ef6955b5d1416..e016a3fd12f0f 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/portalfs/Makefile,v 1.12 2002/01/11 15:48:56 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/portalfs
 
diff --git a/sys/modules/powermac_nvram/Makefile b/sys/modules/powermac_nvram/Makefile
index e56f7207fa271..8cecb94eae496 100644
--- a/sys/modules/powermac_nvram/Makefile
+++ b/sys/modules/powermac_nvram/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/powermac_nvram/Makefile,v 1.2 2006/10/29 17:23:54 marius Exp $
 
 .PATH: ${.CURDIR}/../../dev/powermac_nvram
 
diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile
index 1347e6482bcbe..8026df45238dd 100644
--- a/sys/modules/ppbus/Makefile
+++ b/sys/modules/ppbus/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ppbus/Makefile,v 1.5 2003/11/19 05:08:26 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppbus
diff --git a/sys/modules/ppc/Makefile b/sys/modules/ppc/Makefile
index db36e73377378..28e63cd58c06d 100644
--- a/sys/modules/ppc/Makefile
+++ b/sys/modules/ppc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ppc/Makefile,v 1.3 2006/06/18 05:04:42 marcel Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppc
 KMOD=	ppc
diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile
index 568fddfd4282d..2c1186ea1c8fb 100644
--- a/sys/modules/ppi/Makefile
+++ b/sys/modules/ppi/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ppi/Makefile,v 1.3 2003/11/19 05:08:26 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppi
diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile
index 7e70bb2973ad6..6500015790f1a 100644
--- a/sys/modules/pps/Makefile
+++ b/sys/modules/pps/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pps/Makefile,v 1.3 2003/11/19 05:08:26 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	pps
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 6c840edcfc041..dff0692c6c7c4 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.32 2006/09/27 19:57:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/procfs
 
diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile
index b04bffb0beaf8..026e84a2b977f 100644
--- a/sys/modules/pseudofs/Makefile
+++ b/sys/modules/pseudofs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.4 2005/03/14 16:04:27 des Exp $
 
 .PATH: ${.CURDIR}/../../fs/pseudofs
 
diff --git a/sys/modules/pst/Makefile b/sys/modules/pst/Makefile
index 46e552ddaf749..6e2083d31d616 100644
--- a/sys/modules/pst/Makefile
+++ b/sys/modules/pst/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/pst/Makefile,v 1.1 2003/08/30 08:01:05 sos Exp $
 
 .PATH: ${.CURDIR}/../../dev/pst
 
diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile
index 2b0fbfc9655b9..33d4a8daec20f 100644
--- a/sys/modules/puc/Makefile
+++ b/sys/modules/puc/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/puc/Makefile,v 1.2 2006/04/28 21:21:53 marcel Exp $
 
 .PATH:	${.CURDIR}/../../dev/puc
 
diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile
index 2ec55bff722e1..bd37c5824c6aa 100644
--- a/sys/modules/ral/Makefile
+++ b/sys/modules/ral/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ral/Makefile,v 1.3 2006/03/05 20:38:55 damien Exp $
 
 .PATH: ${.CURDIR}/../../dev/ral
 
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index 37c4d829bc3b5..c379265fed2b2 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/random/Makefile,v 1.15 2004/04/11 15:40:18 marcel Exp $
 
 .PATH: ${.CURDIR}/../../dev/random
 .PATH: ${.CURDIR}/../../crypto/rijndael
diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile
index 84eb9d9585689..c39a3cca681b9 100644
--- a/sys/modules/ray/Makefile
+++ b/sys/modules/ray/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ray/Makefile,v 1.4 2004/05/26 00:53:07 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/ray
 
diff --git a/sys/modules/rc/Makefile b/sys/modules/rc/Makefile
index cc8d22826a454..74a46d646d858 100644
--- a/sys/modules/rc/Makefile
+++ b/sys/modules/rc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rc/Makefile,v 1.3 2005/10/14 23:30:14 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/rc
 
diff --git a/sys/modules/rc4/Makefile b/sys/modules/rc4/Makefile
index 95f609eac0164..61ee38d247bdb 100644
--- a/sys/modules/rc4/Makefile
+++ b/sys/modules/rc4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rc4/Makefile,v 1.1 2003/01/15 19:55:17 sam Exp $
 
 .PATH: ${.CURDIR}/../../crypto/rc4
 
diff --git a/sys/modules/re/Makefile b/sys/modules/re/Makefile
index abc9e49522baf..f72fdd1ba29bb 100644
--- a/sys/modules/re/Makefile
+++ b/sys/modules/re/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/re/Makefile,v 1.3 2005/09/27 18:10:37 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/re
 
diff --git a/sys/modules/reiserfs/Makefile b/sys/modules/reiserfs/Makefile
index 64d0440391346..60f216ed00abd 100644
--- a/sys/modules/reiserfs/Makefile
+++ b/sys/modules/reiserfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/reiserfs/Makefile,v 1.2 2005/06/18 17:10:50 dumbbell Exp $
 
 .PATH: ${.CURDIR}/../../gnu/fs/reiserfs
 KMOD=	reiserfs
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index e846579a8ed7f..685bfbf889f4b 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rl/Makefile,v 1.11 2005/09/27 18:10:37 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/rndtest/Makefile b/sys/modules/rndtest/Makefile
index f818704a861e6..5be96d6ae365d 100644
--- a/sys/modules/rndtest/Makefile
+++ b/sys/modules/rndtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rndtest/Makefile,v 1.1 2003/03/11 19:26:16 sam Exp $
 
 .PATH:	${.CURDIR}/../../dev/rndtest
 KMOD	= rndtest
diff --git a/sys/modules/rp/Makefile b/sys/modules/rp/Makefile
index 8c4c9d972bbc5..f38e9102e5de7 100644
--- a/sys/modules/rp/Makefile
+++ b/sys/modules/rp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rp/Makefile,v 1.4 2005/10/14 23:30:15 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/rp
 
diff --git a/sys/modules/rue/Makefile b/sys/modules/rue/Makefile
index 1837eff1a4ac6..c10305eff8986 100644
--- a/sys/modules/rue/Makefile
+++ b/sys/modules/rue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rue/Makefile,v 1.3 2005/09/27 18:10:37 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/rum/Makefile b/sys/modules/rum/Makefile
index ae9b8cc7e58cf..59af5c4dbee49 100644
--- a/sys/modules/rum/Makefile
+++ b/sys/modules/rum/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/rum/Makefile,v 1.1 2007/05/06 10:07:21 kevlo Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/s3/Makefile b/sys/modules/s3/Makefile
index c0babcbc37174..e545f59c67d3b 100644
--- a/sys/modules/s3/Makefile
+++ b/sys/modules/s3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/s3/Makefile,v 1.5 2001/02/04 12:35:22 peter Exp $
 
 .PATH: ${.CURDIR}/../../dev/fb
 
diff --git a/sys/modules/safe/Makefile b/sys/modules/safe/Makefile
index f1d1d61392ff4..50062fa68bb6d 100644
--- a/sys/modules/safe/Makefile
+++ b/sys/modules/safe/Makefile
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/safe/Makefile,v 1.4 2007/03/21 03:42:50 sam Exp $
 #
 
 .PATH:	${.CURDIR}/../../dev/safe
diff --git a/sys/modules/sbni/Makefile b/sys/modules/sbni/Makefile
index 9dfab90f59ab5..d627d14cb6792 100644
--- a/sys/modules/sbni/Makefile
+++ b/sys/modules/sbni/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.1 2001/11/21 22:29:35 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../dev/sbni
 
diff --git a/sys/modules/sbsh/Makefile b/sys/modules/sbsh/Makefile
index 74569567c4702..6a31e25c5a963 100644
--- a/sys/modules/sbsh/Makefile
+++ b/sys/modules/sbsh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sbsh/Makefile,v 1.1 2003/04/13 06:27:13 fjoe Exp $
 
 .PATH: ${.CURDIR}/../../dev/sbsh
 
diff --git a/sys/modules/scc/Makefile b/sys/modules/scc/Makefile
index d984ef4bd614a..6dc8a6cc81f97 100644
--- a/sys/modules/scc/Makefile
+++ b/sys/modules/scc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/scc/Makefile,v 1.2 2006/04/01 04:54:47 marcel Exp $
 
 .PATH: ${.CURDIR}/../../dev/scc
 
diff --git a/sys/modules/scd/Makefile b/sys/modules/scd/Makefile
index 4cf41456fa4e1..b15ba760e3b67 100644
--- a/sys/modules/scd/Makefile
+++ b/sys/modules/scd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/scd/Makefile,v 1.1 2002/11/05 09:37:32 mdodd Exp $
 
 .PATH: ${.CURDIR}/../../dev/scd
 
diff --git a/sys/modules/scsi_low/Makefile b/sys/modules/scsi_low/Makefile
index d8e3cc36a7cea..ca06184bf3498 100644
--- a/sys/modules/scsi_low/Makefile
+++ b/sys/modules/scsi_low/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/scsi_low/Makefile,v 1.2 2002/01/11 01:16:00 msmith Exp $
 
 .PATH: ${.CURDIR}/../../cam/scsi
 KMOD=	scsi_low
diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile
index 8b88444a995d0..17cc6732053ba 100644
--- a/sys/modules/sem/Makefile
+++ b/sys/modules/sem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sem/Makefile,v 1.2 2005/05/04 10:39:14 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../kern
 
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index 156a3b2bb27bf..86a8a114b9899 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sf/Makefile,v 1.14 2005/09/27 18:10:38 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile
index dc683ba31f3f0..60daf905b2b01 100644
--- a/sys/modules/sio/Makefile
+++ b/sys/modules/sio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sio/Makefile,v 1.10 2006/04/28 21:21:53 marcel Exp $
 
 .if ${MACHINE} == "pc98"
 .PATH: ${.CURDIR}/../../pc98/cbus
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index d16611b83edd1..6c4499a795b1d 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sis/Makefile,v 1.11 2005/09/27 18:10:38 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index 833550a543042..a2c40b4de3a89 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sk/Makefile,v 1.14 2006/04/27 00:14:02 yongari Exp $
 
 .PATH: ${.CURDIR}/../../dev/sk
 
diff --git a/sys/modules/slhci/Makefile b/sys/modules/slhci/Makefile
index 8d356d42a1cd3..73a719f9d32ae 100644
--- a/sys/modules/slhci/Makefile
+++ b/sys/modules/slhci/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/slhci/Makefile,v 1.2 2007/06/20 00:29:51 delphij Exp $
 
 .PATH:	${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
index e8432e39297c1..1661410f1dd7d 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.12 2006/03/05 22:52:17 yar Exp $
 
 .PATH:	${.CURDIR}/../../crypto/des \
 	${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \
diff --git a/sys/modules/sn/Makefile b/sys/modules/sn/Makefile
index b248c757643c9..633942a7dbd4f 100644
--- a/sys/modules/sn/Makefile
+++ b/sys/modules/sn/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sn/Makefile,v 1.4 2004/05/26 00:53:08 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/sn
 
diff --git a/sys/modules/snc/Makefile b/sys/modules/snc/Makefile
index 6c71146252a70..59b83356bc654 100644
--- a/sys/modules/snc/Makefile
+++ b/sys/modules/snc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/snc/Makefile,v 1.4 2005/10/14 23:30:15 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/snc
 
diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile
index 9cafd330e7b66..1965b88a1ac7b 100644
--- a/sys/modules/snp/Makefile
+++ b/sys/modules/snp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/snp/Makefile,v 1.5 2005/09/19 10:14:05 mux Exp $
 
 .PATH: ${.CURDIR}/../../dev/snp
 
diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile
index d6867331eb674..bf5bd35ed30cc 100644
--- a/sys/modules/sound/Makefile
+++ b/sys/modules/sound/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/Makefile,v 1.2 2004/07/16 03:58:46 tanimura Exp $
 
 SUBDIR =
 SUBDIR += sound
diff --git a/sys/modules/sound/Makefile.inc b/sys/modules/sound/Makefile.inc
index 265f86d1ed55a..beabedaf50e10 100644
--- a/sys/modules/sound/Makefile.inc
+++ b/sys/modules/sound/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/Makefile.inc,v 1.1 2000/07/04 23:32:01 cg Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index 711f7a81aa1f9..7defc89bf557e 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.24 2006/10/01 11:18:56 ariff Exp $
 
 .if ${MACHINE_ARCH} == "sparc64"
 SUBDIR  = audiocs es137x
diff --git a/sys/modules/sound/driver/Makefile.inc b/sys/modules/sound/driver/Makefile.inc
index 63bf7601dc367..6be4dd51ec0c5 100644
--- a/sys/modules/sound/driver/Makefile.inc
+++ b/sys/modules/sound/driver/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/Makefile.inc,v 1.3 2001/04/08 21:50:41 obrien Exp $
 
 SRCS+=	ac97_if.h channel_if.h feeder_if.h mixer_if.h
 
diff --git a/sys/modules/sound/driver/ad1816/Makefile b/sys/modules/sound/driver/ad1816/Makefile
index 9c7fa9ec5d856..05f59675bfb0a 100644
--- a/sys/modules/sound/driver/ad1816/Makefile
+++ b/sys/modules/sound/driver/ad1816/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ad1816/Makefile,v 1.2 2001/01/06 14:00:15 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/als4000/Makefile b/sys/modules/sound/driver/als4000/Makefile
index 59dc73ac05bd2..fcb9096d446a5 100644
--- a/sys/modules/sound/driver/als4000/Makefile
+++ b/sys/modules/sound/driver/als4000/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/als4000/Makefile,v 1.2 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/atiixp/Makefile b/sys/modules/sound/driver/atiixp/Makefile
index db49eb2bf1556..65c875c9e4d4d 100644
--- a/sys/modules/sound/driver/atiixp/Makefile
+++ b/sys/modules/sound/driver/atiixp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/atiixp/Makefile,v 1.1 2005/11/27 03:29:59 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/au88x0/Makefile b/sys/modules/sound/driver/au88x0/Makefile
index b00a90f473096..02420c041f5bb 100644
--- a/sys/modules/sound/driver/au88x0/Makefile
+++ b/sys/modules/sound/driver/au88x0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/au88x0/Makefile,v 1.1 2003/06/01 11:58:46 des Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/audiocs/Makefile b/sys/modules/sound/driver/audiocs/Makefile
index ff67554f9e1f5..a462899d3789c 100644
--- a/sys/modules/sound/driver/audiocs/Makefile
+++ b/sys/modules/sound/driver/audiocs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/audiocs/Makefile,v 1.1 2004/10/25 10:29:57 yongari Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/sbus
 
diff --git a/sys/modules/sound/driver/cmi/Makefile b/sys/modules/sound/driver/cmi/Makefile
index 551af426babf0..891bd1e8acd6d 100644
--- a/sys/modules/sound/driver/cmi/Makefile
+++ b/sys/modules/sound/driver/cmi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/cmi/Makefile,v 1.4 2006/05/27 16:32:04 netchild Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/cs4281/Makefile b/sys/modules/sound/driver/cs4281/Makefile
index ed3ddbc1574b1..72de13d994ef5 100644
--- a/sys/modules/sound/driver/cs4281/Makefile
+++ b/sys/modules/sound/driver/cs4281/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/cs4281/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/csa/Makefile b/sys/modules/sound/driver/csa/Makefile
index 521005e143e23..0e0a703b17fcf 100644
--- a/sys/modules/sound/driver/csa/Makefile
+++ b/sys/modules/sound/driver/csa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/csa/Makefile,v 1.4 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/driver/Makefile b/sys/modules/sound/driver/driver/Makefile
index 56a8461e3e6f8..585cc45e804ba 100644
--- a/sys/modules/sound/driver/driver/Makefile
+++ b/sys/modules/sound/driver/driver/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/driver/Makefile,v 1.4 2003/02/07 15:05:37 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound
 
diff --git a/sys/modules/sound/driver/ds1/Makefile b/sys/modules/sound/driver/ds1/Makefile
index c8f90ec781d6b..294ee7500533a 100644
--- a/sys/modules/sound/driver/ds1/Makefile
+++ b/sys/modules/sound/driver/ds1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ds1/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/emu10k1/Makefile b/sys/modules/sound/driver/emu10k1/Makefile
index 14fc0c98997e7..33a834e1df7e2 100644
--- a/sys/modules/sound/driver/emu10k1/Makefile
+++ b/sys/modules/sound/driver/emu10k1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/emu10k1/Makefile,v 1.5 2006/05/27 16:32:04 netchild Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci \
        ${.CURDIR}/../../../../gnu/dev/sound/pci
diff --git a/sys/modules/sound/driver/emu10kx/Makefile b/sys/modules/sound/driver/emu10kx/Makefile
index 3037af765e66b..5b2cc21b63300 100644
--- a/sys/modules/sound/driver/emu10kx/Makefile
+++ b/sys/modules/sound/driver/emu10kx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/emu10kx/Makefile,v 1.4 2007/09/12 07:43:43 ariff Exp $
 .PATH: ${.CURDIR}/../../../../dev/sound/pci \
        ${.CURDIR}/../../../../gnu/dev/sound/pci
 
diff --git a/sys/modules/sound/driver/envy24/Makefile b/sys/modules/sound/driver/envy24/Makefile
index ec1bf4c67bfb8..aa749db203d1d 100644
--- a/sys/modules/sound/driver/envy24/Makefile
+++ b/sys/modules/sound/driver/envy24/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/envy24/Makefile,v 1.3 2006/09/30 18:12:32 netchild Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/envy24ht/Makefile b/sys/modules/sound/driver/envy24ht/Makefile
index e6b0d452bb1b8..92283cd7d22d3 100644
--- a/sys/modules/sound/driver/envy24ht/Makefile
+++ b/sys/modules/sound/driver/envy24ht/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/envy24ht/Makefile,v 1.2 2006/09/30 18:12:32 netchild Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/es137x/Makefile b/sys/modules/sound/driver/es137x/Makefile
index d2a2d58cc3436..d555b5f933e8a 100644
--- a/sys/modules/sound/driver/es137x/Makefile
+++ b/sys/modules/sound/driver/es137x/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/es137x/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/ess/Makefile b/sys/modules/sound/driver/ess/Makefile
index 73da252e9fd38..986f0ea69713f 100644
--- a/sys/modules/sound/driver/ess/Makefile
+++ b/sys/modules/sound/driver/ess/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ess/Makefile,v 1.4 2006/05/12 18:05:35 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/fm801/Makefile b/sys/modules/sound/driver/fm801/Makefile
index a8ed6bd95ee44..b0e1ebdf43fd6 100644
--- a/sys/modules/sound/driver/fm801/Makefile
+++ b/sys/modules/sound/driver/fm801/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/fm801/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/hda/Makefile b/sys/modules/sound/driver/hda/Makefile
index 8508b5d7e501d..150bb41e3bfa7 100644
--- a/sys/modules/sound/driver/hda/Makefile
+++ b/sys/modules/sound/driver/hda/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/hda/Makefile,v 1.1 2006/10/01 11:13:00 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci/hda
 
diff --git a/sys/modules/sound/driver/ich/Makefile b/sys/modules/sound/driver/ich/Makefile
index e0f2ce7e36261..4547436006cdd 100755
--- a/sys/modules/sound/driver/ich/Makefile
+++ b/sys/modules/sound/driver/ich/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/ich/Makefile,v 1.2 2003/02/07 13:56:32 nyan Exp $
 
 .PATH:		${.CURDIR}/../../../../dev/sound/pci
 KMOD		= snd_ich
diff --git a/sys/modules/sound/driver/maestro/Makefile b/sys/modules/sound/driver/maestro/Makefile
index 817097d7aab66..ddef51f0d820e 100644
--- a/sys/modules/sound/driver/maestro/Makefile
+++ b/sys/modules/sound/driver/maestro/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/maestro/Makefile,v 1.4 2005/01/26 16:29:07 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/maestro3/Makefile b/sys/modules/sound/driver/maestro3/Makefile
index d4378b8b790a9..7fd526b327455 100644
--- a/sys/modules/sound/driver/maestro3/Makefile
+++ b/sys/modules/sound/driver/maestro3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/maestro3/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/mss/Makefile b/sys/modules/sound/driver/mss/Makefile
index 44880788998b6..f02f3883ceee5 100644
--- a/sys/modules/sound/driver/mss/Makefile
+++ b/sys/modules/sound/driver/mss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/mss/Makefile,v 1.5 2002/11/06 13:46:59 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/neomagic/Makefile b/sys/modules/sound/driver/neomagic/Makefile
index 9eabb5ccaf997..d4bbb3041b32a 100644
--- a/sys/modules/sound/driver/neomagic/Makefile
+++ b/sys/modules/sound/driver/neomagic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/neomagic/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/sb16/Makefile b/sys/modules/sound/driver/sb16/Makefile
index bf009f7035b8e..b6fe341d5c7e5 100644
--- a/sys/modules/sound/driver/sb16/Makefile
+++ b/sys/modules/sound/driver/sb16/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/sb16/Makefile,v 1.2 2001/01/06 14:00:20 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/sb8/Makefile b/sys/modules/sound/driver/sb8/Makefile
index f2b0da834c7ae..24e92cefd7377 100644
--- a/sys/modules/sound/driver/sb8/Makefile
+++ b/sys/modules/sound/driver/sb8/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/sb8/Makefile,v 1.2 2001/01/06 14:00:20 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/sbc/Makefile b/sys/modules/sound/driver/sbc/Makefile
index 8e2343df26637..ae8c1a14db3e3 100644
--- a/sys/modules/sound/driver/sbc/Makefile
+++ b/sys/modules/sound/driver/sbc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/sbc/Makefile,v 1.4 2002/11/06 13:46:59 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
diff --git a/sys/modules/sound/driver/solo/Makefile b/sys/modules/sound/driver/solo/Makefile
index 01059faf35366..2ac2f6a482b7b 100644
--- a/sys/modules/sound/driver/solo/Makefile
+++ b/sys/modules/sound/driver/solo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/solo/Makefile,v 1.3 2003/02/07 13:56:32 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/spicds/Makefile b/sys/modules/sound/driver/spicds/Makefile
index 35ec8799e938b..a17ad66662aef 100644
--- a/sys/modules/sound/driver/spicds/Makefile
+++ b/sys/modules/sound/driver/spicds/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/spicds/Makefile,v 1.2 2006/09/30 18:12:33 netchild Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/t4dwave/Makefile b/sys/modules/sound/driver/t4dwave/Makefile
index 7cd91402f49e7..179a6f662a28e 100644
--- a/sys/modules/sound/driver/t4dwave/Makefile
+++ b/sys/modules/sound/driver/t4dwave/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/t4dwave/Makefile,v 1.3 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile
index ff92551bb61e3..42803908c5140 100644
--- a/sys/modules/sound/driver/uaudio/Makefile
+++ b/sys/modules/sound/driver/uaudio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/uaudio/Makefile,v 1.3 2004/12/29 08:50:35 imp Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/usb
 
diff --git a/sys/modules/sound/driver/via8233/Makefile b/sys/modules/sound/driver/via8233/Makefile
index fa3fd960185c6..e0f01cd441be0 100644
--- a/sys/modules/sound/driver/via8233/Makefile
+++ b/sys/modules/sound/driver/via8233/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/via8233/Makefile,v 1.2 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/via82c686/Makefile b/sys/modules/sound/driver/via82c686/Makefile
index d53576ce9fce5..d2527313bb5d5 100644
--- a/sys/modules/sound/driver/via82c686/Makefile
+++ b/sys/modules/sound/driver/via82c686/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/via82c686/Makefile,v 1.3 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/driver/vibes/Makefile b/sys/modules/sound/driver/vibes/Makefile
index 663d8a00969c5..456b99280cb86 100644
--- a/sys/modules/sound/driver/vibes/Makefile
+++ b/sys/modules/sound/driver/vibes/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/driver/vibes/Makefile,v 1.4 2003/02/07 13:56:33 nyan Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index adfd36b82be53..30b07661363e4 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.21 2007/05/31 18:43:33 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../dev/sound
 .PATH: ${.CURDIR}/../../../dev/sound/pcm
diff --git a/sys/modules/speaker/Makefile b/sys/modules/speaker/Makefile
index 1a4c5ac163a4d..516a6e6d370f5 100644
--- a/sys/modules/speaker/Makefile
+++ b/sys/modules/speaker/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/speaker/Makefile,v 1.3 2005/11/11 09:57:31 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/speaker
 
diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile
index 1c634bf4bf983..a159afb227568 100644
--- a/sys/modules/splash/Makefile
+++ b/sys/modules/splash/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/Makefile,v 1.3 1999/08/28 00:47:37 peter Exp $
 
 SUBDIR=	bmp pcx
 
diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc
index 265f86d1ed55a..21cbb45f0da0e 100644
--- a/sys/modules/splash/Makefile.inc
+++ b/sys/modules/splash/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/Makefile.inc,v 1.2 1999/08/28 00:47:37 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index a169fdfec21a2..376bf83572e41 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/bmp/Makefile,v 1.9 2004/08/06 20:37:08 des Exp $
 
 .PATH:	${.CURDIR}/../../../dev/fb
 
diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile
index 188dafcd0f02d..ddbad01ac81e1 100644
--- a/sys/modules/splash/pcx/Makefile
+++ b/sys/modules/splash/pcx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/splash/pcx/Makefile,v 1.7 2004/08/06 20:37:08 des Exp $
 
 .PATH:	${.CURDIR}/../../../dev/fb
 
diff --git a/sys/modules/sppp/Makefile b/sys/modules/sppp/Makefile
index 0976210a21a39..7859737888305 100644
--- a/sys/modules/sppp/Makefile
+++ b/sys/modules/sppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sppp/Makefile,v 1.7 2005/10/14 23:30:15 yar Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/sr/Makefile b/sys/modules/sr/Makefile
index 22bfc4bb54836..2a98a48488d52 100644
--- a/sys/modules/sr/Makefile
+++ b/sys/modules/sr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sr/Makefile,v 1.4 2005/10/14 23:30:16 yar Exp $
  
 .PATH:  ${.CURDIR}/../../dev/sr
 KMOD    = if_sr
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 7f6e40574a70d..8c234203b573f 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ste/Makefile,v 1.12 2005/09/27 18:10:38 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/stg/Makefile b/sys/modules/stg/Makefile
index b8c0ae8da5f51..1301aef1c8b59 100644
--- a/sys/modules/stg/Makefile
+++ b/sys/modules/stg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/stg/Makefile,v 1.4 2005/09/27 18:10:39 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/stg
 
diff --git a/sys/modules/stge/Makefile b/sys/modules/stge/Makefile
index 721a42da83e84..d2d23bc050709 100644
--- a/sys/modules/stge/Makefile
+++ b/sys/modules/stge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/stge/Makefile,v 1.1 2006/07/25 00:45:55 yongari Exp $
 
 .PATH: ${.CURDIR}/../../dev/stge
 
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index cbffdeec5d858..f15fe8bcd63ab 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/streams/Makefile,v 1.12 2006/07/01 10:51:55 markm Exp $ 
 
 .PATH: ${.CURDIR}/../../dev/streams
 
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 92047384296cd..42281104b6243 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/svr4/Makefile,v 1.30 2006/07/01 10:51:55 markm Exp $
 
 .PATH:	${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
 KMOD=	svr4
diff --git a/sys/modules/svr4/README b/sys/modules/svr4/README
index a14e2b735401a..9ddd10824a5cf 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
 
-$FreeBSD$
+$FreeBSD: src/sys/modules/svr4/README,v 1.5 2001/05/01 11:26:14 schweikh Exp $
diff --git a/sys/modules/svr4/TO-DO b/sys/modules/svr4/TO-DO
index 078b80d8943a3..e4d2c41c78fe4 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)
 
 
-$FreeBSD$
+$FreeBSD: src/sys/modules/svr4/TO-DO,v 1.2 1999/08/28 00:47:42 peter Exp $
diff --git a/sys/modules/sym/Makefile b/sys/modules/sym/Makefile
index 198c98245aa5f..c254b7ece73b1 100644
--- a/sys/modules/sym/Makefile
+++ b/sys/modules/sym/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sym/Makefile,v 1.3 2001/01/06 14:00:24 obrien Exp $
 
 .PATH: ${.CURDIR}/../../dev/sym
 
diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile
index 71e84d0406136..a003b31f13d63 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile,v 1.15 2005/07/10 11:47:04 marius Exp $
 
 SUBDIR=	${_apm} \
 	blank \
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
index 265f86d1ed55a..960e646f9c0c7 100644
--- a/sys/modules/syscons/Makefile.inc
+++ b/sys/modules/syscons/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/Makefile.inc,v 1.2 1999/08/28 00:47:44 peter Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile
index d2e31d8c15ba2..1ea0c11317605 100644
--- a/sys/modules/syscons/apm/Makefile
+++ b/sys/modules/syscons/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/apm/Makefile,v 1.8 2002/11/06 13:46:59 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/apm
 
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 673b6bd2ff556..a6ef563f8f105 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/blank/Makefile,v 1.14 2002/01/11 15:48:58 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/blank
 
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index b027972c8d837..9da1f9a214419 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/daemon/Makefile,v 1.13 2002/11/06 13:46:59 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/daemon
 
diff --git a/sys/modules/syscons/dragon/Makefile b/sys/modules/syscons/dragon/Makefile
index 95ebecd53982e..04d1ce854b88f 100644
--- a/sys/modules/syscons/dragon/Makefile
+++ b/sys/modules/syscons/dragon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/dragon/Makefile,v 1.3 2002/11/11 10:11:58 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/dragon
 
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index 76919617dae87..f4ed1722b5d1b 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/fade/Makefile,v 1.14 2002/01/11 15:48:59 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/fade
 
diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile
index 219017e7f897f..cb43420c0be5a 100644
--- a/sys/modules/syscons/fire/Makefile
+++ b/sys/modules/syscons/fire/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/fire/Makefile,v 1.9 2002/11/11 10:11:59 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/fire
 
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index 255171ebb4456..d0d2a1e812842 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/green/Makefile,v 1.14 2002/01/11 15:48:59 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/green
 
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index b4439f2ddb991..9114f67242539 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/logo/Makefile,v 1.8 2002/01/11 15:48:59 ru Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/logo
 
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index 5c0d1265a1980..5c688f90351e9 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/rain/Makefile,v 1.8 2002/11/11 10:07:18 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/rain
 
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 9edf830068173..5d98ec2f04808 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/snake/Makefile,v 1.16 2002/11/06 13:47:00 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/snake
 
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index ca3075fe1e846..67a2b87687537 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/star/Makefile,v 1.16 2002/11/06 13:47:00 nyan Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/star
 
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 3ff59d3c4ea3e..43f8ff80110a0 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/syscons/warp/Makefile,v 1.9 2002/11/11 10:11:59 mux Exp $
 
 .PATH:	${.CURDIR}/../../../dev/syscons/warp
 
diff --git a/sys/modules/sysvipc/Makefile b/sys/modules/sysvipc/Makefile
index 6c65857836d22..6acc4466fd74e 100644
--- a/sys/modules/sysvipc/Makefile
+++ b/sys/modules/sysvipc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/Makefile,v 1.1 2000/12/01 17:49:16 alfred Exp $
 
 SUBDIR= sysvmsg sysvsem sysvshm
 
diff --git a/sys/modules/sysvipc/Makefile.inc b/sys/modules/sysvipc/Makefile.inc
index 265f86d1ed55a..4fe9ceee9fe38 100644
--- a/sys/modules/sysvipc/Makefile.inc
+++ b/sys/modules/sysvipc/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/Makefile.inc,v 1.1 2002/11/06 13:41:40 nyan Exp $
 
 .include "../Makefile.inc"
diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile
index 3e48b3128cfbc..353ea112adba3 100644
--- a/sys/modules/sysvipc/sysvmsg/Makefile
+++ b/sys/modules/sysvipc/sysvmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/sysvmsg/Makefile,v 1.4 2005/02/09 08:35:23 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile
index 22d97eed945d0..ca0b1e061cd4f 100644
--- a/sys/modules/sysvipc/sysvsem/Makefile
+++ b/sys/modules/sysvipc/sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/sysvsem/Makefile,v 1.4 2005/02/09 08:35:24 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile
index 760a6a236e19c..cfa6752c48660 100644
--- a/sys/modules/sysvipc/sysvshm/Makefile
+++ b/sys/modules/sysvipc/sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/sysvipc/sysvshm/Makefile,v 1.5 2005/02/09 08:35:24 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../kern
 
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 411cce0153aa3..d8ee2ea183e8b 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ti/Makefile,v 1.17 2005/12/10 00:38:32 scottl Exp $
 
 .PATH: ${.CURDIR}/../../dev/ti
 
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index ea5c80873623f..6a2d406d80c75 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/tl/Makefile,v 1.16 2005/09/27 18:10:39 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/tmpfs/Makefile b/sys/modules/tmpfs/Makefile
index 85aaaca856a0f..74d22600c2982 100644
--- a/sys/modules/tmpfs/Makefile
+++ b/sys/modules/tmpfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/tmpfs/Makefile,v 1.2 2007/06/29 05:23:15 delphij Exp $
 
 .PATH: ${.CURDIR}/../../fs/tmpfs
 
diff --git a/sys/modules/trm/Makefile b/sys/modules/trm/Makefile
index beb1ab474980c..19b598f35f9e9 100644
--- a/sys/modules/trm/Makefile
+++ b/sys/modules/trm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/trm/Makefile,v 1.2 2005/10/14 23:30:16 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/trm
 
diff --git a/sys/modules/twa/Makefile b/sys/modules/twa/Makefile
index e5539e1a2b28d..932ce33044a96 100644
--- a/sys/modules/twa/Makefile
+++ b/sys/modules/twa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/twa/Makefile,v 1.8 2007/05/09 04:16:31 scottl Exp $
 #
 # Copyright (c) 2004-06 Applied Micro Circuits Corporation.
 # All rights reserved.
diff --git a/sys/modules/twe/Makefile b/sys/modules/twe/Makefile
index a74a58dfb143b..1a706ccff796e 100644
--- a/sys/modules/twe/Makefile
+++ b/sys/modules/twe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/twe/Makefile,v 1.7 2005/08/10 04:01:21 obrien Exp $
 
 KMOD=	twe
 .PATH: ${.CURDIR}/../../dev/${KMOD}
diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile
index 1fe6ba119a86d..23413301ce48f 100644
--- a/sys/modules/tx/Makefile
+++ b/sys/modules/tx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/tx/Makefile,v 1.10 2005/09/27 18:10:39 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/tx
 
diff --git a/sys/modules/txp/Makefile b/sys/modules/txp/Makefile
index 379f3e3d2362e..4e055b109f8ee 100644
--- a/sys/modules/txp/Makefile
+++ b/sys/modules/txp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/txp/Makefile,v 1.4 2005/09/27 18:10:39 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/txp
 
diff --git a/sys/modules/uark/Makefile b/sys/modules/uark/Makefile
index 703cc851505ca..ba4b71e2abb1d 100644
--- a/sys/modules/uark/Makefile
+++ b/sys/modules/uark/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uark/Makefile,v 1.1 2006/11/15 09:13:25 maxim Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index b9b6c366f52a9..fa41356f9f496 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.16 2006/10/16 22:11:53 jb Exp $
 
 .PATH: ${.CURDIR}/../../dev/uart
 
diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile
index 1d7eb766fef2d..a28d94efcfb0f 100644
--- a/sys/modules/ubsa/Makefile
+++ b/sys/modules/ubsa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubsa/Makefile,v 1.4 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ubsec/Makefile b/sys/modules/ubsec/Makefile
index e9611c10c5365..3a77f201ca350 100644
--- a/sys/modules/ubsec/Makefile
+++ b/sys/modules/ubsec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubsec/Makefile,v 1.6 2007/03/21 03:42:51 sam Exp $
 
 .PATH:	${.CURDIR}/../../dev/ubsec
 KMOD	= ubsec
diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile
index 41a0bc3f01d23..099bf5b9ddd79 100644
--- a/sys/modules/ubser/Makefile
+++ b/sys/modules/ubser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ubser/Makefile,v 1.3 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ucom/Makefile b/sys/modules/ucom/Makefile
index bbd5c21dbf211..118add5f4383d 100644
--- a/sys/modules/ucom/Makefile
+++ b/sys/modules/ucom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ucom/Makefile,v 1.4 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ucycom/Makefile b/sys/modules/ucycom/Makefile
index d5849a93f520d..b6de48c961f24 100644
--- a/sys/modules/ucycom/Makefile
+++ b/sys/modules/ucycom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ucycom/Makefile,v 1.2 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/udav/Makefile b/sys/modules/udav/Makefile
index fd7acf9369429..103cd36f27f48 100644
--- a/sys/modules/udav/Makefile
+++ b/sys/modules/udav/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udav/Makefile,v 1.3 2005/09/27 18:10:40 mlaier Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
index aeeac7cb4b983..0a343e2948a40 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udbp/Makefile,v 1.9 2005/06/04 10:58:37 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile
index 220cba1e08ceb..3beb472672c5a 100644
--- a/sys/modules/udf/Makefile
+++ b/sys/modules/udf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udf/Makefile,v 1.5 2004/01/13 11:28:50 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/udf
 
diff --git a/sys/modules/udf_iconv/Makefile b/sys/modules/udf_iconv/Makefile
index 008f722bcba19..4de2bcc4d9ba7 100644
--- a/sys/modules/udf_iconv/Makefile
+++ b/sys/modules/udf_iconv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/udf_iconv/Makefile,v 1.1 2003/11/07 09:38:05 scottl Exp $
 
 .PATH:	${.CURDIR}/../../fs/udf
 KMOD=	udf_iconv
diff --git a/sys/modules/ufm/Makefile b/sys/modules/ufm/Makefile
index 28bbc90e3a093..b1ae1727bf9d3 100644
--- a/sys/modules/ufm/Makefile
+++ b/sys/modules/ufm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ufm/Makefile,v 1.3 2004/06/27 12:33:17 imp Exp $
 
 .PATH:	${.CURDIR}/../../dev/usb
 KMOD=	ufm
diff --git a/sys/modules/ufoma/Makefile b/sys/modules/ufoma/Makefile
index e89819c8a4ef5..fd9f23823ea67 100644
--- a/sys/modules/ufoma/Makefile
+++ b/sys/modules/ufoma/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ufoma/Makefile,v 1.1 2006/01/09 17:46:36 takawata Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile
index 9c5927ce3b196..6b267bbcc8af4 100644
--- a/sys/modules/ufs/Makefile
+++ b/sys/modules/ufs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.5 2006/12/21 21:35:49 yar Exp $
 
 .PATH:	${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs
 
diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile
index 65cb10782f5a2..a2d10aaf8c682 100644
--- a/sys/modules/uftdi/Makefile
+++ b/sys/modules/uftdi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uftdi/Makefile,v 1.4 2004/12/29 08:49:49 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index d024a3a396d3d..03b868a041184 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ugen/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 31c5a17ec2b86..d83964aceebad 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uhid/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/uipaq/Makefile b/sys/modules/uipaq/Makefile
index d8378fa22e307..c07623eb31303 100644
--- a/sys/modules/uipaq/Makefile
+++ b/sys/modules/uipaq/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uipaq/Makefile,v 1.1 2007/01/28 11:56:14 takawata Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index 331e72911bdc5..e6697b559b57d 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ukbd/Makefile,v 1.22 2006/09/27 19:57:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index c7d51c30f9fa4..121284e7b7830 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ulpt/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index 4af29fe90976d..cc2ccd67c7ad5 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umass/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile
index ccd775f4ba6f4..7153187a38fb7 100644
--- a/sys/modules/umct/Makefile
+++ b/sys/modules/umct/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umct/Makefile,v 1.4 2004/12/29 08:49:50 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 458a2c3cfafb3..badc4bd557787 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/umodem/Makefile,v 1.14 2005/06/04 10:58:38 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index fee38430c2ec1..ff81fc08f5a8e 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ums/Makefile,v 1.14 2005/06/04 10:58:39 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 64d38c5f2a823..4e155c333fd8c 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/unionfs/Makefile,v 1.12 2002/01/11 15:49:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../fs/unionfs
 
diff --git a/sys/modules/uplcom/Makefile b/sys/modules/uplcom/Makefile
index 36115ccca4369..d1fbaec57b5fd 100644
--- a/sys/modules/uplcom/Makefile
+++ b/sys/modules/uplcom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uplcom/Makefile,v 1.5 2004/12/29 08:49:50 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/ural/Makefile b/sys/modules/ural/Makefile
index 7076e811fb0bc..803f7cdca1419 100644
--- a/sys/modules/ural/Makefile
+++ b/sys/modules/ural/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/ural/Makefile,v 1.2 2005/09/27 18:10:40 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index 0221c5d1a1037..2d5478c872b79 100644
--- a/sys/modules/urio/Makefile
+++ b/sys/modules/urio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$ 
+# $FreeBSD: src/sys/modules/urio/Makefile,v 1.7 2004/12/29 08:49:51 imp Exp $ 
 
 MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
 
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index d08279d893760..faa61e7d93cd5 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/usb/Makefile,v 1.18 2005/06/04 10:58:39 schweikh Exp $
 
 S=	${.CURDIR}/../..
 
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index fa34856593391..a34690cb78e5c 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uscanner/Makefile,v 1.7 2005/06/04 10:58:39 schweikh Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/utopia/Makefile b/sys/modules/utopia/Makefile
index c1a444516c140..b31d18e0e76a9 100644
--- a/sys/modules/utopia/Makefile
+++ b/sys/modules/utopia/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/utopia/Makefile,v 1.2 2005/02/25 09:49:29 harti Exp $
 
 .PATH: ${.CURDIR}/../../dev/utopia
 
diff --git a/sys/modules/uvisor/Makefile b/sys/modules/uvisor/Makefile
index feb74df9acb4b..5807ef5f964a7 100644
--- a/sys/modules/uvisor/Makefile
+++ b/sys/modules/uvisor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uvisor/Makefile,v 1.4 2004/12/29 08:49:51 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/uvscom/Makefile b/sys/modules/uvscom/Makefile
index ceb1959df1f23..dd527b309cea6 100644
--- a/sys/modules/uvscom/Makefile
+++ b/sys/modules/uvscom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uvscom/Makefile,v 1.5 2004/12/29 08:49:51 imp Exp $
 
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index eb49f933c9ba9..796d574e16dd0 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vesa/Makefile,v 1.14 2002/01/11 15:49:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 
diff --git a/sys/modules/vge/Makefile b/sys/modules/vge/Makefile
index a06ee56ff72dd..43acd8fc6e973 100644
--- a/sys/modules/vge/Makefile
+++ b/sys/modules/vge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vge/Makefile,v 1.2 2005/09/27 18:10:40 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/vge
 
diff --git a/sys/modules/vkbd/Makefile b/sys/modules/vkbd/Makefile
index 500274cf94b19..0e03482b1517c 100644
--- a/sys/modules/vkbd/Makefile
+++ b/sys/modules/vkbd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2004/08/13 18:30:24 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vkbd/Makefile,v 1.4 2006/09/27 19:57:01 ru Exp $
 
 .PATH:	${.CURDIR}/../../dev/vkbd
 
diff --git a/sys/modules/vpo/Makefile b/sys/modules/vpo/Makefile
index cad169a856fbf..bf871953d166c 100644
--- a/sys/modules/vpo/Makefile
+++ b/sys/modules/vpo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vpo/Makefile,v 1.6 2002/01/11 15:49:02 ru Exp $
 
 .PATH: ${.CURDIR}/../../dev/ppbus
 
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 9d0e8dbdee9c4..d5b8f1ad41c74 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vr/Makefile,v 1.13 2005/09/27 18:10:40 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile
index 6293b1a21fdb6..2d6d452fe6c3d 100644
--- a/sys/modules/vx/Makefile
+++ b/sys/modules/vx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/vx/Makefile,v 1.4 2005/09/27 18:10:41 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../dev/vx
 
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index 2f32cd367336b..8c99bf92162d9 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wb/Makefile,v 1.13 2005/09/27 18:10:41 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile
index 20fc1a209e560..cf36c3b89d8cc 100644
--- a/sys/modules/wi/Makefile
+++ b/sys/modules/wi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wi/Makefile,v 1.18 2005/10/14 23:30:17 yar Exp $
 
 .PATH: ${.CURDIR}/../../dev/wi
 
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index 57122180a39ad..e66686729ecfe 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan/Makefile,v 1.8 2007/06/11 07:26:35 thompsa Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile
index aa71de2eebf87..0f3e3a8739586 100644
--- a/sys/modules/wlan_acl/Makefile
+++ b/sys/modules/wlan_acl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_acl/Makefile,v 1.1 2004/12/08 17:38:37 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_amrr/Makefile b/sys/modules/wlan_amrr/Makefile
index ac7b5ce25517d..f1018f84fa4a0 100644
--- a/sys/modules/wlan_amrr/Makefile
+++ b/sys/modules/wlan_amrr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_amrr/Makefile,v 1.1 2006/11/26 22:23:30 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile
index 06bafcec6eed5..48ca21b542e5a 100644
--- a/sys/modules/wlan_ccmp/Makefile
+++ b/sys/modules/wlan_ccmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_ccmp/Makefile,v 1.3 2004/12/16 01:10:48 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 .PATH: ${.CURDIR}/../../crypto/rijndael
diff --git a/sys/modules/wlan_scan_ap/Makefile b/sys/modules/wlan_scan_ap/Makefile
index 117a6bca3d87e..7c6f0248ebcc4 100644
--- a/sys/modules/wlan_scan_ap/Makefile
+++ b/sys/modules/wlan_scan_ap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_scan_ap/Makefile,v 1.1 2007/06/11 03:36:53 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_scan_sta/Makefile b/sys/modules/wlan_scan_sta/Makefile
index 8d96875d5fdfb..6200d4697e791 100644
--- a/sys/modules/wlan_scan_sta/Makefile
+++ b/sys/modules/wlan_scan_sta/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_scan_sta/Makefile,v 1.1 2007/06/11 03:36:54 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile
index 1449b78479e07..5a41495730fe4 100644
--- a/sys/modules/wlan_tkip/Makefile
+++ b/sys/modules/wlan_tkip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_tkip/Makefile,v 1.1 2004/12/08 17:38:38 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile
index 88ad322bb5e72..c0aa7a6105890 100644
--- a/sys/modules/wlan_wep/Makefile
+++ b/sys/modules/wlan_wep/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_wep/Makefile,v 1.1 2004/12/08 17:38:38 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile
index fba6f8aabb464..3609c17d0f819 100644
--- a/sys/modules/wlan_xauth/Makefile
+++ b/sys/modules/wlan_xauth/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wlan_xauth/Makefile,v 1.1 2004/12/08 17:38:38 sam Exp $
 
 .PATH: ${.CURDIR}/../../net80211
 
diff --git a/sys/modules/wpi/Makefile b/sys/modules/wpi/Makefile
index b0cbe6d7468a3..46562868dba45 100644
--- a/sys/modules/wpi/Makefile
+++ b/sys/modules/wpi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wpi/Makefile,v 1.2.2.1 2007/12/08 12:44:57 benjsc Exp $
 
 .PATH:  ${.CURDIR}/../../dev/wpi
 
diff --git a/sys/modules/wpifw/Makefile b/sys/modules/wpifw/Makefile
index 77fc98d983df4..9336c522b61a3 100644
--- a/sys/modules/wpifw/Makefile
+++ b/sys/modules/wpifw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/wpifw/Makefile,v 1.1.2.1 2007/12/08 12:44:57 benjsc Exp $
 
 .PATH: ${.CURDIR}/../../contrib/dev/wpi
 
diff --git a/sys/modules/xe/Makefile b/sys/modules/xe/Makefile
index f900854352b45..505bc82c6ef33 100644
--- a/sys/modules/xe/Makefile
+++ b/sys/modules/xe/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/xe/Makefile,v 1.2 2004/05/26 00:53:09 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/xe
 
diff --git a/sys/modules/xfs/Makefile b/sys/modules/xfs/Makefile
index 5d7ce509771ff..090a1077ed6f4 100644
--- a/sys/modules/xfs/Makefile
+++ b/sys/modules/xfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/xfs/Makefile,v 1.3 2006/06/09 06:10:17 rodrigc Exp $
 
 .PATH:	${.CURDIR}/../../gnu/fs/xfs \
 	${.CURDIR}/../../gnu/fs/xfs/FreeBSD \
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 637da4154e54a..e53e435d40666 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/xl/Makefile,v 1.14 2005/09/27 18:10:41 mlaier Exp $
 
 .PATH: ${.CURDIR}/../../pci
 
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index c9157af3e7611..0b0f766bd548c 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.6 2007/06/08 12:35:47 pjd Exp $
 
 KMOD=	zfs
 
diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile
index 0a475b55fce35..f96100648e8d0 100644
--- a/sys/modules/zlib/Makefile
+++ b/sys/modules/zlib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/zlib/Makefile,v 1.1 2004/06/20 17:42:35 markm Exp $
 
 .PATH: ${.CURDIR}/../../net
 
diff --git a/sys/modules/zyd/Makefile b/sys/modules/zyd/Makefile
index 95a7be8c5ea7d..d045b36b20016 100644
--- a/sys/modules/zyd/Makefile
+++ b/sys/modules/zyd/Makefile
@@ -1,6 +1,6 @@
 # ZyDAS Loadable Kernel Module
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/zyd/Makefile,v 1.1 2007/08/29 21:04:26 imp Exp $
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 7af9f3c84b740..e0748c6d3ca97 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -33,7 +33,7 @@
  *
  *      @(#)bpf.c	8.4 (Berkeley) 1/9/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf.c,v 1.181.2.1 2007/10/20 15:09:24 csjp Exp $
  */
 
 #include "opt_bpf.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index b9b03c8d8e332..d846a51be7ee6 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -34,7 +34,7 @@
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *	@(#)bpf.h	1.34 (LBL)     6/16/96
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf.h,v 1.47.2.1 2007/10/21 14:05:27 mlaier Exp $
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 7ee4ef00b9a0e..4888b11b4f06b 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -33,7 +33,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_filter.c,v 1.28 2007/09/13 09:00:32 dwmalone Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpf_jitter.c b/sys/net/bpf_jitter.c
index b1a61c5ebb3ce..1a6a1ad278597 100644
--- a/sys/net/bpf_jitter.c
+++ b/sys/net/bpf_jitter.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/bpf_jitter.c,v 1.3 2005/12/07 21:30:47 jkim Exp $");
 
 #include "opt_bpf.h"
 
diff --git a/sys/net/bpf_jitter.h b/sys/net/bpf_jitter.h
index 9eed2c92ddb91..855bd451ab27e 100644
--- a/sys/net/bpf_jitter.h
+++ b/sys/net/bpf_jitter.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpf_jitter.h,v 1.2 2005/12/07 21:30:47 jkim Exp $
  */
 
 #ifndef _NET_BPF_JITTER_H_
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index a46013edca432..de1df208e555f 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -33,7 +33,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bpfdesc.h,v 1.38 2007/08/06 14:26:00 rwatson Exp $
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index d2709395df28d..318c226926a5d 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.39 2007/08/18 12:06:13 thompsa Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/bridgestp.h b/sys/net/bridgestp.h
index d320b65967202..be8c7bd742861 100644
--- a/sys/net/bridgestp.h
+++ b/sys/net/bridgestp.h
@@ -67,7 +67,7 @@
  *
  * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bridgestp.h,v 1.14 2007/08/04 21:09:04 thompsa Exp $
  */
 
 /*
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index 139f772d35eb9..e888b0cb56b99 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -37,7 +37,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/bsd_comp.c,v 1.24 2006/10/22 11:52:15 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index 9db90a524b49a..97f0770a801ef 100644
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -1,7 +1,7 @@
 /*
  * Fundamental constants relating to ethernet.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ethernet.h,v 1.32.2.1 2007/10/28 16:24:16 thompsa Exp $
  *
  */
 
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 869a8d93b7ed9..5a1ee228f07d8 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/fddi.h,v 1.15 2005/11/11 07:36:14 ru Exp $
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/net/firewire.h b/sys/net/firewire.h
index d47b8225e9dcc..1bfce82dd6890 100644
--- a/sys/net/firewire.h
+++ b/sys/net/firewire.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/net/firewire.h,v 1.3 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_FIREWIRE_H_
diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
index 5f4906b73178a..414e25d17b828 100644
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/ieee8023ad_lacp.c,v 1.12 2007/07/05 09:18:57 thompsa Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h
index b0a67e085ce86..aa7b7440e1804 100644
--- a/sys/net/ieee8023ad_lacp.h
+++ b/sys/net/ieee8023ad_lacp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ieee8023ad_lacp.h,v 1.8 2007/07/05 09:18:57 thompsa Exp $
  */
 
 /*
diff --git a/sys/net/if.c b/sys/net/if.c
index 0b602bcff67ed..5e10232c31e14 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if.c,v 1.273 2007/07/27 11:59:57 rwatson Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index a5a0e967604f2..3876829ff6b50 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if.h,v 1.108 2007/06/11 20:08:11 andre Exp $
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h
index f2dc87cf034c9..5768e88d4c333 100644
--- a/sys/net/if_arc.h
+++ b/sys/net/if_arc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_arc.h,v 1.9 2006/04/12 07:44:31 rwatson Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1993
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 30fb47eb33e8a..073119b1cbb40 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/if_arcsubr.c,v 1.30 2006/04/12 07:44:31 rwatson Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 1e18804ffde33..3a33e4471b61f 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_arp.h,v 1.24 2005/11/11 16:04:48 ru Exp $
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h
index 99cc27757148d..894770ad4fed8 100644
--- a/sys/net/if_atm.h
+++ b/sys/net/if_atm.h
@@ -1,5 +1,5 @@
 /*      $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $       */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_atm.h,v 1.24 2005/08/09 10:19:58 rwatson Exp $ */
 
 /*-
  *
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index b84b08adecfa8..cfb0ee772d547 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.45 2006/12/01 22:45:43 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 321e4b47cf46a..27030d370bf73 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.103.2.3 2007/12/21 05:29:15 thompsa Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h
index bd17ca963dbf6..ac353a263ce61 100644
--- a/sys/net/if_bridgevar.h
+++ b/sys/net/if_bridgevar.h
@@ -67,7 +67,7 @@
  *
  * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.23.2.1 2007/11/07 19:21:41 thompsa Exp $
  */
 
 /*
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index cc52126357145..7e647b5ff147f 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_clone.c,v 1.11 2006/07/09 06:04:00 sam Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index af3395fe7e6a5..6864657229397 100644
--- a/sys/net/if_clone.h
+++ b/sys/net/if_clone.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_clone.h,v 1.4 2006/07/09 06:04:00 sam Exp $
  */
 
 #ifndef	_NET_IF_CLONE_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 51f05d5286e2f..bc38afd869000 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_disc.c,v 1.54 2007/03/26 09:10:28 yar Exp $
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 8d88623db8568..4d2b4f7435d6b 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_dl.h,v 1.14 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_edsc.c b/sys/net/if_edsc.c
index 82b1485bc08ad..ef67840974d32 100644
--- a/sys/net/if_edsc.c
+++ b/sys/net/if_edsc.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_edsc.c,v 1.3 2007/03/26 09:05:10 yar Exp $
  */
 
 /*
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 19c16874c28d8..7320c76430cf5 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ef.c,v 1.39 2006/01/18 14:24:39 andre Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index 9cea7a1606018..1dc82954469ea 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_enc.c,v 1.6.4.1 2007/12/29 17:28:38 thompsa Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index a06a6cda5147a..cd35b6370e654 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.236.2.1 2007/10/28 16:24:16 thompsa Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 2b0f30e2ac14c..8fb344d5a6adb 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_faith.c,v 1.42 2006/08/04 21:27:37 brooks Exp $
  */
 /*
  * derived from
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index a2fd00bd613fe..c04bc34516a55 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.104 2006/10/22 11:52:15 rwatson Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index b1c68d2190603..cd3e1392d3d5e 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_fwsubr.c,v 1.24 2007/06/05 14:15:45 simokawa Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index dfe69bd72f0ee..20c5995076e11 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_gif.c,v 1.66 2006/10/22 11:52:15 rwatson Exp $	*/
 /*	$KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $	*/
 
 /*-
diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h
index 8e9ceb172c9a0..a42ff441c1937 100644
--- a/sys/net/if_gif.h
+++ b/sys/net/if_gif.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_gif.h,v 1.19 2006/01/30 08:39:09 glebius Exp $	*/
 /*	$KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index bd208f1a97cd2..453debe780f8f 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_gre.c,v 1.49 2003/12/11 00:22:29 itojun Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/net/if_gre.c,v 1.46 2007/06/26 23:01:01 rwatson Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 6c8e8537c6d39..3ed9b64f63acd 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/net/if_gre.h,v 1.13 2005/06/10 16:49:18 brooks Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 8dca49914a4bd..4fd9bff98a55a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.75 2006/10/22 11:52:15 rwatson Exp $
  *
  */
 
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
index 27fef3f0d5487..41f935ac832e9 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net/if_lagg.c,v 1.19.2.5 2007/12/21 05:33:48 thompsa Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h
index 2b25118bbab1f..a07963f3cd487 100644
--- a/sys/net/if_lagg.h
+++ b/sys/net/if_lagg.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_lagg.h,v 1.10.2.1 2007/10/18 01:28:30 thompsa Exp $
  */
 
 #ifndef _NET_LAGG_H
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 0d96372ed5be8..ec4427fb47870 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_llc.h,v 1.13 2006/12/01 17:50:11 imp Exp $
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a1bfc7bbf7cbd..aa46d84fae808 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_loop.c,v 1.112 2007/02/09 00:09:35 cognet Exp $
  */
 
 /*
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 392813665d357..06a9bb92d37df 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 $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_media.c,v 1.23 2006/02/14 12:10:03 glebius Exp $ */
 
 /*-
  * Copyright (c) 1997
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 0e888a8bc5c18..20425918ee7ba 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 $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_media.h,v 1.40 2007/09/18 20:30:40 sam Exp $ */
 
 /*-
  * Copyright (c) 1997
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index dc2b8e1d9f617..eba52fc170dc1 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h
index e2b80c87d41e7..18fe163165eb8 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_mib.h,v 1.8 2006/01/04 12:57:09 harti Exp $
  */
 
 #ifndef _NET_IF_MIB_H
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 462b7c55b6886..c716c70227925 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -71,7 +71,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/if_ppp.c,v 1.121 2007/07/02 15:44:30 rwatson Exp $ */
 /* 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 d23255be63f0c..b97c3411ff4c9 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_ppp.h,v 1.15 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index 77e1adeeada9d..39820b7dc4c2e 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -40,7 +40,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_pppvar.h,v 1.26 2006/12/05 18:54:21 ume Exp $
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 3e339706d3942..c63d9831a0b07 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sl.c,v 1.133 2006/11/06 13:42:02 rwatson Exp $
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index e6b6d2c0d3c2d..761cf5c8b5f41 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -28,7 +28,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_slvar.h,v 1.23 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 97f94b390de6d..91a5562308fcd 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -17,7 +17,7 @@
  *
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_sppp.h,v 1.28 2005/06/10 16:49:18 brooks Exp $
  */
 
 #ifndef _NET_IF_SPPP_H_
diff --git a/sys/net/if_spppfr.c b/sys/net/if_spppfr.c
index ae4f95916e381..184ca0f123311 100644
--- a/sys/net/if_spppfr.c
+++ b/sys/net/if_spppfr.c
@@ -20,7 +20,7 @@
  * works or modified versions.
  *
  * $Cronyx Id: if_spppfr.c,v 1.1.2.10 2004/06/29 09:02:30 rik Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_spppfr.c,v 1.3 2005/06/10 16:49:18 brooks Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 9d82399155627..c6f6520d8d31b 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -18,7 +18,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.127 2007/06/10 04:53:13 mjacob Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index dfb9aeade1448..1250a384effd9 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_stf.c,v 1.60 2007/09/23 17:50:17 csjp Exp $	*/
 /*	$KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $	*/
 
 /*-
diff --git a/sys/net/if_stf.h b/sys/net/if_stf.h
index cbaf67033c54b..6ee95f3096c37 100644
--- a/sys/net/if_stf.h
+++ b/sys/net/if_stf.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/if_stf.h,v 1.5 2005/01/07 01:45:34 imp Exp $	*/
 /*	$KAME: if_stf.h,v 1.5 2001/10/12 10:09:17 keiichi Exp $	*/
 
 /*-
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index e08b3b6d589e5..82e3e4e404d5a 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -31,7 +31,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tap.c,v 1.71 2007/03/19 18:17:31 bms Exp $
  * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $
  */
 
diff --git a/sys/net/if_tap.h b/sys/net/if_tap.h
index 0086285e340c8..3d8fb6394dc29 100644
--- a/sys/net/if_tap.h
+++ b/sys/net/if_tap.h
@@ -31,7 +31,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tap.h,v 1.3 2006/09/27 19:57:01 ru Exp $
  * $Id: if_tap.h,v 0.7 2000/07/12 04:12:51 max Exp $
  */
 
diff --git a/sys/net/if_tapvar.h b/sys/net/if_tapvar.h
index 21bac5054d005..32cda7a2600f2 100644
--- a/sys/net/if_tapvar.h
+++ b/sys/net/if_tapvar.h
@@ -34,7 +34,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tapvar.h,v 1.10 2005/06/10 16:49:18 brooks Exp $
  * $Id: if_tapvar.h,v 0.6 2000/07/11 02:16:08 max Exp $
  */
 
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 61f08d7ded056..14566a177f0a5 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -13,7 +13,7 @@
  * UCL. This driver is based much more on read/write/poll mode of
  * operation though.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tun.c,v 1.163 2007/02/05 11:15:52 bms Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 382881cb256d1..f0b12aaf1a415 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_tun.h,v 1.18 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NET_IF_TUN_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index b2d3a15959684..4c9bf48463f85 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.3 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_types.h,v 1.23 2007/06/13 14:01:43 rwatson Exp $
  * $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
  */
 
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 50a469b04ff16..8e6adad9f4ca6 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_var.h,v 1.115.2.1 2007/12/07 05:46:08 kmacy Exp $
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 6cce6e9fe10bb..d9f7a7a349940 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_vlan.c,v 1.124.2.1 2007/10/28 16:24:16 thompsa Exp $
  */
 
 /*
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index ec71df1ace7c9..6d320849649b2 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.26 2007/02/28 22:05:30 bms Exp $
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index cb10874ebc115..aa985cfa0c635 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/iso88025.h,v 1.16 2005/11/11 07:36:14 ru Exp $
  *
  * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
  * the Mach token ring driver.
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index cb61ebeed613d..b11e43769fb73 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/netisr.c,v 1.20 2007/08/06 14:26:00 rwatson Exp $
  */
 
 #include "opt_device_polling.h"
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 9ba3e8d4a653c..d2f2bc79d4ee6 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/netisr.h,v 1.33 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index 78b87f3179c57..643f10d2698dd 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/pfil.c,v 1.14 2006/02/02 03:13:15 csjp Exp $ */
 /*	$NetBSD: pfil.c,v 1.20 2001/11/12 23:49:46 lukem Exp $	*/
 
 /*-
diff --git a/sys/net/pfil.h b/sys/net/pfil.h
index d2308fdbee57a..02742be149b5c 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/net/pfil.h,v 1.16 2007/06/08 12:43:25 gallatin Exp $ */
 /*	$NetBSD: pfil.h,v 1.22 2003/06/23 12:57:08 martin Exp $	*/
 
 /*-
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 6158d88597042..8067ca691cbf4 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/net/pfkeyv2.h,v 1.16 2007/07/03 12:13:43 gnn Exp $	*/
 /*	$KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $	*/
 
 /*-
diff --git a/sys/net/ppp_comp.h b/sys/net/ppp_comp.h
index 00591efc23219..d8cc2021ee60f 100644
--- a/sys/net/ppp_comp.h
+++ b/sys/net/ppp_comp.h
@@ -26,7 +26,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_comp.h,v 1.12 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_PPP_COMP_H
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index 0bf0c495ef5cd..3e27fa8f00934 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/ppp_deflate.c,v 1.22 2006/02/27 16:56:22 wkoszek Exp $	*/
 
 /*-
  * 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 386a1763b1e33..57e503f5afe32 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -25,7 +25,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/ppp_defs.h,v 1.8 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _PPP_DEFS_H_
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index ae37bd762747b..625aed30bf4a7 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -71,7 +71,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net/ppp_tty.c,v 1.72 2006/12/05 18:54:21 ume Exp $ */
 
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 0f718b72b25f5..d626a24da23ca 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.5 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/radix.c,v 1.38 2006/02/07 20:25:39 qingli Exp $
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index ca530955e59ae..772f7c134fad2 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/radix.h,v 1.26 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 705db619f7bda..48ec74f8d22d1 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_cb.c,v 1.34 2006/06/02 08:27:15 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 4e6b77a23ba08..1d9fad59c4174 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_cb.h,v 1.19 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 22f3e7b8adf1c..91b1d4c0c909d 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.44 2006/11/06 13:42:02 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index c843efe4ebd61..cb931dc827788 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.3.1.1 (Berkeley) 2/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/route.c,v 1.120.2.1.2.1 2008/01/09 15:23:36 mux Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/route.h b/sys/net/route.h
index c58a2be9c0db0..e053f5d9fd6da 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/route.h,v 1.65.4.1 2008/01/09 15:23:36 mux Exp $
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index c2a2051b7338c..b0696f6495faa 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/rtsock.c,v 1.143 2007/09/08 19:28:45 cognet Exp $
  */
 #include "opt_sctp.h"
 #include <sys/param.h>
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index d58cd3d0d5446..832961bc284c4 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.c,v 1.19 2004/04/07 20:46:12 imp Exp $
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 794d8b83818b8..85f285a17a5cb 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -31,7 +31,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slcompress.h,v 1.19 2005/01/07 01:45:35 imp Exp $
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index 7b4164e8bef6a..e361ae4f08334 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/slip.h,v 1.10 2004/04/07 20:46:12 imp Exp $
  */
 
 #ifndef _NET_SLIP_H_
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 8fc8cab95b7fa..36bb0a530dc0d 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net/zlib.c,v 1.20 2005/09/11 16:13:02 rodrigc Exp $
  */
 
 /* 
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index 9529e43b8be77..dd929896e39ae 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/net/zlib.h,v 1.10 2005/01/07 01:45:35 imp Exp $	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h
index 9f50e3c4d21a1..1be9890d3a4e8 100644
--- a/sys/net80211/_ieee80211.h
+++ b/sys/net80211/_ieee80211.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/_ieee80211.h,v 1.14 2007/09/18 20:46:36 sam Exp $
  */
 #ifndef _NET80211__IEEE80211_H_
 #define _NET80211__IEEE80211_H_
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index dbeb7a3d6ea8c..c4a7da9a34e99 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.43.2.2 2007/12/07 05:46:08 kmacy Exp $");
 
 /*
  * IEEE 802.11 generic handler
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index 97f9365f7f3e1..8f8b08e2c7641 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211.h,v 1.15.2.3 2007/11/28 06:12:30 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_H_
 #define _NET80211_IEEE80211_H_
diff --git a/sys/net80211/ieee80211_acl.c b/sys/net80211/ieee80211_acl.c
index c5305d055e93c..e8f28ba3ea665 100644
--- a/sys/net80211/ieee80211_acl.c
+++ b/sys/net80211/ieee80211_acl.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_acl.c,v 1.6 2007/06/11 03:36:54 sam Exp $");
 
 /*
  * IEEE 802.11 MAC ACL support.
diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c
index 5b34768b4e6b1..d5ef6a68bd56c 100644
--- a/sys/net80211/ieee80211_amrr.c
+++ b/sys/net80211/ieee80211_amrr.c
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_amrr.c,v 1.3 2007/06/11 03:36:54 sam Exp $");
 
 /*-
  * Naive implementation of the Adaptive Multi Rate Retry algorithm:
diff --git a/sys/net80211/ieee80211_amrr.h b/sys/net80211/ieee80211_amrr.h
index 947d6179be7ff..a4a1b5721c77e 100644
--- a/sys/net80211/ieee80211_amrr.h
+++ b/sys/net80211/ieee80211_amrr.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net80211/ieee80211_amrr.h,v 1.1 2006/11/26 19:55:26 sam Exp $ */
 /*	$OpenBSD: ieee80211_amrr.h,v 1.3 2006/06/17 19:34:31 damien Exp $	*/
 
 /*-
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 83d7c3f968c13..412cadd3a3379 100644
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.16 2007/06/11 03:36:54 sam Exp $");
 
 /*
  * IEEE 802.11 generic crypto support.
diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
index ee99caa190009..7a09e2ae1c4f9 100644
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_crypto.h,v 1.13 2007/06/11 03:36:54 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_CRYPTO_H_
 #define _NET80211_IEEE80211_CRYPTO_H_
diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c
index 525fe9adcaa08..0b272c4da7db1 100644
--- a/sys/net80211/ieee80211_crypto_ccmp.c
+++ b/sys/net80211/ieee80211_crypto_ccmp.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.10 2007/06/11 03:36:54 sam Exp $");
 
 /*
  * IEEE 802.11i AES-CCMP crypto support.
diff --git a/sys/net80211/ieee80211_crypto_none.c b/sys/net80211/ieee80211_crypto_none.c
index 7fbb53d9dee34..54da115530bad 100644
--- a/sys/net80211/ieee80211_crypto_none.c
+++ b/sys/net80211/ieee80211_crypto_none.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_none.c,v 1.7 2007/06/11 03:36:54 sam Exp $");
 
 /*
  * IEEE 802.11 NULL crypto support.
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 327306a298c1c..3af727c48e246 100644
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_tkip.c,v 1.13 2007/06/11 03:36:54 sam Exp $");
 
 /*
  * IEEE 802.11i TKIP crypto support.
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 81d15cc20326f..df59bfa822ce3 100644
--- a/sys/net80211/ieee80211_crypto_wep.c
+++ b/sys/net80211/ieee80211_crypto_wep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_wep.c,v 1.10 2007/06/11 03:36:54 sam Exp $");
 
 /*
  * IEEE 802.11 WEP crypto support.
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
index 1cb78137e9728..4472806cb5721 100644
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.16.2.1 2007/11/11 17:44:35 sam Exp $");
 
 /*
  * IEEE 802.11 support (FreeBSD-specific code)
diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h
index 0052dfe799151..c0b8bc536d45b 100644
--- a/sys/net80211/ieee80211_freebsd.h
+++ b/sys/net80211/ieee80211_freebsd.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.15.2.1 2007/11/11 17:44:35 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_FREEBSD_H_
 #define _NET80211_IEEE80211_FREEBSD_H_
diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
index 63fb39a110fd6..d9498a09bd524 100644
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -25,7 +25,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.4.2.3.2.1 2008/02/05 18:19:12 sam Exp $");
 #endif
 
 /*
diff --git a/sys/net80211/ieee80211_ht.h b/sys/net80211/ieee80211_ht.h
index e876449ea6e03..3d735bbee0bae 100644
--- a/sys/net80211/ieee80211_ht.h
+++ b/sys/net80211/ieee80211_ht.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_ht.h,v 1.2.2.1 2007/11/11 17:44:35 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_HT_H_
 #define _NET80211_IEEE80211_HT_H_
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 9238bdfa2a3e3..2fa8fee347504 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.113.2.1.2.1 2008/02/05 18:29:03 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 83627e83bd443..f3c76dccbf372 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.57.2.1 2007/11/11 17:44:36 sam Exp $");
 
 #include "opt_compat.h"
 
diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h
index e96ab521f3b65..e7d0154e58cb8 100644
--- a/sys/net80211/ieee80211_ioctl.h
+++ b/sys/net80211/ieee80211_ioctl.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_ioctl.h,v 1.24.2.2 2007/11/11 17:44:36 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_IOCTL_H_
 #define _NET80211_IEEE80211_IOCTL_H_
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 0ed8b79346814..fbe102421b311 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.88.2.3 2007/11/28 06:15:03 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index 2799ed4c814ce..2e8073f2a8853 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_node.h,v 1.29.2.1 2007/11/11 17:44:36 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_NODE_H_
 #define _NET80211_IEEE80211_NODE_H_
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 6e31d1d169a0d..8697364e8b0e4 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.54.2.3 2007/12/07 05:46:08 kmacy Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/net80211/ieee80211_power.c b/sys/net80211/ieee80211_power.c
index e764e1f291df1..dd2dcea5a730d 100644
--- a/sys/net80211/ieee80211_power.c
+++ b/sys/net80211/ieee80211_power.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_power.c,v 1.2 2007/09/17 19:07:22 sam Exp $");
 
 /*
  * IEEE 802.11 power save support.
diff --git a/sys/net80211/ieee80211_power.h b/sys/net80211/ieee80211_power.h
index c8461f6040f51..bd24bf21fc1b3 100644
--- a/sys/net80211/ieee80211_power.h
+++ b/sys/net80211/ieee80211_power.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_power.h,v 1.1 2007/06/11 03:36:54 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_POWER_H_
 #define _NET80211_IEEE80211_POWER_H_
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index e67d40ca7da53..001820ae04601 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.42.2.3 2007/11/28 06:11:18 sam Exp $");
 
 /*
  * IEEE 802.11 protocol support.
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 9f94f1cfc77ba..a9bee8d712ba4 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.26.2.1 2007/11/11 17:44:36 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_PROTO_H_
 #define _NET80211_IEEE80211_PROTO_H_
diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h
index 6d966a6758aa0..11f3aa2ea0c36 100644
--- a/sys/net80211/ieee80211_radiotap.h
+++ b/sys/net80211/ieee80211_radiotap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.10 2007/07/01 06:59:30 thompsa Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */
 
 /*-
diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c
index 7f1b3dc8484fa..0e582689c0e08 100644
--- a/sys/net80211/ieee80211_regdomain.c
+++ b/sys/net80211/ieee80211_regdomain.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_regdomain.c,v 1.3 2007/09/17 03:48:32 sam Exp $");
 
 /*
  * IEEE 802.11 regdomain support.
diff --git a/sys/net80211/ieee80211_regdomain.h b/sys/net80211/ieee80211_regdomain.h
index 9c1345e0e7ca8..2a136c82de52b 100644
--- a/sys/net80211/ieee80211_regdomain.h
+++ b/sys/net80211/ieee80211_regdomain.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_regdomain.h,v 1.1 2007/06/11 03:36:55 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_REGDOMAIN_H_
 #define _NET80211_IEEE80211_REGDOMAIN_H_
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
index 6f6b9a684d84b..507954dd5dede 100644
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan.c,v 1.3.2.1 2007/10/31 16:53:44 sam Exp $");
 
 /*
  * IEEE 802.11 scanning support.
diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h
index fed5e0b715666..09e7b697b2df2 100644
--- a/sys/net80211/ieee80211_scan.h
+++ b/sys/net80211/ieee80211_scan.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_scan.h,v 1.3 2007/06/30 21:39:21 thompsa Exp $
  */
 #ifndef _NET80211_IEEE80211_SCAN_H_
 #define _NET80211_IEEE80211_SCAN_H_
diff --git a/sys/net80211/ieee80211_scan_ap.c b/sys/net80211/ieee80211_scan_ap.c
index 300f4407b407a..b813c5004cac4 100644
--- a/sys/net80211/ieee80211_scan_ap.c
+++ b/sys/net80211/ieee80211_scan_ap.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_ap.c,v 1.1.2.1 2007/11/11 17:44:36 sam Exp $");
 
 /*
  * IEEE 802.11 ap scanning support.
diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c
index 7d7548c9f6795..90882f3b2b031 100644
--- a/sys/net80211/ieee80211_scan_sta.c
+++ b/sys/net80211/ieee80211_scan_sta.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.4.2.3 2007/11/29 19:05:09 sam Exp $");
 
 /*
  * IEEE 802.11 station scanning support.
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index 3171ceff4794e..4cddb90e6761d 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.52.2.2 2007/11/29 21:23:22 sam Exp $
  */
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
diff --git a/sys/net80211/ieee80211_xauth.c b/sys/net80211/ieee80211_xauth.c
index c829b6ea2a575..30b74aa4227ad 100644
--- a/sys/net80211/ieee80211_xauth.c
+++ b/sys/net80211/ieee80211_xauth.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_xauth.c,v 1.3 2007/06/06 04:56:04 sam Exp $");
 
 /*
  * External authenticator placeholder module.
diff --git a/sys/netatalk/COPYRIGHT b/sys/netatalk/COPYRIGHT
index f47cdd106d9b1..d0c36b4b89ddd 100644
--- a/sys/netatalk/COPYRIGHT
+++ b/sys/netatalk/COPYRIGHT
@@ -46,5 +46,5 @@
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/COPYRIGHT,v 1.4 2007/01/08 17:58:27 rwatson Exp $
  */
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index 2e705e2e91264..a85d305916630 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -47,7 +47,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/aarp.c,v 1.42 2007/01/12 12:25:12 rwatson Exp $
  */
 
 #include "opt_atalk.h"
diff --git a/sys/netatalk/aarp.h b/sys/netatalk/aarp.h
index b55a9a7cc66c6..517ed448ee9e0 100644
--- a/sys/netatalk/aarp.h
+++ b/sys/netatalk/aarp.h
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/aarp.h,v 1.6 2007/06/28 12:54:58 rwatson Exp $
  */
 
 #ifndef _NETATALK_AARP_H_
diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 5a944c1ad2a73..9afc76ca7dd40 100644
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at.h,v 1.8 2007/01/12 13:18:08 rwatson Exp $
  */
 
 #ifndef _NETATALK_AT_H_
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index c8c563fcd68e0..cf4e0a2b3c883 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_control.c,v 1.46 2007/02/19 22:40:02 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h
index d81a8776f3a12..3391f4590dd34 100644
--- a/sys/netatalk/at_extern.h
+++ b/sys/netatalk/at_extern.h
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_extern.h,v 1.18 2007/01/12 13:18:08 rwatson Exp $
  */
 
 #ifndef _NETATALK_AT_EXTERN_H_
diff --git a/sys/netatalk/at_proto.c b/sys/netatalk/at_proto.c
index 39b0dd61d9728..853b73a5efef5 100644
--- a/sys/netatalk/at_proto.c
+++ b/sys/netatalk/at_proto.c
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_proto.c,v 1.13 2007/01/12 13:18:08 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/at_rmx.c b/sys/netatalk/at_rmx.c
index b39f98059f286..e7c9e32a54691 100644
--- a/sys/netatalk/at_rmx.c
+++ b/sys/netatalk/at_rmx.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * at_rmx.c,v 1.13 1995/05/30 08:09:31 rgrimes Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_rmx.c,v 1.10 2007/01/12 13:18:08 rwatson Exp $
  */
 
 /* This code generates debugging traces to the radix code. */
diff --git a/sys/netatalk/at_var.h b/sys/netatalk/at_var.h
index 0ad1334301de4..f1cd493a09d7c 100644
--- a/sys/netatalk/at_var.h
+++ b/sys/netatalk/at_var.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/at_var.h,v 1.15 2007/01/12 13:18:08 rwatson Exp $
  */
 
 #ifndef _NETATALK_AT_VAR_H_
diff --git a/sys/netatalk/ddp.h b/sys/netatalk/ddp.h
index 1867ae42c61d8..3db1989e4fc9c 100644
--- a/sys/netatalk/ddp.h
+++ b/sys/netatalk/ddp.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp.h,v 1.4 2007/06/28 12:54:58 rwatson Exp $
  */
 
 #ifndef _NETATALK_DDP_H_
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index 7e15cb190845f..aab647283804c 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -46,7 +46,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.32 2007/01/12 15:07:51 rwatson Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index c67264e9eb090..7b9a78fd08565 100644
--- a/sys/netatalk/ddp_output.c
+++ b/sys/netatalk/ddp_output.c
@@ -21,7 +21,7 @@
  *	netatalk@itd.umich.edu
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.30 2007/01/12 15:07:51 rwatson Exp $ */
 
 #include "opt_mac.h"
 
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 068d427ebea6e..3e9b8f7cd2eed 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -46,7 +46,7 @@
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.52 2007/01/12 15:07:51 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/ddp_pcb.h b/sys/netatalk/ddp_pcb.h
index d71836f6ddb03..a4b28694f4492 100644
--- a/sys/netatalk/ddp_pcb.h
+++ b/sys/netatalk/ddp_pcb.h
@@ -47,7 +47,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.h,v 1.5 2007/01/12 15:07:51 rwatson Exp $
  */
 
 #ifndef _NETATALK_DDP_PCB_H_
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index df38e2a182a34..0ff723d455da1 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -47,7 +47,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.55 2007/05/11 10:20:49 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netatalk/ddp_var.h b/sys/netatalk/ddp_var.h
index 71bbb5bee827a..2a71e281b458a 100644
--- a/sys/netatalk/ddp_var.h
+++ b/sys/netatalk/ddp_var.h
@@ -23,7 +23,7 @@
  *	+1-313-764-2278
  *	netatalk@umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.9 2007/01/12 15:07:51 rwatson Exp $
  */
 
 #ifndef _NETATALK_DDP_VAR_H_
diff --git a/sys/netatalk/endian.h b/sys/netatalk/endian.h
index 41df5bce2ec7a..d7e77be52fbc1 100644
--- a/sys/netatalk/endian.h
+++ b/sys/netatalk/endian.h
@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/endian.h,v 1.4 2005/01/07 02:35:34 imp Exp $
  */
 
 #ifndef _ATALK_ENDIAN_H_
diff --git a/sys/netatalk/phase2.h b/sys/netatalk/phase2.h
index e6a4bec13291b..2a7644ab3f6de 100644
--- a/sys/netatalk/phase2.h
+++ b/sys/netatalk/phase2.h
@@ -22,7 +22,7 @@
  *	Ann Arbor, Michigan
  *	+1-313-764-2278
  *	netatalk@umich.edu
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatalk/phase2.h,v 1.3 2005/01/07 02:35:34 imp Exp $
  */
 
 #include <net/if_llc.h>
diff --git a/sys/netatm/atm.h b/sys/netatm/atm.h
index 7ec9bdddf556a..954192283157f 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm.h,v 1.6 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index a0534b7d0d266..c03f07aab712d 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_aal5.c,v 1.25 2006/07/21 17:11:13 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 4cfdf1a391a9c..4f4b4aa3f9215 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.35 2007/06/23 00:02:19 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index c9e6dc5d1d312..f4090226ce0c8 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_cm.h,v 1.8 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index 1d10f0fd75939..aa7a870b253c9 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_device.c,v 1.26 2005/01/07 01:45:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 665e7c09cad64..45f50271600b2 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_if.c,v 1.33 2007/04/03 12:45:10 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index c9ea43aeb68bb..3014423458bf8 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_if.h,v 1.20 2005/06/10 16:49:20 brooks Exp $
  *
  */
 
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index e30cf7824ba58..aa20d3ebc1616 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_ioctl.h,v 1.10 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index 07a263d21c1e7..e0eed21d00c0d 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_pcb.h,v 1.4 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 2fffc5a7975f4..cf4f36b00516b 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_proto.c,v 1.16 2007/07/14 21:49:23 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netatm/atm_sap.h b/sys/netatm/atm_sap.h
index a05b32ab75d8d..941d594e9c011 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sap.h,v 1.3 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index 8018929261e17..7b8f9800c8cb4 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sigmgr.h,v 1.5 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 232d1f0013457..19521238f4385 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_signal.c,v 1.14 2006/01/22 01:04:05 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index d2aecf1b592b2..5bcd092b51900 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.26 2006/04/01 15:41:59 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index b277c44363838..face2ea0e80fe 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_stack.h,v 1.6 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 505e899ee21d4..dbce0b9567220 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_subr.c,v 1.43 2005/01/07 01:45:36 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index 19a1b132bfce3..fed677a1f8dd1 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_sys.h,v 1.9 2005/12/27 12:33:18 stefanf Exp $
  *
  */
 
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 6f40a4651227f..4b470466944c3 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/atm_usrreq.c,v 1.28 2006/11/06 13:42:03 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index 788acc9b26885..4698373c60eda 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.29 2006/04/01 15:41:59 rwatson Exp $
  *
  */
 
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index e70e6462d3e6c..78ae3ef364e20 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/atm_vc.h,v 1.5 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm.h b/sys/netatm/ipatm/ipatm.h
index 303d3cd4f9c84..c1399d4c21b99 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 4f53347df3aa0..fced5bc298ca9 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_event.c,v 1.11 2007/06/23 00:02:19 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 11965d0586750..1b367834c1506 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_if.c,v 1.18 2005/10/31 15:41:26 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index 1bdadd26d017a..4997fe9b64672 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_input.c,v 1.15 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 4376b6647b1e2..9fa7addf2cf50 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.23 2005/10/30 19:44:39 rwatson Exp $");
 
 #ifndef ATM_IP_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 45559f09d6f1e..15b996fa35a4a 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_output.c,v 1.14 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/ipatm/ipatm_serv.h b/sys/netatm/ipatm/ipatm_serv.h
index 5eb6dc12bb677..6f1c8de69d6ac 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_serv.h,v 1.4 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 19c02b3829e7a..edc010614595f 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_usrreq.c,v 1.16 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index 12326775ab95f..902096b2f1413 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 220548f80737e..83ec9b40e22ee 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/ipatm/ipatm_vcm.c,v 1.20 2006/01/22 01:07:11 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index 1487ac5750979..a2711485ed956 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/port.h,v 1.16 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/queue.h b/sys/netatm/queue.h
index 82db2465a25e4..ad9624b5c187e 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/queue.h,v 1.3 2005/01/07 01:45:36 imp Exp $
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 440de2072b1a0..6262a8a70a65d 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.18 2005/01/07 01:45:38 imp Exp $");
 
 #ifndef ATM_SIGPVC_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 67164c8fba047..2fef490f234ad 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/sigpvc/sigpvc_subr.c,v 1.14 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 79b6818f0c83e..f663f55060018 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_var.h,v 1.5 2005/01/07 01:45:38 imp Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index eefdb3ef47668..62c60b0474e01 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_arp.c,v 1.21 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 84a9a6a43918f..26807641eebbd 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_cls.c,v 1.20 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index 5539af6961526..1429f3af2cd49 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_cls.h,v 1.4 2005/01/07 01:45:38 imp Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index b07c503004da8..0818bff6b4952 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.16 2005/01/07 01:45:38 imp Exp $");
 
 #ifndef ATM_SPANS_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 61864d5e3a87b..1609dd6941fa4 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -80,7 +80,7 @@
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_kxdr.c,v 1.15 2005/01/07 01:45:38 imp Exp $");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/sys/netatm/spans/spans_kxdr.h b/sys/netatm/spans/spans_kxdr.h
index b9adfddda6c6b..3756f8f5c94e1 100644
--- a/sys/netatm/spans/spans_kxdr.h
+++ b/sys/netatm/spans/spans_kxdr.h
@@ -30,7 +30,7 @@
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/sys/netatm/spans/spans_kxdr.h,v 1.3 2005/01/07 01:45:38 imp Exp $
  */
 
 #ifndef _SPANS_KXDR_H
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 85da01f468a59..7a1da56073aa9 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_msg.c,v 1.16 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 6f69562c31fa4..d04cacfc4ef56 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_print.c,v 1.11 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 32ee4d1610160..ac3b9d5de523f 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_proto.c,v 1.15 2007/06/23 00:02:19 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 4b7889e2faa9c..da48a14aa42d5 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.13 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 1f74255db9531..05577e48910e7 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/spans/spans_util.c,v 1.11 2005/01/07 01:45:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index 7b1e2c21bdc6f..19b1ddce79010 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/spans/spans_var.h,v 1.9 2005/01/07 01:45:38 imp Exp $
  *
  */
 
diff --git a/sys/netatm/spans/spans_xdr.x b/sys/netatm/spans/spans_xdr.x
index ad9bfcc8c97b3..39e1583676336 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.
 % *
-% *	@(#) $FreeBSD$
+% *	@(#) $FreeBSD: src/sys/netatm/spans/spans_xdr.x,v 1.5 2005/01/07 01:45:38 imp Exp $
 % *
 % */
 %
@@ -61,7 +61,7 @@
 % */
 %
 %#ifndef lint
-%static const char RCSid[] = "@(#) $FreeBSD$";
+%static const char RCSid[] = "@(#) $FreeBSD: src/sys/netatm/spans/spans_xdr.x,v 1.5 2005/01/07 01:45:38 imp Exp $";
 %#endif
 %
 #endif
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 8a07532b55b63..c40e9bf136c7d 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/q2110_sigaa.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 279178b164b1b..f0ff22423d35b 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/q2110_sigcpcs.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index 00ab4e92f29e6..b1930a5bdec3e 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/q2110_subr.c,v 1.9 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 2a105a5943415..d7e98ce26044d 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/qsaal1_sigaa.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index c0ec4c925a352..930d824f41996 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/qsaal1_sigcpcs.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index 273ce82f6b9a6..72b7d7eef5518 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/qsaal1_subr.c,v 1.9 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 8cabd161fee9c..678c13107247f 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscf_uni.c,v 1.22 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni.h b/sys/netatm/uni/sscf_uni.h
index bdb2b26e594cc..d6d49ef5315fb 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 2458ee61753e6..a66be93e687c5 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscf_uni_lower.c,v 1.14 2007/06/23 00:02:20 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index 473366a81235a..33796958ffa6b 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscf_uni_upper.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index 117e3adbd348d..77a4869c3ad07 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_var.h,v 1.8 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 2deb9b9a9503f..3608c2ffd1a84 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop.c,v 1.18 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop.h b/sys/netatm/uni/sscop.h
index 54e5a880d422f..85748a09954d8 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 35bf7f41f659a..024579808cfb8 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_lower.c,v 1.15 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_misc.h b/sys/netatm/uni/sscop_misc.h
index fa7c14aef2157..ab68eadd2e210 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_misc.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 1e95fe9b7e827..36cbf7f76823b 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_pdu.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/sscop_pdu.h b/sys/netatm/uni/sscop_pdu.h
index e039a8a8d619a..5c7f07960bfd2 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 586cf052f97e6..ccfe0cf538070 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_sigaa.c,v 1.10 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 62110177b9f10..a17637dbb114d 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_sigcpcs.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 51a28d870d223..6d1636e1ff4da 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_subr.c,v 1.16 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index 1fba36873ac31..07e877e62d650 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_timer.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 3e7d0b0af74fe..2417ff967f877 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/sscop_upper.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index a71c876be20ce..9eb47a76dbe5d 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/sscop_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni.h b/sys/netatm/uni/uni.h
index 44b0ed630ae9a..b59d20921ed1c 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uni.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index feb1d7d97d2f0..7b58eeeac5e07 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uni_load.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #ifndef ATM_UNI_MODULE
 #include "opt_atm.h"
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index a10cf55c49995..be23fbda76201 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.24 2007/06/23 00:02:20 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 074b8c78fb2e4..0dc61cf696b3a 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_cache.c,v 1.15 2005/06/10 16:49:20 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index 125d20ab1670e..e8de3d6b02739 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_input.c,v 1.16 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index ea0916907c366..3b9da9729f7a7 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_output.c,v 1.10 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index e60665f2a12cc..70260b3a00ac8 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_timer.c,v 1.12 2007/06/23 00:02:20 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 08cc8efeac71c..5238dc94e3b8f 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniarp_vcm.c,v 1.15 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 57c072db4dc71..03566bbbd9bcb 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/uniip.c,v 1.16 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index 1fcdead515c03..d5d9a10afede5 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/uniip_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig.h b/sys/netatm/uni/unisig.h
index 88b496b570d6e..fd79efe0287de 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index e89f551168381..ed4c391611eee 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_decode.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h
index c2253a66b48ac..3badabef24f02 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.h,v 1.5 2007/06/23 00:02:20 mjacob Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 666a3ec946cdd..9d2b3284c5dc4 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_encode.c,v 1.15 2005/12/21 00:19:08 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index 7347becf75799..979bb4647067f 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index aa5a85affe787..5379ed7123320 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_mbuf.c,v 1.11 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_mbuf.h b/sys/netatm/uni/unisig_mbuf.h
index c5bc8bfba1324..7885ad3aec287 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 806102bfe9e38..9a4819ff77b33 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_msg.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_msg.h b/sys/netatm/uni/unisig_msg.h
index 123bdb414aa9b..7fdc336ffd102 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.h,v 1.4 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 72d1733109f67..4b581953108fb 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_print.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_print.h b/sys/netatm/uni/unisig_print.h
index 2812d03fdc07e..b256059784000 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_print.h,v 1.3 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 0e3cee1f9ef20..99f8288a068cf 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_proto.c,v 1.13 2007/06/23 00:02:20 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index 2d58354956b93..488143464afd1 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_sigmgr_state.c,v 1.14 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 821283b1c89f4..029ee35731d9d 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_subr.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index 6bb23ccd765f4..693f15c85f4fa 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_util.c,v 1.12 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index ae6c2fefd7f59..d18721ad6f402 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.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/sys/netatm/uni/unisig_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
  *
  */
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 1c63b074d7cc9..3252bc5e168f5 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netatm/uni/unisig_vc_state.c,v 1.17 2005/01/07 01:45:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES
index 0ddc02f5a6636..2050cc41511f6 100644
--- a/sys/netgraph/NOTES
+++ b/sys/netgraph/NOTES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/NOTES,v 1.2 2001/01/06 00:46:46 julian Exp $
 Development ideas..
 
 Archie's suggestions... :-)
diff --git a/sys/netgraph/atm/atmpif/ng_atmpif.c b/sys/netgraph/atm/atmpif/ng_atmpif.c
index 23e39b92fac5f..f48c1df9c2470 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif.c
+++ b/sys/netgraph/atm/atmpif/ng_atmpif.c
@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/atmpif/ng_atmpif.c,v 1.3 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/atmpif/ng_atmpif_harp.c b/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
index 65ca61976b2ed..f0c2e2bdea2cc 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
+++ b/sys/netgraph/atm/atmpif/ng_atmpif_harp.c
@@ -33,7 +33,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/atmpif/ng_atmpif_harp.c,v 1.5 2005/08/10 06:25:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/atmpif/ng_atmpif_var.h b/sys/netgraph/atm/atmpif/ng_atmpif_var.h
index 515eb4e3a4d06..ceb97c08d39d2 100644
--- a/sys/netgraph/atm/atmpif/ng_atmpif_var.h
+++ b/sys/netgraph/atm/atmpif/ng_atmpif_var.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/atmpif/ng_atmpif_var.h,v 1.2 2005/01/07 01:45:41 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c
index 70303698c8600..404f54e7c87d4 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm.c
+++ b/sys/netgraph/atm/ccatm/ng_ccatm.c
@@ -30,13 +30,13 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ccatm/ng_ccatm.c,v 1.3 2006/09/30 12:37:43 netchild Exp $
  *
  * ATM call control and API
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ccatm/ng_ccatm.c,v 1.3 2006/09/30 12:37:43 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
index 305f2f9677041..0749a94998e9a 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
+++ b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
@@ -28,7 +28,7 @@
  *
  * Customisation of call control source to the NG environment.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ccatm/ng_ccatm_cust.h,v 1.2 2005/01/07 01:45:41 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index b8a489ef6f7a3..9528ac54badbc 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/ng_atm.h b/sys/netgraph/atm/ng_atm.h
index 6b42d721c4cd7..4b40657ada51b 100644
--- a/sys/netgraph/atm/ng_atm.h
+++ b/sys/netgraph/atm/ng_atm.h
@@ -30,7 +30,7 @@
 /*
  * Netgraph module to connect NATM interfaces to netgraph.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_atm.h,v 1.5 2005/01/07 01:45:40 imp Exp $
  */
 #ifndef _NETGRAPH_ATM_NG_ATM_H_
 #define _NETGRAPH_ATM_NG_ATM_H_
diff --git a/sys/netgraph/atm/ng_atmpif.h b/sys/netgraph/atm/ng_atmpif.h
index bc41ad5de9278..70fb2114be5e4 100644
--- a/sys/netgraph/atm/ng_atmpif.h
+++ b/sys/netgraph/atm/ng_atmpif.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_atmpif.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  */
 
 #ifndef _NETGRAPH_ATM_NG_ATMPIF_H_
diff --git a/sys/netgraph/atm/ng_ccatm.h b/sys/netgraph/atm/ng_ccatm.h
index 9e1eb66887f68..b0ab97a59f40b 100644
--- a/sys/netgraph/atm/ng_ccatm.h
+++ b/sys/netgraph/atm/ng_ccatm.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_ccatm.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/atm/ng_sscfu.h b/sys/netgraph/atm/ng_sscfu.h
index a59c98ddc7420..5a8950a70d260 100644
--- a/sys/netgraph/atm/ng_sscfu.h
+++ b/sys/netgraph/atm/ng_sscfu.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_sscfu.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  *
  * Netgraph module for ITU-T Q.2120 UNI SSCF.
  */
diff --git a/sys/netgraph/atm/ng_sscop.h b/sys/netgraph/atm/ng_sscop.h
index 2f1e38ce30eea..b4b2b3e6addc5 100644
--- a/sys/netgraph/atm/ng_sscop.h
+++ b/sys/netgraph/atm/ng_sscop.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_sscop.h,v 1.3 2005/01/07 01:45:40 imp Exp $
  *
  * Netgraph module for Q.2110 SSCOP
  */
diff --git a/sys/netgraph/atm/ng_uni.h b/sys/netgraph/atm/ng_uni.h
index b2f6af0ec3652..b2dc2c5c332e1 100644
--- a/sys/netgraph/atm/ng_uni.h
+++ b/sys/netgraph/atm/ng_uni.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ng_uni.h,v 1.2 2005/01/07 01:45:40 imp Exp $
  *
  * Netgraph module for UNI 4.0
  */
diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c
index ecb23e63d6a4b..47fa5bf71f63d 100644
--- a/sys/netgraph/atm/ngatmbase.c
+++ b/sys/netgraph/atm/ngatmbase.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/ngatmbase.c,v 1.3 2005/01/07 01:45:40 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/module.h>
diff --git a/sys/netgraph/atm/ngatmbase.h b/sys/netgraph/atm/ngatmbase.h
index 910dd03c0847b..126cb0b0ec36f 100644
--- a/sys/netgraph/atm/ngatmbase.h
+++ b/sys/netgraph/atm/ngatmbase.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/ngatmbase.h,v 1.3 2005/01/07 01:45:40 imp Exp $
  *
  * In-kernel UNI stack message functions.
  */
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
index 47413b59d81ce..1cf1f5d51b41d 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ b/sys/netgraph/atm/sscfu/ng_sscfu.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/sscfu/ng_sscfu.c,v 1.4 2005/01/07 01:45:41 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
index b700c1b37d5c4..4605ad53f36ae 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
+++ b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
@@ -28,7 +28,7 @@
  *
  * Customisation of the SSCFU code to ng_sscfu.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h,v 1.2 2005/01/07 01:45:41 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
index cf52cc9de6542..3b7e1c86bf50e 100644
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ b/sys/netgraph/atm/sscop/ng_sscop.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/sscop/ng_sscop.c,v 1.4 2005/08/10 06:25:40 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/sscop/ng_sscop_cust.h b/sys/netgraph/atm/sscop/ng_sscop_cust.h
index a1d839aa4156e..d8f073b41d307 100644
--- a/sys/netgraph/atm/sscop/ng_sscop_cust.h
+++ b/sys/netgraph/atm/sscop/ng_sscop_cust.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/sscop/ng_sscop_cust.h,v 1.5 2005/01/07 01:45:41 imp Exp $
  *
  * Customisation of the SSCOP code to ng_sscop.
  */
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index 92b4ef71c6862..3eb0584ce1cf9 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/atm/uni/ng_uni.c,v 1.6 2005/10/31 15:41:26 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/atm/uni/ng_uni_cust.h b/sys/netgraph/atm/uni/ng_uni_cust.h
index cf9d3549db5bc..603c419bf7480 100644
--- a/sys/netgraph/atm/uni/ng_uni_cust.h
+++ b/sys/netgraph/atm/uni/ng_uni_cust.h
@@ -28,7 +28,7 @@
  *
  * Customisation of signalling source to the NG environment.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/atm/uni/ng_uni_cust.h,v 1.6 2006/06/02 09:08:51 dds Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index 6f6a46e9dbb92..aa1bad379a68d 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/common/ng_bluetooth.c,v 1.7 2007/06/04 18:25:07 dwmalone Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index b244b3019cd13..a9b971661feda 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bt3c_pccard.c,v 1.5 2003/04/01 18:15:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c,v 1.20 2007/02/23 12:19:02 piso Exp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
index 0496ac204c7f7..a3bca3cabf231 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bt3c_var.h,v 1.1 2002/11/24 19:46:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h,v 1.4 2006/07/05 17:18:47 emax Exp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *
diff --git a/sys/netgraph/bluetooth/drivers/h4/TODO b/sys/netgraph/bluetooth/drivers/h4/TODO
index 0862688c19d9f..ef18188750072 100644
--- a/sys/netgraph/bluetooth/drivers/h4/TODO
+++ b/sys/netgraph/bluetooth/drivers/h4/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.2 2004/08/23 18:08:15 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/TODO,v 1.3 2007/08/13 17:19:28 emax Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 853a31a222426..a6c8316b75d96 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.c,v 1.10 2005/10/31 17:57:43 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c,v 1.17 2007/08/13 17:19:28 emax Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
index 27dd77179c8c9..fbf39310e78f0 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4_prse.h,v 1.4 2005/10/31 17:57:43 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h,v 1.5 2007/08/13 17:19:28 emax Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index 1d5baaa4b277f..e79c3b2402962 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4_var.h,v 1.5 2005/10/31 17:57:43 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h,v 1.6 2007/08/13 17:19:28 emax Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/ubt/TODO b/sys/netgraph/bluetooth/drivers/ubt/TODO
index 90f9d1db5094d..608c3b0a099fc 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/TODO
+++ b/sys/netgraph/bluetooth/drivers/ubt/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:46:56 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/TODO,v 1.2 2003/05/10 21:44:39 julian Exp $
 
 1) SMP/Locking
 
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index c2dec1afb8b79..b8f17be83b976 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.33 2007/06/23 04:34:38 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index a7e85328f23e8..ec8f15d9c1068 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.7 2006/09/07 23:38:09 emax Exp $
  */
 
 #ifndef _NG_UBT_VAR_H_
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 8db419a21ad0a..a85b6ebeecb31 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.18 2007/06/23 04:34:38 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/TODO b/sys/netgraph/bluetooth/hci/TODO
index 6f66d7b84d0f2..0cc8f74184c32 100644
--- a/sys/netgraph/bluetooth/hci/TODO
+++ b/sys/netgraph/bluetooth/hci/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.2 2003/04/26 22:36:29 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/hci/TODO,v 1.2 2003/05/10 21:44:40 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index 8d630a272b843..aa31c007fad7c 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_cmds.c,v 1.4 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_cmds.c,v 1.7 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
index 9addd14f8ae25..f802aaca2aae2 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_cmds.h,v 1.1 2002/11/24 19:46:58 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_cmds.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_CMDS_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index a4cc9ba454700..6cab3eaf73b45 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_evnt.c,v 1.6 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_evnt.c,v 1.8 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
index d89cfd51bab8f..e6949f6ea19a7 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_evnt.h,v 1.1 2002/11/24 19:46:58 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_evnt.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_EVNT_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c
index 7ea23c8dfeafb..c7eb336a1cc69 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_main.c,v 1.2 2003/03/18 00:09:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_main.c,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index d7a185c718748..c4b6caf70b688 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_misc.c,v 1.5 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_misc.c,v 1.10 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.h b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
index 59e8a3bd72200..7861b915fe436 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_misc.h,v 1.3 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_misc.h,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_MISC_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_prse.h b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
index fb4e8fa13a034..5856f171e483c 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_prse.h,v 1.2 2003/03/18 00:09:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_prse.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index 311bd4f782f62..1da18d4f6a41a 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_ulpi.c,v 1.7 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c,v 1.8 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
index ced697e45e66c..e3bfb4481b03e 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_ulpi.h,v 1.2 2003/04/26 22:35:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_ULPI_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_var.h b/sys/netgraph/bluetooth/hci/ng_hci_var.h
index bce4a25258db7..8df13a8cd8160 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_var.h,v 1.3 2003/04/26 22:35:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/hci/ng_hci_var.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_HCI_VAR_H_
diff --git a/sys/netgraph/bluetooth/include/ng_bluetooth.h b/sys/netgraph/bluetooth/include/ng_bluetooth.h
index c0da3b9fd32f9..d195aa6f3b3b2 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bluetooth.h,v 1.4 2003/04/26 22:32:34 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_bluetooth.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_BLUETOOTH_H_
diff --git a/sys/netgraph/bluetooth/include/ng_bt3c.h b/sys/netgraph/bluetooth/include/ng_bt3c.h
index 49e0ed17d1709..0cf5d5d9b010a 100644
--- a/sys/netgraph/bluetooth/include/ng_bt3c.h
+++ b/sys/netgraph/bluetooth/include/ng_bt3c.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bt3c.h,v 1.1 2002/11/24 19:47:05 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_bt3c.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  *
  * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
  *
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index 7dc309a943789..111d283460619 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket.h,v 1.8 2003/04/26 22:32:10 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket.h,v 1.8 2006/05/17 00:13:06 emax Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
index b8e98b31e6949..359a990b8a282 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_hci_raw.h,v 1.3 2003/03/25 23:53:32 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h,v 1.7 2006/07/21 17:11:13 rwatson Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_HCI_RAW_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index deea5b3db0dfd..1597650a68153 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap.h,v 1.4 2003/03/25 23:53:33 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h,v 1.8 2006/07/21 17:11:13 rwatson Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index a1fdb2717a13c..6e20bfdcfa6e4 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_rfcomm.h,v 1.10 2003/03/29 22:27:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.8 2006/07/21 17:11:13 rwatson Exp $
  */
 
 #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_
diff --git a/sys/netgraph/bluetooth/include/ng_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index 753c297419e9b..a8a8fdcdb8590 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.h,v 1.1 2002/11/24 19:47:05 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_h4.h,v 1.5 2005/01/07 01:45:43 imp Exp $
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index 5cdfd5cea53a7..da475551abb62 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci.h,v 1.2 2003/03/18 00:09:37 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.7 2006/05/17 00:13:06 emax Exp $
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h
index f57b5cbe3d20d..3be95d94aa09b 100644
--- a/sys/netgraph/bluetooth/include/ng_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_l2cap.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap.h,v 1.2 2003/04/27 00:52:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_l2cap.h,v 1.4 2005/08/31 18:13:23 emax Exp $
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_ubt.h b/sys/netgraph/bluetooth/include/ng_ubt.h
index 94b209729bfd3..0233f08587475 100644
--- a/sys/netgraph/bluetooth/include/ng_ubt.h
+++ b/sys/netgraph/bluetooth/include/ng_ubt.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.h,v 1.6 2003/04/13 21:34:42 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_ubt.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NG_UBT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/TODO b/sys/netgraph/bluetooth/l2cap/TODO
index 7c7bb27c59aa2..0d7aa2971639e 100644
--- a/sys/netgraph/bluetooth/l2cap/TODO
+++ b/sys/netgraph/bluetooth/l2cap/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:47:06 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/l2cap/TODO,v 1.2 2003/05/10 21:44:41 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
index 60bfd457c8504..44a037216e83e 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_cmds.c,v 1.2 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c,v 1.7 2007/03/28 21:25:56 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index 1831b84d0a6e8..5c4f126d09467 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_cmds.h,v 1.4 2003/04/01 18:15:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_CMDS_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index 9d5268e89cf42..2a79976fbc24b 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_evnt.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c,v 1.8 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
index 227b9c6a99a96..d4cd0c93e9938 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_evnt.h,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_EVNT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index b2df2a7e013e9..d97e4e933da46 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_llpi.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c,v 1.9 2005/07/29 14:44:17 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
index 919a0aa444381..a630bd419319a 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_llpi.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_LLPI_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
index 7d5b300ee3743..47905a8c3e483 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_main.c,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index 635298a4e3d3b..8f69b4a603795 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_misc.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c,v 1.12 2005/08/31 18:13:23 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index ad97107e04c2c..e2da0e6935efd 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_misc.h,v 1.3 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h,v 1.6 2005/08/21 19:15:14 pjd Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_MISC_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
index e2ec854e592ba..bc2dba3666bb5 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_prse.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h,v 1.4 2005/01/07 01:45:43 imp Exp $
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index 8a8e31d4225d6..ce2d93c6ef89b 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_ulpi.c,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c,v 1.5 2005/01/07 01:45:43 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
index 8a7679a1de44e..4e9380c650728 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_ulpi.h,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h,v 1.3 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_ULPI_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
index 218849219e8a8..2a93b9adc5df3 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_var.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
 #ifndef _NETGRAPH_L2CAP_VAR_H_
diff --git a/sys/netgraph/bluetooth/socket/TODO b/sys/netgraph/bluetooth/socket/TODO
index c1aa3b2d476d5..b40b7dcee86a2 100644
--- a/sys/netgraph/bluetooth/socket/TODO
+++ b/sys/netgraph/bluetooth/socket/TODO
@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:47:07 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/netgraph/bluetooth/socket/TODO,v 1.2 2003/05/10 21:44:41 julian Exp $
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c
index 3029ffd4c187a..1bbccd69c2c07 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket.c,v 1.4 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket.c,v 1.13 2006/07/21 17:11:13 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index fc951c4cd0b47..9f4a0389174ca 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.23 2006/11/06 13:42:04 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 205ab0e850ecd..a292ab030814d 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.24.2.1 2007/11/05 17:48:23 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index d3d14179a5ae9..06d6f91ee218c 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.20 2006/11/06 13:42:04 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index f815df4c3cd95..8c267bb9cbf76 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.26.2.1 2007/11/07 17:37:18 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index 4532eac1e1fcd..afe08573d6264 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+    "@(#) $FreeBSD: src/sys/netgraph/netflow/netflow.c,v 1.25.4.1 2008/01/30 21:29:10 mav Exp $";
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netgraph/netflow/netflow.h b/sys/netgraph/netflow/netflow.h
index ef709bc8aded9..cb7a1254291ab 100644
--- a/sys/netgraph/netflow/netflow.h
+++ b/sys/netgraph/netflow/netflow.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	 $SourceForge: netflow.h,v 1.8 2004/09/16 17:05:11 glebius Exp $
- *	 $FreeBSD$
+ *	 $FreeBSD: src/sys/netgraph/netflow/netflow.h,v 1.4 2006/04/25 20:01:50 maxim Exp $
  */
 
 /* netflow timeouts in seconds */
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c
index c67d90b098e4e..eea23abbe065f 100644
--- a/sys/netgraph/netflow/ng_netflow.c
+++ b/sys/netgraph/netflow/ng_netflow.c
@@ -28,7 +28,7 @@
  */
 
 static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+    "@(#) $FreeBSD: src/sys/netgraph/netflow/ng_netflow.c,v 1.14 2007/03/28 13:59:13 glebius Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h
index bd35cf09281ae..32a080c61422e 100644
--- a/sys/netgraph/netflow/ng_netflow.h
+++ b/sys/netgraph/netflow/ng_netflow.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	 $SourceForge: ng_netflow.h,v 1.26 2004/09/04 15:44:55 glebius Exp $
- *	 $FreeBSD$
+ *	 $FreeBSD: src/sys/netgraph/netflow/ng_netflow.h,v 1.10 2007/03/28 13:59:13 glebius Exp $
  */
 
 #ifndef	_NG_NETFLOW_H_
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index 792814c03733e..52af62760f961 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.68.2.2 2007/11/21 12:11:45 glebius Exp $
  * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index 4755eb34292d9..ee0c169f6f815 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.20 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_UI.c,v 1.14 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_UI.h b/sys/netgraph/ng_UI.h
index 216570aaf1dc1..f9250501672e5 100644
--- a/sys/netgraph/ng_UI.h
+++ b/sys/netgraph/ng_UI.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_UI.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_UI.h,v 1.6 1999/01/20 00:54:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 6cb534508f9ff..2a27fecd4ab23 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.22 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_async.c,v 1.17 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_async.h b/sys/netgraph/ng_async.h
index 4eb9fb5315d95..b0ea22da1dc59 100644
--- a/sys/netgraph/ng_async.h
+++ b/sys/netgraph/ng_async.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_async.h,v 1.11 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_async.h,v 1.5 1999/01/25 01:17:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c
index 64bf8c3f5c257..9aa0d0cfd86e6 100644
--- a/sys/netgraph/ng_atmllc.c
+++ b/sys/netgraph/ng_atmllc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_atmllc.c,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_atmllc.h b/sys/netgraph/ng_atmllc.h
index e2b35bdb8e3c6..f9d009a3e791e 100644
--- a/sys/netgraph/ng_atmllc.h
+++ b/sys/netgraph/ng_atmllc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_atmllc.h,v 1.2 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef	_NETGRAPH_ATMLLC_H_
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index ad0bec6fbb0c3..c4c2b6fb1cfb7 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -38,7 +38,7 @@
  * Authors: Julian Elischer <julian@freebsd.org>
  *          Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.135.2.2 2007/11/21 12:11:45 glebius Exp $
  * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_bpf.c b/sys/netgraph/ng_bpf.c
index 2a3bbb5d53892..13455dd83759d 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.c,v 1.22 2007/07/26 18:15:02 mav Exp $
  * $Whistle: ng_bpf.c,v 1.3 1999/12/03 20:30:23 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_bpf.h b/sys/netgraph/ng_bpf.h
index 8d1eb8b63d4b6..540b4af870d26 100644
--- a/sys/netgraph/ng_bpf.h
+++ b/sys/netgraph/ng_bpf.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bpf.h,v 1.11 2005/02/12 18:10:26 ru Exp $
  * $Whistle: ng_bpf.h,v 1.3 1999/12/03 20:30:23 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index bc36172415a41..befd97eca0ceb 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.31 2005/02/09 15:14:44 ru Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_bridge.h b/sys/netgraph/ng_bridge.h
index 0524a96cb36ff..66685fd661316 100644
--- a/sys/netgraph/ng_bridge.h
+++ b/sys/netgraph/ng_bridge.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_bridge.h,v 1.4 2005/10/28 14:41:28 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_BRIDGE_H_
diff --git a/sys/netgraph/ng_car.c b/sys/netgraph/ng_car.c
index 1873c5a124896..da4d47b90ec55 100644
--- a/sys/netgraph/ng_car.c
+++ b/sys/netgraph/ng_car.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_car.c,v 1.4 2007/06/13 11:01:17 mav Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_car.h b/sys/netgraph/ng_car.h
index 64ce52ce2e471..e8ca277d589a2 100644
--- a/sys/netgraph/ng_car.h
+++ b/sys/netgraph/ng_car.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_car.h,v 1.1 2007/05/15 16:09:23 mav Exp $
  */
 
 #ifndef _NETGRAPH_NG_CAR_H_
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index e6b7539ecd158..b682610f05820 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.28 2005/04/13 14:03:28 glebius Exp $
  * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_cisco.h b/sys/netgraph/ng_cisco.h
index e6ed9a212460e..ac916ad83d4fd 100644
--- a/sys/netgraph/ng_cisco.h
+++ b/sys/netgraph/ng_cisco.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_cisco.h,v 1.8 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_cisco.h,v 1.6 1999/01/25 01:21:48 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_deflate.c b/sys/netgraph/ng_deflate.c
index 84609e32b71f4..d5753df6497ee 100644
--- a/sys/netgraph/ng_deflate.c
+++ b/sys/netgraph/ng_deflate.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_deflate.c,v 1.3 2007/01/15 05:55:56 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_deflate.h b/sys/netgraph/ng_deflate.h
index 31686080444e7..ec5a12513c187 100644
--- a/sys/netgraph/ng_deflate.h
+++ b/sys/netgraph/ng_deflate.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_deflate.h,v 1.1 2006/12/28 15:44:05 glebius Exp $
  */
 
 #ifndef _NETGRAPH_NG_DEFLATE_H_
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index d8ba67650ed14..88636fe04c6cc 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -27,7 +27,7 @@
  * This node presents a /dev/ngd%d device that interfaces to an other
  * netgraph node.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.22 2006/11/02 17:37:21 andre Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_device.h b/sys/netgraph/ng_device.h
index b718fc07f2ad9..f7b2ccdf92acc 100644
--- a/sys/netgraph/ng_device.h
+++ b/sys/netgraph/ng_device.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_device.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_echo.c b/sys/netgraph/ng_echo.c
index e9daf5eda958b..ee42955c61c4e 100644
--- a/sys/netgraph/ng_echo.c
+++ b/sys/netgraph/ng_echo.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elisher <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.c,v 1.13 2005/04/15 10:14:00 glebius Exp $
  * $Whistle: ng_echo.c,v 1.13 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_echo.h b/sys/netgraph/ng_echo.h
index adb4e7cf67a82..483245be31717 100644
--- a/sys/netgraph/ng_echo.h
+++ b/sys/netgraph/ng_echo.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_echo.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_echo.h,v 1.3 1999/01/20 00:22:12 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index a47aaddac81c6..17d66f71a9117 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_eiface.h b/sys/netgraph/ng_eiface.h
index db07a55028ef0..e670d9826c067 100644
--- a/sys/netgraph/ng_eiface.h
+++ b/sys/netgraph/ng_eiface.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_eiface.h,v 1.9 2005/02/03 11:52:42 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_EIFACE_H_
diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c
index 11a0d96611b69..5a01d67ecbd21 100644
--- a/sys/netgraph/ng_etf.c
+++ b/sys/netgraph/ng_etf.c
@@ -30,7 +30,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_etf.c,v 1.9 2005/03/14 20:49:48 glebius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_etf.h b/sys/netgraph/ng_etf.h
index 9cc87c2fa2841..3ae8441ff6f6d 100644
--- a/sys/netgraph/ng_etf.h
+++ b/sys/netgraph/ng_etf.h
@@ -30,7 +30,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_etf.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_ETF_H_
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index 8c13c8fa49aba..fe589c8347955 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -39,7 +39,7 @@
  * Authors: Archie Cobbs <archie@freebsd.org>
  *	    Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.62 2007/03/20 00:36:10 bms Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_ether.h b/sys/netgraph/ng_ether.h
index f2f051952b7fe..d60a949af1c26 100644
--- a/sys/netgraph/ng_ether.h
+++ b/sys/netgraph/ng_ether.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ether.h,v 1.14 2005/02/14 12:01:09 glebius Exp $
  * $Whistle: ng_ether.h,v 1.1 1999/02/02 03:17:22 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 58f16a942d7f4..0b5bdbb7afb34 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.30 2007/05/18 15:05:49 dwmalone Exp $
  */
 /*-
  * Copyright (c) 1996-1999 Whistle Communications, Inc.
diff --git a/sys/netgraph/ng_fec.h b/sys/netgraph/ng_fec.h
index 8ef441b6c2319..0144023c94f2f 100644
--- a/sys/netgraph/ng_fec.h
+++ b/sys/netgraph/ng_fec.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_fec.h,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 /*-
  * Copyright (c) 1996-1999 Whistle Communications, Inc.
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index 406de6912f7ed..638c6701f105d 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.25 2006/01/14 21:49:31 glebius Exp $
  * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_frame_relay.h b/sys/netgraph/ng_frame_relay.h
index 87b283a08fb47..f0b0843091d2f 100644
--- a/sys/netgraph/ng_frame_relay.h
+++ b/sys/netgraph/ng_frame_relay.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_frame_relay.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_frame_relay.h,v 1.7 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 5d948bd4c5800..3cd6bbc0c2ac5 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -62,7 +62,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif.c,v 1.19 2005/06/10 16:49:21 brooks Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_gif.h b/sys/netgraph/ng_gif.h
index 3b5634209b728..d284f26540a05 100644
--- a/sys/netgraph/ng_gif.h
+++ b/sys/netgraph/ng_gif.h
@@ -62,7 +62,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_GIF_H_
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index 1c5c43a571352..133590ebd33e1 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -62,7 +62,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif_demux.c,v 1.10 2005/01/07 01:45:39 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_gif_demux.h b/sys/netgraph/ng_gif_demux.h
index 072ffa001c6a6..f4293cd4e1fea 100644
--- a/sys/netgraph/ng_gif_demux.h
+++ b/sys/netgraph/ng_gif_demux.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_gif_demux.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_GIF_DEMUX_H_
diff --git a/sys/netgraph/ng_hole.c b/sys/netgraph/ng_hole.c
index f3b8f8c2f0e79..c98b052e58dcf 100644
--- a/sys/netgraph/ng_hole.c
+++ b/sys/netgraph/ng_hole.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elisher <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.15 2005/12/09 07:09:44 ru Exp $
  * $Whistle: ng_hole.c,v 1.10 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_hole.h b/sys/netgraph/ng_hole.h
index 0c3f72d615fb1..72097572aea4c 100644
--- a/sys/netgraph/ng_hole.h
+++ b/sys/netgraph/ng_hole.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hole.h,v 1.6 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_hole.h,v 1.3 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_hub.c b/sys/netgraph/ng_hub.c
index ba298e56b13bc..3f6bfaead3b72 100644
--- a/sys/netgraph/ng_hub.c
+++ b/sys/netgraph/ng_hub.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hub.c,v 1.3 2004/06/26 22:24:16 julian Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_hub.h b/sys/netgraph/ng_hub.h
index a735d7b64dfff..4d5f308a13ea2 100644
--- a/sys/netgraph/ng_hub.h
+++ b/sys/netgraph/ng_hub.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_hub.h,v 1.1 2004/04/17 12:42:16 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_HUB_H_
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index b3c177a23589f..60bf721286364 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.47 2006/06/02 23:14:40 sam Exp $
  * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_iface.h b/sys/netgraph/ng_iface.h
index 54dfa8c786909..ca5bc7d0f1e39 100644
--- a/sys/netgraph/ng_iface.h
+++ b/sys/netgraph/ng_iface.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.9 2005/02/13 16:36:41 archie Exp $
  * $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ip_input.c b/sys/netgraph/ng_ip_input.c
index 416bc12e9ede2..af002dfa79f79 100644
--- a/sys/netgraph/ng_ip_input.c
+++ b/sys/netgraph/ng_ip_input.c
@@ -64,7 +64,7 @@
  * Author:		Brooks Davis <brooks@FreeBSD.org>
  * Derived from:	ng_hole.c
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ip_input.c,v 1.4 2005/01/07 01:45:39 imp Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_ip_input.h b/sys/netgraph/ng_ip_input.h
index 96b72e5ae513a..2c167b9d9b752 100644
--- a/sys/netgraph/ng_ip_input.h
+++ b/sys/netgraph/ng_ip_input.h
@@ -64,7 +64,7 @@
  * Author:		Brooks Davis <brooks@FreeBSD.org>
  * Derived from:	ng_hole.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ip_input.h,v 1.3 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_IP_INPUT_H_
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index f7c66623aa08e..44242bbdba742 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_ipfw.h b/sys/netgraph/ng_ipfw.h
index 5448a38d84088..2d174bd4aaf74 100644
--- a/sys/netgraph/ng_ipfw.h
+++ b/sys/netgraph/ng_ipfw.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ipfw.h,v 1.2 2006/02/17 09:42:49 glebius Exp $
  */
 
 #define NG_IPFW_NODE_TYPE    "ipfw"
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index d3fb8a40e9072..fc1135ea72a92 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.60 2007/02/09 12:35:29 bms Exp $
  * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_ksocket.h b/sys/netgraph/ng_ksocket.h
index 239722d2d8dda..c897f1c052af3 100644
--- a/sys/netgraph/ng_ksocket.h
+++ b/sys/netgraph/ng_ksocket.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ksocket.h,v 1.13 2005/10/28 14:41:28 ru Exp $
  * $Whistle: ng_ksocket.h,v 1.1 1999/11/16 20:04:40 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index accf48d477fad..94e87726c947d 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -36,7 +36,7 @@
  * 
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.17.2.1.2.1 2008/01/09 19:55:51 mav Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_l2tp.h b/sys/netgraph/ng_l2tp.h
index 106162b0c8654..b5f731cd8757b 100644
--- a/sys/netgraph/ng_l2tp.h
+++ b/sys/netgraph/ng_l2tp.h
@@ -36,7 +36,7 @@
  * 
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_l2tp.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_L2TP_H_
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index 105ba7e6f83e8..26ef9c81877b3 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.25 2006/01/14 14:17:27 glebius Exp $
  * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_lmi.h b/sys/netgraph/ng_lmi.h
index f1a1e81a90bb6..3d187e64e3bc0 100644
--- a/sys/netgraph/ng_lmi.h
+++ b/sys/netgraph/ng_lmi.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_lmi.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_lmi.h,v 1.9 1999/01/20 00:22:13 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h
index 7d0f4d8e59fa4..ff5ce010884b5 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.29 2006/10/17 11:01:20 glebius Exp $
  * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 0cf1e7272b9a2..423d6989ea8eb 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.31 2007/05/18 15:28:01 mav Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_mppc.h b/sys/netgraph/ng_mppc.h
index b826806c277e1..81c5461849be6 100644
--- a/sys/netgraph/ng_mppc.h
+++ b/sys/netgraph/ng_mppc.h
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.h,v 1.3 2000/02/12 01:17:22 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_mppc.h,v 1.5 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_MPPC_H_
diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c
index fb6e947ad4bae..b866ae24ca1e9 100644
--- a/sys/netgraph/ng_nat.c
+++ b/sys/netgraph/ng_nat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.10 2007/05/22 12:20:05 mav Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_nat.h b/sys/netgraph/ng_nat.h
index a548cd261e7bd..3fac28b1b0b77 100644
--- a/sys/netgraph/ng_nat.h
+++ b/sys/netgraph/ng_nat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_nat.h,v 1.2 2007/05/22 12:20:05 mav Exp $
  */
 
 #define NG_NAT_NODE_TYPE    "nat"
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index ca742b3dc9593..56e6cffa1edc0 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_one2many.c,v 1.21 2005/03/11 10:29:38 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_one2many.h b/sys/netgraph/ng_one2many.h
index 343f7ee8e729d..c233a53c7250a 100644
--- a/sys/netgraph/ng_one2many.h
+++ b/sys/netgraph/ng_one2many.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_one2many.h,v 1.8 2005/01/07 01:45:39 imp Exp $
  */
 
 #ifndef _NETGRAPH_NG_ONE2MANY_H_
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index 2c46d5c7881d4..255a45d026b6e 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.30 2007/06/23 00:02:20 mjacob Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/netgraph/ng_parse.h b/sys/netgraph/ng_parse.h
index c17feaf458e76..6f32c58c095ec 100644
--- a/sys/netgraph/ng_parse.h
+++ b/sys/netgraph/ng_parse.h
@@ -38,7 +38,7 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.h,v 1.2 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_parse.h,v 1.13 2005/10/28 14:41:28 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_PARSE_H_
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 408ba4b905a66..a53f8b75f7bf0 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -58,7 +58,7 @@
  *
  * Authors: Archie Cobbs <archie@freebsd.org>, Alexander Motin <mav@alkar.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.70.4.1 2008/01/26 14:14:10 mav Exp $
  * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_ppp.h b/sys/netgraph/ng_ppp.h
index c081f2874f264..99dddf05baaf9 100644
--- a/sys/netgraph/ng_ppp.h
+++ b/sys/netgraph/ng_ppp.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_ppp.h,v 1.14 2007/08/01 20:49:35 mav Exp $
  * $Whistle: ng_ppp.h,v 1.8 1999/01/25 02:40:02 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 107bf57418b67..abd3740aed68e 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.84 2007/09/21 08:25:55 mav Exp $
  * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_pppoe.h b/sys/netgraph/ng_pppoe.h
index ca0c0f06b91d7..753e5bbf1b467 100644
--- a/sys/netgraph/ng_pppoe.h
+++ b/sys/netgraph/ng_pppoe.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pppoe.h,v 1.24 2006/08/09 09:56:58 glebius Exp $
  * $Whistle: ng_pppoe.h,v 1.7 1999/10/16 10:16:43 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 5a6bf8b94ce22..edd573e4fd17f 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.40 2007/02/02 09:45:23 glebius Exp $
  * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pptpgre.h b/sys/netgraph/ng_pptpgre.h
index 275f9e2efd7dd..27186957b17f6 100644
--- a/sys/netgraph/ng_pptpgre.h
+++ b/sys/netgraph/ng_pptpgre.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pptpgre.h,v 1.9 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_pptpgre.h,v 1.3 1999/12/08 00:11:36 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_pred1.c b/sys/netgraph/ng_pred1.c
index e637a9dfa7303..44153cc2ecf89 100644
--- a/sys/netgraph/ng_pred1.c
+++ b/sys/netgraph/ng_pred1.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pred1.c,v 1.2 2007/01/15 05:55:56 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_pred1.h b/sys/netgraph/ng_pred1.h
index a33d12043f89a..ae60d87c445c2 100644
--- a/sys/netgraph/ng_pred1.h
+++ b/sys/netgraph/ng_pred1.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_pred1.h,v 1.1 2006/12/29 09:54:32 glebius Exp $
  */
 
 #ifndef _NETGRAPH_NG_PRED1_H_
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 52a89a3adfebb..20c46bed43c24 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.24 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_rfc1490.c,v 1.22 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_rfc1490.h b/sys/netgraph/ng_rfc1490.h
index 0ef3f118ce342..478e1dc0d144c 100644
--- a/sys/netgraph/ng_rfc1490.h
+++ b/sys/netgraph/ng_rfc1490.h
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_rfc1490.h,v 1.7 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_rfc1490.h,v 1.7 1999/01/20 00:54:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c
index 63b3f0be118f2..d78f7bcce9356 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.c,v 1.30 2005/02/06 19:24:59 glebius Exp $
  * $Whistle: ng_sample.c,v 1.13 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h
index 816bc3b2415f1..c7c13bd8b22a6 100644
--- a/sys/netgraph/ng_sample.h
+++ b/sys/netgraph/ng_sample.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sample.h,v 1.7 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_sample.h,v 1.3 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 377182b2a68c2..9d4b3d4aaaa73 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.82.2.1 2007/10/28 17:48:47 mav Exp $
  * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_socket.h b/sys/netgraph/ng_socket.h
index b7e831018abb2..0d832b46559b6 100644
--- a/sys/netgraph/ng_socket.h
+++ b/sys/netgraph/ng_socket.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socket.h,v 1.7 2006/10/17 11:03:55 glebius Exp $
  * $Whistle: ng_socket.h,v 1.5 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_socketvar.h b/sys/netgraph/ng_socketvar.h
index 3cf81035541ab..67d38f7c32a89 100644
--- a/sys/netgraph/ng_socketvar.h
+++ b/sys/netgraph/ng_socketvar.h
@@ -37,7 +37,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_socketvar.h,v 1.10 2005/07/05 17:35:20 glebius Exp $
  * $Whistle: ng_socketvar.h,v 1.1 1999/01/20 21:35:39 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_source.c b/sys/netgraph/ng_source.c
index dad819a1d6bb4..01e4daa982b7d 100644
--- a/sys/netgraph/ng_source.c
+++ b/sys/netgraph/ng_source.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $");
 
 /*
  * This node is used for high speed packet geneneration.  It queues
diff --git a/sys/netgraph/ng_source.h b/sys/netgraph/ng_source.h
index 81a30d724c6fe..cbbb38a1626bb 100644
--- a/sys/netgraph/ng_source.h
+++ b/sys/netgraph/ng_source.h
@@ -36,7 +36,7 @@
  *
  * Author: Dave Chapeskie <dchapeskie@sandvine.com>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_source.h,v 1.9 2007/03/02 01:44:04 emaste Exp $
  */
 
 #ifndef _NETGRAPH_NG_SOURCE_H_
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index b7168f4224f2f..aa3620006cae4 100644
--- a/sys/netgraph/ng_split.c
+++ b/sys/netgraph/ng_split.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_split.c,v 1.7 2005/08/29 13:47:08 glebius Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_split.h b/sys/netgraph/ng_split.h
index c8b672c605ade..d581b3485751c 100644
--- a/sys/netgraph/ng_split.h
+++ b/sys/netgraph/ng_split.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_split.h,v 1.5 2005/10/25 20:56:12 ru Exp $
  *
  */
 
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 988de2e82f0ec..ddfb554310a8e 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -17,7 +17,7 @@
  * Cronyx Id: ng_sppp.c,v 1.1.2.10 2004/03/01 15:17:21 rik Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netgraph/ng_sppp.c,v 1.11 2006/12/29 13:59:50 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netgraph/ng_sppp.h b/sys/netgraph/ng_sppp.h
index be1631e48f36c..8c9ad429b5a28 100644
--- a/sys/netgraph/ng_sppp.h
+++ b/sys/netgraph/ng_sppp.h
@@ -14,7 +14,7 @@
  * as long as this message is kept with the software, all derivative
  * works or modified versions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_sppp.h,v 1.3 2005/02/03 13:03:31 ru Exp $
  * Cronyx Id: ng_sppp.h,v 1.1.2.6 2004/03/01 15:17:21 rik Exp $
  */
 
diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c
index 3fd908a2fd4f2..603060ad4c174 100644
--- a/sys/netgraph/ng_tag.c
+++ b/sys/netgraph/ng_tag.c
@@ -27,7 +27,7 @@
  * Portions Copyright (c) 1999 Whistle Communications, Inc.
  * (ng_bpf by Archie Cobbs <archie@freebsd.org>)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tag.c,v 1.1 2006/06/27 12:45:28 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_tag.h b/sys/netgraph/ng_tag.h
index 369fe72f38ea5..14744b7f09b0c 100644
--- a/sys/netgraph/ng_tag.h
+++ b/sys/netgraph/ng_tag.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tag.h,v 1.1 2006/06/27 12:45:28 glebius Exp $
  */
 
 #ifndef _NETGRAPH_NG_TAG_H_
diff --git a/sys/netgraph/ng_tcpmss.c b/sys/netgraph/ng_tcpmss.c
index ac951e6a7fdd1..8e4098921c926 100644
--- a/sys/netgraph/ng_tcpmss.c
+++ b/sys/netgraph/ng_tcpmss.c
@@ -29,7 +29,7 @@
  * This software includes fragments of the following programs:
  *	tcpmssd		Ruslan Ermilov <ru@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tcpmss.c,v 1.4 2007/01/15 05:01:31 glebius Exp $
  */
 
 /*
diff --git a/sys/netgraph/ng_tcpmss.h b/sys/netgraph/ng_tcpmss.h
index 4450ac6f06298..bec96ef3bd7a0 100644
--- a/sys/netgraph/ng_tcpmss.h
+++ b/sys/netgraph/ng_tcpmss.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tcpmss.h,v 1.1 2005/06/10 08:02:34 glebius Exp $
  */
 
 #ifndef _NETGRAPH_TCPMSS_H_
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index 63eca3ca58f8a..1ca46f606a50b 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -38,7 +38,7 @@
  *
  * Author: Julian Elischer <julian@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.33 2005/06/07 12:22:13 glebius Exp $
  * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_tee.h b/sys/netgraph/ng_tee.h
index 830155e3aa834..da3e22096e6c1 100644
--- a/sys/netgraph/ng_tee.h
+++ b/sys/netgraph/ng_tee.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tee.h,v 1.8 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_tee.h,v 1.2 1999/01/20 00:22:14 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 2e8d7aa6d72dd..69717f51e9ada 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -37,7 +37,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.37 2006/11/06 13:42:03 rwatson Exp $
  * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_tty.h b/sys/netgraph/ng_tty.h
index c6b0094d520de..e4e79f8ed291d 100644
--- a/sys/netgraph/ng_tty.h
+++ b/sys/netgraph/ng_tty.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_tty.h,v 1.4 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_tty.h,v 1.7 1999/01/20 00:22:15 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index ec70956e923a5..bca3ca399a49d 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.26 2005/12/04 00:25:03 ru Exp $
  * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $
  */
 
diff --git a/sys/netgraph/ng_vjc.h b/sys/netgraph/ng_vjc.h
index 284d8d5f5d32f..26da5a0c200a8 100644
--- a/sys/netgraph/ng_vjc.h
+++ b/sys/netgraph/ng_vjc.h
@@ -38,7 +38,7 @@
  *
  * Author: Archie Cobbs <archie@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vjc.h,v 1.9 2005/01/07 01:45:39 imp Exp $
  * $Whistle: ng_vjc.h,v 1.6 1999/01/25 02:40:22 archie Exp $
  */
 
diff --git a/sys/netgraph/ng_vlan.c b/sys/netgraph/ng_vlan.c
index cd57f7c9ec628..4d44c6fc87a5e 100644
--- a/sys/netgraph/ng_vlan.c
+++ b/sys/netgraph/ng_vlan.c
@@ -25,7 +25,7 @@
  *
  * Author: Ruslan Ermilov <ru@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vlan.c,v 1.5 2007/06/11 15:29:02 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/ng_vlan.h b/sys/netgraph/ng_vlan.h
index 7cedc995bb7bd..b74920c1e3515 100644
--- a/sys/netgraph/ng_vlan.h
+++ b/sys/netgraph/ng_vlan.h
@@ -25,7 +25,7 @@
  *
  * Author: Ruslan Ermilov <ru@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netgraph/ng_vlan.h,v 1.2 2005/10/28 14:41:28 ru Exp $
  */
 
 #ifndef _NETGRAPH_NG_VLAN_H_
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c
index 1bbd3fee0b8d6..18782d61a1cc4 100644
--- a/sys/netinet/accf_data.c
+++ b/sys/netinet/accf_data.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/accf_data.c,v 1.11 2007/10/07 20:44:22 silby Exp $");
 
 #define ACCEPT_FILTER_MOD
 
diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c
index 19ad380e4280d..942c350133da2 100644
--- a/sys/netinet/accf_http.c
+++ b/sys/netinet/accf_http.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/accf_http.c,v 1.17 2007/10/07 20:44:22 silby Exp $");
 
 #define ACCEPT_FILTER_MOD
 
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 91b1658ad0f8a..3329ccd4f1ef0 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.21 2007/05/17 21:20:23 jinmei Exp $	*/
 /*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index dda84f20c8d7d..6c5a50cf9c1ed 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/icmp_var.h,v 1.26 2007/07/19 22:34:24 rwatson Exp $
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index d19dea8fd4761..78ef49a4eb26d 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/if_atm.c,v 1.21 2005/08/26 15:27:18 glebius Exp $");
 
 /*
  * IP <=> ATM address resolution.
diff --git a/sys/netinet/if_atm.h b/sys/netinet/if_atm.h
index bd8b51437ecc1..c87850418724c 100644
--- a/sys/netinet/if_atm.h
+++ b/sys/netinet/if_atm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netinet/if_atm.h,v 1.7 2005/01/07 01:45:44 imp Exp $ */
 /*      $NetBSD: if_atm.h,v 1.2 1996/07/03 17:17:17 chuck Exp $       */
 
 /*-
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 36f50546d8799..c4f6d3984e9a4 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.162 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 14df15fcc17c5..9bc6b7ba7ec71 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/if_ether.h,v 1.32 2005/02/22 13:04:03 glebius Exp $
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 1b26bfc834eae..30ae1938ccb07 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.54 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 109fb3eb1d0d7..587539b096000 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp.h,v 1.15 2007/06/15 18:59:10 bms Exp $
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 11c3769a6f65d..eb06bced7f495 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/igmp_var.h,v 1.22 2007/06/12 16:24:53 bms Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index f0bb08dbbf84e..070ed6dcdb60c 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.102 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_carp.h"
 
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 1fca43d43792f..69cbef54baaae 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in.h,v 1.100 2007/06/12 16:24:53 bms Exp $
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 8fe05d9f96b2b..ca56508c931c3 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in_cksum.c,v 1.10 2007/10/07 20:44:22 silby Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 69a34f8eeaf3a..d31d4fd23fc61 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in_gif.c,v 1.38 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_mrouting.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h
index e1f4ae48d6ed6..0124dbbbe8afa 100644
--- a/sys/netinet/in_gif.h
+++ b/sys/netinet/in_gif.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/in_gif.h,v 1.12 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: in_gif.h,v 1.5 2000/04/14 08:36:02 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index a9a0941fc3868..5ef5587b3640d 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.3.2.1 2007/11/29 20:16:42 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 84f1ae3569a8d..a9086930aeb94 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.196.4.1 2007/12/22 20:54:46 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 9b3c13446bb7c..fce04d3ca902a 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.100.2.1 2007/12/07 05:46:08 kmacy Exp $
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 480da0e203d3d..52398056f28c5 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in_proto.c,v 1.87 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_ipx.h"
 #include "opt_mrouting.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index d1c26afb5b23a..11917111656b7 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.57 2007/10/07 20:44:22 silby Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 8ae8885be1091..a5c0a6adda137 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_systm.h,v 1.12 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 47a160a8b7c0e..7cc858b60a8d1 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/in_var.h,v 1.61 2007/06/12 16:24:53 bms Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 3c4903a5f83f7..a7f18165c6395 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip.h,v 1.31 2007/05/11 11:00:48 rwatson Exp $
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 883b65ae8664c..97946ca4c4aed 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip6.h,v 1.15 2005/07/20 10:30:52 ume Exp $	*/
 /*	$KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 3b98187a8ceb3..c08d39fdc2a24 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_carp.c,v 1.52 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_carp.h"
 #include "opt_bpf.h"
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index 2dd954453e0b1..1688b01ebae40 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_carp.h,v 1.3 2006/12/01 18:37:41 imp Exp $	*/
 /*	$OpenBSD: ip_carp.h,v 1.8 2004/07/29 22:12:15 mcbride Exp $	*/
 
 /*
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 35208ff1c541b..e5ae8d9f9b0de 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.130 2007/10/07 20:44:22 silby Exp $");
 
 #if !defined(KLD_MODULE)
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_divert.h b/sys/netinet/ip_divert.h
index 1bb09447b23db..3c387b6f6b5ac 100644
--- a/sys/netinet/ip_divert.h
+++ b/sys/netinet/ip_divert.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_divert.h,v 1.4 2004/10/19 21:14:57 andre Exp $
  */
 
 #ifndef _NETINET_IP_DIVERT_H_
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 995124834ff3d..09cb71001c650 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.110 2007/10/07 20:44:22 silby Exp $");
 
 #define	DUMMYNET_DEBUG
 
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 5215d932f49bd..33c634db624a7 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.40 2007/06/17 00:33:34 mjacob Exp $
  */
 
 #ifndef _IP_DUMMYNET_H
diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 9fce01d7cd686..e33d59dfc23d5 100644
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_ecn.c,v 1.9 2007/10/07 20:44:22 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index 0886cc8277fef..7869f75763c1b 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_ecn.h,v 1.7 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: ip_ecn.h,v 1.8 2002/01/07 11:34:47 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index 0efd22aaf0d95..a9ca63af47db3 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -57,7 +57,7 @@
 /* XXX is M_NETADDR correct? */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_encap.c,v 1.24 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_mrouting.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index 3b1a5aeeb738a..706fdf857fa9f 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet/ip_encap.h,v 1.4 2005/01/07 01:45:44 imp Exp $	*/
 /*	$KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index 97b823f4a1d7f..0dd0714e8766d 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.41 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_ipfw.h"
 #include "opt_ipstealth.h"
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index ae3b60f37fcff..dca34a40bb60a 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.110.4.1 2008/01/28 17:44:30 rwatson Exp $
  */
 
 #ifndef _IPFW2_H
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 43728e60ee439..67f1da4ff7194 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.175.4.1 2008/01/28 17:44:30 rwatson Exp $");
 
 #define        DEB(x)
 #define        DDB(x) x
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c
index 3d7f2a760ffb5..dfa86bd72aac9 100644
--- a/sys/netinet/ip_fw_pfil.c
+++ b/sys/netinet/ip_fw_pfil.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.25 2007/10/07 20:44:23 silby Exp $");
 
 #if !defined(KLD_MODULE)
 #include "opt_ipfw.h"
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index e985006d91892..340c4efaa6a4f 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_gre.c,v 1.25 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index 1fb67d93b9ce9..61bc7c062a594 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: ip_gre.h,v 1.5 2002/06/09 16:33:40 itojun Exp $ */
-/*	 $FreeBSD$ */
+/*	 $FreeBSD: src/sys/netinet/ip_gre.h,v 1.4 2006/01/21 10:44:34 bz Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index f5843a0710155..ec09b7d602b9a 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.118 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_ipsec.h"
 #include "opt_mac.h"
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index e212083cc5d8d..a878198ed60ff 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.26 2005/05/04 13:09:19 andre Exp $
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index 606164bc9e82b..7c3747cc59640 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.9 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_pf.h"
 #include <sys/param.h>
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index e27cafda065d0..d769be8b5dcac 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.332.2.1 2007/12/19 08:10:30 guido Exp $");
 
 #include "opt_bootp.h"
 #include "opt_ipfw.h"
diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c
index b15a6dca57124..8446defa7e608 100644
--- a/sys/netinet/ip_ipsec.c
+++ b/sys/netinet/ip_ipsec.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.8 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_ipsec.h"
 
diff --git a/sys/netinet/ip_ipsec.h b/sys/netinet/ip_ipsec.h
index af82b31bf49c4..a282c913fb744 100644
--- a/sys/netinet/ip_ipsec.h
+++ b/sys/netinet/ip_ipsec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_ipsec.h,v 1.2 2007/08/05 16:16:15 bz Exp $
  */
 
 #ifndef _NETINET_IP_IPSEC_H_
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 6e0e1244b8152..af3fd09290e89 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.138 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index c756d8404b862..d68120c492dda 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_mroute.h,v 1.31 2007/02/08 23:05:08 bms Exp $
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c
index d1c05940231f8..288004536e3f4 100644
--- a/sys/netinet/ip_options.c
+++ b/sys/netinet/ip_options.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_options.c,v 1.6 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_ipstealth.h"
 #include "opt_mac.h"
diff --git a/sys/netinet/ip_options.h b/sys/netinet/ip_options.h
index 0633fcee9d854..26ee5b9211be9 100644
--- a/sys/netinet/ip_options.h
+++ b/sys/netinet/ip_options.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_options.h,v 1.3 2007/05/11 10:48:30 rwatson Exp $
  */
 
 #ifndef _NETINET_IP_OPTIONS_H_
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 261a15fcd880c..9671f06bbd481 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.276 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index eef4e1f736a19..f10704917477d 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ip_var.h,v 1.101 2007/06/12 16:24:53 bms Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/ipprotosw.h b/sys/netinet/ipprotosw.h
index 5f67eda7c252b..4c1337bc5ae23 100644
--- a/sys/netinet/ipprotosw.h
+++ b/sys/netinet/ipprotosw.h
@@ -56,7 +56,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/ipprotosw.h,v 1.6 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_IPPROTOSW_H_
diff --git a/sys/netinet/libalias/HISTORY b/sys/netinet/libalias/HISTORY
index c5bca59cac1f1..258fe6ff7a6f7 100644
--- a/sys/netinet/libalias/HISTORY
+++ b/sys/netinet/libalias/HISTORY
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netinet/libalias/HISTORY,v 1.9 2000/07/26 23:15:46 archie Exp $
 
 Version 1.0: August 11, 1996 (cjm)
 
diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c
index ed500e177f989..475b278f020c1 100644
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.58 2006/12/15 12:50:06 piso Exp $");
 
 /*
     Alias.c provides supervisory control for the functions of the
diff --git a/sys/netinet/libalias/alias.h b/sys/netinet/libalias/alias.h
index 358109c1b08c7..ead88015960b6 100644
--- a/sys/netinet/libalias/alias.h
+++ b/sys/netinet/libalias/alias.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias.h,v 1.34 2006/12/01 16:27:11 piso Exp $
  */
 
 /*
diff --git a/sys/netinet/libalias/alias_cuseeme.c b/sys/netinet/libalias/alias_cuseeme.c
index f25594201bd3a..b51c51256b03a 100644
--- a/sys/netinet/libalias/alias_cuseeme.c
+++ b/sys/netinet/libalias/alias_cuseeme.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_cuseeme.c,v 1.13 2006/09/26 23:26:53 piso Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index 958e87bc1cf71..b596a2c52ede7 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_db.c,v 1.71 2007/04/07 09:47:39 piso Exp $");
 
 /*
     Alias_db.c encapsulates all data structures used for storing
diff --git a/sys/netinet/libalias/alias_dummy.c b/sys/netinet/libalias/alias_dummy.c
index fc6a0f98459ba..204e07f616c98 100644
--- a/sys/netinet/libalias/alias_dummy.c
+++ b/sys/netinet/libalias/alias_dummy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_dummy.c,v 1.1 2006/09/26 23:26:53 piso Exp $");
 
 /* 
  * Alias_dummy is just an empty skeleton used to demostrate how to write
diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c
index 68134af1ab27c..809ff555967b9 100644
--- a/sys/netinet/libalias/alias_ftp.c
+++ b/sys/netinet/libalias/alias_ftp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_ftp.c,v 1.29 2007/04/04 03:14:15 kan Exp $");
 
 /*
     Alias_ftp.c performs special processing for FTP sessions under
diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c
index 5aa80e63cb461..9cd1be6e0de91 100644
--- a/sys/netinet/libalias/alias_irc.c
+++ b/sys/netinet/libalias/alias_irc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_irc.c,v 1.23 2007/04/04 03:16:59 kan Exp $");
 
 /* Alias_irc.c intercepts packages contain IRC CTCP commands, and
 	changes DCC commands to export a port on the aliasing host instead
diff --git a/sys/netinet/libalias/alias_local.h b/sys/netinet/libalias/alias_local.h
index 2abcb69c0a9d2..13178e0dc9f9f 100644
--- a/sys/netinet/libalias/alias_local.h
+++ b/sys/netinet/libalias/alias_local.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias_local.h,v 1.34 2006/12/15 12:50:06 piso Exp $
  */
 
 /*
diff --git a/sys/netinet/libalias/alias_mod.c b/sys/netinet/libalias/alias_mod.c
index 643fe5f5dceb8..9d820a3fbabc4 100644
--- a/sys/netinet/libalias/alias_mod.c
+++ b/sys/netinet/libalias/alias_mod.c
@@ -25,7 +25,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_mod.c,v 1.3 2006/12/15 12:50:06 piso Exp $");
 
 #ifdef _KERNEL
 #include <sys/libkern.h>
diff --git a/sys/netinet/libalias/alias_mod.h b/sys/netinet/libalias/alias_mod.h
index 5e193e97eb5e1..bd3c1bae6638b 100644
--- a/sys/netinet/libalias/alias_mod.h
+++ b/sys/netinet/libalias/alias_mod.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias_mod.h,v 1.1 2006/09/26 23:26:53 piso Exp $
  */
 
 /*
diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index 0d17870fa7eee..643d0bc3e07f3 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_nbt.c,v 1.20 2006/09/26 23:26:53 piso Exp $");
 
 /*
     alias_nbt.c performs special processing for NetBios over TCP/IP
diff --git a/sys/netinet/libalias/alias_old.c b/sys/netinet/libalias/alias_old.c
index 528f6be39fd1c..f542a66eea416 100644
--- a/sys/netinet/libalias/alias_old.c
+++ b/sys/netinet/libalias/alias_old.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_old.c,v 1.8 2006/09/26 23:26:53 piso Exp $");
 
 #ifdef _KERNEL
 #include <sys/param.h>
diff --git a/sys/netinet/libalias/alias_pptp.c b/sys/netinet/libalias/alias_pptp.c
index b4fd9d0d438aa..75c85d089b41d 100644
--- a/sys/netinet/libalias/alias_pptp.c
+++ b/sys/netinet/libalias/alias_pptp.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_pptp.c,v 1.15 2006/09/26 23:26:53 piso Exp $");
 
 /* Includes */
 #ifdef _KERNEL
diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c
index d7efb4bcae556..12c571997fdd5 100644
--- a/sys/netinet/libalias/alias_proxy.c
+++ b/sys/netinet/libalias/alias_proxy.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_proxy.c,v 1.31 2007/04/30 20:26:11 maxim Exp $");
 
 /* file: alias_proxy.c
 
diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c
index e726e55a181a5..7e13d17c4fc5e 100644
--- a/sys/netinet/libalias/alias_skinny.c
+++ b/sys/netinet/libalias/alias_skinny.c
@@ -27,7 +27,7 @@
  *
  * Author: Joe Marcus Clarke <marcus@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/libalias/alias_skinny.c,v 1.14 2007/04/07 09:52:36 piso Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c
index cf372b04ec993..8696bc3016def 100644
--- a/sys/netinet/libalias/alias_smedia.c
+++ b/sys/netinet/libalias/alias_smedia.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_smedia.c,v 1.17 2006/11/07 21:06:48 marcus Exp $");
 
 /*
    Alias_smedia.c is meant to contain the aliasing code for streaming media
diff --git a/sys/netinet/libalias/alias_util.c b/sys/netinet/libalias/alias_util.c
index 805b51a314224..c529854eaaeb7 100644
--- a/sys/netinet/libalias/alias_util.c
+++ b/sys/netinet/libalias/alias_util.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_util.c,v 1.20 2006/12/15 12:50:06 piso Exp $");
 
 
 /*
diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3
index 8f7d93ffe4649..a7cb191d99e42 100644
--- a/sys/netinet/libalias/libalias.3
+++ b/sys/netinet/libalias/libalias.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.58 2006/10/11 07:11:56 ru Exp $
 .\"
 .Dd October 1, 2006
 .Dt LIBALIAS 3
diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index 7878f7972fb6e..cd3b96a912d8a 100644
--- a/sys/netinet/pim.h
+++ b/sys/netinet/pim.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/pim.h,v 1.3 2005/01/07 01:45:44 imp Exp $
  */
 
 #ifndef _NETINET_PIM_H_
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index f79edde23b59f..eb799ef67eb9b 100644
--- a/sys/netinet/pim_var.h
+++ b/sys/netinet/pim_var.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/pim_var.h,v 1.3 2005/08/10 07:10:02 obrien Exp $
  */
 
 #ifndef _NETINET_PIM_VAR_H_
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 1d0ced5d8ecaf..78973d8141a48 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.180 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
diff --git a/sys/netinet/sctp.h b/sys/netinet/sctp.h
index ad5e84cb22b5c..9a50e68734f15 100644
--- a/sys/netinet/sctp.h
+++ b/sys/netinet/sctp.h
@@ -30,7 +30,7 @@
 /* $KAME: sctp.h,v 1.18 2005/03/06 16:04:16 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp.h,v 1.21.2.1 2007/12/09 20:23:47 rrs Exp $");
 
 #ifndef _NETINET_SCTP_H_
 #define _NETINET_SCTP_H_
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index f9f3660f52fac..2d6b9063b628a 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.34 2007/10/01 03:22:28 rrs Exp $");
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_var.h>
 #include <netinet/sctp_sysctl.h>
diff --git a/sys/netinet/sctp_asconf.h b/sys/netinet/sctp_asconf.h
index ca57c00324bbc..ef34bab197b6b 100644
--- a/sys/netinet/sctp_asconf.h
+++ b/sys/netinet/sctp_asconf.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_asconf.h,v 1.8 2005/03/06 16:04:16 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.h,v 1.10 2007/09/15 19:07:42 rrs Exp $");
 
 #ifndef _NETINET_SCTP_ASCONF_H_
 #define _NETINET_SCTP_ASCONF_H_
diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c
index a7d0d84414945..1f3e2723e6253 100644
--- a/sys/netinet/sctp_auth.c
+++ b/sys/netinet/sctp_auth.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_auth.c,v 1.18.4.1 2008/01/31 17:21:50 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp.h>
diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h
index be7e6a0f1545f..066ef94e6eb1e 100644
--- a/sys/netinet/sctp_auth.h
+++ b/sys/netinet/sctp_auth.h
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_auth.h,v 1.5 2007/06/09 13:46:57 rrs Exp $");
 
 #ifndef __SCTP_AUTH_H__
 #define __SCTP_AUTH_H__
diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c
index e0aa304830788..ed7e0e3120fac 100644
--- a/sys/netinet/sctp_bsd_addr.c
+++ b/sys/netinet/sctp_bsd_addr.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.c,v 1.14.4.2 2008/01/31 17:21:50 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_var.h>
diff --git a/sys/netinet/sctp_bsd_addr.h b/sys/netinet/sctp_bsd_addr.h
index 45a05b643e873..ac7e0b9ad2246 100644
--- a/sys/netinet/sctp_bsd_addr.h
+++ b/sys/netinet/sctp_bsd_addr.h
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.h,v 1.6 2007/05/29 09:29:02 rrs Exp $");
 
 #ifndef __sctp_bsd_addr_h__
 #define __sctp_bsd_addr_h__
diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c
index 90a809c0e091f..e7654ab167378 100644
--- a/sys/netinet/sctp_cc_functions.c
+++ b/sys/netinet/sctp_cc_functions.c
@@ -43,7 +43,7 @@
 #include <netinet/sctp_asconf.h>
 #include <netinet/sctp_cc_functions.h>
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.c,v 1.3 2007/09/08 11:35:10 rrs Exp $");
 void
 sctp_set_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net)
 {
diff --git a/sys/netinet/sctp_cc_functions.h b/sys/netinet/sctp_cc_functions.h
index 5d27aef009512..eb320100b1bcc 100644
--- a/sys/netinet/sctp_cc_functions.h
+++ b/sys/netinet/sctp_cc_functions.h
@@ -28,7 +28,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.h,v 1.2 2007/09/10 17:06:25 rrs Exp $");
 
 #ifndef __sctp_cc_functions_h__
 #define __sctp_cc_functions_h__
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h
index 6f2fd61118829..cafb4123e85fe 100644
--- a/sys/netinet/sctp_constants.h
+++ b/sys/netinet/sctp_constants.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_constants.h,v 1.17 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_constants.h,v 1.32.2.2 2007/11/06 02:48:03 rrs Exp $");
 
 #ifndef __sctp_constants_h__
 #define __sctp_constants_h__
diff --git a/sys/netinet/sctp_crc32.c b/sys/netinet/sctp_crc32.c
index f3d1dc0e0b1a4..3bc372ac30e22 100644
--- a/sys/netinet/sctp_crc32.c
+++ b/sys/netinet/sctp_crc32.c
@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_crc32.c,v 1.8 2007/05/08 17:01:10 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_crc32.h>
diff --git a/sys/netinet/sctp_crc32.h b/sys/netinet/sctp_crc32.h
index 3d118e5e6e83d..195cb233a4f48 100644
--- a/sys/netinet/sctp_crc32.h
+++ b/sys/netinet/sctp_crc32.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_crc32.h,v 1.5 2004/08/17 04:06:16 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_crc32.h,v 1.3 2007/05/08 17:01:10 rrs Exp $");
 
 #ifndef __crc32c_h__
 #define __crc32c_h__
diff --git a/sys/netinet/sctp_header.h b/sys/netinet/sctp_header.h
index 090e96db9185f..10582b7409346 100644
--- a/sys/netinet/sctp_header.h
+++ b/sys/netinet/sctp_header.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_header.h,v 1.14 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_header.h,v 1.6 2007/08/24 00:53:51 rrs Exp $");
 
 #ifndef __sctp_header_h__
 #define __sctp_header_h__
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 1c9c385e8b40d..296253a1fc01d 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.45.2.2.2.1 2008/01/31 17:21:50 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_var.h>
diff --git a/sys/netinet/sctp_indata.h b/sys/netinet/sctp_indata.h
index 9ab5ebffe58b0..66c9486c0447c 100644
--- a/sys/netinet/sctp_indata.h
+++ b/sys/netinet/sctp_indata.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_indata.h,v 1.9 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.h,v 1.9 2007/06/22 13:50:56 rrs Exp $");
 
 #ifndef __sctp_indata_h__
 #define __sctp_indata_h__
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 5bad746ec355e..6edc8946190dc 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.65.2.1.2.1 2008/02/02 12:44:13 rwatson Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_var.h>
diff --git a/sys/netinet/sctp_input.h b/sys/netinet/sctp_input.h
index 01a67c60d6f84..f89555aef677c 100644
--- a/sys/netinet/sctp_input.h
+++ b/sys/netinet/sctp_input.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_input.h,v 1.6 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.h,v 1.7 2007/07/02 19:22:22 rrs Exp $");
 
 #ifndef __sctp_input_h__
 #define __sctp_input_h__
diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h
index eeaca5d2efa07..25197473681cb 100644
--- a/sys/netinet/sctp_lock_bsd.h
+++ b/sys/netinet/sctp_lock_bsd.h
@@ -69,7 +69,7 @@
  * the sctppcbinfo list's we will do a SCTP_INP_INFO_WLOCK().
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_lock_bsd.h,v 1.10 2007/09/18 15:16:38 rrs Exp $");
 
 
 extern struct sctp_foo_stuff sctp_logoff[];
diff --git a/sys/netinet/sctp_os.h b/sys/netinet/sctp_os.h
index fb7c53606ffe0..bae364c546407 100644
--- a/sys/netinet/sctp_os.h
+++ b/sys/netinet/sctp_os.h
@@ -28,7 +28,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_os.h,v 1.9 2007/08/24 00:53:52 rrs Exp $");
 #ifndef __sctp_os_h__
 #define __sctp_os_h__
 
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index b16594354e436..1537c258725f1 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -28,7 +28,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_os_bsd.h,v 1.33 2007/09/18 15:16:38 rrs Exp $");
 #ifndef __sctp_os_bsd_h__
 #define __sctp_os_bsd_h__
 /*
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index be5349ed25a1f..43f7a7bdf7dd6 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.58.2.3 2007/12/09 20:23:47 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <sys/proc.h>
diff --git a/sys/netinet/sctp_output.h b/sys/netinet/sctp_output.h
index d37c163dd6a4b..dc850251e9c3d 100644
--- a/sys/netinet/sctp_output.h
+++ b/sys/netinet/sctp_output.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_output.h,v 1.14 2005/03/06 16:04:18 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_output.h,v 1.13 2007/10/01 03:22:28 rrs Exp $");
 
 #ifndef __sctp_output_h__
 #define __sctp_output_h__
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 0d036374b3fd5..89e68f5542ac4 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.62.2.2.2.1 2008/01/31 17:21:50 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <sys/proc.h>
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index 65e4b505c0c88..1c5ed0aa56d08 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.31.2.1 2007/11/06 02:48:03 rrs Exp $");
 
 #ifndef __sctp_pcb_h__
 #define __sctp_pcb_h__
diff --git a/sys/netinet/sctp_peeloff.c b/sys/netinet/sctp_peeloff.c
index d49688ec68f4f..37cee7f8c4a93 100644
--- a/sys/netinet/sctp_peeloff.c
+++ b/sys/netinet/sctp_peeloff.c
@@ -32,7 +32,7 @@
 /* $KAME: sctp_peeloff.c,v 1.13 2005/03/06 16:04:18 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_peeloff.c,v 1.16.4.1 2008/02/02 12:44:13 rwatson Exp $");
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_pcb.h>
 #include <netinet/sctputil.h>
diff --git a/sys/netinet/sctp_peeloff.h b/sys/netinet/sctp_peeloff.h
index db61db3ba3589..aab74045967ef 100644
--- a/sys/netinet/sctp_peeloff.h
+++ b/sys/netinet/sctp_peeloff.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_peeloff.h,v 1.6 2005/03/06 16:04:18 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_peeloff.h,v 1.3 2007/05/08 17:01:10 rrs Exp $");
 
 #ifndef __sctp_peeloff_h__
 #define __sctp_peeloff_h__
diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h
index 69b6f921f91bf..f31bf3e755758 100644
--- a/sys/netinet/sctp_structs.h
+++ b/sys/netinet/sctp_structs.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_structs.h,v 1.13 2005/03/06 16:04:18 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_structs.h,v 1.25.2.2 2007/12/09 20:23:47 rrs Exp $");
 
 #ifndef __sctp_structs_h__
 #define __sctp_structs_h__
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index fd232d94c5599..1067b85f28dc8 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_sysctl.c,v 1.16 2007/09/13 14:43:54 rrs Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_constants.h>
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 3b93b68ee8575..425f508962389 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_sysctl.h,v 1.13 2007/09/15 19:07:42 rrs Exp $");
 
 #ifndef __sctp_sysctl_h__
 #define __sctp_sysctl_h__
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index 6f6d188b92aef..c30c1540072c8 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_timer.c,v 1.29 2005/03/06 16:04:18 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.c,v 1.32.2.1 2007/10/25 12:27:06 rrs Exp $");
 
 #define _IP_VHL
 #include <netinet/sctp_os.h>
diff --git a/sys/netinet/sctp_timer.h b/sys/netinet/sctp_timer.h
index 216d0d42edd40..5f6d14615ec0e 100644
--- a/sys/netinet/sctp_timer.h
+++ b/sys/netinet/sctp_timer.h
@@ -30,7 +30,7 @@
 
 /* $KAME: sctp_timer.h,v 1.6 2005/03/06 16:04:18 itojun Exp $	 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.h,v 1.7 2007/09/13 10:36:42 rrs Exp $");
 
 #ifndef __sctp_timer_h__
 #define __sctp_timer_h__
diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h
index ef6942b0ac54a..74c92d11382c3 100644
--- a/sys/netinet/sctp_uio.h
+++ b/sys/netinet/sctp_uio.h
@@ -30,7 +30,7 @@
 
 /* $KAME: sctp_uio.h,v 1.11 2005/03/06 16:04:18 itojun Exp $	 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_uio.h,v 1.29 2007/09/18 15:16:39 rrs Exp $");
 
 #ifndef __sctp_uio_h__
 #define __sctp_uio_h__
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 0c6bf6f7ee31e..cb0f9ff678db7 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -31,7 +31,7 @@
 /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.48.2.3 2007/12/09 20:23:47 rrs Exp $");
 #include <netinet/sctp_os.h>
 #include <sys/proc.h>
 #include <netinet/sctp_pcb.h>
diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h
index e2fe3f81114a4..300eac6e9143b 100644
--- a/sys/netinet/sctp_var.h
+++ b/sys/netinet/sctp_var.h
@@ -31,7 +31,7 @@
 /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.20.2.1 2007/10/25 12:27:06 rrs Exp $");
 
 #ifndef _NETINET_SCTP_VAR_H_
 #define _NETINET_SCTP_VAR_H_
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 25b2f9215ac51..66f3bd0973a44 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -31,7 +31,7 @@
 /* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65.2.4.2.1 2008/02/02 12:44:13 rwatson Exp $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_pcb.h>
diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h
index 24157e33e3101..4b2e1f9d7d99e 100644
--- a/sys/netinet/sctputil.h
+++ b/sys/netinet/sctputil.h
@@ -32,7 +32,7 @@
 /* $KAME: sctputil.h,v 1.15 2005/03/06 16:04:19 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/sctputil.h,v 1.29.2.1 2007/11/06 02:48:04 rrs Exp $");
 #ifndef __sctputil_h__
 #define __sctputil_h__
 
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index ee4fd1c2fe38b..1bc1faacba7f7 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp.h,v 1.40 2007/05/25 21:28:49 andre Exp $
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index aaeac9dfaf62c..12b64125cdaa5 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_debug.c,v 1.29 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 8547d0e7b7a3f..cf29bd19a2a53 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_debug.h,v 1.16 2007/03/24 22:15:02 maxim Exp $
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 61fd0c1f8a28a..e3cf137ab3390 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_fsm.h,v 1.20 2007/07/30 11:06:41 des Exp $
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index 3a686078417ca..921c8fb721d77 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.17 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_inet6.h"
 
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 4e69016fa785d..96c0d3be2c068 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.370 2007/10/07 20:44:23 silby Exp $");
 
 #include "opt_ipfw.h"		/* for ipfw_fwd	*/
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 962d5468618f9..e32e1c01f1bb2 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_output.c,v 1.141.2.3 2007/12/05 10:37:17 bz Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index d011878e4b835..48225cc697e63 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_reass.c,v 1.353 2007/10/07 20:44:24 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index aa0849ccf94e7..c5ab7f768e9b2 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_sack.c,v 1.40 2007/05/11 11:21:43 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index f58b537c72a26..b81fdd156954b 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_seq.h,v 1.26 2006/06/18 14:24:12 andre Exp $
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 03f545ef1c337..937d70d3b3f38 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.300.2.2 2007/12/02 10:32:49 bz Exp $");
 
 #include "opt_compat.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 8e95db46685a5..a04dee5fe57c1 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.130.2.6 2007/12/20 12:34:32 ru Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
index b58fdc58547a2..641bf9b49be35 100644
--- a/sys/netinet/tcp_syncache.h
+++ b/sys/netinet/tcp_syncache.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.1 2007/07/27 00:57:06 silby Exp $
  */
 
 #ifndef _NETINET_TCP_SYNCACHE_H_
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 2a7847710e449..2086a52c5038d 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_timer.c,v 1.99 2007/10/07 20:44:24 silby Exp $");
 
 #include "opt_inet6.h"
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index ff455b6b01541..9dd45b3ede300 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_timer.h,v 1.39 2007/09/24 05:26:24 silby Exp $
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index d31e99c053eee..deb3d9ec67696 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_timewait.c,v 1.287 2007/10/07 20:44:24 silby Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index f3f836ce312d5..4746cdd71aa3d 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.163.2.1.2.1 2008/01/26 13:57:33 rwatson Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 099904366a91d..e564eb86068be 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.157.2.1 2007/12/07 05:46:09 kmacy Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 3a89d5d5bd306..f5732bcf879fe 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/tcpip.h,v 1.12 2005/01/07 01:45:45 imp Exp $
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 2e8fd8da508f7..aed30992bb1b7 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp.h,v 1.10 2007/02/20 10:13:11 rwatson Exp $
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 3e122bfddc07a..66fed4cd56c4b 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.218 2007/10/07 20:44:24 silby Exp $");
 
 #include "opt_ipfw.h"
 #include "opt_inet6.h"
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index c4c077a4cf1dd..76c9cee9d3930 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet/udp_var.h,v 1.33 2007/07/10 09:30:46 rwatson Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 5a8250130e98b..3e90c2aedbb04 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/dest6.c,v 1.11 2007/07/05 16:23:46 delphij Exp $	*/
 /*	$KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $	*/
 
 /*-
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 8bb4fa9206a1c..30c64e1713072 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/frag6.c,v 1.33 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 91f8be63a36a0..bbb8fd5b255ea 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/icmp6.c,v 1.80 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/icmp6.h b/sys/netinet6/icmp6.h
index a6414efccb7ef..300b8aca2e33b 100644
--- a/sys/netinet6/icmp6.h
+++ b/sys/netinet6/icmp6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/icmp6.h,v 1.6 2000/07/04 16:35:09 itojun Exp $	*/
 /*	$KAME: icmp6.h,v 1.17 2000/06/11 17:23:40 jinmei Exp $	*/
 
 #error "netinet6/icmp6.h is obsolete.  use netinet/icmp6.h"
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index e801ef4b12fc0..fab9a43044a8a 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6.c,v 1.73 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index e2d05a010efbd..9f9708a6c474f 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6.h,v 1.51 2007/07/19 09:16:40 bz Exp $	*/
 /*	$KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c
index 864f51a82a689..73ab999a6e09c 100644
--- a/sys/netinet6/in6_cksum.c
+++ b/sys/netinet6/in6_cksum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.16 2007/07/05 16:23:47 delphij Exp $	*/
 /*	$KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index b925e367d8b68..f3c154794ccb6 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.29 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_gif.h b/sys/netinet6/in6_gif.h
index 2834162c6c809..ddaee1d63f351 100644
--- a/sys/netinet6/in6_gif.h
+++ b/sys/netinet6/in6_gif.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_gif.h,v 1.7 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 85ddd6a845c54..03a24c15c8a9f 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.39 2007/07/05 16:23:47 delphij Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h
index 77cc88f1be4df..f8fb0b64afa1b 100644
--- a/sys/netinet6/in6_ifattach.h
+++ b/sys/netinet6/in6_ifattach.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_ifattach.h,v 1.7 2005/10/21 16:23:00 suz Exp $	*/
 /*	$KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index d81c6f20c6a5a..ef6f50e989399 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.84.2.1 2007/12/21 14:25:43 rwatson Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index 832c755b7f866..c3c48944289b9 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_pcb.h,v 1.19 2007/05/11 10:20:50 rwatson Exp $	*/
 /*	$KAME: in6_pcb.h,v 1.13 2001/02/06 09:16:53 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 849c83e9070d5..2230741c2eda7 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_proto.c,v 1.46 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 775699daae7cd..bb129311527e8 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.18 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: in6_rmx.c,v 1.11 2001/07/26 06:53:16 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index d83ffc2fccd2b..30a4160816d0c 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_src.c,v 1.46 2007/07/05 16:29:39 delphij Exp $	*/
 /*	$KAME: in6_src.c,v 1.132 2003/08/26 04:42:27 keiichi Exp $	*/
 
 /*-
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index ebfcaea1b5b0d..163b2b065f04d 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/in6_var.h,v 1.31 2007/06/02 08:02:36 jinmei Exp $	*/
 /*	$KAME: in6_var.h,v 1.56 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6.h b/sys/netinet6/ip6.h
index 9eec13fb25ec1..528ff7ce31e67 100644
--- a/sys/netinet6/ip6.h
+++ b/sys/netinet6/ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6.h,v 1.5 2000/07/04 16:35:09 itojun Exp $	*/
 /*	$KAME: ip6.h,v 1.7 2000/03/25 07:23:36 sumikawa Exp $	*/
 
 #error "netinet6/ip6.h is obsolete.  use netinet/ip6.h"
diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h
index 8dcdbd1c581c9..20b03dbb35996 100644
--- a/sys/netinet6/ip6_ecn.h
+++ b/sys/netinet6/ip6_ecn.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_ecn.h,v 1.6 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 0f1ad8e705d3b..78e5240d47637 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.40 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index c5507ffb671ff..36b1a518e3fea 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,6 +1,6 @@
 /*	$KAME: ip6_id.c,v 1.13 2003/09/16 09:11:19 itojun Exp $	*/
 /*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/netinet6/ip6_id.c,v 1.8 2007/07/05 16:23:47 delphij Exp $ */
 
 /*-
  * Copyright (C) 2003 WIDE Project.
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index eb7865767a6ca..f9ef537814164 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_input.c,v 1.95 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c
index 5e13241e5ddcf..90d482f71656e 100644
--- a/sys/netinet6/ip6_ipsec.c
+++ b/sys/netinet6/ip6_ipsec.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/ip6_ipsec.c,v 1.6 2007/08/05 16:16:15 bz Exp $
  */
 
 #include "opt_ipsec.h"
diff --git a/sys/netinet6/ip6_ipsec.h b/sys/netinet6/ip6_ipsec.h
index 2b5668dbae3ec..194aaeb6ed729 100644
--- a/sys/netinet6/ip6_ipsec.h
+++ b/sys/netinet6/ip6_ipsec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/ip6_ipsec.h,v 1.2 2007/08/05 16:16:15 bz Exp $
  */
 
 #ifndef _NETINET_IP6_IPSEC_H_
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 67b29b7ec1cc8..658459b4e512c 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.46 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index ebdf8ac6fc1af..841cfceafdf5a 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.12 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index e1a721a84083f..34a86d91fc7d9 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.109 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index a01cf8a69b33a..dbe2f03f7d6f2 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_var.h,v 1.39 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index a6bb6833e8a8b..7a765fb4466cb 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/ip6protosw.h,v 1.13 2005/01/07 02:30:34 imp Exp $	*/
 /*	$KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $	*/
 
 /*-
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index f7a63328fecca..3dbda38d93412 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/mld6.c,v 1.31 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/mld6_var.h b/sys/netinet6/mld6_var.h
index a4e52f21f28c6..62135253460cf 100644
--- a/sys/netinet6/mld6_var.h
+++ b/sys/netinet6/mld6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/mld6_var.h,v 1.7 2005/10/21 16:23:00 suz Exp $	*/
 /*	$KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 6fce08475b298..bd1560d5575b3 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6.c,v 1.83.2.1 2007/10/30 18:03:50 jhb Exp $	*/
 /*	$KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 1d72623522281..b4bee91cc8c20 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6.h,v 1.21 2005/10/21 16:23:00 suz Exp $	*/
 /*	$KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 0572069b1b18f..99c9598670c09 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.47 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 2a816029234f0..53c26ecfaf301 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.36 2007/07/05 16:29:40 delphij Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 25e2b2320f34f..2d280f5a04f8d 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/pim6.h,v 1.3 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index aa6fc6c3fa641..37eb6c1fc9086 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/pim6_var.h,v 1.5 2005/08/10 07:10:02 obrien Exp $	*/
 /*	$KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 1256781a95ea2..19d8a8d39e5aa 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.73 2007/07/05 16:29:40 delphij Exp $
  */
 
 /*-
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index 62aac14519f70..f40b1c6e22fce 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/raw_ip6.h,v 1.2 2005/01/07 02:30:35 imp Exp $	*/
 /*	$KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index 989de86e223a8..39d3b6aceca16 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/route6.c,v 1.14 2007/07/05 16:23:48 delphij Exp $	*/
 /*	$KAME: route6.c,v 1.24 2001/03/14 03:07:05 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 50646ae2068ce..3c6ef0985c5e1 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/scope6.c,v 1.17 2007/07/05 16:23:48 delphij Exp $	*/
 /*	$KAME: scope6.c,v 1.10 2000/07/24 13:29:31 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index 3dbdcd98f31b1..ad68c48155516 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netinet6/scope6_var.h,v 1.5 2005/07/25 12:31:42 ume Exp $	*/
 /*	$KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $	*/
 
 /*-
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 8b6c249c1b2e1..5c3000752c1f7 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -29,7 +29,7 @@
  */
 /*	$KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $	*/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.41 2007/09/13 10:36:43 rrs Exp $");
 
 
 #include <netinet/sctp_os.h>
diff --git a/sys/netinet6/sctp6_var.h b/sys/netinet6/sctp6_var.h
index 3b744e32e330e..020e25e553e5c 100644
--- a/sys/netinet6/sctp6_var.h
+++ b/sys/netinet6/sctp6_var.h
@@ -31,7 +31,7 @@
 #ifndef _NETINET6_SCTP6_VAR_H_
 #define _NETINET6_SCTP6_VAR_H_
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netinet6/sctp6_var.h,v 1.8 2007/09/13 10:36:43 rrs Exp $");
 
 #if defined(_KERNEL)
 
diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h
index 68d8bfda5e86f..bf826c768c948 100644
--- a/sys/netinet6/tcp6_var.h
+++ b/sys/netinet6/tcp6_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/tcp6_var.h,v 1.7 2005/01/07 02:30:35 imp Exp $
  */
 
 /*-
@@ -58,7 +58,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/tcp6_var.h,v 1.7 2005/01/07 02:30:35 imp Exp $
  */
 
 #ifndef _NETINET_TCP6_VAR_H_
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index b443eadc51661..373c4903e67be 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -60,7 +60,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.81 2007/09/08 08:18:24 rwatson Exp $
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index feee95e0e0854..c699bcdbe2cb1 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netinet6/udp6_var.h,v 1.9 2007/07/23 07:58:58 rwatson Exp $
  */
 
 /*-
diff --git a/sys/netipsec/ah.h b/sys/netipsec/ah.h
index 1ffeacdc39771..4f52153f8a0c7 100644
--- a/sys/netipsec/ah.h
+++ b/sys/netipsec/ah.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ah.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ah_var.h b/sys/netipsec/ah_var.h
index 5a8c06e141553..9e023783deb47 100644
--- a/sys/netipsec/ah_var.h
+++ b/sys/netipsec/ah_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ah_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h
index eb3739701181d..b3adabe869341 100644
--- a/sys/netipsec/esp.h
+++ b/sys/netipsec/esp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/esp.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/esp_var.h b/sys/netipsec/esp_var.h
index 278b996a708fd..d25ce0fd66eae 100644
--- a/sys/netipsec/esp_var.h
+++ b/sys/netipsec/esp_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/esp_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipcomp.h b/sys/netipsec/ipcomp.h
index 47e9305ef6bef..c74e3ef191277 100644
--- a/sys/netipsec/ipcomp.h
+++ b/sys/netipsec/ipcomp.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipcomp.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipcomp_var.h b/sys/netipsec/ipcomp_var.h
index 6a506bb5bf040..25d98c958dc2c 100644
--- a/sys/netipsec/ipcomp_var.h
+++ b/sys/netipsec/ipcomp_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipcomp_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipip_var.h b/sys/netipsec/ipip_var.h
index 7fbc64315f93a..0a9761e5fa1af 100644
--- a/sys/netipsec/ipip_var.h
+++ b/sys/netipsec/ipip_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipip_var.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$OpenBSD: ip_ipip.h,v 1.5 2002/06/09 16:26:10 itojun Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 1f8e6abb594b6..ef7072bffcc57 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec.c,v 1.24 2007/07/01 11:38:29 gnn Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index 14640149dc4e3..8f82a0b62090d 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec.h,v 1.13 2007/07/01 11:38:29 gnn Exp $	*/
 /*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h
index 32b2b83f883ec..819ba3f73be67 100644
--- a/sys/netipsec/ipsec6.h
+++ b/sys/netipsec/ipsec6.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec6.h,v 1.3 2007/07/01 11:38:29 gnn Exp $	*/
 /*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index cea8aff5daf00..5351d5087bf46 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec_input.c,v 1.19 2007/09/12 05:54:53 gnn Exp $	*/
 /*	$OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c
index d4ec42ae53a91..a2dd718071fe2 100644
--- a/sys/netipsec/ipsec_mbuf.c
+++ b/sys/netipsec/ipsec_mbuf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.13 2007/07/01 11:38:29 gnn Exp $
  */
 
 /*
diff --git a/sys/netipsec/ipsec_osdep.h b/sys/netipsec/ipsec_osdep.h
index 992dd87fec237..7cd8995e39581 100644
--- a/sys/netipsec/ipsec_osdep.h
+++ b/sys/netipsec/ipsec_osdep.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/ipsec_osdep.h,v 1.6 2007/06/12 00:12:00 rwatson Exp $	*/
 /*	$NetBSD: ipsec_osdep.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 27ad224124b9c..e92e6f69c6e45 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.16 2007/07/19 09:57:54 bz Exp $
  */
 
 /*
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 5dfc32f4df413..09df9fef16340 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key.c,v 1.28 2007/07/01 11:38:29 gnn Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h
index 7c63272ab4afc..9113b2b2ff73b 100644
--- a/sys/netipsec/key.h
+++ b/sys/netipsec/key.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key.h,v 1.4 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_debug.c b/sys/netipsec/key_debug.c
index 7252ea0c6f90f..f7a892dd601fd 100644
--- a/sys/netipsec/key_debug.c
+++ b/sys/netipsec/key_debug.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key_debug.c,v 1.5 2007/07/01 11:38:29 gnn Exp $	*/
 /*	$KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_debug.h b/sys/netipsec/key_debug.h
index be53f7a1f712f..a8ca140d4086c 100644
--- a/sys/netipsec/key_debug.h
+++ b/sys/netipsec/key_debug.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key_debug.h,v 1.2 2005/01/07 01:45:46 imp Exp $	*/
 /*	$KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_var.h b/sys/netipsec/key_var.h
index edf232d86cc5c..c477faf250fb2 100644
--- a/sys/netipsec/key_var.h
+++ b/sys/netipsec/key_var.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/key_var.h,v 1.3 2006/03/25 13:38:52 gnn Exp $	*/
 /*	$KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keydb.h b/sys/netipsec/keydb.h
index c9a37e3452bde..67e3cc60ddc2d 100644
--- a/sys/netipsec/keydb.h
+++ b/sys/netipsec/keydb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keydb.h,v 1.6 2006/03/25 13:38:52 gnn Exp $	*/
 /*	$KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index cc1214ba59bf9..1aae5574ce281 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keysock.c,v 1.18.2.2 2007/11/20 09:35:15 bz Exp $	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keysock.h b/sys/netipsec/keysock.h
index a331b5e3694cc..2fdc1c33449e6 100644
--- a/sys/netipsec/keysock.h
+++ b/sys/netipsec/keysock.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/keysock.h,v 1.3 2006/01/21 10:44:34 bz Exp $	*/
 /*	$KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netipsec/xform.h b/sys/netipsec/xform.h
index 58509c5304b8f..171cafd8bf656 100644
--- a/sys/netipsec/xform.h
+++ b/sys/netipsec/xform.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform.h,v 1.3 2006/03/30 18:57:04 bz Exp $	*/
 /*	$OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c
index 99236a8786f30..0e39f58fa9297 100644
--- a/sys/netipsec/xform_ah.c
+++ b/sys/netipsec/xform_ah.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ah.c,v 1.15 2007/08/06 14:26:02 rwatson Exp $	*/
 /*	$OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index 190098044d1b3..099014c594679 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_esp.c,v 1.20 2007/08/06 14:26:02 rwatson Exp $	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c
index 142a7315e8e08..9e5a1f050d54a 100644
--- a/sys/netipsec/xform_ipcomp.c
+++ b/sys/netipsec/xform_ipcomp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.11 2007/08/06 14:26:02 rwatson Exp $	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
 /*-
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 80fafd252cdcf..02f96be92e711 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.15 2007/07/19 09:57:54 bz Exp $	*/
 /*	$OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_tcp.c b/sys/netipsec/xform_tcp.c
index a401548e49133..96355fd8d74ef 100644
--- a/sys/netipsec/xform_tcp.c
+++ b/sys/netipsec/xform_tcp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/netipsec/xform_tcp.c,v 1.5 2006/03/25 13:38:52 gnn Exp $ */
 
 /*-
  * Copyright (c) 2003 Bruce M. Simpson <bms@spc.org>
diff --git a/sys/netipx/README b/sys/netipx/README
index a067daf877d9c..ca1ae622119c8 100644
--- a/sys/netipx/README
+++ b/sys/netipx/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/netipx/README,v 1.8 2006/03/27 09:10:09 rwatson Exp $
 
 This protocol implements IPX/SPX over Ethernet_II frame type 0x8137.
 Please note: the SPX implementation may require further work and testing
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 5ae0d4bf32cec..c7cea16ef0f9f 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx.c,v 1.33 2007/06/13 22:42:43 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index 77022b2f2c0ff..e0a54f220ec8b 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -58,7 +58,7 @@
  *
  *	@(#)ipx.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx.h,v 1.24 2007/06/13 14:01:43 rwatson Exp $
  */
 
 #ifndef _NETIPX_IPX_H_
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index 6aa87fbba1687..4049ee3516b47 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_cksum.c,v 1.15 2007/05/11 10:38:34 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index 8b5d16c855cee..3899fcb41f5d6 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -58,7 +58,7 @@
  *
  *	@(#)ipx_if.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_if.h,v 1.18 2007/06/13 14:01:43 rwatson Exp $
  */
 
 #ifndef _NETIPX_IPX_IF_H_
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index e57586cfad92d..b583be6b8796e 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.57 2007/05/11 10:38:34 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index 61d8759ee55c7..ea7b3c6cf0108 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_outputfl.c,v 1.24 2007/05/11 10:38:34 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 36c1354e09968..6fe96291bd85e 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.49 2007/05/11 10:38:34 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index 4ef60111451f4..8ad2562ac6293 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -61,7 +61,7 @@
  *
  *	@(#)ipx_pcb.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.29 2007/05/11 10:38:34 rwatson Exp $
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index a762ea705b2c3..97c4a44028278 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_proto.c,v 1.22 2007/01/08 22:14:00 rwatson Exp $");
 
 #include "opt_ipx.h"
 
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index f7d56f3ce959c..4d2578fba057c 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.62 2007/06/13 14:01:43 rwatson Exp $");
 
 #include "opt_ipx.h"
 
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index 1c76613f45010..6b7508a5f3f21 100644
--- a/sys/netipx/ipx_var.h
+++ b/sys/netipx/ipx_var.h
@@ -58,7 +58,7 @@
  *
  *	@(#)ipx_var.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/ipx_var.h,v 1.24 2007/05/11 10:38:34 rwatson Exp $
  */
 
 #ifndef _NETIPX_IPX_VAR_H_
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 044b6d4e8df55..0220e4ea04037 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -58,7 +58,7 @@
  *
  *	@(#)spx.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx.h,v 1.20 2007/01/08 22:14:00 rwatson Exp $
  */
 
 #ifndef _NETIPX_SPX_H_
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index 7f482617ef710..0908e4add6a7e 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/spx_debug.c,v 1.19 2007/07/30 11:06:42 des Exp $");
 
 #include "opt_inet.h"
 #include "opt_tcpdebug.h"
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index 24405bc791ca7..72b347f6bb6f3 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -58,7 +58,7 @@
  *
  *	@(#)spx_debug.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_debug.h,v 1.18 2007/07/30 11:06:42 des Exp $
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index eda949d707d6f..d876dcf301724 100644
--- a/sys/netipx/spx_timer.h
+++ b/sys/netipx/spx_timer.h
@@ -58,7 +58,7 @@
  *
  *	@(#)spx_timer.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_timer.h,v 1.12 2007/01/08 22:14:00 rwatson Exp $
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index d34b2b12905b8..b4c34d211f9bd 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.86 2007/01/08 22:14:00 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/netipx/spx_var.h b/sys/netipx/spx_var.h
index 47be027041e74..1ff135626be8c 100644
--- a/sys/netipx/spx_var.h
+++ b/sys/netipx/spx_var.h
@@ -58,7 +58,7 @@
  *
  *	@(#)spx_var.h
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netipx/spx_var.h,v 1.11 2007/01/08 22:14:00 rwatson Exp $
  */
 
 #ifndef _NETIPX_SPX_VAR_H_
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index fd9fc01374e99..64c5c90de1421 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.49 2007/01/08 22:30:39 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 5603b9e77d57b..06e612ad67797 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: natm.h,v 1.1 1996/07/04 03:20:12 chuck Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/netnatm/natm.h,v 1.14 2007/04/16 12:31:35 pjd Exp $
  */
 
 /*
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 9cbc46081254c..d9618e899112e 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -39,7 +39,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm_pcb.c,v 1.18 2007/01/08 22:30:39 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index 976f4b40acc33..315013b8fe7dc 100644
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm_proto.c,v 1.20 2007/01/08 22:30:39 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp.h b/sys/netncp/ncp.h
index 5b10d9a07b5be..26f9918d13e1f 100644
--- a/sys/netncp/ncp.h
+++ b/sys/netncp/ncp.h
@@ -5,7 +5,7 @@
  *  Copyright (C) 1995 by Volker Lendecke
  *  New version derived from original ncp.h, 1998 Boris Popov
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp.h,v 1.7 2005/01/07 01:45:48 imp Exp $
  */
 
 #ifndef _NETNCP_NCP_H_
diff --git a/sys/netncp/ncp_cfg.h b/sys/netncp/ncp_cfg.h
index 82a30d748d5d2..748af5abd6642 100644
--- a/sys/netncp/ncp_cfg.h
+++ b/sys/netncp/ncp_cfg.h
@@ -1,7 +1,7 @@
 /* 
  * static configuration for libncp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_cfg.h,v 1.1 1999/10/12 11:56:38 bp Exp $
  */
 
 #define NCP_NLS_KOI2CP866
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 6987b61b0330d..cc8f1fa3731f4 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_conn.c,v 1.30 2007/05/27 17:14:33 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 6a2d603148ef1..535de9e9a6f5d 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_conn.h,v 1.12 2005/01/07 01:45:48 imp Exp $
  */
 #ifndef _NETNCP_NCP_CONN_H_
 #define _NETNCP_NCP_CONN_H_
diff --git a/sys/netncp/ncp_crypt.c b/sys/netncp/ncp_crypt.c
index 9899ef6984bb9..fcda29fac8d36 100644
--- a/sys/netncp/ncp_crypt.c
+++ b/sys/netncp/ncp_crypt.c
@@ -17,7 +17,7 @@
    $********************************************************* */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_crypt.c,v 1.5 2003/06/11 05:30:35 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_file.h b/sys/netncp/ncp_file.h
index cebf4b9db10ae..f902ba3ae74f4 100644
--- a/sys/netncp/ncp_file.h
+++ b/sys/netncp/ncp_file.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_file.h,v 1.4 2005/01/07 01:45:48 imp Exp $
  */
 
 #ifndef _NETNCP_NCP_FILE_H_
diff --git a/sys/netncp/ncp_lib.h b/sys/netncp/ncp_lib.h
index f3ce680ab4382..ffe1262fe9ef1 100644
--- a/sys/netncp/ncp_lib.h
+++ b/sys/netncp/ncp_lib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_lib.h,v 1.7 2005/01/07 01:45:48 imp Exp $
  */
 
 #ifndef _NETNCP_NCP_LIB_H_
diff --git a/sys/netncp/ncp_login.c b/sys/netncp/ncp_login.c
index a61eb76dd496f..4bdf4d4646088 100644
--- a/sys/netncp/ncp_login.c
+++ b/sys/netncp/ncp_login.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_login.c,v 1.6 2005/01/07 01:45:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_mod.c b/sys/netncp/ncp_mod.c
index 955fa31e7303c..2d2c8604454b4 100644
--- a/sys/netncp/ncp_mod.c
+++ b/sys/netncp/ncp_mod.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_mod.c,v 1.16 2006/11/06 13:42:06 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_ncp.c b/sys/netncp/ncp_ncp.c
index 92b7e59e95e7d..e1f495105d6ff 100644
--- a/sys/netncp/ncp_ncp.c
+++ b/sys/netncp/ncp_ncp.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.20 2005/01/07 01:45:48 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_ncp.h b/sys/netncp/ncp_ncp.h
index ab1c74229e8c9..98837e07b2255 100644
--- a/sys/netncp/ncp_ncp.h
+++ b/sys/netncp/ncp_ncp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_ncp.h,v 1.8 2005/01/07 01:45:48 imp Exp $
  */
 #ifndef _NETNCP_NCP_NCP_H_
 #define _NETNCP_NCP_NCP_H_
diff --git a/sys/netncp/ncp_nls.c b/sys/netncp/ncp_nls.c
index bb746fc1474f7..645f0aeee1aa7 100644
--- a/sys/netncp/ncp_nls.c
+++ b/sys/netncp/ncp_nls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_nls.c,v 1.8 2005/02/23 22:44:38 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_nls.h b/sys/netncp/ncp_nls.h
index 0a391528536b5..511070253785c 100644
--- a/sys/netncp/ncp_nls.h
+++ b/sys/netncp/ncp_nls.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_nls.h,v 1.7 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_NLS_H_
 #define _NETNCP_NCP_NLS_H_
diff --git a/sys/netncp/ncp_rcfile.h b/sys/netncp/ncp_rcfile.h
index 034402d33e075..daa09fd85d354 100644
--- a/sys/netncp/ncp_rcfile.h
+++ b/sys/netncp/ncp_rcfile.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_rcfile.h,v 1.5 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_RCFILE_H_
 #define _NETNCP_NCP_RCFILE_H_
diff --git a/sys/netncp/ncp_rq.c b/sys/netncp/ncp_rq.c
index b637c9a183270..c1f1c84e0e633 100644
--- a/sys/netncp/ncp_rq.c
+++ b/sys/netncp/ncp_rq.c
@@ -33,7 +33,7 @@
  */ 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_rq.c,v 1.15 2005/07/29 13:22:37 imura Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_rq.h b/sys/netncp/ncp_rq.h
index d0ad9ad57ab7e..509bf50b09d10 100644
--- a/sys/netncp/ncp_rq.h
+++ b/sys/netncp/ncp_rq.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_rq.h,v 1.9 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_RQ_H_
 #define _NETNCP_NCP_RQ_H_
diff --git a/sys/netncp/ncp_sock.c b/sys/netncp/ncp_sock.c
index 0fe320fc6c346..a2ce4801643bc 100644
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_sock.c,v 1.19 2007/06/05 00:00:55 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netncp/ncp_sock.h b/sys/netncp/ncp_sock.h
index 7833760285f4f..aeeb97498437e 100644
--- a/sys/netncp/ncp_sock.h
+++ b/sys/netncp/ncp_sock.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_sock.h,v 1.6 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_SOCK_H_
 #define _NETNCP_NCP_SOCK_H_
diff --git a/sys/netncp/ncp_subr.c b/sys/netncp/ncp_subr.c
index fd7969a9f69fc..1bd8c8ffe178a 100644
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netncp/ncp_subr.c,v 1.14 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netncp/ncp_subr.h b/sys/netncp/ncp_subr.h
index 5c5775565d281..9e20d44c46fa7 100644
--- a/sys/netncp/ncp_subr.h
+++ b/sys/netncp/ncp_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_subr.h,v 1.10 2006/11/06 13:42:06 rwatson Exp $
  */
 #ifndef _NETNCP_NCP_SUBR_H_
 #define _NETNCP_NCP_SUBR_H_
diff --git a/sys/netncp/ncp_user.h b/sys/netncp/ncp_user.h
index dc6d3cddedd9d..59485ab61d622 100644
--- a/sys/netncp/ncp_user.h
+++ b/sys/netncp/ncp_user.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncp_user.h,v 1.3 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETNCP_NCP_USER_H_
 #define _NETNCP_NCP_USER_H_
diff --git a/sys/netncp/ncpio.h b/sys/netncp/ncpio.h
index 53c90eac96c63..b9a4240ccdaf0 100644
--- a/sys/netncp/ncpio.h
+++ b/sys/netncp/ncpio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/ncpio.h,v 1.1 2003/02/28 04:31:29 tjr Exp $
  */
 
 #ifndef _NETNCP_NCPIO_H_
diff --git a/sys/netncp/nwerror.h b/sys/netncp/nwerror.h
index 8dc7a93022b0b..93fb510167c73 100644
--- a/sys/netncp/nwerror.h
+++ b/sys/netncp/nwerror.h
@@ -1,7 +1,7 @@
 /*
  * NetWare requestor error codes, they taken from NDK
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netncp/nwerror.h,v 1.2 1999/12/12 05:50:07 bp Exp $
  */
 #ifndef _NETNCP_NWERROR_H_
 #define _NETNCP_NWERROR_H_
diff --git a/sys/netsmb/netbios.h b/sys/netsmb/netbios.h
index 9ee78d8191c18..84f2b43698377 100644
--- a/sys/netsmb/netbios.h
+++ b/sys/netsmb/netbios.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/netbios.h,v 1.6 2005/10/02 08:32:49 bp Exp $
  */
 #ifndef _NETSMB_NETBIOS_H_
 #define	_NETSMB_NETBIOS_H_
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index a12746538b6c3..4cb813a2c8df6 100644
--- a/sys/netsmb/smb.h
+++ b/sys/netsmb/smb.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb.h,v 1.10 2005/01/07 01:45:49 imp Exp $
  */
 
 /*
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index eee6b09e1db9d..b71782f4c4cda 100644
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.18 2006/11/06 13:42:06 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_conn.h b/sys/netsmb/smb_conn.h
index a83af8b15038d..9359d3567985f 100644
--- a/sys/netsmb/smb_conn.h
+++ b/sys/netsmb/smb_conn.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_conn.h,v 1.11 2005/01/07 01:45:49 imp Exp $
  */
 
 /*
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index b647afd09ae85..1544212debb25 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_crypt.c,v 1.10 2006/08/22 03:05:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index 3181438b4657b..8a2ff17e9337a 100644
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_dev.c,v 1.33 2007/07/10 09:23:10 avatar Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netsmb/smb_dev.h b/sys/netsmb/smb_dev.h
index 1454ab3e3ff48..0071da8109116 100644
--- a/sys/netsmb/smb_dev.h
+++ b/sys/netsmb/smb_dev.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_dev.h,v 1.5 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_DEV_H_
 #define _NETSMB_DEV_H_
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index 8a687c260e793..da4472d60665d 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_iod.c,v 1.17 2006/08/22 03:05:51 marcel Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index fb7e5d55d8fd3..1b53433d2ca77 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_rq.c,v 1.17 2006/08/22 03:05:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_rq.h b/sys/netsmb/smb_rq.h
index d989e4fc07036..30b87df7adf59 100644
--- a/sys/netsmb/smb_rq.h
+++ b/sys/netsmb/smb_rq.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_rq.h,v 1.5 2006/08/22 03:05:51 marcel Exp $
  */
 #ifndef _NETSMB_SMB_RQ_H_
 #define	_NETSMB_SMB_RQ_H_
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index d6633e7d9d94f..359e7cb55e068 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_smb.c,v 1.15 2007/06/15 23:49:54 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index 23598a73939ef..f595e561fe49c 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_subr.c,v 1.21 2006/11/05 06:31:08 bp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h
index 15e4a7a114741..fedf18a6c6e00 100644
--- a/sys/netsmb/smb_subr.h
+++ b/sys/netsmb/smb_subr.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_subr.h,v 1.13 2006/11/06 13:42:06 rwatson Exp $
  */
 #ifndef _NETSMB_SMB_SUBR_H_
 #define _NETSMB_SMB_SUBR_H_
diff --git a/sys/netsmb/smb_tran.h b/sys/netsmb/smb_tran.h
index 4d8955da036d6..8e9031ccbbf79 100644
--- a/sys/netsmb/smb_tran.h
+++ b/sys/netsmb/smb_tran.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_tran.h,v 1.4 2005/01/07 01:45:49 imp Exp $
  */
 
 #ifndef _NETSMB_SMB_TRAN_H_
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 7bdf2116b60b1..0a6e53dcdee35 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.26 2007/06/15 23:49:54 mjacob Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
diff --git a/sys/netsmb/smb_trantcp.h b/sys/netsmb/smb_trantcp.h
index 6251b0ef0d700..d1b905ac7b292 100644
--- a/sys/netsmb/smb_trantcp.h
+++ b/sys/netsmb/smb_trantcp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/netsmb/smb_trantcp.h,v 1.4 2005/01/07 01:45:49 imp Exp $
  */
 #ifndef _NETSMB_SMB_TRANTCP_H_
 #define	_NETSMB_SMB_TRANTCP_H_
diff --git a/sys/netsmb/smb_usr.c b/sys/netsmb/smb_usr.c
index 2916ee840eeeb..01a7dbd99bd6c 100644
--- a/sys/netsmb/smb_usr.c
+++ b/sys/netsmb/smb_usr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_usr.c,v 1.6 2005/01/07 01:45:49 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 54c3f418f9ff4..f0a08e0c354c9 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs/nfs_common.c,v 1.118 2005/07/14 20:08:26 ps Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 7c06130959394..a4b1a44ec8d99 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfs_common.h,v 1.38 2005/07/14 20:08:26 ps Exp $
  */
 
 
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index aa2057c244d45..7c0849f953587 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/nfsproto.h,v 1.12 2006/11/28 19:33:28 rees Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 0d7935f9a467e..15d639c17245d 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/rpcv2.h,v 1.14 2005/01/07 01:45:50 imp Exp $
  */
 
 
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index 67546718282a2..393abb2606da5 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfs/xdr_subs.h,v 1.15 2005/01/07 01:45:50 imp Exp $
  */
 
 
diff --git a/sys/nfs4client/nfs4.h b/sys/nfs4client/nfs4.h
index 4bcc6a7f31214..5b6f41b9b4e5f 100644
--- a/sys/nfs4client/nfs4.h
+++ b/sys/nfs4client/nfs4.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4.h,v 1.25 2003/11/05 14:58:58 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_dev.c b/sys/nfs4client/nfs4_dev.c
index 35276d350f127..42935c8cca30b 100644
--- a/sys/nfs4client/nfs4_dev.c
+++ b/sys/nfs4client/nfs4_dev.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_dev.c,v 1.9 2006/05/13 00:16:35 cel Exp $ */
 /* $Id: nfs4_dev.c,v 1.10 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_dev.h b/sys/nfs4client/nfs4_dev.h
index be14ce2cdb33f..c5c38e7f31c0e 100644
--- a/sys/nfs4client/nfs4_dev.h
+++ b/sys/nfs4client/nfs4_dev.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_dev.h,v 1.3 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_dev.h,v 1.3 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_idmap.c b/sys/nfs4client/nfs4_idmap.c
index 7eae5ec090790..32d8e4c20b40b 100644
--- a/sys/nfs4client/nfs4_idmap.c
+++ b/sys/nfs4client/nfs4_idmap.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_idmap.c,v 1.5 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_idmap.c,v 1.4 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_idmap.h b/sys/nfs4client/nfs4_idmap.h
index 0b09cf43444d6..7ced68c93651d 100644
--- a/sys/nfs4client/nfs4_idmap.h
+++ b/sys/nfs4client/nfs4_idmap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_idmap.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_idmap.h,v 1.2 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_socket.c b/sys/nfs4client/nfs4_socket.c
index c33bcbb8c885c..05142ffec36b2 100644
--- a/sys/nfs4client/nfs4_socket.c
+++ b/sys/nfs4client/nfs4_socket.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_socket.c,v 1.4 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs_socket.c,v 1.12 2003/11/05 14:59:01 rees Exp $ */
 
 /*-
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_socket.c,v 1.4 2005/01/07 01:45:50 imp Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfs4client/nfs4_subs.c b/sys/nfs4client/nfs4_subs.c
index a08240ae21d23..8f381fd79c397 100644
--- a/sys/nfs4client/nfs4_subs.c
+++ b/sys/nfs4client/nfs4_subs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_subs.c,v 1.6 2006/11/28 19:33:28 rees Exp $ */
 /* $Id: nfs4_subs.c,v 1.52 2003/11/05 14:58:59 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vfs.h b/sys/nfs4client/nfs4_vfs.h
index 61999ac925b60..eb33195cca985 100644
--- a/sys/nfs4client/nfs4_vfs.h
+++ b/sys/nfs4client/nfs4_vfs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vfs.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_vfs.h,v 1.4 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vfs_subs.c b/sys/nfs4client/nfs4_vfs_subs.c
index 6d667afa9fa00..d699246dcb8a8 100644
--- a/sys/nfs4client/nfs4_vfs_subs.c
+++ b/sys/nfs4client/nfs4_vfs_subs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vfs_subs.c,v 1.5 2007/01/25 13:07:25 bde Exp $ */
 /* $Id: nfs4_vfs_subs.c,v 1.5 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vfsops.c b/sys/nfs4client/nfs4_vfsops.c
index da9ad96d61a76..4785710157796 100644
--- a/sys/nfs4client/nfs4_vfsops.c
+++ b/sys/nfs4client/nfs4_vfsops.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_vfsops.c,v 1.27 2007/01/25 14:18:40 bde Exp $");
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
diff --git a/sys/nfs4client/nfs4_vn.h b/sys/nfs4client/nfs4_vn.h
index 2f5f7306187f9..ee79b79b1781b 100644
--- a/sys/nfs4client/nfs4_vn.h
+++ b/sys/nfs4client/nfs4_vn.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vn.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4_vn.h,v 1.5 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vn_subs.c b/sys/nfs4client/nfs4_vn_subs.c
index 317c7ffe28dab..38c0570810b18 100644
--- a/sys/nfs4client/nfs4_vn_subs.c
+++ b/sys/nfs4client/nfs4_vn_subs.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4_vn_subs.c,v 1.5 2006/11/28 19:33:28 rees Exp $ */
 /* $Id: nfs4_vn_subs.c,v 1.9 2003/11/05 14:59:00 rees Exp $ */
 
 /*-
diff --git a/sys/nfs4client/nfs4_vnops.c b/sys/nfs4client/nfs4_vnops.c
index 8094a3e333597..9ee9c919fe61f 100644
--- a/sys/nfs4client/nfs4_vnops.c
+++ b/sys/nfs4client/nfs4_vnops.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfs4client/nfs4_vnops.c,v 1.37 2007/06/01 01:12:44 jeff Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3
diff --git a/sys/nfs4client/nfs4m_subs.h b/sys/nfs4client/nfs4m_subs.h
index 60d0758637de1..c4a716878b2e7 100644
--- a/sys/nfs4client/nfs4m_subs.h
+++ b/sys/nfs4client/nfs4m_subs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/nfs4client/nfs4m_subs.h,v 1.2 2005/01/07 01:45:50 imp Exp $ */
 /* $Id: nfs4m_subs.h,v 1.36 2003/11/05 14:59:01 rees Exp $ */
 
 /*-
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index 44d4d970181cf..550f4db8fb124 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.70 2007/08/06 14:26:02 rwatson Exp $");
 
 #include "opt_bootp.h"
 
diff --git a/sys/nfsclient/krpc.h b/sys/nfsclient/krpc.h
index 44b84e019fb16..7778f2392c538 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 $	*/
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/nfsclient/krpc.h,v 1.8 2001/09/18 23:31:50 peter Exp $	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index b5a1d1579f972..483caf6fd2b1b 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/krpc_subr.c,v 1.30 2007/08/06 14:26:02 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 29fb33284470b..eee8a23c7ce7f 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfs.h,v 1.98.2.1 2007/10/12 19:18:46 mohans Exp $
  */
 
 #ifndef _NFSCLIENT_NFS_H_
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 8066ac20c7829..30579784c71e8 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.165 2007/09/25 21:08:48 mohans Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c
index 4825d31ac0cb4..0b952bc9da38b 100644
--- a/sys/nfsclient/nfs_diskless.c
+++ b/sys/nfsclient/nfs_diskless.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.17 2006/12/06 02:15:25 sam Exp $");
 
 #include "opt_bootp.h"
 
diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c
index be334c7a51864..5144cdf1c7963 100644
--- a/sys/nfsclient/nfs_lock.c
+++ b/sys/nfsclient/nfs_lock.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.45 2007/04/21 18:11:18 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_lock.h b/sys/nfsclient/nfs_lock.h
index b49d12cfee929..e47f73bfcfd5e 100644
--- a/sys/nfsclient/nfs_lock.h
+++ b/sys/nfsclient/nfs_lock.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *      from nfs_lock.h,v 2.2 1998/04/28 19:38:41 don Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfs_lock.h,v 1.6 2004/12/06 08:31:32 phk Exp $
  */
 
 /*
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index ac98732c76b5c..3c2258f2aa94a 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_nfsiod.c,v 1.91 2007/09/25 21:08:49 mohans Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index e97e3589f1f4f..e4b6611f4c110 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.86 2007/03/13 01:50:26 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 644eb8bb66779..7aa31d8eb3a62 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.154.2.1 2007/10/12 19:18:46 mohans Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 1c78599ba451f..6191b28648c62 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.146.2.1 2007/10/12 19:18:46 mohans Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index b00c0ac7f46e8..70d8d78b25914 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.193.2.1 2007/10/26 21:46:31 jhb Exp $");
 
 
 #include "opt_bootp.h"
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 090029075d580..7eb500cde3aed 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.276.2.1 2007/11/27 12:20:58 rwatson Exp $");
 
 /*
  * vnode op calls for Sun NFS version 2 and 3
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 7ebf1a058fb7e..71cea24ca9ad3 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsargs.h,v 1.68 2005/06/10 23:50:40 green Exp $
  */
 
 #ifndef _NFSCLIENT_NFSARGS_H_
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index aa2bc043c924a..7a34c9b73a089 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsdiskless.h,v 1.18 2006/12/06 02:15:25 sam Exp $
  */
 
 #ifndef _NFSCLIENT_NFSDISKLESS_H_
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index 62666a5e523b6..0a1cf47e5cd59 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsm_subs.h,v 1.37 2005/11/21 18:39:18 rees Exp $
  */
 
 #ifndef _NFSCLIENT_NFSM_SUBS_H_
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 861584628a388..effdd56df9092 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsmount.h,v 1.32.2.1 2007/10/12 19:18:46 mohans Exp $
  */
 
 #ifndef _NFSCLIENT_NFSMOUNT_H_
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index f6d898a6b0a5d..3235ed3e3e49a 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsnode.h,v 1.60 2007/03/09 04:02:37 mohans Exp $
  */
 
 #ifndef _NFSCLIENT_NFSNODE_H_
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 8028429fc9274..e2362232ca13f 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nfsstats.h,v 1.65 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSCLIENT_NFSSTATS_H_
diff --git a/sys/nfsclient/nlminfo.h b/sys/nfsclient/nlminfo.h
index 7d3e0ff0be9e6..bab6dab1bc2e9 100644
--- a/sys/nfsclient/nlminfo.h
+++ b/sys/nfsclient/nlminfo.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *      from BSDI nlminfo.h,v 2.1 1998/03/18 01:30:38 don Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsclient/nlminfo.h,v 1.3 2005/10/26 07:18:36 glebius Exp $
  */
 
 /*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 2604e90c92abd..7bd832cfff607 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.82.2.1 2007/11/25 19:15:53 rwatson Exp $
  */
 
 #ifndef _NFSSERVER_NFS_H_
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 0a087abe4ea1c..795f9721d834c 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.174.2.1 2007/10/26 21:46:31 jhb Exp $");
 
 /*
  * nfs version 2 and 3 server calls to vnode ops
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index ca6b8c212206c..a60d0566e6d28 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.44 2007/03/17 18:18:08 jeff Exp $");
 
 /*
  * Reference: Chet Juszczak, "Improving the Performance and Correctness
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 053cffca71862..fb045c7b2422a 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.104 2007/08/06 14:26:02 rwatson Exp $");
 
 /*
  * Socket operations for use by nfs
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 84c15544c0816..b32b0e4f6364e 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.149.2.1.2.1 2008/02/14 14:12:13 remko Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 3043fcd4766ad..c3598d5736408 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.116.2.1 2007/10/12 03:59:18 mohans Exp $");
 
 #include "opt_inet6.h"
 
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index f2dafc4ac967f..92518ab50f697 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfsm_subs.h,v 1.39 2007/03/17 18:18:08 jeff Exp $
  */
 
 #ifndef _NFSSERVER_NFSM_SUBS_H_
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index 66176f4a26c2c..f10e53bb4e9e1 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfsrvcache.h,v 1.19 2006/06/23 00:42:26 mohans Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVCACHE_H_
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index d149e52c2df98..21309b5265275 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/nfsserver/nfsrvstats.h,v 1.65 2005/01/07 01:45:51 imp Exp $
  */
 
 #ifndef _NFSSERVER_NFSRVSTATS_H_
diff --git a/sys/opencrypto/cast.c b/sys/opencrypto/cast.c
index 7474b3681f879..e952a605a3554 100644
--- a/sys/opencrypto/cast.c
+++ b/sys/opencrypto/cast.c
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cast.c,v 1.4 2007/07/05 06:59:14 peter Exp $");
 
 #include <sys/types.h>
 #include <opencrypto/cast.h>
diff --git a/sys/opencrypto/cast.h b/sys/opencrypto/cast.h
index 8e2d0d19349bb..048d5eef6a8ec 100644
--- a/sys/opencrypto/cast.h
+++ b/sys/opencrypto/cast.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cast.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*      $OpenBSD: cast.h,v 1.2 2002/03/14 01:26:51 millert Exp $       */
 
 /*-
diff --git a/sys/opencrypto/castsb.h b/sys/opencrypto/castsb.h
index ed13058c804f9..2845ac8fb5436 100644
--- a/sys/opencrypto/castsb.h
+++ b/sys/opencrypto/castsb.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/castsb.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*      $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $       */
 /*-
  *	CAST-128 in C
diff --git a/sys/opencrypto/criov.c b/sys/opencrypto/criov.c
index 96f0dfc59b664..e3084c4be3ef3 100644
--- a/sys/opencrypto/criov.c
+++ b/sys/opencrypto/criov.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index 738328cabca7c..05163aeec097e 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.27 2007/03/21 03:42:51 sam Exp $");
 
 /*
  * Cryptographic Subsystem.
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index a940a3cd19138..08712157a3fe8 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.35 2007/10/08 20:08:34 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index afd79c84e737e..ca269e7808b29 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $	*/
 /*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/cryptodev_if.m b/sys/opencrypto/cryptodev_if.m
index c7d48cc602b2c..31aa83d9a148f 100644
--- a/sys/opencrypto/cryptodev_if.m
+++ b/sys/opencrypto/cryptodev_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/opencrypto/cryptodev_if.m,v 1.1 2007/03/21 03:43:33 sam Exp $
 #
 
 #include <sys/malloc.h>
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c
index ba837185e7582..2b7b579de0146 100644
--- a/sys/opencrypto/cryptosoft.c
+++ b/sys/opencrypto/cryptosoft.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.19 2007/05/09 19:37:02 gnn Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/cryptosoft.h b/sys/opencrypto/cryptosoft.h
index af78dc18529e1..7820a44d872be 100644
--- a/sys/opencrypto/cryptosoft.h
+++ b/sys/opencrypto/cryptosoft.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/cryptosoft.h,v 1.4 2007/03/21 03:42:51 sam Exp $	*/
 /*	$OpenBSD: cryptosoft.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/deflate.c
index 49021d772c9dc..7d5a9fd4a5f9b 100644
--- a/sys/opencrypto/deflate.c
+++ b/sys/opencrypto/deflate.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/deflate.c,v 1.4 2005/05/30 05:01:44 scottl Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/opencrypto/deflate.h b/sys/opencrypto/deflate.h
index 5c8ebd41e8de4..7976b1afb8bb0 100644
--- a/sys/opencrypto/deflate.h
+++ b/sys/opencrypto/deflate.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/deflate.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /* $OpenBSD: deflate.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
 
 /*-
diff --git a/sys/opencrypto/rmd160.c b/sys/opencrypto/rmd160.c
index f97a6f4dc8577..b223eefc4ea57 100644
--- a/sys/opencrypto/rmd160.c
+++ b/sys/opencrypto/rmd160.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/rmd160.c,v 1.3 2005/01/07 02:29:16 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/rmd160.h b/sys/opencrypto/rmd160.h
index 60dce64251ca1..c5da99cde696e 100644
--- a/sys/opencrypto/rmd160.h
+++ b/sys/opencrypto/rmd160.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/rmd160.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: rmd160.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
 /*-
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
diff --git a/sys/opencrypto/skipjack.c b/sys/opencrypto/skipjack.c
index 0899e382ead03..c1cb9c6d65f08 100644
--- a/sys/opencrypto/skipjack.c
+++ b/sys/opencrypto/skipjack.c
@@ -13,7 +13,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/skipjack.c,v 1.3 2005/01/07 02:29:16 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/opencrypto/skipjack.h b/sys/opencrypto/skipjack.h
index 3e88418ce217a..9cc66ee28604b 100644
--- a/sys/opencrypto/skipjack.h
+++ b/sys/opencrypto/skipjack.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/skipjack.h,v 1.2 2005/01/07 02:29:16 imp Exp $	*/
 /*	$OpenBSD: skipjack.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c
index 464429f122b79..9e5e22abd2a45 100644
--- a/sys/opencrypto/xform.c
+++ b/sys/opencrypto/xform.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/opencrypto/xform.c,v 1.9 2007/05/09 19:37:02 gnn Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/xform.h b/sys/opencrypto/xform.h
index de7528b8cd945..149be162724d4 100644
--- a/sys/opencrypto/xform.h
+++ b/sys/opencrypto/xform.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/opencrypto/xform.h,v 1.4 2007/05/09 19:37:02 gnn Exp $	*/
 /*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
 
 /*-
diff --git a/sys/pc98/apm/apm_bioscall.S b/sys/pc98/apm/apm_bioscall.S
index fa42734a7cbf9..2d84ecf7a4811 100644
--- a/sys/pc98/apm/apm_bioscall.S
+++ b/sys/pc98/apm/apm_bioscall.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/apm/apm_bioscall.S,v 1.1 2005/04/20 12:28:19 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/30line.h b/sys/pc98/cbus/30line.h
index c2e0f107a260b..e9430507eb62d 100644
--- a/sys/pc98/cbus/30line.h
+++ b/sys/pc98/cbus/30line.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/30line.h,v 1.7 2005/01/09 22:17:39 imp Exp $
  */
 
 #ifndef __PC98_PC98_30LINE_H__
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 4c48305c01d56..52cb51fa0e0e0 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/cbus.h,v 1.22 2006/05/08 12:03:57 nyan Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/cbus/cbus_dma.c b/sys/pc98/cbus/cbus_dma.c
index 255f7e0ebd134..6e95d2bbc87d8 100644
--- a/sys/pc98/cbus/cbus_dma.c
+++ b/sys/pc98/cbus/cbus_dma.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/cbus_dma.c,v 1.23 2005/05/14 10:14:56 nyan Exp $");
 
 /*
  * code to manage AT bus
diff --git a/sys/pc98/cbus/cbus_dmareg.h b/sys/pc98/cbus/cbus_dmareg.h
index 9401b916560eb..fc4f36eb76ec3 100644
--- a/sys/pc98/cbus/cbus_dmareg.h
+++ b/sys/pc98/cbus/cbus_dmareg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/cbus_dmareg.h,v 1.1 2005/05/14 10:14:56 nyan Exp $
  */
 
 #ifndef _PC98_CBUS_CBUS_DMAREG_H_
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 037ef402ca795..fd12f4c2a5196 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.162 2007/07/29 20:16:48 dwmalone Exp $");
 
 /*
  * Routines to handle clock hardware.
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 8373f45163c50..c1b505234f8e6 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -50,7 +50,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/fdc.c,v 1.170 2007/03/21 03:38:37 nyan Exp $
  */
 
 #include "opt_fdc.h"
diff --git a/sys/pc98/cbus/fdc_cbus.c b/sys/pc98/cbus/fdc_cbus.c
index 098ee5daefe2e..f25adcc693b0e 100644
--- a/sys/pc98/cbus/fdc_cbus.c
+++ b/sys/pc98/cbus/fdc_cbus.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/fdc_cbus.c,v 1.6 2005/05/14 10:51:16 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
index 6d8e7e115d0d3..3c09142c743c3 100644
--- a/sys/pc98/cbus/fdcreg.h
+++ b/sys/pc98/cbus/fdcreg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/fdcreg.h,v 1.11 2004/04/07 04:59:58 imp Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/fdcvar.h b/sys/pc98/cbus/fdcvar.h
index 4ae53d95ac597..0fa8ffa2b7f46 100644
--- a/sys/pc98/cbus/fdcvar.h
+++ b/sys/pc98/cbus/fdcvar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/fdcvar.h,v 1.3 2004/07/17 10:07:19 nyan Exp $
  */
 
 /* XXX should audit this file to see if additional copyrights needed */
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index f5719f0558362..581a0cddae068 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/gdc.c,v 1.50 2005/12/06 11:19:37 ru Exp $
  */
 
 #include "opt_gdc.h"
diff --git a/sys/pc98/cbus/nmi.c b/sys/pc98/cbus/nmi.c
index 16612aa25b446..d4369d7b888e7 100644
--- a/sys/pc98/cbus/nmi.c
+++ b/sys/pc98/cbus/nmi.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/nmi.c,v 1.3 2005/09/14 12:39:06 nyan Exp $");
 
 #include <sys/types.h>
 #include <sys/syslog.h>
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index f0d0da7e3e986..924e5c103e337 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/olpt.c,v 1.31 2007/02/23 20:11:27 piso Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/olptreg.h b/sys/pc98/cbus/olptreg.h
index 80bc704f006c5..0751585df35e9 100644
--- a/sys/pc98/cbus/olptreg.h
+++ b/sys/pc98/cbus/olptreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/olptreg.h,v 1.2 2005/05/14 10:51:16 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index 0b3d1d7bd04f9..8f12f3439797d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/pckbd.c,v 1.33 2007/02/23 12:19:02 piso Exp $
  */
 
 #include "opt_compat.h"
diff --git a/sys/pc98/cbus/pckbdtables.h b/sys/pc98/cbus/pckbdtables.h
index 5386f52174eb0..fa307acf140ad 100644
--- a/sys/pc98/cbus/pckbdtables.h
+++ b/sys/pc98/cbus/pckbdtables.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/pckbdtables.h,v 1.1 2005/05/12 13:39:31 nyan Exp $
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/pc98/cbus/pmc.c b/sys/pc98/cbus/pmc.c
index 13eade08322b3..c760fba1a71ad 100644
--- a/sys/pc98/cbus/pmc.c
+++ b/sys/pc98/cbus/pmc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/pmc.c,v 1.5 2004/06/03 06:10:02 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/cbus/sc_machdep.h b/sys/pc98/cbus/sc_machdep.h
index ea7b3ba7069a3..d09fd1a00f117 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/sc_machdep.h,v 1.5 2001/07/14 08:07:26 nyan Exp $
  */
 
 #ifndef _PC98_PC98_SC_MACHDEP_H_
diff --git a/sys/pc98/cbus/scgdcrndr.c b/sys/pc98/cbus/scgdcrndr.c
index f8ea8d137c054..e574564ce47fe 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/scgdcrndr.c,v 1.13 2005/05/29 11:53:14 nyan Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/cbus/scterm-sck.c b/sys/pc98/cbus/scterm-sck.c
index 9b45490ad1714..99807a3193d6d 100644
--- a/sys/pc98/cbus/scterm-sck.c
+++ b/sys/pc98/cbus/scterm-sck.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/scterm-sck.c,v 1.17 2005/12/05 11:58:34 ru Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 2d0ea3f032841..f3aab100cb5fc 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/scvtb.c,v 1.13 2003/02/19 05:47:40 imp Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 718214d4651f1..97aaf77707ac7 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/sio.c,v 1.245 2007/07/11 22:30:13 mjacob Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/cbus/sio_cbus.c b/sys/pc98/cbus/sio_cbus.c
index 2df560cd90cdd..0c5715716e7c8 100644
--- a/sys/pc98/cbus/sio_cbus.c
+++ b/sys/pc98/cbus/sio_cbus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/sio_cbus.c,v 1.9 2005/05/14 10:51:16 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 4d75f228e816f..3c75d60c235b4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/cbus/syscons_cbus.c,v 1.24 2007/02/27 17:22:30 jhb Exp $
  */
 
 #include "opt_syscons.h"
diff --git a/sys/pc98/compile/.cvsignore b/sys/pc98/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/pc98/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/pc98/conf/.cvsignore b/sys/pc98/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/pc98/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index d42d4d339c94c..5e631047dc6e0 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/pc98
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/DEFAULTS,v 1.10 2007/06/11 00:38:06 marcel Exp $
 
 machine		pc98 i386
 options 	PC98
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index d1d8f82448c49..e3b17b2cb28ba 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.297.2.1 2007/10/11 06:20:27 kensmith Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index a64a0067dab31..e1e37a5f13216 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.26 2006/05/17 21:25:23 marius Exp $
 
 hint.atacbus.0.at="isa"
 hint.atacbus.0.port="0x640"
diff --git a/sys/pc98/conf/MAC b/sys/pc98/conf/MAC
index 6aee5da075821..9a8fd9c85978a 100644
--- a/sys/pc98/conf/MAC
+++ b/sys/pc98/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/MAC,v 1.1 2005/09/18 03:15:35 csjp Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/pc98/conf/Makefile b/sys/pc98/conf/Makefile
index 2c006e9c2c80d..c87a6d7b4ec4c 100644
--- a/sys/pc98/conf/Makefile
+++ b/sys/pc98/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/Makefile,v 1.3 2003/02/26 23:36:59 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 09a20737e3dd4..c34e5e9b9d3a3 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.85 2007/07/04 00:18:39 bz Exp $
 #
 
 #
diff --git a/sys/pc98/include/_bus.h b/sys/pc98/include/_bus.h
index 8070792dffc9b..57805c65dac02 100644
--- a/sys/pc98/include/_bus.h
+++ b/sys/pc98/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/_bus.h,v 1.3 2005/04/19 21:07:00 imp Exp $
  */
 
 #ifndef PC98_INCLUDE__BUS_H
diff --git a/sys/pc98/include/_inttypes.h b/sys/pc98/include/_inttypes.h
index 327018581cd3c..3302e303393a2 100644
--- a/sys/pc98/include/_inttypes.h
+++ b/sys/pc98/include/_inttypes.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_inttypes.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_inttypes.h>
diff --git a/sys/pc98/include/_limits.h b/sys/pc98/include/_limits.h
index 21e2fb6f73d34..20aceddd47654 100644
--- a/sys/pc98/include/_limits.h
+++ b/sys/pc98/include/_limits.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_limits.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_limits.h>
diff --git a/sys/pc98/include/_stdint.h b/sys/pc98/include/_stdint.h
index bb4242a75b9ca..6b35e89e3c305 100644
--- a/sys/pc98/include/_stdint.h
+++ b/sys/pc98/include/_stdint.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_stdint.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/_stdint.h>
diff --git a/sys/pc98/include/_types.h b/sys/pc98/include/_types.h
index 63da67a982a2b..72255419a5990 100644
--- a/sys/pc98/include/_types.h
+++ b/sys/pc98/include/_types.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/_types.h,v 1.3 2006/01/09 06:05:57 imp Exp $ */
 
 #include <i386/_types.h>
diff --git a/sys/pc98/include/apicreg.h b/sys/pc98/include/apicreg.h
index a9766d5bfd6a5..3a67488c3f806 100644
--- a/sys/pc98/include/apicreg.h
+++ b/sys/pc98/include/apicreg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/apicreg.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/apicreg.h>
diff --git a/sys/pc98/include/apicvar.h b/sys/pc98/include/apicvar.h
index 4f52d82009437..9ef1cda30c5a2 100644
--- a/sys/pc98/include/apicvar.h
+++ b/sys/pc98/include/apicvar.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/apicvar.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/apicvar.h>
diff --git a/sys/pc98/include/apm_bios.h b/sys/pc98/include/apm_bios.h
index 261ae3726d913..e1cef24ebf911 100644
--- a/sys/pc98/include/apm_bios.h
+++ b/sys/pc98/include/apm_bios.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/apm_bios.h,v 1.2 2005/04/03 23:26:05 imp Exp $
  */
 
 #ifndef _PC98_INCLUDE_APM_BIOS_H_
diff --git a/sys/pc98/include/apm_segments.h b/sys/pc98/include/apm_segments.h
index fac544b04273f..11d32968d2a88 100644
--- a/sys/pc98/include/apm_segments.h
+++ b/sys/pc98/include/apm_segments.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/apm_segments.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/apm_segments.h>
diff --git a/sys/pc98/include/asm.h b/sys/pc98/include/asm.h
index aa141634f7de7..dbcf127a02cbc 100644
--- a/sys/pc98/include/asm.h
+++ b/sys/pc98/include/asm.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/asm.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/asm.h>
diff --git a/sys/pc98/include/asmacros.h b/sys/pc98/include/asmacros.h
index 98f3839356bf0..1130ebd276702 100644
--- a/sys/pc98/include/asmacros.h
+++ b/sys/pc98/include/asmacros.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/asmacros.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/asmacros.h>
diff --git a/sys/pc98/include/atomic.h b/sys/pc98/include/atomic.h
index e6550e4bc6ec1..ff28c25c7c98d 100644
--- a/sys/pc98/include/atomic.h
+++ b/sys/pc98/include/atomic.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/atomic.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/atomic.h>
diff --git a/sys/pc98/include/bootinfo.h b/sys/pc98/include/bootinfo.h
index c627e432227a1..5e1e25ff08c3e 100644
--- a/sys/pc98/include/bootinfo.h
+++ b/sys/pc98/include/bootinfo.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/bootinfo.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/bootinfo.h>
diff --git a/sys/pc98/include/bus.h b/sys/pc98/include/bus.h
index bb10690e37024..da73536bb08be 100644
--- a/sys/pc98/include/bus.h
+++ b/sys/pc98/include/bus.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/bus.h,v 1.6 2005/12/05 11:58:35 ru Exp $
  */
 
 /*	$NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $	*/
diff --git a/sys/pc98/include/bus_dma.h b/sys/pc98/include/bus_dma.h
index 4fdad3f5a7873..40e5ccc6dfc32 100644
--- a/sys/pc98/include/bus_dma.h
+++ b/sys/pc98/include/bus_dma.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/bus_dma.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/bus_dma.h>
diff --git a/sys/pc98/include/clock.h b/sys/pc98/include/clock.h
index a2a654ad52d5c..6821f5fc7d8e1 100644
--- a/sys/pc98/include/clock.h
+++ b/sys/pc98/include/clock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/clock.h,v 1.2 2005/04/13 13:12:12 nyan Exp $
  */
 
 #ifndef _PC98_INCLUDE_CLOCK_H_
diff --git a/sys/pc98/include/cpu.h b/sys/pc98/include/cpu.h
index 6da74edee9a66..33a1def66df18 100644
--- a/sys/pc98/include/cpu.h
+++ b/sys/pc98/include/cpu.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cpu.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cpu.h>
diff --git a/sys/pc98/include/cpufunc.h b/sys/pc98/include/cpufunc.h
index deb0c39b38002..a5026cae54f57 100644
--- a/sys/pc98/include/cpufunc.h
+++ b/sys/pc98/include/cpufunc.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cpufunc.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cpufunc.h>
diff --git a/sys/pc98/include/cputypes.h b/sys/pc98/include/cputypes.h
index dbea880f70649..b7cd9d946b158 100644
--- a/sys/pc98/include/cputypes.h
+++ b/sys/pc98/include/cputypes.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cputypes.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cputypes.h>
diff --git a/sys/pc98/include/cserial.h b/sys/pc98/include/cserial.h
index c7fc610942999..f3bbf652eb0db 100644
--- a/sys/pc98/include/cserial.h
+++ b/sys/pc98/include/cserial.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/cserial.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/cserial.h>
diff --git a/sys/pc98/include/db_machdep.h b/sys/pc98/include/db_machdep.h
index a1b0c147664fb..87d0910624f1e 100644
--- a/sys/pc98/include/db_machdep.h
+++ b/sys/pc98/include/db_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/db_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/db_machdep.h>
diff --git a/sys/pc98/include/elf.h b/sys/pc98/include/elf.h
index 39937596f1691..1554b697e4af1 100644
--- a/sys/pc98/include/elf.h
+++ b/sys/pc98/include/elf.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/elf.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/elf.h>
diff --git a/sys/pc98/include/endian.h b/sys/pc98/include/endian.h
index 911c53e39ccd1..2a1f09c69d0f4 100644
--- a/sys/pc98/include/endian.h
+++ b/sys/pc98/include/endian.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/endian.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/endian.h>
diff --git a/sys/pc98/include/exec.h b/sys/pc98/include/exec.h
index e86bada4aaa08..d24f8e3f6a737 100644
--- a/sys/pc98/include/exec.h
+++ b/sys/pc98/include/exec.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/exec.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/exec.h>
diff --git a/sys/pc98/include/float.h b/sys/pc98/include/float.h
index 28e3b02a5acc0..7f03394cfc566 100644
--- a/sys/pc98/include/float.h
+++ b/sys/pc98/include/float.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/float.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/float.h>
diff --git a/sys/pc98/include/floatingpoint.h b/sys/pc98/include/floatingpoint.h
index c61de43cd1ae6..043d750ce0acf 100644
--- a/sys/pc98/include/floatingpoint.h
+++ b/sys/pc98/include/floatingpoint.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/floatingpoint.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/floatingpoint.h>
diff --git a/sys/pc98/include/frame.h b/sys/pc98/include/frame.h
index 89d90c053215b..dc69729671177 100644
--- a/sys/pc98/include/frame.h
+++ b/sys/pc98/include/frame.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/frame.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/frame.h>
diff --git a/sys/pc98/include/gdb_machdep.h b/sys/pc98/include/gdb_machdep.h
index dcb25bb3faffe..e58dcadc706e3 100644
--- a/sys/pc98/include/gdb_machdep.h
+++ b/sys/pc98/include/gdb_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/gdb_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/gdb_machdep.h>
diff --git a/sys/pc98/include/ieeefp.h b/sys/pc98/include/ieeefp.h
index 67f0c099406ec..aa1f85e4bf4be 100644
--- a/sys/pc98/include/ieeefp.h
+++ b/sys/pc98/include/ieeefp.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ieeefp.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/ieeefp.h>
diff --git a/sys/pc98/include/in_cksum.h b/sys/pc98/include/in_cksum.h
index e7227d4479df2..04160e9170872 100644
--- a/sys/pc98/include/in_cksum.h
+++ b/sys/pc98/include/in_cksum.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/in_cksum.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/in_cksum.h>
diff --git a/sys/pc98/include/intr_machdep.h b/sys/pc98/include/intr_machdep.h
index 9fccf8af67426..1d0b5455e0495 100644
--- a/sys/pc98/include/intr_machdep.h
+++ b/sys/pc98/include/intr_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/intr_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/intr_machdep.h>
diff --git a/sys/pc98/include/ioctl_bt848.h b/sys/pc98/include/ioctl_bt848.h
index 668fd4a3a6c1b..69b730e8e678a 100644
--- a/sys/pc98/include/ioctl_bt848.h
+++ b/sys/pc98/include/ioctl_bt848.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ioctl_bt848.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/ioctl_bt848.h>
diff --git a/sys/pc98/include/ioctl_meteor.h b/sys/pc98/include/ioctl_meteor.h
index 1a750bdd72151..bf3e97743f7dc 100644
--- a/sys/pc98/include/ioctl_meteor.h
+++ b/sys/pc98/include/ioctl_meteor.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ioctl_meteor.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/ioctl_meteor.h>
diff --git a/sys/pc98/include/iodev.h b/sys/pc98/include/iodev.h
index 683ea7929264c..34b050f7321d7 100644
--- a/sys/pc98/include/iodev.h
+++ b/sys/pc98/include/iodev.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/iodev.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/iodev.h>
diff --git a/sys/pc98/include/kdb.h b/sys/pc98/include/kdb.h
index 9d412d45d2614..9be2601e9f407 100644
--- a/sys/pc98/include/kdb.h
+++ b/sys/pc98/include/kdb.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/kdb.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/kdb.h>
diff --git a/sys/pc98/include/legacyvar.h b/sys/pc98/include/legacyvar.h
index 0e521280241c9..ac552ef07fa58 100644
--- a/sys/pc98/include/legacyvar.h
+++ b/sys/pc98/include/legacyvar.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/legacyvar.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/legacyvar.h>
diff --git a/sys/pc98/include/limits.h b/sys/pc98/include/limits.h
index b51a993d79332..16fc746117cae 100644
--- a/sys/pc98/include/limits.h
+++ b/sys/pc98/include/limits.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/limits.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/limits.h>
diff --git a/sys/pc98/include/md_var.h b/sys/pc98/include/md_var.h
index 7ca6f3cc8cf1a..29baba4f6b806 100644
--- a/sys/pc98/include/md_var.h
+++ b/sys/pc98/include/md_var.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/md_var.h,v 1.3 2006/08/09 18:25:07 imp Exp $
  */
 
 #ifndef _PC98_INCLUDE_MD_VAR_H_
diff --git a/sys/pc98/include/memdev.h b/sys/pc98/include/memdev.h
index 46e2301617122..41add3bd98ef6 100644
--- a/sys/pc98/include/memdev.h
+++ b/sys/pc98/include/memdev.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/memdev.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/memdev.h>
diff --git a/sys/pc98/include/metadata.h b/sys/pc98/include/metadata.h
index 1d783ec905914..715107173f2d5 100644
--- a/sys/pc98/include/metadata.h
+++ b/sys/pc98/include/metadata.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/metadata.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/metadata.h>
diff --git a/sys/pc98/include/minidump.h b/sys/pc98/include/minidump.h
index 55c9b3176e1af..8234bcef06ae2 100644
--- a/sys/pc98/include/minidump.h
+++ b/sys/pc98/include/minidump.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/minidump.h,v 1.1 2006/04/21 12:13:59 nyan Exp $ */
 
 #include <i386/minidump.h>
diff --git a/sys/pc98/include/mp_watchdog.h b/sys/pc98/include/mp_watchdog.h
index f0b91c00c4add..2616bcf100911 100644
--- a/sys/pc98/include/mp_watchdog.h
+++ b/sys/pc98/include/mp_watchdog.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/mp_watchdog.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/mp_watchdog.h>
diff --git a/sys/pc98/include/mptable.h b/sys/pc98/include/mptable.h
index 2f6fb2d4aa65e..5bc5f8282802a 100644
--- a/sys/pc98/include/mptable.h
+++ b/sys/pc98/include/mptable.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/mptable.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/mptable.h>
diff --git a/sys/pc98/include/mutex.h b/sys/pc98/include/mutex.h
index a79c8f700e6fe..51ad36cc56aaa 100644
--- a/sys/pc98/include/mutex.h
+++ b/sys/pc98/include/mutex.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/mutex.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/mutex.h>
diff --git a/sys/pc98/include/npx.h b/sys/pc98/include/npx.h
index c1c0712a26aa1..5d15fb30d55c6 100644
--- a/sys/pc98/include/npx.h
+++ b/sys/pc98/include/npx.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/npx.h,v 1.2 2005/05/12 12:47:41 nyan Exp $
  */
 
 #ifndef _PC98_INCLUDE_NPX_H_
diff --git a/sys/pc98/include/param.h b/sys/pc98/include/param.h
index 2e44cf22cc5b0..0e0405f6952ec 100644
--- a/sys/pc98/include/param.h
+++ b/sys/pc98/include/param.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/param.h,v 1.3 2006/01/09 06:05:57 imp Exp $
  */
 
 #define MACHINE		"pc98"
diff --git a/sys/pc98/include/pc/bios.h b/sys/pc98/include/pc/bios.h
index d804fdec3618b..f77ab543d9c5e 100644
--- a/sys/pc98/include/pc/bios.h
+++ b/sys/pc98/include/pc/bios.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pc/bios.h,v 1.1 2005/04/01 23:19:43 imp Exp $ */
 
 #include <i386/pc/bios.h>
diff --git a/sys/pc98/include/pc/display.h b/sys/pc98/include/pc/display.h
index 0a906c885d8cc..c1f2f41577bf3 100644
--- a/sys/pc98/include/pc/display.h
+++ b/sys/pc98/include/pc/display.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/pc/display.h,v 1.2 2005/04/13 13:12:12 nyan Exp $
  */
 
 #ifndef _PC98_INCLUDE_PC_DISPLAY_H_
diff --git a/sys/pc98/include/pc/vesa.h b/sys/pc98/include/pc/vesa.h
index 2c1c3eb0c5735..5af57cf438037 100644
--- a/sys/pc98/include/pc/vesa.h
+++ b/sys/pc98/include/pc/vesa.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pc/vesa.h,v 1.1 2005/04/01 23:19:43 imp Exp $ */
 
 #include <i386/pc/vesa.h>
diff --git a/sys/pc98/include/pcaudioio.h b/sys/pc98/include/pcaudioio.h
index 1e9eee52265f1..02b0faf9e17ec 100644
--- a/sys/pc98/include/pcaudioio.h
+++ b/sys/pc98/include/pcaudioio.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcaudioio.h,v 1.2 2005/04/10 03:36:13 nyan Exp $ */
 
 #include <i386/pcaudioio.h>
diff --git a/sys/pc98/include/pcb.h b/sys/pc98/include/pcb.h
index 20b7d1843664e..dd27783c8bd07 100644
--- a/sys/pc98/include/pcb.h
+++ b/sys/pc98/include/pcb.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcb.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pcb.h>
diff --git a/sys/pc98/include/pcb_ext.h b/sys/pc98/include/pcb_ext.h
index 81f25f63ebfd1..31288d22d82ad 100644
--- a/sys/pc98/include/pcb_ext.h
+++ b/sys/pc98/include/pcb_ext.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcb_ext.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pcb_ext.h>
diff --git a/sys/pc98/include/pci_cfgreg.h b/sys/pc98/include/pci_cfgreg.h
index dc9207deb23a9..964acec52c343 100644
--- a/sys/pc98/include/pci_cfgreg.h
+++ b/sys/pc98/include/pci_cfgreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/pci_cfgreg.h,v 1.2 2005/04/03 23:26:44 imp Exp $
  */
 
 #ifndef _PC98_INCLUDE_PCI_CFGREG_H_
diff --git a/sys/pc98/include/pcpu.h b/sys/pc98/include/pcpu.h
index 9edf432c2d496..99fd41a60f890 100644
--- a/sys/pc98/include/pcpu.h
+++ b/sys/pc98/include/pcpu.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pcpu.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pcpu.h>
diff --git a/sys/pc98/include/pecoff_machdep.h b/sys/pc98/include/pecoff_machdep.h
index b9e6d29ab4b5a..177e93639782d 100644
--- a/sys/pc98/include/pecoff_machdep.h
+++ b/sys/pc98/include/pecoff_machdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pecoff_machdep.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pecoff_machdep.h>
diff --git a/sys/pc98/include/perfmon.h b/sys/pc98/include/perfmon.h
index c4e13f5189a43..a4cbc0af6fdff 100644
--- a/sys/pc98/include/perfmon.h
+++ b/sys/pc98/include/perfmon.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/perfmon.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/perfmon.h>
diff --git a/sys/pc98/include/pmap.h b/sys/pc98/include/pmap.h
index f17c14e4c4764..5f952f67796e5 100644
--- a/sys/pc98/include/pmap.h
+++ b/sys/pc98/include/pmap.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pmap.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/pmap.h>
diff --git a/sys/pc98/include/pmc_mdep.h b/sys/pc98/include/pmc_mdep.h
index 5ad152e6ee98e..b2ed869a1ae56 100644
--- a/sys/pc98/include/pmc_mdep.h
+++ b/sys/pc98/include/pmc_mdep.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/pmc_mdep.h,v 1.1 2005/04/19 21:06:06 imp Exp $ */
 
 #include <i386/pmc_mdep.h>
diff --git a/sys/pc98/include/ppireg.h b/sys/pc98/include/ppireg.h
index e2f914655741d..2ff816d834c08 100644
--- a/sys/pc98/include/ppireg.h
+++ b/sys/pc98/include/ppireg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/ppireg.h,v 1.1 2005/05/14 09:10:02 nyan Exp $
  */
 
 #ifndef _MACHINE_PPIREG_H_
diff --git a/sys/pc98/include/privatespace.h b/sys/pc98/include/privatespace.h
index 5db57c3230e9f..e6bf6ca766bab 100644
--- a/sys/pc98/include/privatespace.h
+++ b/sys/pc98/include/privatespace.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/privatespace.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/privatespace.h>
diff --git a/sys/pc98/include/proc.h b/sys/pc98/include/proc.h
index 77c2355a7500c..b400836866b6a 100644
--- a/sys/pc98/include/proc.h
+++ b/sys/pc98/include/proc.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/proc.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/proc.h>
diff --git a/sys/pc98/include/profile.h b/sys/pc98/include/profile.h
index 791bffbf73f5e..6d0cc3ae638ab 100644
--- a/sys/pc98/include/profile.h
+++ b/sys/pc98/include/profile.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/profile.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/profile.h>
diff --git a/sys/pc98/include/psl.h b/sys/pc98/include/psl.h
index db40cf0efb4c3..18141db73bd4c 100644
--- a/sys/pc98/include/psl.h
+++ b/sys/pc98/include/psl.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/psl.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/psl.h>
diff --git a/sys/pc98/include/ptrace.h b/sys/pc98/include/ptrace.h
index 9253dc353119b..736a8ba7f4470 100644
--- a/sys/pc98/include/ptrace.h
+++ b/sys/pc98/include/ptrace.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ptrace.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/ptrace.h>
diff --git a/sys/pc98/include/reg.h b/sys/pc98/include/reg.h
index c7f2a43708cca..90def0f938c49 100644
--- a/sys/pc98/include/reg.h
+++ b/sys/pc98/include/reg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/reg.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/reg.h>
diff --git a/sys/pc98/include/reloc.h b/sys/pc98/include/reloc.h
index 3666ec1068175..d5d6ba338a122 100644
--- a/sys/pc98/include/reloc.h
+++ b/sys/pc98/include/reloc.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/reloc.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/reloc.h>
diff --git a/sys/pc98/include/resource.h b/sys/pc98/include/resource.h
index 43349bfa2a8fe..4ceca483efff1 100644
--- a/sys/pc98/include/resource.h
+++ b/sys/pc98/include/resource.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/resource.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/resource.h>
diff --git a/sys/pc98/include/runq.h b/sys/pc98/include/runq.h
index f6b60cf932cd3..52dec171dc3fd 100644
--- a/sys/pc98/include/runq.h
+++ b/sys/pc98/include/runq.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/runq.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/runq.h>
diff --git a/sys/pc98/include/segments.h b/sys/pc98/include/segments.h
index 062c3df6d18dd..f4bc29ee649cd 100644
--- a/sys/pc98/include/segments.h
+++ b/sys/pc98/include/segments.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/segments.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/segments.h>
diff --git a/sys/pc98/include/setjmp.h b/sys/pc98/include/setjmp.h
index 9d8a3a99dd18e..781cfadcfdeb9 100644
--- a/sys/pc98/include/setjmp.h
+++ b/sys/pc98/include/setjmp.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/setjmp.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/setjmp.h>
diff --git a/sys/pc98/include/sf_buf.h b/sys/pc98/include/sf_buf.h
index ee9d94623c834..0ec21c1271f3c 100644
--- a/sys/pc98/include/sf_buf.h
+++ b/sys/pc98/include/sf_buf.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/sf_buf.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/sf_buf.h>
diff --git a/sys/pc98/include/sigframe.h b/sys/pc98/include/sigframe.h
index 6d7a9c5c9c96a..77c833d400de7 100644
--- a/sys/pc98/include/sigframe.h
+++ b/sys/pc98/include/sigframe.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/sigframe.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/sigframe.h>
diff --git a/sys/pc98/include/signal.h b/sys/pc98/include/signal.h
index 0c5f6dd9a62c5..207019d361cac 100644
--- a/sys/pc98/include/signal.h
+++ b/sys/pc98/include/signal.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/signal.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/signal.h>
diff --git a/sys/pc98/include/smapi.h b/sys/pc98/include/smapi.h
index 0d83e8467aa59..66597032e2b30 100644
--- a/sys/pc98/include/smapi.h
+++ b/sys/pc98/include/smapi.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/smapi.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/smapi.h>
diff --git a/sys/pc98/include/smp.h b/sys/pc98/include/smp.h
index 28d98e8d44a4f..99692c81e5fb0 100644
--- a/sys/pc98/include/smp.h
+++ b/sys/pc98/include/smp.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/smp.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/smp.h>
diff --git a/sys/pc98/include/speaker.h b/sys/pc98/include/speaker.h
index 31eb9b6e98c36..49f71e53de8b0 100644
--- a/sys/pc98/include/speaker.h
+++ b/sys/pc98/include/speaker.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/speaker.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/speaker.h>
diff --git a/sys/pc98/include/specialreg.h b/sys/pc98/include/specialreg.h
index 1e87205b2e8d4..8aaff7856705f 100644
--- a/sys/pc98/include/specialreg.h
+++ b/sys/pc98/include/specialreg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/specialreg.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/specialreg.h>
diff --git a/sys/pc98/include/stdarg.h b/sys/pc98/include/stdarg.h
index bba2f9ff6ad14..5218efa256f43 100644
--- a/sys/pc98/include/stdarg.h
+++ b/sys/pc98/include/stdarg.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/stdarg.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/stdarg.h>
diff --git a/sys/pc98/include/sysarch.h b/sys/pc98/include/sysarch.h
index 42fae76486842..6061fc9bbc036 100644
--- a/sys/pc98/include/sysarch.h
+++ b/sys/pc98/include/sysarch.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/sysarch.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/sysarch.h>
diff --git a/sys/pc98/include/timerreg.h b/sys/pc98/include/timerreg.h
index 59c223c5d3dc1..05248ad4f1e77 100644
--- a/sys/pc98/include/timerreg.h
+++ b/sys/pc98/include/timerreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/include/timerreg.h,v 1.2 2005/05/28 13:40:27 nyan Exp $
  */
 
 /*
diff --git a/sys/pc98/include/trap.h b/sys/pc98/include/trap.h
index 9c147ae1327e3..8f76c547ea60f 100644
--- a/sys/pc98/include/trap.h
+++ b/sys/pc98/include/trap.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/trap.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/trap.h>
diff --git a/sys/pc98/include/tss.h b/sys/pc98/include/tss.h
index e97ed51e8de21..39f078d780de4 100644
--- a/sys/pc98/include/tss.h
+++ b/sys/pc98/include/tss.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/tss.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/tss.h>
diff --git a/sys/pc98/include/ucontext.h b/sys/pc98/include/ucontext.h
index 83422140243c4..81fb3e1be4c96 100644
--- a/sys/pc98/include/ucontext.h
+++ b/sys/pc98/include/ucontext.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/ucontext.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/ucontext.h>
diff --git a/sys/pc98/include/varargs.h b/sys/pc98/include/varargs.h
index 21f5ce3c1c989..fceecb46c2852 100644
--- a/sys/pc98/include/varargs.h
+++ b/sys/pc98/include/varargs.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/varargs.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/varargs.h>
diff --git a/sys/pc98/include/vm86.h b/sys/pc98/include/vm86.h
index 5dfa21858fc08..5cfbfa3105ffe 100644
--- a/sys/pc98/include/vm86.h
+++ b/sys/pc98/include/vm86.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/vm86.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/vm86.h>
diff --git a/sys/pc98/include/vmparam.h b/sys/pc98/include/vmparam.h
index 2004749c42c40..0f627f0b208f1 100644
--- a/sys/pc98/include/vmparam.h
+++ b/sys/pc98/include/vmparam.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/include/vmparam.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/vmparam.h>
diff --git a/sys/pc98/linux/linux.h b/sys/pc98/linux/linux.h
index d330a96f7c95f..ee926be2211e1 100644
--- a/sys/pc98/linux/linux.h
+++ b/sys/pc98/linux/linux.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/linux/linux.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/linux/linux.h>
diff --git a/sys/pc98/linux/linux_ipc64.h b/sys/pc98/linux/linux_ipc64.h
index 4fcdb641693f1..b5e95848b29b1 100644
--- a/sys/pc98/linux/linux_ipc64.h
+++ b/sys/pc98/linux/linux_ipc64.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/linux/linux_ipc64.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/linux/linux_ipc64.h>
diff --git a/sys/pc98/linux/linux_proto.h b/sys/pc98/linux/linux_proto.h
index f5ccdd18f5678..02fd96fdc47f4 100644
--- a/sys/pc98/linux/linux_proto.h
+++ b/sys/pc98/linux/linux_proto.h
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/linux/linux_proto.h,v 1.1 2005/04/01 23:19:42 imp Exp $ */
 
 #include <i386/linux/linux_proto.h>
diff --git a/sys/pc98/pc98/busio.s b/sys/pc98/pc98/busio.s
index 915dcae21bf0e..a95985a39ffcc 100644
--- a/sys/pc98/pc98/busio.s
+++ b/sys/pc98/pc98/busio.s
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/pc98/busio.s,v 1.4 2005/01/07 02:29:17 imp Exp $ */
 /*	$NecBSD: busio.s,v 1.16.4.1 1999/08/16 09:06:08 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/pc98/pc98/busiosubr.c b/sys/pc98/pc98/busiosubr.c
index 8776d3fe6fd47..0dd831e61bdb9 100644
--- a/sys/pc98/pc98/busiosubr.c
+++ b/sys/pc98/pc98/busiosubr.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pc98/pc98/busiosubr.c,v 1.5 2005/01/07 02:29:17 imp Exp $ */
 /*	$NecBSD: busiosubr.c,v 1.30.4.4 1999/08/28 02:25:35 honda Exp $	*/
 /*	$NetBSD$	*/
 
diff --git a/sys/pc98/pc98/canbepm.c b/sys/pc98/pc98/canbepm.c
index 5c347a07e187f..059defeef209c 100644
--- a/sys/pc98/pc98/canbepm.c
+++ b/sys/pc98/pc98/canbepm.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbepm.c,v 1.3 2003/02/04 16:17:13 nyan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/canbus.c b/sys/pc98/pc98/canbus.c
index 522b4d0ba5ce3..08afd6507ec33 100644
--- a/sys/pc98/pc98/canbus.c
+++ b/sys/pc98/pc98/canbus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbus.c,v 1.6 2006/05/16 14:32:17 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/canbus.h b/sys/pc98/pc98/canbus.h
index b63cc765cd6f1..ce47a56342d73 100644
--- a/sys/pc98/pc98/canbus.h
+++ b/sys/pc98/pc98/canbus.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbus.h,v 1.3 2003/02/04 16:17:13 nyan Exp $
  */
 
 #ifndef _PC98_PC98_CANBUS_H_
diff --git a/sys/pc98/pc98/canbus_if.m b/sys/pc98/pc98/canbus_if.m
index 42d2cd52929c8..85e5235d0f715 100644
--- a/sys/pc98/pc98/canbus_if.m
+++ b/sys/pc98/pc98/canbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pc98/pc98/canbus_if.m,v 1.3 2005/01/07 02:29:17 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/pc98/pc98/canbusvars.h b/sys/pc98/pc98/canbusvars.h
index fc2acc11a976c..afaec674d4366 100644
--- a/sys/pc98/pc98/canbusvars.h
+++ b/sys/pc98/pc98/canbusvars.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/canbusvars.h,v 1.3 2003/02/04 16:17:13 nyan Exp $
  */
 
 #ifndef _PC98_PC98_CANBUSVARS_H_
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 3ec69be6f456a..b4c0ca4485355 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.396.4.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_atalk.h"
 #include "opt_compat.h"
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index badf6a3ed735d..67652b9d9664e 100644
--- a/sys/pc98/pc98/pc98_machdep.c
+++ b/sys/pc98/pc98/pc98_machdep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98_machdep.c,v 1.28 2006/08/09 18:25:07 imp Exp $
  */
 
 #include "opt_pc98.h"
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index ffd4ba8186c8c..cb6379b9ca54d 100644
--- a/sys/pc98/pc98/pc98_machdep.h
+++ b/sys/pc98/pc98/pc98_machdep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pc98/pc98/pc98_machdep.h,v 1.14 2006/05/08 12:03:58 nyan Exp $
  */
 
 #ifndef __PC98_PC98_PC98_MACHDEP_H__
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h
index 9489067205cab..e6a933cc31ca2 100644
--- a/sys/pccard/cardinfo.h
+++ b/sys/pccard/cardinfo.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/pccard/cardinfo.h,v 1.31 2006/01/10 05:21:01 imp Exp $ */
 
 #ifndef	_PCCARD_CARDINFO_H_
 #define	_PCCARD_CARDINFO_H_
diff --git a/sys/pccard/cis.h b/sys/pccard/cis.h
index 6cc935b80ff2b..adaa57c6b0257 100644
--- a/sys/pccard/cis.h
+++ b/sys/pccard/cis.h
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pccard/cis.h,v 1.5 2005/01/07 02:29:17 imp Exp $
  *
  */
 
diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index ec0807a24cd3c..2e2ad0db60ef1 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.56.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index 74bd2b1a4b17d..7c5454d914aef 100644
--- a/sys/pci/agp_ali.c
+++ b/sys/pci/agp_ali.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_ali.c,v 1.18.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index 7c3bd0d4b1b09..5fe1c798e07fe 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_amd.c,v 1.23.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_amd64.c b/sys/pci/agp_amd64.c
index 7c1a25d758863..ff9fd0e09cc36 100644
--- a/sys/pci/agp_amd64.c
+++ b/sys/pci/agp_amd64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_amd64.c,v 1.14.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_ati.c b/sys/pci/agp_ati.c
index 6bc60197aed84..5b023cdb85c31 100644
--- a/sys/pci/agp_ati.c
+++ b/sys/pci/agp_ati.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_ati.c,v 1.3.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 2e3ea0736701a..a74f6e53b699e 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_i810.c,v 1.41.2.2 2007/12/01 16:24:23 remko Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_if.m b/sys/pci/agp_if.m
index faf7b1ab8fdfb..705d98fa34993 100644
--- a/sys/pci/agp_if.m
+++ b/sys/pci/agp_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/pci/agp_if.m,v 1.3 2005/01/07 02:29:18 imp Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index 60e0e6f8ad68b..eb14416533e6b 100644
--- a/sys/pci/agp_intel.c
+++ b/sys/pci/agp_intel.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_intel.c,v 1.34.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_nvidia.c b/sys/pci/agp_nvidia.c
index 8e2d243425c63..3bbe8e43d5059 100644
--- a/sys/pci/agp_nvidia.c
+++ b/sys/pci/agp_nvidia.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_nvidia.c,v 1.11.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 /*
  * Written using information gleaned from the
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index a51514aba561f..a4d99e1efd0eb 100644
--- a/sys/pci/agp_sis.c
+++ b/sys/pci/agp_sis.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_sis.c,v 1.20.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index d60f49aef64ce..32c1533e73174 100644
--- a/sys/pci/agp_via.c
+++ b/sys/pci/agp_via.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/agp_via.c,v 1.24.2.1 2007/11/08 20:29:53 jhb Exp $");
 
 #include "opt_bus.h"
 
diff --git a/sys/pci/agppriv.h b/sys/pci/agppriv.h
index b4c90a053f733..3a5f66595f044 100644
--- a/sys/pci/agppriv.h
+++ b/sys/pci/agppriv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/agppriv.h,v 1.6.2.1 2007/11/08 20:29:53 jhb Exp $
  */
 
 #ifndef _PCI_AGPPRIV_H_
diff --git a/sys/pci/agpreg.h b/sys/pci/agpreg.h
index 38504445a4cf4..e578dac9cfd61 100644
--- a/sys/pci/agpreg.h
+++ b/sys/pci/agpreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/agpreg.h,v 1.19 2007/07/13 16:28:12 anholt Exp $
  */
 
 #ifndef _PCI_AGPREG_H_
diff --git a/sys/pci/agpvar.h b/sys/pci/agpvar.h
index df3112b49d297..8b9c7b0abe843 100644
--- a/sys/pci/agpvar.h
+++ b/sys/pci/agpvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/pci/agpvar.h,v 1.3 2005/12/20 20:05:21 jhb Exp $
  */
 
 #ifndef _PCI_AGPVAR_H_
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 53b2f9d885cc4..ad20954dc5f42 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/alpm.c,v 1.26 2007/01/11 19:56:24 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index f8ec9c54848b5..4314a0a1827de 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/amdpm.c,v 1.21 2007/01/11 19:56:24 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/pci/amdsmb.c b/sys/pci/amdsmb.c
index 1b59a5a8c174a..fd55d46efd911 100644
--- a/sys/pci/amdsmb.c
+++ b/sys/pci/amdsmb.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/amdsmb.c,v 1.4 2007/01/11 19:56:24 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index ebe421f18f2b3..7d2c611c112df 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_mn.c,v 1.49 2007/02/23 19:41:34 imp Exp $");
 
 /*
  * Stuff to describe the MUNIC32X and FALC54 chips.
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 82985026f19bb..bd2a8b72d693b 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_pcn.c,v 1.83 2007/02/23 12:19:03 piso Exp $");
 
 /*
  * AMD Am79c972 fast ethernet PCI NIC driver. Datasheets are available
diff --git a/sys/pci/if_pcnreg.h b/sys/pci/if_pcnreg.h
index 406d4380be016..9ad662c982bcb 100644
--- a/sys/pci/if_pcnreg.h
+++ b/sys/pci/if_pcnreg.h
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_pcnreg.h,v 1.15 2006/11/28 01:33:17 marius Exp $
  */
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index b30408193fe4d..0f757e66d006f 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.170.2.1 2007/12/02 08:38:31 remko Exp $");
 
 /*
  * RealTek 8129/8139 PCI NIC driver
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index fbfb65b2dc260..ea608090eb50e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.67.2.2 2007/12/15 02:57:18 yongari Exp $
  */
 
 /*
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index c76f4d321e71f..a0e2d5b50738b 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_sf.c,v 1.95 2007/02/23 12:19:03 piso Exp $");
 
 /*
  * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h
index 29861ef343aab..de659928ac3fd 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sfreg.h,v 1.19 2006/09/15 11:01:23 ru Exp $
  */
 
 /*
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 890224706c9bf..c0ef576d791af 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.150 2007/02/24 14:27:36 delphij Exp $");
 
 /*
  * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h
index 7f93062e646e6..b3138d82cc105 100644
--- a/sys/pci/if_sisreg.h
+++ b/sys/pci/if_sisreg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.38 2007/02/24 14:27:36 delphij Exp $
  */
 
 /*
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 57a1377a8c8fc..f6a3ddb5612e7 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_ste.c,v 1.99 2007/06/15 21:45:41 thompsa Exp $");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h
index 0114ebe459c62..b1afa6b151c56 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_stereg.h,v 1.22 2007/03/10 03:10:34 yongari Exp $
  */
 
 /*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index f2993e253776d..c380095242b1b 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_tl.c,v 1.111 2007/05/09 09:02:11 yar Exp $");
 
 /*
  * Texas Instruments ThunderLAN driver for FreeBSD 2.2.6 and 3.x.
diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h
index f04b52bda59c6..80a4c3995e3aa 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_tlreg.h,v 1.25 2006/09/15 11:01:23 ru Exp $
  */
 
 
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index dd514ee976874..c2785546e5267 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.126.2.1 2007/10/12 03:41:54 yongari Exp $");
 
 /*
  * VIA Rhine fast ethernet PCI NIC driver
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index d1073bd180b35..fe83be0599419 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.34 2007/04/23 12:19:02 phk Exp $
  */
 
 /*
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 671a0b3d5ff27..31eb287f034cc 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_wb.c,v 1.92 2007/02/23 12:19:03 piso Exp $");
 
 /*
  * Winbond fast ethernet PCI NIC driver
diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h
index c5315c4efcb5a..953b0e2151081 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_wbreg.h,v 1.17 2006/09/15 11:01:23 ru Exp $
  */
 
 /*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index e82511dcac70f..9ac3d55de0ca5 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.210 2007/08/06 14:26:03 rwatson Exp $");
 
 /*
  * 3Com 3c90x Etherlink XL PCI NIC driver
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index ca393f3eec5a9..1730006ed7b15 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/if_xlreg.h,v 1.59 2006/12/06 02:18:41 marius Exp $
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 2e5e815b5a444..232ea45a0b889 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/intpm.c,v 1.39.2.1 2007/10/27 13:27:02 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/intpmreg.h b/sys/pci/intpmreg.h
index 236c737a9bd0b..19dc9435f8f33 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/pci/intpmreg.h,v 1.4 2007/01/11 19:56:24 jhb Exp $
  */
 
 #ifndef __INTPMREG_H__
diff --git a/sys/pci/locate.pl b/sys/pci/locate.pl
index 89688e1c6af22..dfd8e54f93bc3 100755
--- a/sys/pci/locate.pl
+++ b/sys/pci/locate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $FreeBSD$
+# $FreeBSD: src/sys/pci/locate.pl,v 1.4 2000/06/27 22:41:12 alfred Exp $
 
 use strict;
 
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index c344a1e85fd76..2f9076ab805a7 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -40,7 +40,7 @@
 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.197 2007/06/17 05:55:53 scottl Exp $");
 
 
 #define NCR_DATE "pl30 98/1/1"
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index 34f1618f8d49c..fede60ac6f5c2 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** $FreeBSD$
+** $FreeBSD: src/sys/pci/ncrreg.h,v 1.15 2005/01/07 05:01:24 scottl Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
diff --git a/sys/pci/nfsmb.c b/sys/pci/nfsmb.c
index 3bf3604196dc4..e8f3636d66c64 100644
--- a/sys/pci/nfsmb.c
+++ b/sys/pci/nfsmb.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.6.2.1 2007/11/14 19:40:56 remko Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index d9305e2b2b979..dc10915a7bbda 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/viapm.c,v 1.18 2007/08/02 04:29:19 kevlo Exp $");
 
 #include "opt_isa.h"
 
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 0ca567f8853c4..eba1360df8b00 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/pci/xrpu.c,v 1.41 2005/02/24 21:32:56 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/compile/.cvsignore b/sys/powerpc/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/powerpc/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/powerpc/conf/.cvsignore b/sys/powerpc/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/powerpc/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index 7204e8b232794..e7abad8dacf32 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/powerpc
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/DEFAULTS,v 1.9 2007/06/13 05:07:42 marcel Exp $
 
 machine		powerpc
 
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index ddeec38a68058..03170362f5242 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.71.2.2 2007/10/29 00:07:03 marcel Exp $
 
 cpu		OEA
 ident		GENERIC
diff --git a/sys/powerpc/conf/GENERIC.hints b/sys/powerpc/conf/GENERIC.hints
index e8c0da7a1d7eb..907a3bc53de67 100644
--- a/sys/powerpc/conf/GENERIC.hints
+++ b/sys/powerpc/conf/GENERIC.hints
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/GENERIC.hints,v 1.1 2004/07/19 02:08:22 grehan Exp $
diff --git a/sys/powerpc/conf/MAC b/sys/powerpc/conf/MAC
index 862638397da7a..6264c6ae2fcc8 100644
--- a/sys/powerpc/conf/MAC
+++ b/sys/powerpc/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/MAC,v 1.1 2005/09/18 03:15:36 csjp Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/powerpc/conf/Makefile b/sys/powerpc/conf/Makefile
index 2c006e9c2c80d..590c5fb1138de 100644
--- a/sys/powerpc/conf/Makefile
+++ b/sys/powerpc/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/Makefile,v 1.1 2005/12/21 02:51:41 sam Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 176e661341535..545b3f82040a6 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.9 2007/09/26 21:14:18 marius Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h
index 5561ce7341278..14f73643dcc97 100644
--- a/sys/powerpc/include/_bus.h
+++ b/sys/powerpc/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $
  */
 
 #ifndef POWERPC_INCLUDE__BUS_H
diff --git a/sys/powerpc/include/_inttypes.h b/sys/powerpc/include/_inttypes.h
index 7da589d8a7710..4f957ef7f2b1b 100644
--- a/sys/powerpc/include/_inttypes.h
+++ b/sys/powerpc/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index 76e73544de64d..b2183ce8e4566 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_limits.h,v 1.29 2005/08/20 16:44:41 stefanf Exp $
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h
index 0d8aedfff5d68..4a62d24303150 100644
--- a/sys/powerpc/include/_stdint.h
+++ b/sys/powerpc/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index c6babcf4a1080..065883511ce4c 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/_types.h,v 1.7 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h
index 34d8ad65e8d7e..a84bb7fe6cfa9 100644
--- a/sys/powerpc/include/asm.h
+++ b/sys/powerpc/include/asm.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: asm.h,v 1.6.18.1 2000/07/25 08:37:14 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.10 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h
index 9bbf3bf30564f..bd14e6193a07a 100644
--- a/sys/powerpc/include/atomic.h
+++ b/sys/powerpc/include/atomic.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/atomic.h,v 1.15 2007/07/10 04:40:00 marcel Exp $
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/powerpc/include/bat.h b/sys/powerpc/include/bat.h
index 27c6d5a895f65..969af237b9be5 100644
--- a/sys/powerpc/include/bat.h
+++ b/sys/powerpc/include/bat.h
@@ -65,7 +65,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: bat.h,v 1.2 1999/12/18 01:36:06 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/bat.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_BAT_H_
diff --git a/sys/powerpc/include/bootinfo.h b/sys/powerpc/include/bootinfo.h
index aa967ac59689b..3eaa2afe3d19a 100644
--- a/sys/powerpc/include/bootinfo.h
+++ b/sys/powerpc/include/bootinfo.h
@@ -24,7 +24,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/bootinfo.h,v 1.9 2005/01/07 02:29:19 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h
index 7460d130f70e6..a62e6673826fe 100644
--- a/sys/powerpc/include/bus.h
+++ b/sys/powerpc/include/bus.h
@@ -66,7 +66,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: bus.h,v 1.9.4.1 2000/06/30 16:27:30 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/bus.h,v 1.19 2006/12/13 03:25:31 marcel Exp $
  */
 
 #ifndef	_MACPPC_BUS_H_
diff --git a/sys/powerpc/include/bus_dma.h b/sys/powerpc/include/bus_dma.h
index d10a0557bc6ba..522550eabd3f6 100644
--- a/sys/powerpc/include/bus_dma.h
+++ b/sys/powerpc/include/bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/bus_dma.h,v 1.1 2005/03/14 16:46:28 scottl Exp $ */
 
 #ifndef _POWERPC_BUS_DMA_H_
 #define _POWERPC_BUS_DMA_H_
diff --git a/sys/powerpc/include/clock.h b/sys/powerpc/include/clock.h
index ead37ac149abc..e393447c49d4a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/clock.h,v 1.13 2006/10/02 12:59:58 phk Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index a8fea27d3dcae..999fa6aa20b84 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: cpu.h,v 1.11 2000/05/26 21:19:53 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/cpu.h,v 1.21 2007/06/09 21:55:16 marcel Exp $
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index f02ff3bd55a33..4b09d31f3abdc 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/cpufunc.h,v 1.21 2004/08/07 00:20:00 grehan Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/powerpc/include/db_machdep.h b/sys/powerpc/include/db_machdep.h
index 8873d43ac8bd9..16a47b40f2c76 100644
--- a/sys/powerpc/include/db_machdep.h
+++ b/sys/powerpc/include/db_machdep.h
@@ -25,7 +25,7 @@
  *
  *	$OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $
  *	$NetBSD: db_machdep.h,v 1.4.22.1 2000/08/05 11:10:43 wiz Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/db_machdep.h,v 1.8 2005/01/07 02:29:19 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h
index d2b8e12107d85..1392c6cdb295c 100644
--- a/sys/powerpc/include/elf.h
+++ b/sys/powerpc/include/elf.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.8 2006/10/04 21:37:10 jb Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h
index bc96b9e4fc812..aa42f3cc12532 100644
--- a/sys/powerpc/include/endian.h
+++ b/sys/powerpc/include/endian.h
@@ -28,7 +28,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/endian.h,v 1.14 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/powerpc/include/exec.h b/sys/powerpc/include/exec.h
index f5a2bb26f61f2..9252dbb4d20e0 100644
--- a/sys/powerpc/include/exec.h
+++ b/sys/powerpc/include/exec.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/exec.h,v 1.3 2005/02/19 21:16:48 ru Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/powerpc/include/float.h b/sys/powerpc/include/float.h
index 5ac715a041805..8e6b1dc4b64ea 100644
--- a/sys/powerpc/include/float.h
+++ b/sys/powerpc/include/float.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
  *	from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/float.h,v 1.8 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/powerpc/include/floatingpoint.h b/sys/powerpc/include/floatingpoint.h
index e62e47415a748..dbc365dabc016 100644
--- a/sys/powerpc/include/floatingpoint.h
+++ b/sys/powerpc/include/floatingpoint.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/floatingpoint.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h
index d712b9458903f..fce64aa67c72f 100644
--- a/sys/powerpc/include/fpu.h
+++ b/sys/powerpc/include/fpu.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: fpu.h,v 1.2 1999/12/07 15:14:56 danw Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/fpu.h,v 1.3 2003/02/05 11:37:59 benno Exp $
  */
 
 #ifndef	_MACHINE_FPU_H_
diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h
index 09b7a95177712..759526eee546c 100644
--- a/sys/powerpc/include/frame.h
+++ b/sys/powerpc/include/frame.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: frame.h,v 1.2 1999/01/10 10:13:15 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/frame.h,v 1.12 2005/12/22 22:16:08 jhb Exp $
  */
 
 #ifndef	_MACHINE_FRAME_H_
diff --git a/sys/powerpc/include/gdb_machdep.h b/sys/powerpc/include/gdb_machdep.h
index e8c5055fdf5a7..3ee7c284a6b37 100644
--- a/sys/powerpc/include/gdb_machdep.h
+++ b/sys/powerpc/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/gdb_machdep.h,v 1.1 2006/08/24 21:52:11 marcel Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/powerpc/include/hid.h b/sys/powerpc/include/hid.h
index 3739839af252b..ca7ccdb3501bc 100644
--- a/sys/powerpc/include/hid.h
+++ b/sys/powerpc/include/hid.h
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.3 2005/02/04 01:14:38 grehan Exp $
  */
 
 #ifndef _POWERPC_HID_H_
diff --git a/sys/powerpc/include/ieee.h b/sys/powerpc/include/ieee.h
index 793012de44350..e5879a5fa0ad6 100644
--- a/sys/powerpc/include/ieee.h
+++ b/sys/powerpc/include/ieee.h
@@ -37,7 +37,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ieee.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/powerpc/include/ieeefp.h b/sys/powerpc/include/ieeefp.h
index 820fffe1cd9ce..c9f7d65edb2ba 100644
--- a/sys/powerpc/include/ieeefp.h
+++ b/sys/powerpc/include/ieeefp.h
@@ -2,7 +2,7 @@
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  * $NetBSD: ieeefp.h,v 1.2 1999/07/07 01:52:26 danw Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ieeefp.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/powerpc/include/in_cksum.h b/sys/powerpc/include/in_cksum.h
index 09920062a0ae9..09a7fa9c6c880 100644
--- a/sys/powerpc/include/in_cksum.h
+++ b/sys/powerpc/include/in_cksum.h
@@ -29,7 +29,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
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/in_cksum.h,v 1.3 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/powerpc/include/intr.h b/sys/powerpc/include/intr.h
index 8bc417c6a9bd3..165b1b308ae17 100644
--- a/sys/powerpc/include/intr.h
+++ b/sys/powerpc/include/intr.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: intr.h,v 1.6 2000/02/11 13:15:44 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/intr.h,v 1.4 2002/03/20 23:17:49 alfred Exp $
  */
 
 #ifndef _MACPPC_INTR_H_
diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h
index 25f47f0301c81..1d256d0e42cce 100644
--- a/sys/powerpc/include/intr_machdep.h
+++ b/sys/powerpc/include/intr_machdep.h
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/intr_machdep.h,v 1.9 2007/08/11 19:25:31 marcel Exp $
  */
 
 #ifndef	_MACHINE_INTR_MACHDEP_H_
diff --git a/sys/powerpc/include/kdb.h b/sys/powerpc/include/kdb.h
index 2cb49a801b086..de2cc0e7bf5c4 100644
--- a/sys/powerpc/include/kdb.h
+++ b/sys/powerpc/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/kdb.h,v 1.4 2007/06/09 21:55:16 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index 35eea1f619dee..c270280abcbf8 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/limits.h,v 1.28 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index 567b190876b8b..25efa63692ca4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/md_var.h,v 1.29.2.1 2007/11/14 16:41:30 grehan Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/powerpc/include/memdev.h b/sys/powerpc/include/memdev.h
index 69072d9889caa..ee3e4cf5dfb96 100644
--- a/sys/powerpc/include/memdev.h
+++ b/sys/powerpc/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/memdev.h,v 1.1 2004/08/16 13:07:40 ssouhlal Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/powerpc/include/metadata.h b/sys/powerpc/include/metadata.h
index 124d46b1b551d..b0abfe670311a 100644
--- a/sys/powerpc/include/metadata.h
+++ b/sys/powerpc/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/metadata.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/powerpc/include/mmuvar.h b/sys/powerpc/include/mmuvar.h
index fc2f8d5c9ca51..ad404af117628 100644
--- a/sys/powerpc/include/mmuvar.h
+++ b/sys/powerpc/include/mmuvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/mmuvar.h,v 1.1 2005/11/08 06:48:08 grehan Exp $
  */
 
 #ifndef _MACHINE_MMUVAR_H_
diff --git a/sys/powerpc/include/mutex.h b/sys/powerpc/include/mutex.h
index 0b7fe2633e267..5507ef686e031 100644
--- a/sys/powerpc/include/mutex.h
+++ b/sys/powerpc/include/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/mutex.h,v 1.28 2001/12/18 00:27:17 jhb Exp $
  */
 
 #ifndef _MACHINE_MUTEX_H_
diff --git a/sys/powerpc/include/nexusvar.h b/sys/powerpc/include/nexusvar.h
index df8a0f69b92ca..b6d5bde9e9e24 100644
--- a/sys/powerpc/include/nexusvar.h
+++ b/sys/powerpc/include/nexusvar.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/nexusvar.h,v 1.3 2004/01/13 11:20:52 grehan Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_
diff --git a/sys/powerpc/include/ofw_machdep.h b/sys/powerpc/include/ofw_machdep.h
index a4b601e5499eb..eeaaf9c47d733 100644
--- a/sys/powerpc/include/ofw_machdep.h
+++ b/sys/powerpc/include/ofw_machdep.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ofw_machdep.h,v 1.3 2006/07/26 17:12:54 marcel Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
diff --git a/sys/powerpc/include/openpicreg.h b/sys/powerpc/include/openpicreg.h
index 2fa393d20fd20..af22775848689 100644
--- a/sys/powerpc/include/openpicreg.h
+++ b/sys/powerpc/include/openpicreg.h
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from NetBSD: openpicreg.h,v 1.3 2001/08/30 03:08:52 briggs Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/openpicreg.h,v 1.3 2002/07/09 11:26:09 benno Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h
index 081cf7aecfcff..de2e4fe8afd74 100644
--- a/sys/powerpc/include/openpicvar.h
+++ b/sys/powerpc/include/openpicvar.h
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/openpicvar.h,v 1.6 2007/08/11 19:25:31 marcel Exp $
  */
 
 #ifndef	_POWERPC_OPENPICVAR_H_
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index 6a2018eab0d8a..00e3c848e034a 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/param.h,v 1.16 2005/12/06 13:27:21 ru Exp $
  */
 
 /*
diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h
index 3c31441d9b210..97ebd38f2dbd6 100644
--- a/sys/powerpc/include/pcb.h
+++ b/sys/powerpc/include/pcb.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pcb.h,v 1.4 2000/06/04 11:57:17 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pcb.h,v 1.9 2006/07/26 17:05:11 marcel Exp $
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 6e95076301265..82524d6659072 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pcpu.h,v 1.24 2007/06/04 21:38:47 attilio Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/powerpc/include/pio.h b/sys/powerpc/include/pio.h
index bf2cb5b67fcc1..44b5e03b5183d 100644
--- a/sys/powerpc/include/pio.h
+++ b/sys/powerpc/include/pio.h
@@ -30,7 +30,7 @@
  *
  *	$NetBSD: pio.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $
  *	$OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pio.h,v 1.2 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_PIO_H_
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index d02f8d646c066..60150a86aa1b9 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.20 2006/12/05 04:01:52 grehan Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
diff --git a/sys/powerpc/include/pmc_mdep.h b/sys/powerpc/include/pmc_mdep.h
index d5417c3cedb66..836f48608c68f 100644
--- a/sys/powerpc/include/pmc_mdep.h
+++ b/sys/powerpc/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/powerpc/include/powerpc.h b/sys/powerpc/include/powerpc.h
index 3de078899dd32..760bd5d823e53 100644
--- a/sys/powerpc/include/powerpc.h
+++ b/sys/powerpc/include/powerpc.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: powerpc.h,v 1.3 2000/06/01 00:49:59 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/powerpc.h,v 1.6 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_POWERPC_H_
diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h
index c958fb76f0fbd..d6a5110acd3e7 100644
--- a/sys/powerpc/include/proc.h
+++ b/sys/powerpc/include/proc.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: proc.h,v 1.2 1997/04/16 22:57:48 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/proc.h,v 1.7 2005/04/04 21:53:55 jhb Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/powerpc/include/profile.h b/sys/powerpc/include/profile.h
index 96f3825e1dc4e..d495b62fc93fd 100644
--- a/sys/powerpc/include/profile.h
+++ b/sys/powerpc/include/profile.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/profile.h,v 1.6 2005/12/29 04:07:36 grehan Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/powerpc/include/psl.h b/sys/powerpc/include/psl.h
index a7ab6f1354b3c..208f9383d3975 100644
--- a/sys/powerpc/include/psl.h
+++ b/sys/powerpc/include/psl.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: psl.h,v 1.5 2000/11/19 19:52:37 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/psl.h,v 1.4 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_PSL_H_
diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h
index 391c82e45951d..2c802887df138 100644
--- a/sys/powerpc/include/pte.h
+++ b/sys/powerpc/include/pte.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pte.h,v 1.2 1998/08/31 14:43:40 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/pte.h,v 1.5 2005/11/11 12:03:28 grehan Exp $
  */
 
 #ifndef	_MACHINE_PTE_H_
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index eef24f829b481..eda14e76b5660 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ptrace.h,v 1.13 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h
index 640365546e7c0..e48e9953dc76e 100644
--- a/sys/powerpc/include/reg.h
+++ b/sys/powerpc/include/reg.h
@@ -1,5 +1,5 @@
 /* $NetBSD: reg.h,v 1.4 2000/06/04 09:30:44 tsubai Exp $	*/
-/* $FreeBSD$	*/
+/* $FreeBSD: src/sys/powerpc/include/reg.h,v 1.6 2004/07/29 13:39:27 ssouhlal Exp $	*/
 
 #ifndef _POWERPC_REG_H_
 #define	_POWERPC_REG_H_
diff --git a/sys/powerpc/include/reloc.h b/sys/powerpc/include/reloc.h
index 0e4155dac4cf7..aa012b1b5113f 100644
--- a/sys/powerpc/include/reloc.h
+++ b/sys/powerpc/include/reloc.h
@@ -26,5 +26,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/reloc.h,v 1.3 2007/01/12 07:19:22 imp Exp $
  */
diff --git a/sys/powerpc/include/resource.h b/sys/powerpc/include/resource.h
index edde5eb299085..f01480a95884a 100644
--- a/sys/powerpc/include/resource.h
+++ b/sys/powerpc/include/resource.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/resource.h,v 1.4 2005/01/07 02:29:19 imp Exp $ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/powerpc/include/runq.h b/sys/powerpc/include/runq.h
index e906fa192c6c1..bff28141e758b 100644
--- a/sys/powerpc/include/runq.h
+++ b/sys/powerpc/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/runq.h,v 1.3 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/powerpc/include/sc_machdep.h b/sys/powerpc/include/sc_machdep.h
index 4f3526fabcf01..9dbef5aeb48c0 100644
--- a/sys/powerpc/include/sc_machdep.h
+++ b/sys/powerpc/include/sc_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/sc_machdep.h,v 1.1 2004/01/21 05:16:23 grehan Exp $
  */
 
 #ifndef	_MACHINE_SC_MACHDEP_H_
diff --git a/sys/powerpc/include/setjmp.h b/sys/powerpc/include/setjmp.h
index e453044dbf3bb..1d066be288668 100644
--- a/sys/powerpc/include/setjmp.h
+++ b/sys/powerpc/include/setjmp.h
@@ -1,6 +1,6 @@
 /*-
  *	$NetBSD: setjmp.h,v 1.3 1998/09/16 23:51:27 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/setjmp.h,v 1.4 2002/10/05 05:47:56 mike Exp $
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/powerpc/include/sf_buf.h b/sys/powerpc/include/sf_buf.h
index 6997419c64230..19157377320f4 100644
--- a/sys/powerpc/include/sf_buf.h
+++ b/sys/powerpc/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/sf_buf.h,v 1.2 2004/04/18 08:10:04 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/powerpc/include/sigframe.h b/sys/powerpc/include/sigframe.h
index d0e886e9bc900..f0f1dfd565024 100644
--- a/sys/powerpc/include/sigframe.h
+++ b/sys/powerpc/include/sigframe.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/sigframe.h,v 1.4 2002/09/19 04:46:36 grehan Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/powerpc/include/signal.h b/sys/powerpc/include/signal.h
index ba0bee2b7797c..e270ab9fbdf54 100644
--- a/sys/powerpc/include/signal.h
+++ b/sys/powerpc/include/signal.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/signal.h,v 1.6 2005/08/20 16:44:41 stefanf Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/powerpc/include/smp.h b/sys/powerpc/include/smp.h
index 15ec74ce8f80d..388792b65417d 100644
--- a/sys/powerpc/include/smp.h
+++ b/sys/powerpc/include/smp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/include/smp.h,v 1.1 2001/06/16 07:14:04 benno Exp $ */
 
 /*
  * An empty file now,
diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h
index f3919f1a550ff..aba401687b780 100644
--- a/sys/powerpc/include/spr.h
+++ b/sys/powerpc/include/spr.h
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: spr.h,v 1.25 2002/08/14 15:38:40 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.6 2005/02/04 01:17:04 grehan Exp $
  */
 #ifndef _POWERPC_SPR_H_
 #define	_POWERPC_SPR_H_
diff --git a/sys/powerpc/include/sr.h b/sys/powerpc/include/sr.h
index 2ef7b35850765..09d919eb9432e 100644
--- a/sys/powerpc/include/sr.h
+++ b/sys/powerpc/include/sr.h
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/sr.h,v 1.5 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef _MACHINE_SR_H_
diff --git a/sys/powerpc/include/stdarg.h b/sys/powerpc/include/stdarg.h
index e81aab30b5c0c..1157c7fa071e2 100644
--- a/sys/powerpc/include/stdarg.h
+++ b/sys/powerpc/include/stdarg.h
@@ -25,7 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: stdarg.h,v 1.5 2000/02/27 17:50:21 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/stdarg.h,v 1.10 2006/09/21 01:37:02 kan Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h
index 18778a84cf8ce..07556e543c184 100644
--- a/sys/powerpc/include/trap.h
+++ b/sys/powerpc/include/trap.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/powerpc/include/trap.h,v 1.5 2007/08/07 18:39:28 marcel Exp $ 
  */
 
 #ifndef	_POWERPC_TRAP_H_
diff --git a/sys/powerpc/include/ucontext.h b/sys/powerpc/include/ucontext.h
index 58b6a80bd2ac7..b3f227c269458 100644
--- a/sys/powerpc/include/ucontext.h
+++ b/sys/powerpc/include/ucontext.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/ucontext.h,v 1.5 2005/01/07 02:29:19 imp Exp $
  */
 
 #ifndef	_MACHINE_UCONTEXT_H_
diff --git a/sys/powerpc/include/varargs.h b/sys/powerpc/include/varargs.h
index fed04c9463edb..6fc17e0a5f217 100644
--- a/sys/powerpc/include/varargs.h
+++ b/sys/powerpc/include/varargs.h
@@ -25,7 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  *	$NetBSD: varargs.h,v 1.5 2000/02/27 17:50:22 tsubai Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/varargs.h,v 1.6 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h
index 0f8298e05c553..fc02b1f9f0b87 100644
--- a/sys/powerpc/include/vmparam.h
+++ b/sys/powerpc/include/vmparam.h
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: vmparam.h,v 1.11 2000/02/11 19:25:16 thorpej Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/include/vmparam.h,v 1.10 2007/09/25 06:25:05 alc Exp $
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/powerpc/ofw/ofw_pci.c b/sys/powerpc/ofw/ofw_pci.c
index ca4b36eb04564..fe45ea52e8880 100644
--- a/sys/powerpc/ofw/ofw_pci.c
+++ b/sys/powerpc/ofw/ofw_pci.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from NetBSD: pci_machdep.c,v 1.18 2001/07/22 11:29:48 wiz Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_pci.c,v 1.5 2005/01/07 02:29:20 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/ofw/ofw_pci.h b/sys/powerpc/ofw/ofw_pci.h
index 8d78f9189e801..e34ed2b096058 100644
--- a/sys/powerpc/ofw/ofw_pci.h
+++ b/sys/powerpc/ofw/ofw_pci.h
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_pci.h,v 1.2 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef	_POWERPC_OFW_PCI_H_
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index 4cc73c4be34b3..ee131c162f012 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_pcib_pci.c,v 1.5 2006/01/06 19:22:19 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c
index 1296ea6be5788..d3d8629e50320 100644
--- a/sys/powerpc/ofw/ofw_syscons.c
+++ b/sys/powerpc/ofw/ofw_syscons.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/ofw/ofw_syscons.c,v 1.9 2005/09/28 14:54:07 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/ofw/ofw_syscons.h b/sys/powerpc/ofw/ofw_syscons.h
index af33c52d6d819..f3a2e4d985248 100644
--- a/sys/powerpc/ofw/ofw_syscons.h
+++ b/sys/powerpc/ofw/ofw_syscons.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/ofw/ofw_syscons.h,v 1.4 2005/02/25 02:29:01 grehan Exp $
  */
 
 #ifndef _OFW_SYSCONS_H_
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index 141f56ec7071e..d96df10cce5ff 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.13 2005/05/14 02:11:45 grehan Exp $");
 
 /*
  * Mac 'Kauai' PCI ATA controller
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c
index f582a5ceef88d..35584cf1bccb0 100644
--- a/sys/powerpc/powermac/ata_macio.c
+++ b/sys/powerpc/powermac/ata_macio.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.19 2005/05/01 13:11:29 grehan Exp $
  */
 
 /*
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index f606b655582d4..df5a6d21b5235 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/grackle.c,v 1.9 2007/09/30 11:05:16 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powermac/gracklevar.h b/sys/powerpc/powermac/gracklevar.h
index bb5b150e074a1..e066266c110d8 100644
--- a/sys/powerpc/powermac/gracklevar.h
+++ b/sys/powerpc/powermac/gracklevar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/gracklevar.h,v 1.2 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef	_POWERPC_POWERMAC_GRACKLEVAR_H_
diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c
index cf8a4624b58f4..2839200fe750e 100644
--- a/sys/powerpc/powermac/hrowpic.c
+++ b/sys/powerpc/powermac/hrowpic.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/hrowpic.c,v 1.13 2007/08/11 19:25:32 marcel Exp $
  */
 
 /*
diff --git a/sys/powerpc/powermac/hrowpicvar.h b/sys/powerpc/powermac/hrowpicvar.h
index ac643f574d487..179d6b2a1986e 100644
--- a/sys/powerpc/powermac/hrowpicvar.h
+++ b/sys/powerpc/powermac/hrowpicvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/hrowpicvar.h,v 1.3 2007/08/11 19:25:32 marcel Exp $
  */
 
 #ifndef  _POWERPC_POWERMAC_HROWPICVAR_H_
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index d3d3dd4a43fd9..5544f36b4ca90 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/macio.c,v 1.20 2006/04/20 04:19:10 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/powermac/maciovar.h b/sys/powerpc/powermac/maciovar.h
index e2891022ea23c..1cc051ab83584 100644
--- a/sys/powerpc/powermac/maciovar.h
+++ b/sys/powerpc/powermac/maciovar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/maciovar.h,v 1.7 2005/12/03 11:59:26 marius Exp $
  */
 
 #ifndef _MACIO_MACIOVAR_H_
diff --git a/sys/powerpc/powermac/openpic_macio.c b/sys/powerpc/powermac/openpic_macio.c
index 822804e1c2cee..77b5b8f7f4e9f 100644
--- a/sys/powerpc/powermac/openpic_macio.c
+++ b/sys/powerpc/powermac/openpic_macio.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powermac/openpic_macio.c,v 1.10 2007/08/11 19:25:32 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c
index 62777eb337480..286806e82fb48 100644
--- a/sys/powerpc/powermac/pswitch.c
+++ b/sys/powerpc/powermac/pswitch.c
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/pswitch.c,v 1.6 2007/03/02 15:13:17 piso Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index f3b0996e5ea04..9671c6d0083f9 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/uninorth.c,v 1.16 2007/09/30 11:05:16 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h
index d2ee8d793e3c3..15139e393215f 100644
--- a/sys/powerpc/powermac/uninorthvar.h
+++ b/sys/powerpc/powermac/uninorthvar.h
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powermac/uninorthvar.h,v 1.4 2005/01/07 02:29:20 imp Exp $
  */
 
 #ifndef	_POWERPC_POWERMAC_UNINORTHVAR_H_
diff --git a/sys/powerpc/powerpc/atomic.S b/sys/powerpc/powerpc/atomic.S
index c6f669a6670b8..c13f5a5252dfc 100644
--- a/sys/powerpc/powerpc/atomic.S
+++ b/sys/powerpc/powerpc/atomic.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/atomic.S,v 1.3 2005/01/07 02:29:20 imp Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index 6449323041826..e9f28c9630894 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/autoconf.c,v 1.16 2007/08/11 19:25:32 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/bcopy.c b/sys/powerpc/powerpc/bcopy.c
index af9e3bfd82db1..9b9e486e56d15 100644
--- a/sys/powerpc/powerpc/bcopy.c
+++ b/sys/powerpc/powerpc/bcopy.c
@@ -39,7 +39,7 @@ static char *rcsid = "$NetBSD: bcopy.c,v 1.2 1997/04/16 22:09:41 thorpej Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/bcopy.c,v 1.5 2004/04/07 04:59:59 imp Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 5f4ad44c37bd7..a3422e3115625 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/busdma_machdep.c,v 1.28 2007/06/22 03:57:36 yongari Exp $");
 
 /*
  * MacPPC bus dma support routines
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index 0c01cf048911a..baa30eb3feddc 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.28.2.1 2007/11/14 16:41:31 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/copyinout.c b/sys/powerpc/powerpc/copyinout.c
index 4e9f77746f1a4..c18fb34577d7d 100644
--- a/sys/powerpc/powerpc/copyinout.c
+++ b/sys/powerpc/powerpc/copyinout.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.15 2006/10/18 19:56:20 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/copystr.c b/sys/powerpc/powerpc/copystr.c
index 1a159d87185b7..d66bd81fc1c01 100644
--- a/sys/powerpc/powerpc/copystr.c
+++ b/sys/powerpc/powerpc/copystr.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copystr.c,v 1.2 2003/04/03 21:36:33 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index d942af6d4279b..ae9cd3aab1d8d 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -55,7 +55,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.9 2007/02/18 17:40:09 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/db_disasm.c b/sys/powerpc/powerpc/db_disasm.c
index 67f90d254401e..e8dfd657409c8 100644
--- a/sys/powerpc/powerpc/db_disasm.c
+++ b/sys/powerpc/powerpc/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_disasm.c,v 1.2 2002/10/04 01:19:18 grehan Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.12 2002/01/05 22:07:26 jhawk Exp $	*/
 /*	$OpenBSD: db_disasm.c,v 1.2 1996/12/28 06:21:48 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_hwwatch.c b/sys/powerpc/powerpc/db_hwwatch.c
index a5b0a69f5a919..08027ca518e2f 100644
--- a/sys/powerpc/powerpc/db_hwwatch.c
+++ b/sys/powerpc/powerpc/db_hwwatch.c
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/db_hwwatch.c,v 1.3 2005/09/10 03:01:25 marcel Exp $
  */
 #include <sys/param.h>
 
diff --git a/sys/powerpc/powerpc/db_interface.c b/sys/powerpc/powerpc/db_interface.c
index 3dae648d05fe8..3a4cc12737ad4 100644
--- a/sys/powerpc/powerpc/db_interface.c
+++ b/sys/powerpc/powerpc/db_interface.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_interface.c,v 1.7 2007/06/09 21:55:16 marcel Exp $ */
 /*	$NetBSD: db_interface.c,v 1.20 2002/05/13 20:30:09 matt Exp $ */
 /*	$OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_memrw.c b/sys/powerpc/powerpc/db_memrw.c
index e27bc67fafe57..dd0e78d823fd5 100644
--- a/sys/powerpc/powerpc/db_memrw.c
+++ b/sys/powerpc/powerpc/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_memrw.c,v 1.4 2005/01/07 02:29:20 imp Exp $ */
 /*	$NetBSD: db_memrw.c,v 1.5 2001/12/27 10:25:41 dbj Exp $	*/
 /*	$OpenBSD: db_memrw.c,v 1.2 1996/12/28 06:21:52 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_trace.c b/sys/powerpc/powerpc/db_trace.c
index 188e0287aab27..4be2b14e85f19 100644
--- a/sys/powerpc/powerpc/db_trace.c
+++ b/sys/powerpc/powerpc/db_trace.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/powerpc/powerpc/db_trace.c,v 1.13 2006/07/12 21:22:44 jhb Exp $ */
 /*	$NetBSD: db_trace.c,v 1.20 2002/05/13 20:30:09 matt Exp $	*/
 /*	$OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $	*/
 
diff --git a/sys/powerpc/powerpc/elf_machdep.c b/sys/powerpc/powerpc/elf_machdep.c
index ff017e13e9364..d3d885968afd4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/elf_machdep.c,v 1.24 2007/05/22 02:22:58 kan Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c
index c4cc326da431a..5aecb27900b68 100644
--- a/sys/powerpc/powerpc/fpu.c
+++ b/sys/powerpc/powerpc/fpu.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/fpu.c,v 1.7 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/powerpc/powerpc/fuswintr.c b/sys/powerpc/powerpc/fuswintr.c
index cb5abb7b9a18c..b19a0feedabd3 100644
--- a/sys/powerpc/powerpc/fuswintr.c
+++ b/sys/powerpc/powerpc/fuswintr.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/fuswintr.c,v 1.3 2003/04/03 21:36:33 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/gdb_machdep.c b/sys/powerpc/powerpc/gdb_machdep.c
index 5fbb744273915..6fe0cf46e905a 100644
--- a/sys/powerpc/powerpc/gdb_machdep.c
+++ b/sys/powerpc/powerpc/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/gdb_machdep.c,v 1.1 2006/08/24 21:52:11 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 63719cc12d20a..0b2885f2c2ff6 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/genassym.c,v 1.58 2006/11/30 04:17:05 jb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/in_cksum.c b/sys/powerpc/powerpc/in_cksum.c
index a65ed7dddfbee..21ad7046a51c3 100644
--- a/sys/powerpc/powerpc/in_cksum.c
+++ b/sys/powerpc/powerpc/in_cksum.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/in_cksum.c,v 1.3 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/interrupt.c b/sys/powerpc/powerpc/interrupt.c
index ff77fc8dc074e..709624fb939c2 100644
--- a/sys/powerpc/powerpc/interrupt.c
+++ b/sys/powerpc/powerpc/interrupt.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/interrupt.c,v 1.8 2007/08/11 19:25:32 marcel Exp $
  */
 
 /*
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 7653347579f37..70408342ec498 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -57,7 +57,7 @@
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
  *	form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.13.2.1 2007/11/26 16:14:45 scottl Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/locore.S b/sys/powerpc/powerpc/locore.S
index 1a3c0bbaceeb4..02aa7729f7d2f 100644
--- a/sys/powerpc/powerpc/locore.S
+++ b/sys/powerpc/powerpc/locore.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/locore.S,v 1.22 2005/10/30 21:29:59 grehan Exp $ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index 7cea2c0bd4d02..81ef2560a4638 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.103.2.1.2.1 2008/01/19 18:15:05 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c
index 340fa82a8eb51..9c903ea8a2b58 100644
--- a/sys/powerpc/powerpc/mem.c
+++ b/sys/powerpc/powerpc/mem.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mem.c,v 1.2 2006/07/26 17:12:54 marcel Exp $");
 
 /*
  * Memory special file
diff --git a/sys/powerpc/powerpc/mmu_if.m b/sys/powerpc/powerpc/mmu_if.m
index 0fc546fb14b29..2d12eaee6153f 100644
--- a/sys/powerpc/powerpc/mmu_if.m
+++ b/sys/powerpc/powerpc/mmu_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.7 2006/12/05 04:01:52 grehan Exp $
 #
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index d1a0faa9d50fa..529958e9139a8 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.115 2006/12/20 01:10:21 grehan Exp $");
 
 /*
  * Manages physical address maps.
diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c
index f76eedf58e3a5..71149413bf918 100644
--- a/sys/powerpc/powerpc/mp_machdep.c
+++ b/sys/powerpc/powerpc/mp_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/powerpc/powerpc/mp_machdep.c,v 1.13 2006/05/16 14:32:17 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c
index e31ef61a813c4..91548d6448648 100644
--- a/sys/powerpc/powerpc/nexus.c
+++ b/sys/powerpc/powerpc/nexus.c
@@ -52,7 +52,7 @@
  *
  * 	from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/nexus.c,v 1.15 2007/08/11 19:25:32 marcel Exp $
  */
 #include "opt_psim.h"
 
diff --git a/sys/powerpc/powerpc/ofw_machdep.c b/sys/powerpc/powerpc/ofw_machdep.c
index d63236f9bda84..80f7304b4cce6 100644
--- a/sys/powerpc/powerpc/ofw_machdep.c
+++ b/sys/powerpc/powerpc/ofw_machdep.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.17 2006/12/13 06:11:22 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/powerpc/powerpc/ofwmagic.S b/sys/powerpc/powerpc/ofwmagic.S
index 55af6d2544406..2b0ae8999b74b 100644
--- a/sys/powerpc/powerpc/ofwmagic.S
+++ b/sys/powerpc/powerpc/ofwmagic.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/ofwmagic.S,v 1.3 2004/08/16 15:45:27 marius Exp $ */
 /* $NetBSD: ofwmagic.S,v 1.2 1997/10/09 08:38:18 jtc Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index c6a086380eb94..c7ff5a9a0c8b0 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/openpic.c,v 1.16 2007/08/11 19:25:32 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/pic_if.m b/sys/powerpc/powerpc/pic_if.m
index 9db9c1667a128..eaf75685d5227 100644
--- a/sys/powerpc/powerpc/pic_if.m
+++ b/sys/powerpc/powerpc/pic_if.m
@@ -24,7 +24,7 @@
 # SUCH DAMAGE.
 #
 # from: src/sys/kern/bus_if.m,v 1.21 2002/04/21 11:16:10 markm Exp
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/powerpc/pic_if.m,v 1.4 2007/08/11 19:25:32 marcel Exp $
 #
 
 #include <sys/bus.h>
diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c
index 9a9c1f5db8488..1146fcf78b9c9 100644
--- a/sys/powerpc/powerpc/pmap_dispatch.c
+++ b/sys/powerpc/powerpc/pmap_dispatch.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.9.4.1 2008/01/19 18:15:06 kib Exp $");
 
 /*
  * Dispatch MI pmap calls to the appropriate MMU implementation
diff --git a/sys/powerpc/powerpc/sc_machdep.c b/sys/powerpc/powerpc/sc_machdep.c
index a81ffddbb211b..1e923cfabd54b 100644
--- a/sys/powerpc/powerpc/sc_machdep.c
+++ b/sys/powerpc/powerpc/sc_machdep.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/sc_machdep.c,v 1.1 2004/01/21 05:16:23 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/setjmp.S b/sys/powerpc/powerpc/setjmp.S
index b372e40e3ff0d..0e4af71ec4a03 100644
--- a/sys/powerpc/powerpc/setjmp.S
+++ b/sys/powerpc/powerpc/setjmp.S
@@ -1,4 +1,4 @@
-/*	$FreeBSD$  */
+/*	$FreeBSD: src/sys/powerpc/powerpc/setjmp.S,v 1.1 2002/07/10 12:26:17 benno Exp $  */
 /*	from:	NetBSD: setjmp.S,v 1.1 1998/01/27 15:13:12 sakamoto Exp $  */
 /*	from:	OpenBSD: setjmp.S,v 1.2 1996/12/28 06:22:18 rahnds Exp 	*/
 /* kernel version of this file, does not have signal goop */
diff --git a/sys/powerpc/powerpc/sigcode.S b/sys/powerpc/powerpc/sigcode.S
index af0ed49e153b6..f5b9a55709cf6 100644
--- a/sys/powerpc/powerpc/sigcode.S
+++ b/sys/powerpc/powerpc/sigcode.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/sigcode.S,v 1.4 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: sigcode.S,v 1.1 1999/11/17 14:56:11 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/powerpc/suswintr.c b/sys/powerpc/powerpc/suswintr.c
index 0252201e8a4b0..16a7070d199ea 100644
--- a/sys/powerpc/powerpc/suswintr.c
+++ b/sys/powerpc/powerpc/suswintr.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/suswintr.c,v 1.3 2004/02/11 07:48:19 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/swtch.S b/sys/powerpc/powerpc/swtch.S
index 038e788b9175c..3838a3cc5f656 100644
--- a/sys/powerpc/powerpc/swtch.S
+++ b/sys/powerpc/powerpc/swtch.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/swtch.S,v 1.21 2005/01/07 02:29:20 imp Exp $ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/syncicache.c b/sys/powerpc/powerpc/syncicache.c
index 3d4f732e72bfe..992e5c5a83636 100644
--- a/sys/powerpc/powerpc/syncicache.c
+++ b/sys/powerpc/powerpc/syncicache.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/syncicache.c,v 1.6 2007/06/09 21:55:16 marcel Exp $");
 
 #include <sys/param.h>
 #if	defined(_KERNEL) || defined(_STANDALONE)
diff --git a/sys/powerpc/powerpc/sys_machdep.c b/sys/powerpc/powerpc/sys_machdep.c
index 86e6e077c3f48..9a97da198609c 100644
--- a/sys/powerpc/powerpc/sys_machdep.c
+++ b/sys/powerpc/powerpc/sys_machdep.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/sys_machdep.c,v 1.5 2005/01/07 02:29:20 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index a5ab7ebbffb2a..dde5ca29df1f5 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.67 2007/08/07 18:40:02 marcel Exp $");
 
 #include "opt_ktrace.h"
 
diff --git a/sys/powerpc/powerpc/trap_subr.S b/sys/powerpc/powerpc/trap_subr.S
index 06ed891406f9d..419b9e9d1bb21 100644
--- a/sys/powerpc/powerpc/trap_subr.S
+++ b/sys/powerpc/powerpc/trap_subr.S
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/powerpc/powerpc/trap_subr.S,v 1.16 2005/12/23 13:05:27 grehan Exp $ */
 /* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c
index 070ad9871c5d2..32a340496fca0 100644
--- a/sys/powerpc/powerpc/uio_machdep.c
+++ b/sys/powerpc/powerpc/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.7 2007/06/09 21:55:16 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/powerpc/powerpc/uma_machdep.c b/sys/powerpc/powerpc/uma_machdep.c
index 89d092a008435..bb1bb0c6edb0e 100644
--- a/sys/powerpc/powerpc/uma_machdep.c
+++ b/sys/powerpc/powerpc/uma_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 1b58c1ec6b1d1..1f20fa3a3df2b 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$
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.115 2007/06/06 06:01:56 grehan Exp $
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c
index f9b4a56ba3611..b021e8a1bd5a4 100644
--- a/sys/powerpc/psim/ata_iobus.c
+++ b/sys/powerpc/psim/ata_iobus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/ata_iobus.c,v 1.14 2005/11/11 09:36:38 grehan Exp $
  */
 
 /*
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index 30cbeed7cedf4..7dc8ecc27e0a4 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/iobus.c,v 1.9 2006/04/20 04:19:10 imp Exp $
  */
 
 /*
diff --git a/sys/powerpc/psim/iobusvar.h b/sys/powerpc/psim/iobusvar.h
index 1ab7f7eaed901..c3b46c08bd847 100644
--- a/sys/powerpc/psim/iobusvar.h
+++ b/sys/powerpc/psim/iobusvar.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/iobusvar.h,v 1.3 2005/01/07 02:29:21 imp Exp $
  */
 
 #ifndef _PSIM_IOBUSVAR_H_
diff --git a/sys/powerpc/psim/openpic_iobus.c b/sys/powerpc/psim/openpic_iobus.c
index a3a69d318c2de..1340107cb7663 100644
--- a/sys/powerpc/psim/openpic_iobus.c
+++ b/sys/powerpc/psim/openpic_iobus.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/powerpc/psim/openpic_iobus.c,v 1.7 2007/08/11 19:25:32 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/powerpc/psim/psim-tree b/sys/powerpc/psim/psim-tree
index 62391c5ed950b..ad8c1b8b53742 100644
--- a/sys/powerpc/psim/psim-tree
+++ b/sys/powerpc/psim/psim-tree
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/powerpc/psim/psim-tree,v 1.2 2004/02/04 13:23:05 grehan Exp $
 #
 # Simple psim h/w description
 #
diff --git a/sys/powerpc/psim/uart_iobus.c b/sys/powerpc/psim/uart_iobus.c
index 1768338b99523..38ca07a796649 100644
--- a/sys/powerpc/psim/uart_iobus.c
+++ b/sys/powerpc/psim/uart_iobus.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/powerpc/psim/uart_iobus.c,v 1.5 2006/07/26 19:39:55 marcel Exp $
  */
 
 /*
diff --git a/sys/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c
index 94ffd526c235b..4dd2b0ded4ac1 100644
--- a/sys/rpc/rpcclnt.c
+++ b/sys/rpc/rpcclnt.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.20 2007/08/06 14:26:03 rwatson Exp $ */
 /* $Id: rpcclnt.c,v 1.9 2003/11/05 14:59:03 rees Exp $ */
 
 /*-
diff --git a/sys/rpc/rpcclnt.h b/sys/rpc/rpcclnt.h
index f57c4dc91dce1..0c2a8f1c182a8 100644
--- a/sys/rpc/rpcclnt.h
+++ b/sys/rpc/rpcclnt.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcclnt.h,v 1.5 2005/01/07 02:29:21 imp Exp $ */
 /*	$OpenBSD: nfsmount.h,v 1.11 2002/03/14 01:27:13 millert Exp $	*/
 /*	$NetBSD: nfsmount.h,v 1.10 1996/02/18 11:54:03 fvdl Exp $	*/
 
diff --git a/sys/rpc/rpcm_subs.h b/sys/rpc/rpcm_subs.h
index ac789f3c593ae..7d53fce42b3d4 100644
--- a/sys/rpc/rpcm_subs.h
+++ b/sys/rpc/rpcm_subs.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/rpc/rpcm_subs.h,v 1.3 2005/01/07 02:29:21 imp Exp $ */
 /*	$OpenBSD: nfsm_subs.h,v 1.11 2000/01/05 20:50:52 millert Exp $	*/
 /*	$NetBSD: nfsm_subs.h,v 1.10 1996/03/20 21:59:56 fvdl Exp $	*/
 
diff --git a/sys/rpc/types.h b/sys/rpc/types.h
index 4be9cc816157d..f69a9e77d07d7 100644
--- a/sys/rpc/types.h
+++ b/sys/rpc/types.h
@@ -30,7 +30,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD$
+ * $FreeBSD: src/sys/rpc/types.h,v 1.12 2007/04/10 22:10:16 pjd Exp $
  */
 
 /*
diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c
index 78ad6104fc64d..13bd1af983f2f 100644
--- a/sys/security/audit/audit.c
+++ b/sys/security/audit/audit.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit.c,v 1.33.2.1 2007/11/02 09:53:32 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/audit/audit.h b/sys/security/audit/audit.h
index 9442a1da2e305..bf92895871d09 100644
--- a/sys/security/audit/audit.h
+++ b/sys/security/audit/audit.h
@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit.h,v 1.14 2007/06/27 17:01:14 csjp Exp $
  */
 
 /*
diff --git a/sys/security/audit/audit_arg.c b/sys/security/audit/audit_arg.c
index 678076de5e02b..95e82ebb52737 100644
--- a/sys/security/audit/audit_arg.c
+++ b/sys/security/audit/audit_arg.c
@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.15 2007/06/27 17:01:14 csjp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/audit/audit_bsm.c b/sys/security/audit/audit_bsm.c
index e276f4cf7d9e8..158704341f6a8 100644
--- a/sys/security/audit/audit_bsm.c
+++ b/sys/security/audit/audit_bsm.c
@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.20.2.1.2.1 2008/02/05 14:36:41 csjp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c
index 3282226d19223..ec05ac0b77283 100644
--- a/sys/security/audit/audit_bsm_klib.c
+++ b/sys/security/audit/audit_bsm_klib.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_bsm_klib.c,v 1.7.2.1 2007/11/02 09:53:32 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/audit/audit_bsm_token.c b/sys/security/audit/audit_bsm_token.c
index b36e456558233..e7d34f71a4d5e 100644
--- a/sys/security/audit/audit_bsm_token.c
+++ b/sys/security/audit/audit_bsm_token.c
@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.14 2007/06/27 17:01:14 csjp Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/security/audit/audit_ioctl.h b/sys/security/audit/audit_ioctl.h
index edf0339870539..ed50fbb66e770 100644
--- a/sys/security/audit/audit_ioctl.h
+++ b/sys/security/audit/audit_ioctl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_ioctl.h,v 1.5 2007/04/29 16:20:32 rwatson Exp $
  */
 
 #ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_
diff --git a/sys/security/audit/audit_pipe.c b/sys/security/audit/audit_pipe.c
index ce2f1df517e3a..210b031072835 100644
--- a/sys/security/audit/audit_pipe.c
+++ b/sys/security/audit/audit_pipe.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.11.2.2 2007/11/04 16:44:48 csjp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/audit/audit_private.h b/sys/security/audit/audit_private.h
index 1e5aa83f56433..337842cc306fb 100644
--- a/sys/security/audit/audit_private.h
+++ b/sys/security/audit/audit_private.h
@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.16 2007/06/01 21:58:58 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c
index fa037abee52cf..c5a13d7ee7f5e 100644
--- a/sys/security/audit/audit_syscalls.c
+++ b/sys/security/audit/audit_syscalls.c
@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.21 2007/06/27 17:01:15 csjp Exp $
  */
 
 #include "opt_mac.h"
diff --git a/sys/security/audit/audit_trigger.c b/sys/security/audit/audit_trigger.c
index 08cacb013b0f3..a667114c76656 100644
--- a/sys/security/audit/audit_trigger.c
+++ b/sys/security/audit/audit_trigger.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_trigger.c,v 1.5 2007/06/13 21:17:23 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/audit/audit_worker.c b/sys/security/audit/audit_worker.c
index cdf1cf2683fba..f2532b47ae1a8 100644
--- a/sys/security/audit/audit_worker.c
+++ b/sys/security/audit/audit_worker.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.16 2007/06/01 21:58:59 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_audit.c b/sys/security/mac/mac_audit.c
index 69731c7f7c812..07c6f7c70b378 100644
--- a/sys/security/mac/mac_audit.c
+++ b/sys/security/mac/mac_audit.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_audit.c,v 1.2 2007/06/26 14:14:01 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index d54316ecb6743..b3a3f95a831d9 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -65,7 +65,7 @@
 #include "opt_mac.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_framework.c,v 1.136 2007/01/01 01:40:29 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
index d9ede98351b38..418fec656061f 100644
--- a/sys/security/mac/mac_framework.h
+++ b/sys/security/mac/mac_framework.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.84.2.1 2007/11/06 14:46:58 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac/mac_inet.c b/sys/security/mac/mac_inet.c
index 7704d730e175f..75080f30c5954 100644
--- a/sys/security/mac/mac_inet.c
+++ b/sys/security/mac/mac_inet.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.11 2007/04/22 19:55:55 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index fcf59aa4ecb7e..d5cc1a31f84ec 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.121 2007/02/06 14:19:24 rwatson Exp $
  */
 
 #ifndef _SYS_SECURITY_MAC_MAC_INTERNAL_H_
diff --git a/sys/security/mac/mac_label.c b/sys/security/mac/mac_label.c
index c05865316373b..4e4bc72efebc6 100644
--- a/sys/security/mac/mac_label.c
+++ b/sys/security/mac/mac_label.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_label.c,v 1.8 2007/02/06 14:19:24 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 05a0073c20a33..14e1c6c8c2b5b 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.126 2007/04/22 19:55:55 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 6578517681f2b..97472d924fab3 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_pipe.c,v 1.112 2007/04/22 19:55:56 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h
index c16fbb564625e..31d4e021c8a4d 100644
--- a/sys/security/mac/mac_policy.h
+++ b/sys/security/mac/mac_policy.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.94.2.1 2007/11/06 14:46:58 rwatson Exp $
  */
 /*
  * Kernel interface for MAC policy modules.
diff --git a/sys/security/mac/mac_posix_sem.c b/sys/security/mac/mac_posix_sem.c
index 52494b7c30d59..b685853bd1567 100644
--- a/sys/security/mac/mac_posix_sem.c
+++ b/sys/security/mac/mac_posix_sem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_posix_sem.c,v 1.9.2.2 2007/12/21 14:32:04 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_posix.h"
diff --git a/sys/security/mac/mac_priv.c b/sys/security/mac/mac_priv.c
index 45a8c8129c7e2..a13625d825a68 100644
--- a/sys/security/mac/mac_priv.c
+++ b/sys/security/mac/mac_priv.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_priv.c,v 1.3 2006/12/22 23:34:44 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index abba4a9b98485..7c3fff5887b76 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.118 2007/04/22 19:55:56 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_socket.c b/sys/security/mac/mac_socket.c
index 07722ad602a37..bea8e2d411046 100644
--- a/sys/security/mac/mac_socket.c
+++ b/sys/security/mac/mac_socket.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_socket.c,v 1.10 2007/04/22 19:55:56 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index cda98c2e25060..fe5cd91493f81 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_syscalls.c,v 1.132 2007/08/06 14:26:03 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 380466e7a111b..1b2ed4dc70c25 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_system.c,v 1.112 2007/04/22 19:55:56 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_sysv_msg.c b/sys/security/mac/mac_sysv_msg.c
index 054614b1b48b6..305d012eeb074 100644
--- a/sys/security/mac/mac_sysv_msg.c
+++ b/sys/security/mac/mac_sysv_msg.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_sysv_msg.c,v 1.9 2007/02/06 10:59:21 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_sysv_sem.c b/sys/security/mac/mac_sysv_sem.c
index e77331e8f4d3e..bb4489bf8dcdc 100644
--- a/sys/security/mac/mac_sysv_sem.c
+++ b/sys/security/mac/mac_sysv_sem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_sysv_sem.c,v 1.8 2007/02/06 10:59:21 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_sysv_shm.c b/sys/security/mac/mac_sysv_shm.c
index 6cabeb42397e1..b25b28be590a0 100644
--- a/sys/security/mac/mac_sysv_shm.c
+++ b/sys/security/mac/mac_sysv_shm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_sysv_shm.c,v 1.7 2007/02/06 10:59:21 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index ad6a0e6dc630d..b10b21d212ec4 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.122 2007/09/10 00:00:16 rwatson Exp $");
 
 #include "opt_mac.h"
 
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 5a87aeed46263..183536adfe3fe 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.107.2.1 2007/11/06 14:46:58 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_biba/mac_biba.h b/sys/security/mac_biba/mac_biba.h
index 05eefab05b0df..e2c5cae5a4cd9 100644
--- a/sys/security/mac_biba/mac_biba.h
+++ b/sys/security/mac_biba/mac_biba.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_biba/mac_biba.h,v 1.7 2004/07/16 02:03:50 rwatson Exp $
  */
 /*
  * Definitions for the TrustedBSD Biba integrity policy module.
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index bdeadce021298..48f8eb98c881f 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.39 2007/09/10 00:00:17 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.h b/sys/security/mac_bsdextended/mac_bsdextended.h
index c09abc0f2ab06..f5a24d2b584fb 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.h
+++ b/sys/security/mac_bsdextended/mac_bsdextended.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.h,v 1.7 2007/07/05 13:16:04 rwatson Exp $
  */
 
 #ifndef _SYS_SECURITY_MAC_BSDEXTENDED_H
diff --git a/sys/security/mac_ifoff/mac_ifoff.c b/sys/security/mac_ifoff/mac_ifoff.c
index 412a547940b97..00a56ee41a9ae 100644
--- a/sys/security/mac_ifoff/mac_ifoff.c
+++ b/sys/security/mac_ifoff/mac_ifoff.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_ifoff/mac_ifoff.c,v 1.13 2007/04/23 13:15:21 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index 2186b97bbffd2..577720d547e86 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.53 2007/09/17 05:27:20 jeff Exp $
  */
 
 /*
diff --git a/sys/security/mac_lomac/mac_lomac.h b/sys/security/mac_lomac/mac_lomac.h
index 9edba981aa07c..a6ffc5d5cc894 100644
--- a/sys/security/mac_lomac/mac_lomac.h
+++ b/sys/security/mac_lomac/mac_lomac.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.h,v 1.4 2005/01/23 14:26:09 rwatson Exp $
  */
 /*
  * Definitions for the TrustedBSD LOMAC integrity policy module.
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index 0a84ae13f89cc..1f34f9cc3d747 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.88.2.1 2007/11/06 14:46:59 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_mls/mac_mls.h b/sys/security/mac_mls/mac_mls.h
index 7bed921b87fb7..d4f0d348838ce 100644
--- a/sys/security/mac_mls/mac_mls.h
+++ b/sys/security/mac_mls/mac_mls.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.h,v 1.8 2004/07/16 02:03:50 rwatson Exp $
  */
 /*
  * Definitions for the TrustedBSD MLS confidentiality policy module.
diff --git a/sys/security/mac_none/mac_none.c b/sys/security/mac_none/mac_none.c
index d1036d8704724..653b7e2a0cff9 100644
--- a/sys/security/mac_none/mac_none.c
+++ b/sys/security/mac_none/mac_none.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_none/mac_none.c,v 1.36 2007/02/23 11:21:26 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c
index c418d3f3450a8..2e1855ed582ac 100644
--- a/sys/security/mac_partition/mac_partition.c
+++ b/sys/security/mac_partition/mac_partition.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.19 2007/04/23 13:15:22 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_partition/mac_partition.h b/sys/security/mac_partition/mac_partition.h
index f5675e2e428c0..2765ac209fee0 100644
--- a/sys/security/mac_partition/mac_partition.h
+++ b/sys/security/mac_partition/mac_partition.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_partition/mac_partition.h,v 1.3 2004/02/22 00:33:12 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_portacl/mac_portacl.c b/sys/security/mac_portacl/mac_portacl.c
index 633f606e19723..70011e6b2531f 100644
--- a/sys/security/mac_portacl/mac_portacl.c
+++ b/sys/security/mac_portacl/mac_portacl.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_portacl/mac_portacl.c,v 1.15 2007/06/12 00:12:00 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_seeotheruids/mac_seeotheruids.c b/sys/security/mac_seeotheruids/mac_seeotheruids.c
index 1e5e4df3ef076..7c4ea54922002 100644
--- a/sys/security/mac_seeotheruids/mac_seeotheruids.c
+++ b/sys/security/mac_seeotheruids/mac_seeotheruids.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_seeotheruids/mac_seeotheruids.c,v 1.15 2007/06/12 00:12:01 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 8fa9a0db979ed..b92cf3eaaf117 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.68.2.1 2007/11/06 14:46:59 rwatson Exp $
  */
 
 /*
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index 4947cdc49c425..56f509362c87a 100644
--- a/sys/security/mac_test/mac_test.c
+++ b/sys/security/mac_test/mac_test.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.78.2.1 2007/11/06 14:46:59 rwatson Exp $
  */
 
 /*
diff --git a/sys/sparc64/central/central.c b/sys/sparc64/central/central.c
index 51b2a2216d5c1..fdef630c358a0 100644
--- a/sys/sparc64/central/central.c
+++ b/sys/sparc64/central/central.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.12 2007/03/07 21:13:50 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/compile/.cvsignore b/sys/sparc64/compile/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/sparc64/compile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/sparc64/conf/.cvsignore b/sys/sparc64/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/sparc64/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index 0bcec69a22129..abd93a1a8e701 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/sparc64
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/DEFAULTS,v 1.10.2.1 2007/11/26 20:07:20 marius Exp $
 
 machine		sparc64
 
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 5ffcc9c117dd1..5e0948faa2c22 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.127.2.1 2007/10/11 06:20:27 kensmith Exp $
 
 cpu		SUN4U
 ident		GENERIC
diff --git a/sys/sparc64/conf/GENERIC.hints b/sys/sparc64/conf/GENERIC.hints
index e8c0da7a1d7eb..30d9b32767d68 100644
--- a/sys/sparc64/conf/GENERIC.hints
+++ b/sys/sparc64/conf/GENERIC.hints
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/GENERIC.hints,v 1.1 2001/08/14 03:27:02 jake Exp $
diff --git a/sys/sparc64/conf/MAC b/sys/sparc64/conf/MAC
index 56af83d0a806d..b373de867757e 100644
--- a/sys/sparc64/conf/MAC
+++ b/sys/sparc64/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/MAC,v 1.1 2005/09/18 03:15:36 csjp Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/sparc64/conf/Makefile b/sys/sparc64/conf/Makefile
index 2c006e9c2c80d..50f097a1ffcf8 100644
--- a/sys/sparc64/conf/Makefile
+++ b/sys/sparc64/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/Makefile,v 1.2 2003/02/26 23:36:59 ru Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 2f9e4e4911cc7..14b615294d7e0 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.30 2006/11/02 00:01:15 marius Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 7fb8a3ad51c40..9920eb6f9cf37 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.26 2006/04/20 04:20:40 imp Exp $");
 
 /*
  * UltraSPARC 5 and beyond Ebus support.
diff --git a/sys/sparc64/ebus/ebusreg.h b/sys/sparc64/ebus/ebusreg.h
index fd192e67ffb52..f519559f76a66 100644
--- a/sys/sparc64/ebus/ebusreg.h
+++ b/sys/sparc64/ebus/ebusreg.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/sys/sparc64/ebus/ebusreg.h,v 1.2 2005/01/07 02:29:21 imp Exp $	*/
 /*	$OpenBSD: ebusreg.h,v 1.4 2001/10/01 18:08:04 jason Exp $	*/
 /*	$NetBSD: ebusreg.h,v 1.1 1999/06/04 13:29:13 mrg Exp $	*/
 
diff --git a/sys/sparc64/fhc/clkbrd.c b/sys/sparc64/fhc/clkbrd.c
index 6d9ffc8d4292e..a2b665a9378d5 100644
--- a/sys/sparc64/fhc/clkbrd.c
+++ b/sys/sparc64/fhc/clkbrd.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/clkbrd.c,v 1.3 2006/03/28 19:46:48 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/fhc/clkbrdreg.h b/sys/sparc64/fhc/clkbrdreg.h
index 167c1ba89688a..ed3f27f15c737 100644
--- a/sys/sparc64/fhc/clkbrdreg.h
+++ b/sys/sparc64/fhc/clkbrdreg.h
@@ -26,7 +26,7 @@
  *
  *	from: OpenBSD: clkbrdreg.h,v 1.2 2004/10/01 15:36:30 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/fhc/clkbrdreg.h,v 1.2 2006/03/28 19:46:48 marius Exp $
  */
 
 #ifndef _SPARC64_FHC_CLKBRDREG_H_
diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c
index 8fcd25d120c63..a5d3e34841c78 100644
--- a/sys/sparc64/fhc/fhc.c
+++ b/sys/sparc64/fhc/fhc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc.c,v 1.18 2007/09/06 19:16:29 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/fhc/fhcreg.h b/sys/sparc64/fhc/fhcreg.h
index 2c6043abf793d..63555ecefcf7c 100644
--- a/sys/sparc64/fhc/fhcreg.h
+++ b/sys/sparc64/fhc/fhcreg.h
@@ -50,7 +50,7 @@
  *
  *	from: OpenBSD: fhcreg.h,v 1.3 2004/09/28 16:26:03 jason Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/fhc/fhcreg.h,v 1.3 2005/03/19 00:48:34 marius Exp $
  */
 
 #ifndef _SPARC64_FHC_FHCREG_H_
diff --git a/sys/sparc64/include/_bus.h b/sys/sparc64/include/_bus.h
index b24ed629208b2..551a9dfe84c0e 100644
--- a/sys/sparc64/include/_bus.h
+++ b/sys/sparc64/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_bus.h,v 1.2 2006/06/13 19:18:09 marius Exp $
  */
 
 #ifndef SPARC64_INCLUDE__BUS_H
diff --git a/sys/sparc64/include/_inttypes.h b/sys/sparc64/include/_inttypes.h
index e6b2536ff379b..9b669288cc077 100644
--- a/sys/sparc64/include/_inttypes.h
+++ b/sys/sparc64/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_inttypes.h,v 1.2 2002/06/30 05:48:03 mike Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/sparc64/include/_limits.h b/sys/sparc64/include/_limits.h
index 248369288caef..21548aac00afe 100644
--- a/sys/sparc64/include/_limits.h
+++ b/sys/sparc64/include/_limits.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_limits.h,v 1.14 2005/08/20 16:44:41 stefanf Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/sparc64/include/_stdint.h b/sys/sparc64/include/_stdint.h
index 1aed3e3b4efc1..f3844dd342064 100644
--- a/sys/sparc64/include/_stdint.h
+++ b/sys/sparc64/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h
index f810c159a6efd..6cb1982d3738b 100644
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -29,7 +29,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.8 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/sparc64/include/asi.h b/sys/sparc64/include/asi.h
index a05166ffabc86..7256cb361933f 100644
--- a/sys/sparc64/include/asi.h
+++ b/sys/sparc64/include/asi.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: asi.h,v 1.3 1997/08/08 14:31:42 torek
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/asi.h,v 1.12 2006/10/09 05:59:04 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ASI_H_
diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h
index 8182fe77fe76a..f36a728ce8b9f 100644
--- a/sys/sparc64/include/asm.h
+++ b/sys/sparc64/include/asm.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *	from: FreeBSD: src/sys/i386/include/asm.h,v 1.7 2000/01/25
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/asm.h,v 1.7 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/sparc64/include/asmacros.h b/sys/sparc64/include/asmacros.h
index a0e317b218e48..49ff402501555 100644
--- a/sys/sparc64/include/asmacros.h
+++ b/sys/sparc64/include/asmacros.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/asmacros.h,v 1.19 2004/06/06 21:26:48 phk Exp $
  */
 
 #ifndef	_MACHINE_ASMACROS_H_
diff --git a/sys/sparc64/include/atomic.h b/sys/sparc64/include/atomic.h
index 77d455bfce5a4..373c4bcf8cc96 100644
--- a/sys/sparc64/include/atomic.h
+++ b/sys/sparc64/include/atomic.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/atomic.h,v 1.10 2005/09/27 17:39:11 jhb Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index a052bc9ea1847..da97e10d41984 100644
--- a/sys/sparc64/include/bus.h
+++ b/sys/sparc64/include/bus.h
@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.41 2007/01/18 18:32:25 marius Exp $
  */
 
 #ifndef	_MACHINE_BUS_H_
diff --git a/sys/sparc64/include/bus_common.h b/sys/sparc64/include/bus_common.h
index fce7584ea0abf..d7ca59f3e1b2c 100644
--- a/sys/sparc64/include/bus_common.h
+++ b/sys/sparc64/include/bus_common.h
@@ -33,7 +33,7 @@
  *	form: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_common.h,v 1.7 2007/09/06 19:16:29 marius Exp $
  */
 
 #ifndef _MACHINE_BUS_COMMON_H_
diff --git a/sys/sparc64/include/bus_dma.h b/sys/sparc64/include/bus_dma.h
index e2b89a1263a5f..253d71d8efc55 100644
--- a/sys/sparc64/include/bus_dma.h
+++ b/sys/sparc64/include/bus_dma.h
@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_dma.h,v 1.1 2005/03/14 16:46:28 scottl Exp $
  */
 
 #ifndef _SPARC64_BUS_DMA_H
diff --git a/sys/sparc64/include/bus_private.h b/sys/sparc64/include/bus_private.h
index 9e5ab082685eb..df87d77e6a100 100644
--- a/sys/sparc64/include/bus_private.h
+++ b/sys/sparc64/include/bus_private.h
@@ -25,7 +25,7 @@
  *
  *	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.25 2002/01/05
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/bus_private.h,v 1.8 2007/03/07 21:13:50 marius Exp $
  */
 
 #ifndef	_MACHINE_BUS_PRIVATE_H_
diff --git a/sys/sparc64/include/cache.h b/sys/sparc64/include/cache.h
index 94045547c600f..016fbbdb7978e 100644
--- a/sys/sparc64/include/cache.h
+++ b/sys/sparc64/include/cache.h
@@ -39,7 +39,7 @@
  *	from: @(#)cache.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: cache.h,v 1.3 2000/08/01 00:28:02 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/cache.h,v 1.13 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef _MACHINE_CACHE_H_
diff --git a/sys/sparc64/include/ccr.h b/sys/sparc64/include/ccr.h
index 2b7ac84ec9b6b..76b0888f6f0d2 100644
--- a/sys/sparc64/include/ccr.h
+++ b/sys/sparc64/include/ccr.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ccr.h,v 1.2 2001/12/29 06:50:25 jake Exp $
  */
 
 #ifndef	_MACHINE_CCR_H_
diff --git a/sys/sparc64/include/clock.h b/sys/sparc64/include/clock.h
index c98b024437e39..67d2ed607de0b 100644
--- a/sys/sparc64/include/clock.h
+++ b/sys/sparc64/include/clock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/clock.h,v 1.7 2006/10/02 12:59:58 phk Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_
diff --git a/sys/sparc64/include/cpu.h b/sys/sparc64/include/cpu.h
index ef487210ac351..16b1ebbf9c7d4 100644
--- a/sys/sparc64/include/cpu.h
+++ b/sys/sparc64/include/cpu.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
  *	from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.17 2006/05/11 17:29:25 phk Exp $
  */
 
 #ifndef	_MACHINE_CPU_H_
diff --git a/sys/sparc64/include/cpufunc.h b/sys/sparc64/include/cpufunc.h
index 211eec3c2be17..2506b8cf02e15 100644
--- a/sys/sparc64/include/cpufunc.h
+++ b/sys/sparc64/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.21 2005/07/27 20:01:45 jhb Exp $
  */
 
 #ifndef	_MACHINE_CPUFUNC_H_
diff --git a/sys/sparc64/include/db_machdep.h b/sys/sparc64/include/db_machdep.h
index 439df3699df56..dfcb4f6f3216d 100644
--- a/sys/sparc64/include/db_machdep.h
+++ b/sys/sparc64/include/db_machdep.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/db_machdep.h,v 1.9 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/sparc64/include/elf.h b/sys/sparc64/include/elf.h
index 76e3a76371991..aa3f9f686f12f 100644
--- a/sys/sparc64/include/elf.h
+++ b/sys/sparc64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.15 2006/10/04 21:37:10 jb Exp $
  */
 
 #ifndef	_MACHINE_ELF_H_
diff --git a/sys/sparc64/include/endian.h b/sys/sparc64/include/endian.h
index 17447844ac44b..41b54289dca94 100644
--- a/sys/sparc64/include/endian.h
+++ b/sys/sparc64/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.16 2006/10/30 21:50:11 marius Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/sparc64/include/exec.h b/sys/sparc64/include/exec.h
index c0f93b68bf905..89b285a357e95 100644
--- a/sys/sparc64/include/exec.h
+++ b/sys/sparc64/include/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/exec.h,v 1.3 2001/08/09 02:09:34 obrien Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/sparc64/include/float.h b/sys/sparc64/include/float.h
index cf78df0c6b556..fd1e01725b6a5 100644
--- a/sys/sparc64/include/float.h
+++ b/sys/sparc64/include/float.h
@@ -32,7 +32,7 @@
  *
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/float.h,v 1.6 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/sparc64/include/floatingpoint.h b/sys/sparc64/include/floatingpoint.h
index d47756a00c6c4..5645490723ca4 100644
--- a/sys/sparc64/include/floatingpoint.h
+++ b/sys/sparc64/include/floatingpoint.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/floatingpoint.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/sparc64/include/fp.h b/sys/sparc64/include/fp.h
index bf0d79a8aba6b..241a6ba6b6351 100644
--- a/sys/sparc64/include/fp.h
+++ b/sys/sparc64/include/fp.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/fp.h,v 1.9 2003/04/01 04:02:44 jake Exp $
  */
 
 #ifndef	_MACHINE_FP_H_
diff --git a/sys/sparc64/include/frame.h b/sys/sparc64/include/frame.h
index 5b776f2205cae..b4a133d78df2c 100644
--- a/sys/sparc64/include/frame.h
+++ b/sys/sparc64/include/frame.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/frame.h,v 1.17 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_FRAME_H_
diff --git a/sys/sparc64/include/fsr.h b/sys/sparc64/include/fsr.h
index db0039a236e09..9f51543b5c9cf 100644
--- a/sys/sparc64/include/fsr.h
+++ b/sys/sparc64/include/fsr.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/fsr.h,v 1.4 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_FSR_H_
diff --git a/sys/sparc64/include/gdb_machdep.h b/sys/sparc64/include/gdb_machdep.h
index efbc5e78524b9..008e5c4b7d3e5 100644
--- a/sys/sparc64/include/gdb_machdep.h
+++ b/sys/sparc64/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/gdb_machdep.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/sparc64/include/idprom.h b/sys/sparc64/include/idprom.h
index df76a7f731221..53425f0115a2b 100644
--- a/sys/sparc64/include/idprom.h
+++ b/sys/sparc64/include/idprom.h
@@ -30,7 +30,7 @@
  *
  *	from: NetBSD: idprom.h,v 1.2 1998/09/05 23:57:26 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/idprom.h,v 1.2 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IDPROM_H_
diff --git a/sys/sparc64/include/ieee.h b/sys/sparc64/include/ieee.h
index 82ba9a1ae62f0..f4eb76212705e 100644
--- a/sys/sparc64/include/ieee.h
+++ b/sys/sparc64/include/ieee.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ieee.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/sparc64/include/ieeefp.h b/sys/sparc64/include/ieeefp.h
index 11264949acee4..eb7911dfe4a60 100644
--- a/sys/sparc64/include/ieeefp.h
+++ b/sys/sparc64/include/ieeefp.h
@@ -1,7 +1,7 @@
 /*-
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ieeefp.h,v 1.4 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/sparc64/include/in_cksum.h b/sys/sparc64/include/in_cksum.h
index 2e46f4632968d..e7835ea7412b8 100644
--- a/sys/sparc64/include/in_cksum.h
+++ b/sys/sparc64/include/in_cksum.h
@@ -55,7 +55,7 @@
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  *	from: FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/in_cksum.h,v 1.3 2006/01/12 11:40:39 marius Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/sparc64/include/instr.h b/sys/sparc64/include/instr.h
index d6befbbc3ffee..b789ff4105ccf 100644
--- a/sys/sparc64/include/instr.h
+++ b/sys/sparc64/include/instr.h
@@ -31,7 +31,7 @@
  *
  *	from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/instr.h,v 1.7 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_INSTR_H_
diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h
index 1a9209fdeaca9..fef1be1798349 100644
--- a/sys/sparc64/include/intr_machdep.h
+++ b/sys/sparc64/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/intr_machdep.h,v 1.17 2007/09/06 19:16:29 marius Exp $
  */
 
 #ifndef	_MACHINE_INTR_MACHDEP_H_
diff --git a/sys/sparc64/include/iommureg.h b/sys/sparc64/include/iommureg.h
index 0218cfad4ea71..68b9dca9e369b 100644
--- a/sys/sparc64/include/iommureg.h
+++ b/sys/sparc64/include/iommureg.h
@@ -33,7 +33,7 @@
  *	from: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/iommureg.h,v 1.8 2007/08/05 11:56:43 marius Exp $
  */
 
 #ifndef _MACHINE_IOMMUREG_H_
diff --git a/sys/sparc64/include/iommuvar.h b/sys/sparc64/include/iommuvar.h
index 792a8235b7a95..39e9d93cd8d97 100644
--- a/sys/sparc64/include/iommuvar.h
+++ b/sys/sparc64/include/iommuvar.h
@@ -27,7 +27,7 @@
  *
  *	from: NetBSD: iommuvar.h,v 1.9 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/iommuvar.h,v 1.16 2007/08/05 11:56:43 marius Exp $
  */
 
 #ifndef _MACHINE_IOMMUVAR_H_
diff --git a/sys/sparc64/include/kdb.h b/sys/sparc64/include/kdb.h
index 02ce4e703b1ec..4c97a5421d480 100644
--- a/sys/sparc64/include/kdb.h
+++ b/sys/sparc64/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/kdb.h,v 1.4 2007/06/09 21:55:17 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/sparc64/include/kerneldump.h b/sys/sparc64/include/kerneldump.h
index 7fad3fce88dde..04d43f32454a5 100644
--- a/sys/sparc64/include/kerneldump.h
+++ b/sys/sparc64/include/kerneldump.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/kerneldump.h,v 1.2 2003/04/08 06:35:08 jake Exp $
  */
 
 #ifndef _MACHINE_KERNELDUMP_H_
diff --git a/sys/sparc64/include/ktr.h b/sys/sparc64/include/ktr.h
index 0b7e96a50eec1..696137af5c5b2 100644
--- a/sys/sparc64/include/ktr.h
+++ b/sys/sparc64/include/ktr.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ktr.h,v 1.6 2005/12/06 16:38:08 marius Exp $
  */
 
 #ifndef _MACHINE_KTR_H_
diff --git a/sys/sparc64/include/limits.h b/sys/sparc64/include/limits.h
index 679dcec51b311..ba392a15c5564 100644
--- a/sys/sparc64/include/limits.h
+++ b/sys/sparc64/include/limits.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/limits.h,v 1.12 2005/03/04 21:26:07 joerg Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/sparc64/include/lsu.h b/sys/sparc64/include/lsu.h
index a8787dcabdc75..66d595f5a7220 100644
--- a/sys/sparc64/include/lsu.h
+++ b/sys/sparc64/include/lsu.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/lsu.h,v 1.2 2002/07/16 16:24:03 tmm Exp $
  */
 
 #ifndef	_MACHINE_LSU_H_
diff --git a/sys/sparc64/include/md_var.h b/sys/sparc64/include/md_var.h
index 34a3437ac06a2..530ec260afca3 100644
--- a/sys/sparc64/include/md_var.h
+++ b/sys/sparc64/include/md_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/md_var.h,v 1.16 2005/01/19 18:24:07 jhb Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/sparc64/include/memdev.h b/sys/sparc64/include/memdev.h
index 671a6b467d7ef..f1205ca76b2e4 100644
--- a/sys/sparc64/include/memdev.h
+++ b/sys/sparc64/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/memdev.h,v 1.1 2004/08/01 11:40:54 markm Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/sparc64/include/metadata.h b/sys/sparc64/include/metadata.h
index d14e1f150d639..781b40b165c0a 100644
--- a/sys/sparc64/include/metadata.h
+++ b/sys/sparc64/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.5 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/sparc64/include/mutex.h b/sys/sparc64/include/mutex.h
index c9b2e1ddde073..25cdbc6111e5b 100644
--- a/sys/sparc64/include/mutex.h
+++ b/sys/sparc64/include/mutex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/mutex.h,v 1.5 2001/12/18 00:27:18 jhb Exp $
  */
 
 #ifndef	_MACHINE_MUTEX_H_
diff --git a/sys/sparc64/include/ofw_bus.h b/sys/sparc64/include/ofw_bus.h
index 1e9004e15d77a..44d45cd253f62 100644
--- a/sys/sparc64/include/ofw_bus.h
+++ b/sys/sparc64/include/ofw_bus.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_bus.h,v 1.7 2004/08/16 15:45:27 marius Exp $
  */
 
 #ifndef	_MACHINE_OFW_BUS_H_
diff --git a/sys/sparc64/include/ofw_machdep.h b/sys/sparc64/include/ofw_machdep.h
index ac1fcc1ea1ede..19cc300880824 100644
--- a/sys/sparc64/include/ofw_machdep.h
+++ b/sys/sparc64/include/ofw_machdep.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_machdep.h,v 1.6 2005/02/12 19:13:51 marius Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
diff --git a/sys/sparc64/include/ofw_mem.h b/sys/sparc64/include/ofw_mem.h
index af9089ed034a6..ed6f549840249 100644
--- a/sys/sparc64/include/ofw_mem.h
+++ b/sys/sparc64/include/ofw_mem.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_mem.h,v 1.3 2003/06/07 18:29:29 jake Exp $
  */
 
 #ifndef _MACHINE_OFW_MEM_H_
diff --git a/sys/sparc64/include/ofw_nexus.h b/sys/sparc64/include/ofw_nexus.h
index 5de08b778c8a9..d93257dde0e3b 100644
--- a/sys/sparc64/include/ofw_nexus.h
+++ b/sys/sparc64/include/ofw_nexus.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ofw_nexus.h,v 1.7 2007/03/07 21:13:51 marius Exp $
  */
 
 #ifndef _MACHINE_OFW_NEXUS_H_
diff --git a/sys/sparc64/include/param.h b/sys/sparc64/include/param.h
index dd86233a943b3..24747b5540962 100644
--- a/sys/sparc64/include/param.h
+++ b/sys/sparc64/include/param.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/param.h,v 1.22 2006/12/18 07:28:59 kmacy Exp $
  */
 
 /*
diff --git a/sys/sparc64/include/pcb.h b/sys/sparc64/include/pcb.h
index 7e8294ad9b687..263e317fd6dbb 100644
--- a/sys/sparc64/include/pcb.h
+++ b/sys/sparc64/include/pcb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pcb.h,v 1.18 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_PCB_H_
diff --git a/sys/sparc64/include/pcpu.h b/sys/sparc64/include/pcpu.h
index f3a9f64ee0d8a..2c5395ec31ea1 100644
--- a/sys/sparc64/include/pcpu.h
+++ b/sys/sparc64/include/pcpu.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pcpu.h,v 1.22 2007/06/04 21:38:47 attilio Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/sparc64/include/pmap.h b/sys/sparc64/include/pmap.h
index 3524adf3f9b87..0a95940a280be 100644
--- a/sys/sparc64/include/pmap.h
+++ b/sys/sparc64/include/pmap.h
@@ -33,7 +33,7 @@
  *	from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h        7.4 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.47 2006/07/20 17:48:40 alc Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
diff --git a/sys/sparc64/include/pmc_mdep.h b/sys/sparc64/include/pmc_mdep.h
index cf643c7b4f399..6951e12d2297c 100644
--- a/sys/sparc64/include/pmc_mdep.h
+++ b/sys/sparc64/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/sparc64/include/proc.h b/sys/sparc64/include/proc.h
index bfd1268e433c5..4a60e9d259300 100644
--- a/sys/sparc64/include/proc.h
+++ b/sys/sparc64/include/proc.h
@@ -28,7 +28,7 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/proc.h,v 1.14 2005/04/04 21:53:55 jhb Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/sparc64/include/profile.h b/sys/sparc64/include/profile.h
index 6c7d1b297ac95..fbcd31052f026 100644
--- a/sys/sparc64/include/profile.h
+++ b/sys/sparc64/include/profile.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.9 2007/05/11 23:43:55 marius Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/sparc64/include/pstate.h b/sys/sparc64/include/pstate.h
index 4f536303c82b3..eb25a4871b98e 100644
--- a/sys/sparc64/include/pstate.h
+++ b/sys/sparc64/include/pstate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/pstate.h,v 1.7 2001/12/29 07:01:34 jake Exp $
  */
 
 #ifndef	_MACHINE_PSTATE_H_
diff --git a/sys/sparc64/include/ptrace.h b/sys/sparc64/include/ptrace.h
index 49b1e1c0ee9aa..855520fdbdbf6 100644
--- a/sys/sparc64/include/ptrace.h
+++ b/sys/sparc64/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ptrace.h,v 1.8 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_PTRACE_H_
diff --git a/sys/sparc64/include/reg.h b/sys/sparc64/include/reg.h
index d2241861d209e..66bd5904fcd30 100644
--- a/sys/sparc64/include/reg.h
+++ b/sys/sparc64/include/reg.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
  *	from: FreeBSD: src/sys/i386/include/reg.h,v 1.23 2000/09/21
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/reg.h,v 1.14 2004/04/07 05:00:00 imp Exp $
  */
 
 #ifndef	_MACHINE_REG_H_
diff --git a/sys/sparc64/include/reloc.h b/sys/sparc64/include/reloc.h
index 0e4155dac4cf7..ee8f83a508869 100644
--- a/sys/sparc64/include/reloc.h
+++ b/sys/sparc64/include/reloc.h
@@ -26,5 +26,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/reloc.h,v 1.3 2007/01/12 07:18:16 imp Exp $
  */
diff --git a/sys/sparc64/include/resource.h b/sys/sparc64/include/resource.h
index 229d14f253b0f..34da1c6fd43b8 100644
--- a/sys/sparc64/include/resource.h
+++ b/sys/sparc64/include/resource.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/resource.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/sparc64/include/runq.h b/sys/sparc64/include/runq.h
index 6d03646fd539b..61ad384c56182 100644
--- a/sys/sparc64/include/runq.h
+++ b/sys/sparc64/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/runq.h,v 1.3 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/sparc64/include/sc_machdep.h b/sys/sparc64/include/sc_machdep.h
index 3a492f2383ba4..c91a45d043205 100644
--- a/sys/sparc64/include/sc_machdep.h
+++ b/sys/sparc64/include/sc_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sc_machdep.h,v 1.1 2003/08/24 00:47:40 jake Exp $
  */
 
 #ifndef	_MACHINE_SC_MACHDEP_H_
diff --git a/sys/sparc64/include/setjmp.h b/sys/sparc64/include/setjmp.h
index f58776dce61c7..ada7a2ba67b96 100644
--- a/sys/sparc64/include/setjmp.h
+++ b/sys/sparc64/include/setjmp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: FreeBSD: src/sys/i386/include/setjmp.h,v 1.5 2000/10/06
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/setjmp.h,v 1.9 2007/01/12 07:18:16 imp Exp $
  */
 
 #ifndef	_MACHINE_SETJMP_H_
diff --git a/sys/sparc64/include/sf_buf.h b/sys/sparc64/include/sf_buf.h
index b6ee1cc20b69e..bec993b4e403e 100644
--- a/sys/sparc64/include/sf_buf.h
+++ b/sys/sparc64/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sf_buf.h,v 1.1 2003/11/16 06:11:26 alc Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/sparc64/include/sigframe.h b/sys/sparc64/include/sigframe.h
index fd40afdd1209b..2ab2243817471 100644
--- a/sys/sparc64/include/sigframe.h
+++ b/sys/sparc64/include/sigframe.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from:	FreeBSD: src/sys/alpha/include/sigframe.h,v 1.1 1999/09/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sigframe.h,v 1.1 2001/09/03 22:41:40 jake Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/sparc64/include/signal.h b/sys/sparc64/include/signal.h
index d96cef6dd6c83..46ee11bae60d8 100644
--- a/sys/sparc64/include/signal.h
+++ b/sys/sparc64/include/signal.h
@@ -28,7 +28,7 @@
  *
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  * 	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/signal.h,v 1.13 2005/08/20 16:44:41 stefanf Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/sparc64/include/smp.h b/sys/sparc64/include/smp.h
index 01127e83adc34..847c616e93ed3 100644
--- a/sys/sparc64/include/smp.h
+++ b/sys/sparc64/include/smp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.22 2007/06/16 23:26:00 marius Exp $
  */
 
 #ifndef	_MACHINE_SMP_H_
diff --git a/sys/sparc64/include/stdarg.h b/sys/sparc64/include/stdarg.h
index 9e6cd94c70dc5..ef753829f9f48 100644
--- a/sys/sparc64/include/stdarg.h
+++ b/sys/sparc64/include/stdarg.h
@@ -35,7 +35,7 @@
  *
  *	@(#)stdarg.h	8.2 (Berkeley) 9/27/93
  *	$NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/stdarg.h,v 1.9 2006/09/21 01:37:02 kan Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/sparc64/include/sysarch.h b/sys/sparc64/include/sysarch.h
index c209ef8048d2f..867a99671b992 100644
--- a/sys/sparc64/include/sysarch.h
+++ b/sys/sparc64/include/sysarch.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/sysarch.h,v 1.14 2000/09/21
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/sysarch.h,v 1.4 2004/04/07 05:00:00 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/include/tick.h b/sys/sparc64/include/tick.h
index 8586a0d89f8d5..418112ed10e16 100644
--- a/sys/sparc64/include/tick.h
+++ b/sys/sparc64/include/tick.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tick.h,v 1.4 2005/04/16 14:57:38 marius Exp $
  */
 
 #ifndef _MACHINE_TICK_H_
diff --git a/sys/sparc64/include/tlb.h b/sys/sparc64/include/tlb.h
index 235a18652bdb9..d9829c529b999 100644
--- a/sys/sparc64/include/tlb.h
+++ b/sys/sparc64/include/tlb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tlb.h,v 1.26 2003/04/13 21:54:58 jake Exp $
  */
 
 #ifndef	_MACHINE_TLB_H_
diff --git a/sys/sparc64/include/trap.h b/sys/sparc64/include/trap.h
index e4adc7881f1a4..1344032b392b8 100644
--- a/sys/sparc64/include/trap.h
+++ b/sys/sparc64/include/trap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/trap.h,v 1.12 2006/01/16 01:35:24 kris Exp $
  */
 
 #ifndef	_MACHINE_TRAP_H_
diff --git a/sys/sparc64/include/tsb.h b/sys/sparc64/include/tsb.h
index 1fd1e8f758b4b..26b222287b179 100644
--- a/sys/sparc64/include/tsb.h
+++ b/sys/sparc64/include/tsb.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.19 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_TSB_H_
diff --git a/sys/sparc64/include/tstate.h b/sys/sparc64/include/tstate.h
index bead8184451c2..bb1f110f8cfbc 100644
--- a/sys/sparc64/include/tstate.h
+++ b/sys/sparc64/include/tstate.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tstate.h,v 1.2 2001/12/29 07:11:00 jake Exp $
  */
 
 #ifndef	_MACHINE_TSTATE_H_
diff --git a/sys/sparc64/include/tte.h b/sys/sparc64/include/tte.h
index 70337fe4113dc..0c12a5020961a 100644
--- a/sys/sparc64/include/tte.h
+++ b/sys/sparc64/include/tte.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/tte.h,v 1.16 2003/03/27 02:16:31 jake Exp $
  */
 
 #ifndef	_MACHINE_TTE_H_
diff --git a/sys/sparc64/include/ucontext.h b/sys/sparc64/include/ucontext.h
index c05ec26a90533..9fbb1a75d1a64 100644
--- a/sys/sparc64/include/ucontext.h
+++ b/sys/sparc64/include/ucontext.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/alpha/include/ucontext.h,v 1.3 1999/10/08
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ucontext.h,v 1.8 2003/01/10 00:04:56 jake Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/sparc64/include/upa.h b/sys/sparc64/include/upa.h
index 3e56917b63833..9ab82c00108b0 100644
--- a/sys/sparc64/include/upa.h
+++ b/sys/sparc64/include/upa.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/upa.h,v 1.4 2002/04/02 17:38:52 tmm Exp $
  */
 
 #ifndef _MACHINE_UPA_H_
diff --git a/sys/sparc64/include/utrap.h b/sys/sparc64/include/utrap.h
index c8fa7431d95f6..c436181ddecd0 100644
--- a/sys/sparc64/include/utrap.h
+++ b/sys/sparc64/include/utrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/utrap.h,v 1.5 2006/01/16 01:35:24 kris Exp $
  */
 
 #ifndef	_MACHINE_UTRAP_H_
diff --git a/sys/sparc64/include/varargs.h b/sys/sparc64/include/varargs.h
index a168c6e33c326..a477054c4c134 100644
--- a/sys/sparc64/include/varargs.h
+++ b/sys/sparc64/include/varargs.h
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.3 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/varargs.h,v 1.8 2005/03/02 21:33:28 joerg Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/sparc64/include/ver.h b/sys/sparc64/include/ver.h
index 78e57d822b896..325e0790c3887 100644
--- a/sys/sparc64/include/ver.h
+++ b/sys/sparc64/include/ver.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/ver.h,v 1.6 2007/05/20 13:47:36 marius Exp $
  */
 
 #ifndef	_MACHINE_VER_H_
diff --git a/sys/sparc64/include/vmparam.h b/sys/sparc64/include/vmparam.h
index 5609e8e9ec117..02bb05dd287dd 100644
--- a/sys/sparc64/include/vmparam.h
+++ b/sys/sparc64/include/vmparam.h
@@ -37,7 +37,7 @@
  *
  *	from: @(#)vmparam.h     5.9 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/vmparam.h,v 1.33 2000/03/30
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/vmparam.h,v 1.18 2007/09/25 06:25:06 alc Exp $
  */
 
 
diff --git a/sys/sparc64/include/watch.h b/sys/sparc64/include/watch.h
index bb658f9efb53e..232b532ef1cc5 100644
--- a/sys/sparc64/include/watch.h
+++ b/sys/sparc64/include/watch.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/watch.h,v 1.2 2003/04/08 06:35:08 jake Exp $
  */
 
 #ifndef	_MACHINE_WATCH_H_
diff --git a/sys/sparc64/include/wstate.h b/sys/sparc64/include/wstate.h
index 7ce0a495d5d2b..d2253ce02a1b2 100644
--- a/sys/sparc64/include/wstate.h
+++ b/sys/sparc64/include/wstate.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: wstate.h,v 1.4 1997/09/18 13:05:51 torek Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/include/wstate.h,v 1.4 2002/02/25 18:37:17 jake Exp $
  */
 
 #ifndef	_MACHINE_WSTATE_H_
diff --git a/sys/sparc64/isa/isa.c b/sys/sparc64/isa/isa.c
index 37ec63aedf363..4d14229be6b84 100644
--- a/sys/sparc64/isa/isa.c
+++ b/sys/sparc64/isa/isa.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/isa/isa.c,v 1.19 2007/02/23 12:19:05 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/isa/isa_dma.c b/sys/sparc64/isa/isa_dma.c
index 19c464485a8ef..44ff4d555ea72 100644
--- a/sys/sparc64/isa/isa_dma.c
+++ b/sys/sparc64/isa/isa_dma.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/isa/isa_dma.c,v 1.2 2005/02/06 13:46:39 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/isa/ofw_isa.c b/sys/sparc64/isa/ofw_isa.c
index e1d75374aec15..273508bc8dff0 100644
--- a/sys/sparc64/isa/ofw_isa.c
+++ b/sys/sparc64/isa/ofw_isa.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/isa/ofw_isa.c,v 1.11 2005/12/03 19:52:20 marius Exp $");
 
 /*
  * Helper functions which can be used in both ISA and EBus code.
diff --git a/sys/sparc64/isa/ofw_isa.h b/sys/sparc64/isa/ofw_isa.h
index 74b48c0ed00d6..59db14d140699 100644
--- a/sys/sparc64/isa/ofw_isa.h
+++ b/sys/sparc64/isa/ofw_isa.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/isa/ofw_isa.h,v 1.5 2005/01/07 02:29:22 imp Exp $
  */
 
 #ifndef _SPARC64_ISA_OFW_ISA_H_
diff --git a/sys/sparc64/pci/apb.c b/sys/sparc64/pci/apb.c
index 9455882d5dbec..722cf5257372e 100644
--- a/sys/sparc64/pci/apb.c
+++ b/sys/sparc64/pci/apb.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/apb.c,v 1.14 2007/09/30 11:05:17 marius Exp $");
 
 /*
  * Support for the Sun APB (Advanced PCI Bridge) PCI-PCI bridge.
diff --git a/sys/sparc64/pci/ofw_pci.h b/sys/sparc64/pci/ofw_pci.h
index 40d531e0e2536..d26408f7768ec 100644
--- a/sys/sparc64/pci/ofw_pci.h
+++ b/sys/sparc64/pci/ofw_pci.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pci.h,v 1.11 2007/06/18 21:49:42 marius Exp $
  */
 
 #ifndef _SPARC64_PCI_OFW_PCI_H_
diff --git a/sys/sparc64/pci/ofw_pci_if.m b/sys/sparc64/pci/ofw_pci_if.m
index d93f9784e2cc5..0320dc60e19bd 100644
--- a/sys/sparc64/pci/ofw_pci_if.m
+++ b/sys/sparc64/pci/ofw_pci_if.m
@@ -22,7 +22,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sparc64/pci/ofw_pci_if.m,v 1.8 2007/06/18 21:49:42 marius Exp $
 
 #include <sys/bus.h>
 
diff --git a/sys/sparc64/pci/ofw_pcib.c b/sys/sparc64/pci/ofw_pcib.c
index aaa2c530cc7a8..008074174818a 100644
--- a/sys/sparc64/pci/ofw_pcib.c
+++ b/sys/sparc64/pci/ofw_pcib.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcib.c,v 1.8 2007/06/18 21:46:07 marius Exp $");
 
 #include "opt_ofw_pci.h"
 
diff --git a/sys/sparc64/pci/ofw_pcib_subr.c b/sys/sparc64/pci/ofw_pcib_subr.c
index 7cc867bfa303f..41c513d419175 100644
--- a/sys/sparc64/pci/ofw_pcib_subr.c
+++ b/sys/sparc64/pci/ofw_pcib_subr.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcib_subr.c,v 1.8 2007/06/18 21:49:42 marius Exp $");
 
 #include "opt_ofw_pci.h"
 
diff --git a/sys/sparc64/pci/ofw_pcib_subr.h b/sys/sparc64/pci/ofw_pcib_subr.h
index 8c17e2caeae3d..836d4cd0c034a 100644
--- a/sys/sparc64/pci/ofw_pcib_subr.h
+++ b/sys/sparc64/pci/ofw_pcib_subr.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/ofw_pcib_subr.h,v 1.3 2004/08/12 17:41:32 marius Exp $
  */
 
 #ifndef _SPARC64_PCI_OFW_PCI_SUBR_H
diff --git a/sys/sparc64/pci/ofw_pcibus.c b/sys/sparc64/pci/ofw_pcibus.c
index f77138958dc30..7e50a419d5706 100644
--- a/sys/sparc64/pci/ofw_pcibus.c
+++ b/sys/sparc64/pci/ofw_pcibus.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcibus.c,v 1.16.2.1 2007/12/04 21:40:47 marius Exp $");
 
 #include "opt_ofw_pci.h"
 
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 9f5632f3dd085..152bd09d632fb 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.70.2.1 2007/12/04 21:40:47 marius Exp $");
 
 /*
  * Support for `Hummingbird' (UltraSPARC IIe), `Psycho' and `Psycho+'
diff --git a/sys/sparc64/pci/psychoreg.h b/sys/sparc64/pci/psychoreg.h
index bf7a279a59ab1..2918408750c5b 100644
--- a/sys/sparc64/pci/psychoreg.h
+++ b/sys/sparc64/pci/psychoreg.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/psychoreg.h,v 1.14 2007/09/06 19:16:30 marius Exp $
  */
 
 #ifndef _SPARC64_PCI_PSYCHOREG_H_
diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h
index b99181d97f288..7af43766cc70c 100644
--- a/sys/sparc64/pci/psychovar.h
+++ b/sys/sparc64/pci/psychovar.h
@@ -27,7 +27,7 @@
  *
  *	from: NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/pci/psychovar.h,v 1.16.2.1 2007/12/04 21:40:47 marius Exp $
  */
 
 #ifndef _SPARC64_PCI_PSYCHOVAR_H_
diff --git a/sys/sparc64/sbus/dma_sbus.c b/sys/sparc64/sbus/dma_sbus.c
index 2b10562b7ace3..6dd15f1dbe405 100644
--- a/sys/sparc64/sbus/dma_sbus.c
+++ b/sys/sparc64/sbus/dma_sbus.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.5 2007/01/20 14:06:01 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sbus/lsi64854.c b/sys/sparc64/sbus/lsi64854.c
index 7ee3bc11e3f09..58013cacaed31 100644
--- a/sys/sparc64/sbus/lsi64854.c
+++ b/sys/sparc64/sbus/lsi64854.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/lsi64854.c,v 1.8 2006/01/31 12:50:02 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sbus/lsi64854reg.h b/sys/sparc64/sbus/lsi64854reg.h
index 802e9d6be82e7..02218f8efb5cf 100644
--- a/sys/sparc64/sbus/lsi64854reg.h
+++ b/sys/sparc64/sbus/lsi64854reg.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/sparc64/sbus/lsi64854reg.h,v 1.3 2005/04/17 17:41:32 marius Exp $ */
 
 /*
  * LSI 64854 DMA engine. Contains three independent channels
diff --git a/sys/sparc64/sbus/lsi64854var.h b/sys/sparc64/sbus/lsi64854var.h
index 9cdd0e3d61ec5..f8afb410d5d98 100644
--- a/sys/sparc64/sbus/lsi64854var.h
+++ b/sys/sparc64/sbus/lsi64854var.h
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/sys/sparc64/sbus/lsi64854var.h,v 1.6 2006/01/31 12:50:02 marius Exp $ */
 
 struct lsi64854_softc {
 	device_t		sc_dev;
diff --git a/sys/sparc64/sbus/ofw_sbus.h b/sys/sparc64/sbus/ofw_sbus.h
index 8db6a3217364e..942e01fa1fa7d 100644
--- a/sys/sparc64/sbus/ofw_sbus.h
+++ b/sys/sparc64/sbus/ofw_sbus.h
@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: sbusvar.h,v 1.12 2001/09/24 23:49:34 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/ofw_sbus.h,v 1.1 2002/02/13 16:11:36 tmm Exp $
  */
 
 #ifndef _SPARC64_SBUS_OFW_SBUS_H_
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 44f51f55023ae..37aef6768a900 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.46 2007/09/06 19:16:30 marius Exp $");
 
 /*
  * SBus support.
diff --git a/sys/sparc64/sbus/sbusreg.h b/sys/sparc64/sbus/sbusreg.h
index 7271d697f913a..147fb3a42d29c 100644
--- a/sys/sparc64/sbus/sbusreg.h
+++ b/sys/sparc64/sbus/sbusreg.h
@@ -21,7 +21,7 @@
  *
  *	from: NetBSD: sbusreg.h,v 1.7 1999/06/07 05:28:03 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/sbusreg.h,v 1.4 2007/09/06 19:16:30 marius Exp $
  */
 
 #ifndef _SPARC64_SBUS_SBUSREG_H_
diff --git a/sys/sparc64/sbus/sbusvar.h b/sys/sparc64/sbus/sbusvar.h
index e4f2895e261a3..e645d1ae3926e 100644
--- a/sys/sparc64/sbus/sbusvar.h
+++ b/sys/sparc64/sbus/sbusvar.h
@@ -73,7 +73,7 @@
  *	from: @(#)sbusvar.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: sbusvar.h,v 1.7 1999/06/05 05:30:43 mrg Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sbus/sbusvar.h,v 1.6 2005/05/19 14:47:31 marius Exp $
  */
 
 #ifndef _SPARC64_SBUS_SBUSVAR_H_
diff --git a/sys/sparc64/sparc64/autoconf.c b/sys/sparc64/sparc64/autoconf.c
index 15b8921dae821..a692d329ce1d5 100644
--- a/sys/sparc64/sparc64/autoconf.c
+++ b/sys/sparc64/sparc64/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/autoconf.c,v 1.14 2006/11/18 07:10:51 kmacy Exp $
  */
 
 #include "opt_isa.h"
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 0d1e926374d88..dec076cc9756e 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.46 2007/05/29 06:30:26 yongari Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index 48d324af12af2..e15ce9f536e24 100644
--- a/sys/sparc64/sparc64/cache.c
+++ b/sys/sparc64/sparc64/cache.c
@@ -68,7 +68,7 @@
  *	from: @(#)cache.c	8.2 (Berkeley) 10/30/93
  *	from: NetBSD: cache.c,v 1.5 2000/12/06 01:47:50 mrg Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/cache.c,v 1.20 2005/01/07 02:29:23 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/cheetah.c b/sys/sparc64/sparc64/cheetah.c
index 14f099d37138c..4ab753e5e0565 100644
--- a/sys/sparc64/sparc64/cheetah.c
+++ b/sys/sparc64/sparc64/cheetah.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/cheetah.c,v 1.5 2003/11/11 06:41:54 jake Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sparc64/sparc64/clock.c b/sys/sparc64/sparc64/clock.c
index 37341fd3ba437..dc4d75d97f10d 100644
--- a/sys/sparc64/sparc64/clock.c
+++ b/sys/sparc64/sparc64/clock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/clock.c,v 1.10 2003/02/03 17:53:15 jake Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/counter.c b/sys/sparc64/sparc64/counter.c
index 3e934659f9b0e..cf7f453170fa4 100644
--- a/sys/sparc64/sparc64/counter.c
+++ b/sys/sparc64/sparc64/counter.c
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/counter.c,v 1.6 2004/09/30 14:30:29 kensmith Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_disasm.c b/sys/sparc64/sparc64/db_disasm.c
index 32bdcca9069bf..93cd503f4f7ad 100644
--- a/sys/sparc64/sparc64/db_disasm.c
+++ b/sys/sparc64/sparc64/db_disasm.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.
  *	from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_disasm.c,v 1.8 2005/01/07 02:29:23 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_hwwatch.c b/sys/sparc64/sparc64/db_hwwatch.c
index 7a1e3c4253cb4..88449e105f9a7 100644
--- a/sys/sparc64/sparc64/db_hwwatch.c
+++ b/sys/sparc64/sparc64/db_hwwatch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_hwwatch.c,v 1.6 2005/09/10 03:01:25 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/db_interface.c b/sys/sparc64/sparc64/db_interface.c
index 95bea8a51657d..8086cca51921e 100644
--- a/sys/sparc64/sparc64/db_interface.c
+++ b/sys/sparc64/sparc64/db_interface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/db_interface.c,v 1.11 2006/10/10 07:26:53 bde Exp $
  */
 
 #include <sys/param.h> 
diff --git a/sys/sparc64/sparc64/db_trace.c b/sys/sparc64/sparc64/db_trace.c
index 73d3b310cf1ee..49ea4e665f630 100644
--- a/sys/sparc64/sparc64/db_trace.c
+++ b/sys/sparc64/sparc64/db_trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/db_trace.c,v 1.26 2006/07/12 21:22:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/dump_machdep.c b/sys/sparc64/sparc64/dump_machdep.c
index a617d4a6a18b6..695362b72fb9a 100644
--- a/sys/sparc64/sparc64/dump_machdep.c
+++ b/sys/sparc64/sparc64/dump_machdep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.8.14.1 2008/01/30 21:21:51 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index c7070185a286f..e4bf3fac1256c 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.13 2007/07/23 09:42:32 dwmalone Exp $");
 
 /*
  * clock (eeprom) attaches at EBus, FireHose or SBus
diff --git a/sys/sparc64/sparc64/elf_machdep.c b/sys/sparc64/sparc64/elf_machdep.c
index 85a72974a8e13..dc0cb66435f4d 100644
--- a/sys/sparc64/sparc64/elf_machdep.c
+++ b/sys/sparc64/sparc64/elf_machdep.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.23.2.1 2007/10/21 21:09:55 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S
index 5b7173d400a23..073ef23f53b4e 100644
--- a/sys/sparc64/sparc64/exception.S
+++ b/sys/sparc64/sparc64/exception.S
@@ -54,7 +54,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.75 2007/09/06 19:16:30 marius Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/gdb_machdep.c b/sys/sparc64/sparc64/gdb_machdep.c
index 97e6135605119..d303194ab9f61 100644
--- a/sys/sparc64/sparc64/gdb_machdep.c
+++ b/sys/sparc64/sparc64/gdb_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/gdb_machdep.c,v 1.3 2005/01/07 02:29:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/genassym.c b/sys/sparc64/sparc64/genassym.c
index 8ef97c54ae251..15d5365067e14 100644
--- a/sys/sparc64/sparc64/genassym.c
+++ b/sys/sparc64/sparc64/genassym.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.70 2007/09/17 05:27:21 jeff Exp $");
 
 #include "opt_kstack_pages.h"
 
diff --git a/sys/sparc64/sparc64/identcpu.c b/sys/sparc64/sparc64/identcpu.c
index 28cd5237e05dd..d2b514657b1a9 100644
--- a/sys/sparc64/sparc64/identcpu.c
+++ b/sys/sparc64/sparc64/identcpu.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.17 2007/05/20 13:47:36 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/in_cksum.c b/sys/sparc64/sparc64/in_cksum.c
index 8239b110e772f..88f5de167ff64 100644
--- a/sys/sparc64/sparc64/in_cksum.c
+++ b/sys/sparc64/sparc64/in_cksum.c
@@ -54,7 +54,7 @@
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  * 	from: FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.22 2000/11/25
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/in_cksum.c,v 1.2 2004/04/07 05:00:01 imp Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S
index ca4456faa4c7d..832c899d4daa1 100644
--- a/sys/sparc64/sparc64/interrupt.S
+++ b/sys/sparc64/sparc64/interrupt.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.10 2007/01/19 11:15:33 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index 735b4c0f230fc..a81fb8702d9ac 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.27.2.1 2007/11/26 15:06:50 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 1237a564265dd..7a87d30e38045 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.45 2007/08/05 11:56:44 marius Exp $");
 
 /*
  * UltraSPARC IOMMU support; used by both the PCI and SBus code.
diff --git a/sys/sparc64/sparc64/locore.S b/sys/sparc64/sparc64/locore.S
index 54a9171bf7ad3..2501eb66b6f3d 100644
--- a/sys/sparc64/sparc64/locore.S
+++ b/sys/sparc64/sparc64/locore.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/locore.S,v 1.22 2005/11/30 16:09:10 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 2e6d05e572bcf..7cd1b42be2789 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.138.4.1 2008/01/19 18:15:06 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index e8c58e2606fc3..27480ec0e5195 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mem.c,v 1.18 2007/05/20 13:06:45 marius Exp $");
 
 /*
  * Memory special file
diff --git a/sys/sparc64/sparc64/mp_exception.S b/sys/sparc64/sparc64/mp_exception.S
index ca8c90c2f656a..dc0629d66f26a 100644
--- a/sys/sparc64/sparc64/mp_exception.S
+++ b/sys/sparc64/sparc64/mp_exception.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_exception.S,v 1.13 2007/01/19 11:15:33 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/mp_locore.S b/sys/sparc64/sparc64/mp_locore.S
index 3864ac69e69e9..1c99bbcff23ea 100644
--- a/sys/sparc64/sparc64/mp_locore.S
+++ b/sys/sparc64/sparc64/mp_locore.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_locore.S,v 1.8 2007/01/19 11:15:33 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sparc64/sparc64/mp_machdep.c b/sys/sparc64/sparc64/mp_machdep.c
index d005f8ac6328a..e9aa0380c0889 100644
--- a/sys/sparc64/sparc64/mp_machdep.c
+++ b/sys/sparc64/sparc64/mp_machdep.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.36 2007/06/16 23:26:00 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/nexus.c b/sys/sparc64/sparc64/nexus.c
index 23314d86038dd..93a6e26b04926 100644
--- a/sys/sparc64/sparc64/nexus.c
+++ b/sys/sparc64/sparc64/nexus.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/nexus.c,v 1.20 2007/03/07 21:13:51 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index f7458dcc62fdb..25d66a79b36aa 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -54,7 +54,7 @@
  *
  *	from: $NetBSD: ofw_machdep.c,v 1.16 2001/07/20 00:07:14 eeh Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/ofw_bus.c,v 1.12 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c
index 7efc807e28b70..8fdfdc7022552 100644
--- a/sys/sparc64/sparc64/ofw_machdep.c
+++ b/sys/sparc64/sparc64/ofw_machdep.c
@@ -25,7 +25,7 @@
  */
  
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/ofw_machdep.c,v 1.16 2007/01/18 18:32:26 marius Exp $");
 
 /*
  * Some Open Firmware helper functions that are likely machine dependent.
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index 1c71c5f381c81..17c494457ec4e 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *      from:   @(#)pmap.c      7.7 (Berkeley)  5/12/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.166.4.1 2008/01/19 18:15:06 kib Exp $
  */
 
 /*
diff --git a/sys/sparc64/sparc64/prof_machdep.c b/sys/sparc64/sparc64/prof_machdep.c
index c0fb7794dcf76..0a3b8e4808d4b 100644
--- a/sys/sparc64/sparc64/prof_machdep.c
+++ b/sys/sparc64/sparc64/prof_machdep.c
@@ -26,7 +26,7 @@
  *
  *	from: src/sys/i386/isa/prof_machdep.c,v 1.16 2000/07/04 11:25:19
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/prof_machdep.c,v 1.2 2006/05/16 14:32:17 phk Exp $
  */
 
 #ifdef GUPROF
diff --git a/sys/sparc64/sparc64/rtc.c b/sys/sparc64/sparc64/rtc.c
index fe7f17e64a26d..f215024e73acc 100644
--- a/sys/sparc64/sparc64/rtc.c
+++ b/sys/sparc64/sparc64/rtc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/rtc.c,v 1.7 2007/07/23 09:42:32 dwmalone Exp $");
 
 /*
  * The `rtc' device is a MC146818 compatible clock found on the ISA
diff --git a/sys/sparc64/sparc64/rwindow.c b/sys/sparc64/sparc64/rwindow.c
index 5ea877413bd81..7be296361f7fe 100644
--- a/sys/sparc64/sparc64/rwindow.c
+++ b/sys/sparc64/sparc64/rwindow.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: trap.c,v 1.17.2.9 1999/10/19 15:29:52 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/rwindow.c,v 1.9 2004/11/27 06:51:38 das Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/sc_machdep.c b/sys/sparc64/sparc64/sc_machdep.c
index f56f669274f28..e203ae252a495 100644
--- a/sys/sparc64/sparc64/sc_machdep.c
+++ b/sys/sparc64/sparc64/sc_machdep.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/sc_machdep.c,v 1.3 2007/03/07 21:13:51 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/spitfire.c b/sys/sparc64/sparc64/spitfire.c
index abbcdaee3cfab..36bd393e80a88 100644
--- a/sys/sparc64/sparc64/spitfire.c
+++ b/sys/sparc64/sparc64/spitfire.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/spitfire.c,v 1.5 2003/11/11 06:41:54 jake Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sparc64/sparc64/support.S b/sys/sparc64/sparc64/support.S
index bd9a9aff98fb2..32e457fb0c368 100644
--- a/sys/sparc64/sparc64/support.S
+++ b/sys/sparc64/sparc64/support.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/support.S,v 1.32 2007/01/19 11:15:33 marius Exp $");
 
 #include <sys/errno.h>
 
diff --git a/sys/sparc64/sparc64/swtch.S b/sys/sparc64/sparc64/swtch.S
index 85478830d819b..973ac5bf03255 100644
--- a/sys/sparc64/sparc64/swtch.S
+++ b/sys/sparc64/sparc64/swtch.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.34 2007/01/19 11:15:33 marius Exp $");
 
 #include <machine/asmacros.h>
 #include <machine/asi.h>
diff --git a/sys/sparc64/sparc64/sys_machdep.c b/sys/sparc64/sparc64/sys_machdep.c
index 9ac5fbc212a4f..5f731d02b4e1a 100644
--- a/sys/sparc64/sparc64/sys_machdep.c
+++ b/sys/sparc64/sparc64/sys_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/sys_machdep.c,v 1.14 2005/01/19 18:24:07 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sparc64/sparc64/tick.c b/sys/sparc64/sparc64/tick.c
index 67f22323abe0a..fd675eeafebbe 100644
--- a/sys/sparc64/sparc64/tick.c
+++ b/sys/sparc64/sparc64/tick.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/tick.c,v 1.22 2007/09/06 19:16:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sparc64/sparc64/tlb.c b/sys/sparc64/sparc64/tlb.c
index 2226e02278223..60f455a42453d 100644
--- a/sys/sparc64/sparc64/tlb.c
+++ b/sys/sparc64/sparc64/tlb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/tlb.c,v 1.8 2003/08/22 07:38:08 imp Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index 8d0ea358dfd31..53e267b187eae 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.88 2007/06/04 21:38:48 attilio Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktr.h"
diff --git a/sys/sparc64/sparc64/tsb.c b/sys/sparc64/sparc64/tsb.c
index 86c14264ddd7c..9aa0ab7d52e40 100644
--- a/sys/sparc64/sparc64/tsb.c
+++ b/sys/sparc64/sparc64/tsb.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI: pmap.c,v 1.28.2.15 2000/04/27 03:10:31 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/tsb.c,v 1.39 2007/06/03 19:39:38 alc Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/sparc64/sparc64/uio_machdep.c b/sys/sparc64/sparc64/uio_machdep.c
index 4a670fa512eff..99e293b40abc8 100644
--- a/sys/sparc64/sparc64/uio_machdep.c
+++ b/sys/sparc64/sparc64/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/uio_machdep.c,v 1.8 2005/01/07 02:29:23 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sparc64/sparc64/upa.c b/sys/sparc64/sparc64/upa.c
index 3a21527d17ae3..5d79624583fd6 100644
--- a/sys/sparc64/sparc64/upa.c
+++ b/sys/sparc64/sparc64/upa.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/upa.c,v 1.9 2007/09/06 19:16:30 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index fce7786313f5e..a296cd794dff3 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -40,7 +40,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * 	from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.76 2007/09/15 18:47:01 alc Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sun4v/cddl/mdesc/mdesc_diff.c b/sys/sun4v/cddl/mdesc/mdesc_diff.c
index 4bd2334730c77..7cb13b251b6d9 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_diff.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_diff.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_diff.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/mdesc/mdesc_findname.c b/sys/sun4v/cddl/mdesc/mdesc_findname.c
index c9616192a1133..2a1bbd88f723e 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_findname.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_findname.c
@@ -18,7 +18,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_findname.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c b/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c
index 558b97631b172..c52b3b8a0e209 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c
@@ -18,7 +18,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/sun4v/cddl/mdesc/mdesc_fini.c b/sys/sun4v/cddl/mdesc/mdesc_fini.c
index ff32ce8c8b50e..3dd227e9f2130 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_fini.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_fini.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_fini.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c b/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c
index c3e2386c86e7d..28b65f198e931 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/mdesc/mdesc_getgen.c b/sys/sun4v/cddl/mdesc/mdesc_getgen.c
index 7d1ad5198b46b..4e02cd6f87401 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_getgen.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getgen.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_getgen.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c b/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c
index 199a4362e4988..aba71aac0f25f 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c
@@ -18,7 +18,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c b/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c
index 61f9c307884f0..9f2b0ae99f3b8 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c
@@ -18,7 +18,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/sun4v/cddl/mdesc/mdesc_getpropval.c b/sys/sun4v/cddl/mdesc/mdesc_getpropval.c
index 3a17d5c7b01dc..56234de27a022 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_getpropval.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getpropval.c
@@ -18,7 +18,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_getpropval.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/sun4v/cddl/mdesc/mdesc_init_intern.c b/sys/sun4v/cddl/mdesc/mdesc_init_intern.c
index dd5973e067f33..e64eed38391f9 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_init_intern.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_init_intern.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_init_intern.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/mdesc/mdesc_nodecount.c b/sys/sun4v/cddl/mdesc/mdesc_nodecount.c
index 1c0376d5138e6..ff103409cb6b3 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_nodecount.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_nodecount.c
@@ -18,7 +18,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_nodecount.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/sun4v/cddl/mdesc/mdesc_rootnode.c b/sys/sun4v/cddl/mdesc/mdesc_rootnode.c
index 2e4437aa131d9..d26134b7a3632 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_rootnode.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_rootnode.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_rootnode.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/mdesc/mdesc_scandag.c b/sys/sun4v/cddl/mdesc/mdesc_scandag.c
index 4d7716a14cae5..577cb11801430 100644
--- a/sys/sun4v/cddl/mdesc/mdesc_scandag.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_scandag.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/cddl/mdesc/mdesc_scandag.c,v 1.1 2006/11/24 01:56:46 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/cddl/t1_copy.S b/sys/sun4v/cddl/t1_copy.S
index 6fe5a3d877aad..92e49be48e696 100644
--- a/sys/sun4v/cddl/t1_copy.S
+++ b/sys/sun4v/cddl/t1_copy.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/sys/sun4v/cddl/t1_copy.S,v 1.1 2006/11/23 19:58:06 kmacy Exp $")
 	
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sun4v/compile/.cvsignore b/sys/sun4v/compile/.cvsignore
deleted file mode 100644
index e69de29bb2d1d..0000000000000
--- a/sys/sun4v/compile/.cvsignore
+++ /dev/null
diff --git a/sys/sun4v/conf/.cvsignore b/sys/sun4v/conf/.cvsignore
deleted file mode 100644
index 232298edb15fe..0000000000000
--- a/sys/sun4v/conf/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-[A-Za-z0-9]*
diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS
index 325901ebabd34..bd41e907a9e3a 100644
--- a/sys/sun4v/conf/DEFAULTS
+++ b/sys/sun4v/conf/DEFAULTS
@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/sun4v
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/conf/DEFAULTS,v 1.6 2007/06/11 00:38:06 marcel Exp $
 
 machine		sun4v
 
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index 9e1d9eabeea8f..41063ab7827a4 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/conf/GENERIC,v 1.14.2.1 2007/10/11 06:20:27 kensmith Exp $
 
 cpu		SUN4V
 ident		GENERIC
diff --git a/sys/sun4v/conf/GENERIC.hints b/sys/sun4v/conf/GENERIC.hints
index e8c0da7a1d7eb..8b7f7cb0c8918 100644
--- a/sys/sun4v/conf/GENERIC.hints
+++ b/sys/sun4v/conf/GENERIC.hints
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/conf/GENERIC.hints,v 1.1 2006/10/05 06:14:25 kmacy Exp $
diff --git a/sys/sun4v/conf/MAC b/sys/sun4v/conf/MAC
index 56af83d0a806d..d7e35ce480127 100644
--- a/sys/sun4v/conf/MAC
+++ b/sys/sun4v/conf/MAC
@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/conf/MAC,v 1.1 2006/10/05 06:14:25 kmacy Exp $
 
 include 	GENERIC
 ident 		MAC
diff --git a/sys/sun4v/conf/Makefile b/sys/sun4v/conf/Makefile
index 2c006e9c2c80d..69f02033e2d43 100644
--- a/sys/sun4v/conf/Makefile
+++ b/sys/sun4v/conf/Makefile
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/conf/Makefile,v 1.1 2006/10/05 06:14:25 kmacy Exp $
 
 .include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/sun4v/conf/NOTES b/sys/sun4v/conf/NOTES
index 88e7b1ed73a9c..f4f82a8a3adda 100644
--- a/sys/sun4v/conf/NOTES
+++ b/sys/sun4v/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/conf/NOTES,v 1.9 2006/11/22 04:35:58 kmacy Exp $
 #
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
diff --git a/sys/sun4v/include/_bus.h b/sys/sun4v/include/_bus.h
index 7cbe96f96fd61..019574476b6b5 100644
--- a/sys/sun4v/include/_bus.h
+++ b/sys/sun4v/include/_bus.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/_bus.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef SPARC64_INCLUDE__BUS_H
diff --git a/sys/sun4v/include/_inttypes.h b/sys/sun4v/include/_inttypes.h
index e6b2536ff379b..93994842953b7 100644
--- a/sys/sun4v/include/_inttypes.h
+++ b/sys/sun4v/include/_inttypes.h
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/_inttypes.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/sun4v/include/_limits.h b/sys/sun4v/include/_limits.h
index 248369288caef..b4bc56271d44d 100644
--- a/sys/sun4v/include/_limits.h
+++ b/sys/sun4v/include/_limits.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/_limits.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/sun4v/include/_stdint.h b/sys/sun4v/include/_stdint.h
index 1aed3e3b4efc1..2f8cc5c481818 100644
--- a/sys/sun4v/include/_stdint.h
+++ b/sys/sun4v/include/_stdint.h
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/_stdint.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE__STDINT_H_
diff --git a/sys/sun4v/include/_types.h b/sys/sun4v/include/_types.h
index 612bda749a85d..b39104b2189e8 100644
--- a/sys/sun4v/include/_types.h
+++ b/sys/sun4v/include/_types.h
@@ -29,7 +29,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/_types.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/sun4v/include/asi.h b/sys/sun4v/include/asi.h
index d2a2b1c7b9af4..62ea83f35fb45 100644
--- a/sys/sun4v/include/asi.h
+++ b/sys/sun4v/include/asi.h
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: asi.h,v 1.3 1997/08/08 14:31:42 torek
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/asi.h,v 1.2 2006/10/09 04:45:18 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ASI_H_
diff --git a/sys/sun4v/include/asm.h b/sys/sun4v/include/asm.h
index 780149b5e644c..ad9dac8a57a38 100644
--- a/sys/sun4v/include/asm.h
+++ b/sys/sun4v/include/asm.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *	from: FreeBSD: src/sys/i386/include/asm.h,v 1.7 2000/01/25
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/asm.h,v 1.2 2006/11/23 02:25:16 kmacy Exp $
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/sun4v/include/asmacros.h b/sys/sun4v/include/asmacros.h
index 884dc5caabe04..7c12c97e36129 100644
--- a/sys/sun4v/include/asmacros.h
+++ b/sys/sun4v/include/asmacros.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/asmacros.h,v 1.2 2006/11/15 03:16:30 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ASMACROS_H_
diff --git a/sys/sun4v/include/atomic.h b/sys/sun4v/include/atomic.h
index 77d455bfce5a4..550d90af9351f 100644
--- a/sys/sun4v/include/atomic.h
+++ b/sys/sun4v/include/atomic.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/atomic.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
diff --git a/sys/sun4v/include/bus.h b/sys/sun4v/include/bus.h
index 27901df65c505..87145717666b8 100644
--- a/sys/sun4v/include/bus.h
+++ b/sys/sun4v/include/bus.h
@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/bus.h,v 1.3 2007/01/18 18:32:26 marius Exp $
  */
 
 #ifndef	_MACHINE_BUS_H_
diff --git a/sys/sun4v/include/bus_common.h b/sys/sun4v/include/bus_common.h
index 216f592c8d5c9..7d2ce3f77b722 100644
--- a/sys/sun4v/include/bus_common.h
+++ b/sys/sun4v/include/bus_common.h
@@ -33,7 +33,7 @@
  *	form: @(#)sbusreg.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/bus_common.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_BUS_COMMON_H_
diff --git a/sys/sun4v/include/bus_dma.h b/sys/sun4v/include/bus_dma.h
index e2b89a1263a5f..167d9d2041a1d 100644
--- a/sys/sun4v/include/bus_dma.h
+++ b/sys/sun4v/include/bus_dma.h
@@ -69,7 +69,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/bus_dma.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _SPARC64_BUS_DMA_H
diff --git a/sys/sun4v/include/bus_private.h b/sys/sun4v/include/bus_private.h
index ca6536d1c9688..b36cc0e8fd3a5 100644
--- a/sys/sun4v/include/bus_private.h
+++ b/sys/sun4v/include/bus_private.h
@@ -25,7 +25,7 @@
  *
  *	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.25 2002/01/05
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/bus_private.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_BUS_PRIVATE_H_
diff --git a/sys/sun4v/include/ccr.h b/sys/sun4v/include/ccr.h
index 2b7ac84ec9b6b..b987bf0ba7740 100644
--- a/sys/sun4v/include/ccr.h
+++ b/sys/sun4v/include/ccr.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ccr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CCR_H_
diff --git a/sys/sun4v/include/cddl/mdesc.h b/sys/sun4v/include/cddl/mdesc.h
index 2e5148d3e22da..cfe9acbb91c07 100644
--- a/sys/sun4v/include/cddl/mdesc.h
+++ b/sys/sun4v/include/cddl/mdesc.h
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/cddl/mdesc.h,v 1.2 2006/12/18 07:25:26 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/include/cddl/mdesc_impl.h b/sys/sun4v/include/cddl/mdesc_impl.h
index aa9ff27a8bb10..5ee31347f7a56 100644
--- a/sys/sun4v/include/cddl/mdesc_impl.h
+++ b/sys/sun4v/include/cddl/mdesc_impl.h
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/cddl/mdesc_impl.h,v 1.1 2006/10/05 06:14:27 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/include/clock.h b/sys/sun4v/include/clock.h
index fbedfea57de97..4da36f7b75351 100644
--- a/sys/sun4v/include/clock.h
+++ b/sys/sun4v/include/clock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/clock.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_
diff --git a/sys/sun4v/include/cpu.h b/sys/sun4v/include/cpu.h
index 838d4adeb4338..d2e621b2226da 100644
--- a/sys/sun4v/include/cpu.h
+++ b/sys/sun4v/include/cpu.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
  *	from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/cpu.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CPU_H_
diff --git a/sys/sun4v/include/cpufunc.h b/sys/sun4v/include/cpufunc.h
index fd7fd7d021f53..43ed76b8824d5 100644
--- a/sys/sun4v/include/cpufunc.h
+++ b/sys/sun4v/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/cpufunc.h,v 1.2 2006/11/11 03:18:07 kmacy Exp $
  */
 
 #ifndef	_MACHINE_CPUFUNC_H_
diff --git a/sys/sun4v/include/db_machdep.h b/sys/sun4v/include/db_machdep.h
index 439df3699df56..5dd82b175eed0 100644
--- a/sys/sun4v/include/db_machdep.h
+++ b/sys/sun4v/include/db_machdep.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/db_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/sun4v/include/elf.h b/sys/sun4v/include/elf.h
index 76e3a76371991..6bbf1f535b48d 100644
--- a/sys/sun4v/include/elf.h
+++ b/sys/sun4v/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.2 2006/11/03 23:03:46 jb Exp $
  */
 
 #ifndef	_MACHINE_ELF_H_
diff --git a/sys/sun4v/include/endian.h b/sys/sun4v/include/endian.h
index 17447844ac44b..17b0eb1d49c4a 100644
--- a/sys/sun4v/include/endian.h
+++ b/sys/sun4v/include/endian.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/endian.h,v 1.2 2006/10/30 21:50:11 marius Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/sun4v/include/exec.h b/sys/sun4v/include/exec.h
index c0f93b68bf905..e7f51571278d5 100644
--- a/sys/sun4v/include/exec.h
+++ b/sys/sun4v/include/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/exec.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/sun4v/include/float.h b/sys/sun4v/include/float.h
index cf78df0c6b556..4797e55e34f19 100644
--- a/sys/sun4v/include/float.h
+++ b/sys/sun4v/include/float.h
@@ -32,7 +32,7 @@
  *
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/float.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/sun4v/include/floatingpoint.h b/sys/sun4v/include/floatingpoint.h
index d47756a00c6c4..8aec8185802d7 100644
--- a/sys/sun4v/include/floatingpoint.h
+++ b/sys/sun4v/include/floatingpoint.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/floatingpoint.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/sun4v/include/fp.h b/sys/sun4v/include/fp.h
index bf0d79a8aba6b..5279c15c5e282 100644
--- a/sys/sun4v/include/fp.h
+++ b/sys/sun4v/include/fp.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/fp.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef	_MACHINE_FP_H_
diff --git a/sys/sun4v/include/frame.h b/sys/sun4v/include/frame.h
index 55438ac6a20e8..b71d2133888ff 100644
--- a/sys/sun4v/include/frame.h
+++ b/sys/sun4v/include/frame.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/frame.h,v 1.2 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_FRAME_H_
diff --git a/sys/sun4v/include/fsr.h b/sys/sun4v/include/fsr.h
index db0039a236e09..05b7945dd1d71 100644
--- a/sys/sun4v/include/fsr.h
+++ b/sys/sun4v/include/fsr.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/fsr.h,v 1.2 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_FSR_H_
diff --git a/sys/sun4v/include/gdb_machdep.h b/sys/sun4v/include/gdb_machdep.h
index efbc5e78524b9..d466c4b4d5c4f 100644
--- a/sys/sun4v/include/gdb_machdep.h
+++ b/sys/sun4v/include/gdb_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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/gdb_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/sun4v/include/hv_api.h b/sys/sun4v/include/hv_api.h
index 8407631b44e43..d2dab6c60b36e 100644
--- a/sys/sun4v/include/hv_api.h
+++ b/sys/sun4v/include/hv_api.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/hv_api.h,v 1.6 2006/11/26 22:47:52 kmacy Exp $
  */
 
 #ifndef _MACHINE_HV_API_H
diff --git a/sys/sun4v/include/hv_pcivar.h b/sys/sun4v/include/hv_pcivar.h
index 37414693b28df..d8dc9e6b3a8cc 100644
--- a/sys/sun4v/include/hv_pcivar.h
+++ b/sys/sun4v/include/hv_pcivar.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/hv_pcivar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _HV_PCIVAR_H_
diff --git a/sys/sun4v/include/hviommu.h b/sys/sun4v/include/hviommu.h
index a8f8474cb2ea7..e3288799f404f 100644
--- a/sys/sun4v/include/hviommu.h
+++ b/sys/sun4v/include/hviommu.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/hviommu.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _HVIOMMU_H_
diff --git a/sys/sun4v/include/hypervisorvar.h b/sys/sun4v/include/hypervisorvar.h
index 4f5ea7fd1d0b1..4d0df0b01e4cd 100644
--- a/sys/sun4v/include/hypervisorvar.h
+++ b/sys/sun4v/include/hypervisorvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/hypervisorvar.h,v 1.12 2006/11/26 04:37:49 kmacy Exp $
  */
 
 
diff --git a/sys/sun4v/include/idprom.h b/sys/sun4v/include/idprom.h
index df76a7f731221..3bfe79f52366d 100644
--- a/sys/sun4v/include/idprom.h
+++ b/sys/sun4v/include/idprom.h
@@ -30,7 +30,7 @@
  *
  *	from: NetBSD: idprom.h,v 1.2 1998/09/05 23:57:26 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/idprom.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IDPROM_H_
diff --git a/sys/sun4v/include/ieee.h b/sys/sun4v/include/ieee.h
index 82ba9a1ae62f0..f1b141327e8ba 100644
--- a/sys/sun4v/include/ieee.h
+++ b/sys/sun4v/include/ieee.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ieee.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/sun4v/include/ieeefp.h b/sys/sun4v/include/ieeefp.h
index 11264949acee4..8d8b983004f32 100644
--- a/sys/sun4v/include/ieeefp.h
+++ b/sys/sun4v/include/ieeefp.h
@@ -1,7 +1,7 @@
 /*-
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ieeefp.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/sun4v/include/in_cksum.h b/sys/sun4v/include/in_cksum.h
index 2e46f4632968d..005bbfbc07ca0 100644
--- a/sys/sun4v/include/in_cksum.h
+++ b/sys/sun4v/include/in_cksum.h
@@ -55,7 +55,7 @@
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  *	from: FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/in_cksum.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/sun4v/include/instr.h b/sys/sun4v/include/instr.h
index d6befbbc3ffee..f8b71ace437bc 100644
--- a/sys/sun4v/include/instr.h
+++ b/sys/sun4v/include/instr.h
@@ -31,7 +31,7 @@
  *
  *	from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/instr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $
  */
 
 #ifndef _MACHINE_INSTR_H_
diff --git a/sys/sun4v/include/intr_machdep.h b/sys/sun4v/include/intr_machdep.h
index e933c8aee61b8..c5a0adbc84b06 100644
--- a/sys/sun4v/include/intr_machdep.h
+++ b/sys/sun4v/include/intr_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/intr_machdep.h,v 1.4 2007/02/23 12:19:06 piso Exp $
  */
 
 #ifndef	_MACHINE_INTR_MACHDEP_H_
diff --git a/sys/sun4v/include/kdb.h b/sys/sun4v/include/kdb.h
index 92b2ed7d4e423..d29ccf18229e0 100644
--- a/sys/sun4v/include/kdb.h
+++ b/sys/sun4v/include/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/kdb.h,v 1.2 2007/06/09 21:55:17 marcel Exp $
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/sun4v/include/kerneldump.h b/sys/sun4v/include/kerneldump.h
index 7fad3fce88dde..4eb1a6fe54e8b 100644
--- a/sys/sun4v/include/kerneldump.h
+++ b/sys/sun4v/include/kerneldump.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/kerneldump.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_KERNELDUMP_H_
diff --git a/sys/sun4v/include/ktr.h b/sys/sun4v/include/ktr.h
index 10e33cf0386b7..370b8aeecc151 100644
--- a/sys/sun4v/include/ktr.h
+++ b/sys/sun4v/include/ktr.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ktr.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_KTR_H_
diff --git a/sys/sun4v/include/limits.h b/sys/sun4v/include/limits.h
index 679dcec51b311..aa9b265d11cb3 100644
--- a/sys/sun4v/include/limits.h
+++ b/sys/sun4v/include/limits.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/limits.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/sun4v/include/lsu.h b/sys/sun4v/include/lsu.h
index a8787dcabdc75..e68e1a5fc36ab 100644
--- a/sys/sun4v/include/lsu.h
+++ b/sys/sun4v/include/lsu.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/lsu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_LSU_H_
diff --git a/sys/sun4v/include/md_var.h b/sys/sun4v/include/md_var.h
index 9c48897ac81d5..67f6fcebdcb00 100644
--- a/sys/sun4v/include/md_var.h
+++ b/sys/sun4v/include/md_var.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/md_var.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/sun4v/include/mdesc_bus.h b/sys/sun4v/include/mdesc_bus.h
index bdc115153efcb..bdf350ceb864a 100644
--- a/sys/sun4v/include/mdesc_bus.h
+++ b/sys/sun4v/include/mdesc_bus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/mdesc_bus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_MDESC_BUS_H_
diff --git a/sys/sun4v/include/mdesc_bus_subr.h b/sys/sun4v/include/mdesc_bus_subr.h
index d25e0b5aa3577..ecc9d51ef481c 100644
--- a/sys/sun4v/include/mdesc_bus_subr.h
+++ b/sys/sun4v/include/mdesc_bus_subr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/mdesc_bus_subr.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_MDESC_MDESC_BUS_SUBR_H_
diff --git a/sys/sun4v/include/memdev.h b/sys/sun4v/include/memdev.h
index 671a6b467d7ef..42d19993f8030 100644
--- a/sys/sun4v/include/memdev.h
+++ b/sys/sun4v/include/memdev.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/memdev.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #define CDEV_MAJOR	2
diff --git a/sys/sun4v/include/metadata.h b/sys/sun4v/include/metadata.h
index d14e1f150d639..729326684969a 100644
--- a/sys/sun4v/include/metadata.h
+++ b/sys/sun4v/include/metadata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/metadata.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_METADATA_H_
diff --git a/sys/sun4v/include/mmu.h b/sys/sun4v/include/mmu.h
index 838213633a9df..383b9e30213f9 100644
--- a/sys/sun4v/include/mmu.h
+++ b/sys/sun4v/include/mmu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/mmu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 
diff --git a/sys/sun4v/include/mutex.h b/sys/sun4v/include/mutex.h
index c9b2e1ddde073..e1c0035dca436 100644
--- a/sys/sun4v/include/mutex.h
+++ b/sys/sun4v/include/mutex.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/mutex.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_MUTEX_H_
diff --git a/sys/sun4v/include/nexusvar.h b/sys/sun4v/include/nexusvar.h
index 5e28696ff7999..93e9aa28928d5 100644
--- a/sys/sun4v/include/nexusvar.h
+++ b/sys/sun4v/include/nexusvar.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/nexusvar.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_NEXUSVAR_H_
diff --git a/sys/sun4v/include/ofw_bus.h b/sys/sun4v/include/ofw_bus.h
index 1e9004e15d77a..86c9fe869536a 100644
--- a/sys/sun4v/include/ofw_bus.h
+++ b/sys/sun4v/include/ofw_bus.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ofw_bus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_OFW_BUS_H_
diff --git a/sys/sun4v/include/ofw_machdep.h b/sys/sun4v/include/ofw_machdep.h
index ac1fcc1ea1ede..0ae37a3d4da06 100644
--- a/sys/sun4v/include/ofw_machdep.h
+++ b/sys/sun4v/include/ofw_machdep.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ofw_machdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
diff --git a/sys/sun4v/include/ofw_mem.h b/sys/sun4v/include/ofw_mem.h
index af9089ed034a6..a1f2468c9ba53 100644
--- a/sys/sun4v/include/ofw_mem.h
+++ b/sys/sun4v/include/ofw_mem.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ofw_mem.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_MEM_H_
diff --git a/sys/sun4v/include/ofw_nexus.h b/sys/sun4v/include/ofw_nexus.h
index 59337d2a0f566..06b098bc46171 100644
--- a/sys/sun4v/include/ofw_nexus.h
+++ b/sys/sun4v/include/ofw_nexus.h
@@ -28,7 +28,7 @@
  *
  *	from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ofw_nexus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_OFW_NEXUS_H_
diff --git a/sys/sun4v/include/param.h b/sys/sun4v/include/param.h
index 6e1d389b304cf..5343a08465f4a 100644
--- a/sys/sun4v/include/param.h
+++ b/sys/sun4v/include/param.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/param.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/include/pcb.h b/sys/sun4v/include/pcb.h
index ae366e5ae45fa..090ae81c3a1fb 100644
--- a/sys/sun4v/include/pcb.h
+++ b/sys/sun4v/include/pcb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/pcb.h,v 1.3 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_PCB_H_
diff --git a/sys/sun4v/include/pcpu.h b/sys/sun4v/include/pcpu.h
index 69f3dd509334a..2e1b65524502d 100644
--- a/sys/sun4v/include/pcpu.h
+++ b/sys/sun4v/include/pcpu.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.9 2007/06/12 21:19:12 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/sun4v/include/pmap.h b/sys/sun4v/include/pmap.h
index 3390e99c6846e..c6e6c5369a604 100644
--- a/sys/sun4v/include/pmap.h
+++ b/sys/sun4v/include/pmap.h
@@ -33,7 +33,7 @@
  *	from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h        7.4 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/pmap.h,v 1.8 2007/05/20 13:06:45 marius Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
diff --git a/sys/sun4v/include/pmc_mdep.h b/sys/sun4v/include/pmc_mdep.h
index cf643c7b4f399..4afa3ca09a847 100644
--- a/sys/sun4v/include/pmc_mdep.h
+++ b/sys/sun4v/include/pmc_mdep.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/pmc_mdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/sun4v/include/proc.h b/sys/sun4v/include/proc.h
index bfd1268e433c5..9e19cf6dba3d4 100644
--- a/sys/sun4v/include/proc.h
+++ b/sys/sun4v/include/proc.h
@@ -28,7 +28,7 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/proc.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/sun4v/include/profile.h b/sys/sun4v/include/profile.h
index 6c7d1b297ac95..a714e320d8419 100644
--- a/sys/sun4v/include/profile.h
+++ b/sys/sun4v/include/profile.h
@@ -26,7 +26,7 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/profile.h,v 1.2 2007/05/11 23:43:55 marius Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/sun4v/include/pstate.h b/sys/sun4v/include/pstate.h
index f0e5b68d6556d..caa8b465babc8 100644
--- a/sys/sun4v/include/pstate.h
+++ b/sys/sun4v/include/pstate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/pstate.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PSTATE_H_
diff --git a/sys/sun4v/include/ptrace.h b/sys/sun4v/include/ptrace.h
index 49b1e1c0ee9aa..fad3ff131052c 100644
--- a/sys/sun4v/include/ptrace.h
+++ b/sys/sun4v/include/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ptrace.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_PTRACE_H_
diff --git a/sys/sun4v/include/reg.h b/sys/sun4v/include/reg.h
index d2241861d209e..9085c5935bb14 100644
--- a/sys/sun4v/include/reg.h
+++ b/sys/sun4v/include/reg.h
@@ -31,7 +31,7 @@
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
  *	from: FreeBSD: src/sys/i386/include/reg.h,v 1.23 2000/09/21
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/reg.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_REG_H_
diff --git a/sys/sun4v/include/reloc.h b/sys/sun4v/include/reloc.h
index 0e4155dac4cf7..eb206d669e87e 100644
--- a/sys/sun4v/include/reloc.h
+++ b/sys/sun4v/include/reloc.h
@@ -26,5 +26,5 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/reloc.h,v 1.2 2007/01/12 07:19:22 imp Exp $
  */
diff --git a/sys/sun4v/include/resource.h b/sys/sun4v/include/resource.h
index 229d14f253b0f..e11e648f1aa0b 100644
--- a/sys/sun4v/include/resource.h
+++ b/sys/sun4v/include/resource.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/resource.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/sun4v/include/runq.h b/sys/sun4v/include/runq.h
index 6d03646fd539b..39351c413b648 100644
--- a/sys/sun4v/include/runq.h
+++ b/sys/sun4v/include/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/runq.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_RUNQ_H_
diff --git a/sys/sun4v/include/sc_machdep.h b/sys/sun4v/include/sc_machdep.h
index 3a492f2383ba4..302cbc698e853 100644
--- a/sys/sun4v/include/sc_machdep.h
+++ b/sys/sun4v/include/sc_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/sc_machdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_SC_MACHDEP_H_
diff --git a/sys/sun4v/include/setjmp.h b/sys/sun4v/include/setjmp.h
index f58776dce61c7..e11f3d083f04d 100644
--- a/sys/sun4v/include/setjmp.h
+++ b/sys/sun4v/include/setjmp.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: FreeBSD: src/sys/i386/include/setjmp.h,v 1.5 2000/10/06
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/setjmp.h,v 1.2 2007/01/12 07:19:22 imp Exp $
  */
 
 #ifndef	_MACHINE_SETJMP_H_
diff --git a/sys/sun4v/include/sf_buf.h b/sys/sun4v/include/sf_buf.h
index b090cb26601d1..2af1fc19db100 100644
--- a/sys/sun4v/include/sf_buf.h
+++ b/sys/sun4v/include/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/sf_buf.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_SF_BUF_H_
diff --git a/sys/sun4v/include/sigframe.h b/sys/sun4v/include/sigframe.h
index fd40afdd1209b..4507c1f1f02ca 100644
--- a/sys/sun4v/include/sigframe.h
+++ b/sys/sun4v/include/sigframe.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from:	FreeBSD: src/sys/alpha/include/sigframe.h,v 1.1 1999/09/29
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/sigframe.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_SIGFRAME_H_
diff --git a/sys/sun4v/include/signal.h b/sys/sun4v/include/signal.h
index d96cef6dd6c83..950403071bdf5 100644
--- a/sys/sun4v/include/signal.h
+++ b/sys/sun4v/include/signal.h
@@ -28,7 +28,7 @@
  *
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  * 	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/signal.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/sun4v/include/smp.h b/sys/sun4v/include/smp.h
index d1d9da42bb461..2e64833940cef 100644
--- a/sys/sun4v/include/smp.h
+++ b/sys/sun4v/include/smp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/smp.h,v 1.5 2007/04/05 18:34:11 kan Exp $
  */
 
 #ifndef	_MACHINE_SMP_H_
diff --git a/sys/sun4v/include/stdarg.h b/sys/sun4v/include/stdarg.h
index a7ff28484389f..3925b450e156e 100644
--- a/sys/sun4v/include/stdarg.h
+++ b/sys/sun4v/include/stdarg.h
@@ -35,7 +35,7 @@
  *
  *	@(#)stdarg.h	8.2 (Berkeley) 9/27/93
  *	$NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/stdarg.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_STDARG_H_
diff --git a/sys/sun4v/include/sun4v_cpufunc.h b/sys/sun4v/include/sun4v_cpufunc.h
index 61eb2cca1393a..951f09351d9d2 100644
--- a/sys/sun4v/include/sun4v_cpufunc.h
+++ b/sys/sun4v/include/sun4v_cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/sun4v_cpufunc.h,v 1.2 2006/11/24 05:27:48 kmacy Exp $
  */
 
 #ifndef	_MACHINE_SUN4V_CPUFUNC_H_
diff --git a/sys/sun4v/include/sysarch.h b/sys/sun4v/include/sysarch.h
index c209ef8048d2f..90badce2de4f1 100644
--- a/sys/sun4v/include/sysarch.h
+++ b/sys/sun4v/include/sysarch.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/sysarch.h,v 1.14 2000/09/21
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/sysarch.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 /*
diff --git a/sys/sun4v/include/tick.h b/sys/sun4v/include/tick.h
index 8586a0d89f8d5..487665716cb7b 100644
--- a/sys/sun4v/include/tick.h
+++ b/sys/sun4v/include/tick.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/tick.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_TICK_H_
diff --git a/sys/sun4v/include/tlb.h b/sys/sun4v/include/tlb.h
index 74e008ebcf6c9..f7d7913fd2579 100644
--- a/sys/sun4v/include/tlb.h
+++ b/sys/sun4v/include/tlb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/tlb.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_TLB_H_
diff --git a/sys/sun4v/include/trap.h b/sys/sun4v/include/trap.h
index 42efb8bd7e2d3..d3f763e37788b 100644
--- a/sys/sun4v/include/trap.h
+++ b/sys/sun4v/include/trap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/trap.h,v 1.4 2007/06/16 22:30:38 marius Exp $
  */
 
 #ifndef	_MACHINE_TRAP_H_
diff --git a/sys/sun4v/include/tsb.h b/sys/sun4v/include/tsb.h
index 30fa1f873a643..ce1fb25d5524b 100644
--- a/sys/sun4v/include/tsb.h
+++ b/sys/sun4v/include/tsb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/tsb.h,v 1.4 2006/12/04 19:35:40 kmacy Exp $
  */
 
 #ifndef	_MACHINE_TSB_H_
diff --git a/sys/sun4v/include/tstate.h b/sys/sun4v/include/tstate.h
index 8bb5b24177274..e4f54b4c4cc77 100644
--- a/sys/sun4v/include/tstate.h
+++ b/sys/sun4v/include/tstate.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/tstate.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_TSTATE_H_
diff --git a/sys/sun4v/include/tte.h b/sys/sun4v/include/tte.h
index 4cdcd0d38fc92..2ab65db8deb78 100644
--- a/sys/sun4v/include/tte.h
+++ b/sys/sun4v/include/tte.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/tte.h,v 1.2 2006/10/09 04:45:18 kmacy Exp $
  */
 
 #ifndef	_MACHINE_TTE_H_
diff --git a/sys/sun4v/include/tte_hash.h b/sys/sun4v/include/tte_hash.h
index 82f620df6e3b2..882612ebd5eb2 100644
--- a/sys/sun4v/include/tte_hash.h
+++ b/sys/sun4v/include/tte_hash.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/tte_hash.h,v 1.4 2006/11/22 04:33:34 kmacy Exp $
  */
 
 #ifndef	_MACHINE_TTE_HASH_H_
diff --git a/sys/sun4v/include/ucontext.h b/sys/sun4v/include/ucontext.h
index c05ec26a90533..01a1fe106cef6 100644
--- a/sys/sun4v/include/ucontext.h
+++ b/sys/sun4v/include/ucontext.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/alpha/include/ucontext.h,v 1.3 1999/10/08
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ucontext.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/sun4v/include/upa.h b/sys/sun4v/include/upa.h
index 70bf34d3353d4..181e41475b7c2 100644
--- a/sys/sun4v/include/upa.h
+++ b/sys/sun4v/include/upa.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/upa.h,v 1.2 2007/05/20 13:19:32 marius Exp $
  */
 
 #include <sparc64/upa.h>
diff --git a/sys/sun4v/include/utrap.h b/sys/sun4v/include/utrap.h
index 45019c8ca9ee0..1a87e92abe64a 100644
--- a/sys/sun4v/include/utrap.h
+++ b/sys/sun4v/include/utrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/utrap.h,v 1.3 2007/01/19 11:15:33 marius Exp $
  */
 
 #ifndef	_MACHINE_UTRAP_H_
diff --git a/sys/sun4v/include/varargs.h b/sys/sun4v/include/varargs.h
index a168c6e33c326..9b84a9a3ed130 100644
--- a/sys/sun4v/include/varargs.h
+++ b/sys/sun4v/include/varargs.h
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.3 (Berkeley) 3/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/varargs.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef _MACHINE_VARARGS_H_
diff --git a/sys/sun4v/include/ver.h b/sys/sun4v/include/ver.h
index d752cc7022507..422f395dcff23 100644
--- a/sys/sun4v/include/ver.h
+++ b/sys/sun4v/include/ver.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/ver.h,v 1.2 2007/05/20 13:19:32 marius Exp $
  */
 
 #include <sparc64/ver.h>
diff --git a/sys/sun4v/include/vmparam.h b/sys/sun4v/include/vmparam.h
index a994401eb33a1..2a1aaef19b687 100644
--- a/sys/sun4v/include/vmparam.h
+++ b/sys/sun4v/include/vmparam.h
@@ -37,7 +37,7 @@
  *
  *	from: @(#)vmparam.h     5.9 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/vmparam.h,v 1.33 2000/03/30
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/vmparam.h,v 1.5 2007/09/25 06:25:06 alc Exp $
  */
 
 
diff --git a/sys/sun4v/include/watch.h b/sys/sun4v/include/watch.h
index bb658f9efb53e..d0c4aebfad9e2 100644
--- a/sys/sun4v/include/watch.h
+++ b/sys/sun4v/include/watch.h
@@ -21,7 +21,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/watch.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_WATCH_H_
diff --git a/sys/sun4v/include/wstate.h b/sys/sun4v/include/wstate.h
index 3d42bf9e326b5..585fcffe69b6e 100644
--- a/sys/sun4v/include/wstate.h
+++ b/sys/sun4v/include/wstate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/include/wstate.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
  */
 
 #ifndef	_MACHINE_WSTATE_H_
diff --git a/sys/sun4v/mdesc/mdesc_bus_if.m b/sys/sun4v/mdesc/mdesc_bus_if.m
index 9f5df3d95a892..37dd3a360a03c 100644
--- a/sys/sun4v/mdesc/mdesc_bus_if.m
+++ b/sys/sun4v/mdesc/mdesc_bus_if.m
@@ -24,7 +24,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/sun4v/mdesc/mdesc_bus_if.m,v 1.1 2006/10/05 06:14:27 kmacy Exp $
 
 # Interface for retrieving the package handle and a subset, namely
 # 'compatible', 'device_type', 'model' and 'name', of the standard
diff --git a/sys/sun4v/mdesc/mdesc_bus_subr.c b/sys/sun4v/mdesc/mdesc_bus_subr.c
index 0399168a2a1cd..c3e1a2ef9064a 100644
--- a/sys/sun4v/mdesc/mdesc_bus_subr.c
+++ b/sys/sun4v/mdesc/mdesc_bus_subr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/mdesc/mdesc_bus_subr.c,v 1.1 2006/10/05 06:14:27 kmacy Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/sun4v/mdesc/mdesc_init.c b/sys/sun4v/mdesc/mdesc_init.c
index bb2990de94c22..32fd1218ab474 100644
--- a/sys/sun4v/mdesc/mdesc_init.c
+++ b/sys/sun4v/mdesc/mdesc_init.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/mdesc/mdesc_init.c,v 1.6 2007/09/11 22:54:09 attilio Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/sun4v/mdesc/mdesc_subr.c b/sys/sun4v/mdesc/mdesc_subr.c
index 4840708abddb3..22cd0cc70679e 100644
--- a/sys/sun4v/mdesc/mdesc_subr.c
+++ b/sys/sun4v/mdesc/mdesc_subr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/mdesc/mdesc_subr.c,v 1.1 2006/10/05 06:14:27 kmacy Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
diff --git a/sys/sun4v/mdesc/mdesc_vdevfindnode.c b/sys/sun4v/mdesc/mdesc_vdevfindnode.c
index e90702dde583e..f33210f35d63e 100644
--- a/sys/sun4v/mdesc/mdesc_vdevfindnode.c
+++ b/sys/sun4v/mdesc/mdesc_vdevfindnode.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/mdesc/mdesc_vdevfindnode.c,v 1.1 2006/12/18 07:22:25 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/sun4v/mdesc/mdesc_vdevfindval.c b/sys/sun4v/mdesc/mdesc_vdevfindval.c
index be2db6f6eac1e..f0d3612ed9049 100644
--- a/sys/sun4v/mdesc/mdesc_vdevfindval.c
+++ b/sys/sun4v/mdesc/mdesc_vdevfindval.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/mdesc/mdesc_vdevfindval.c,v 1.2 2006/12/07 02:05:13 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/sun4v/sun4v/bus_machdep.c b/sys/sun4v/sun4v/bus_machdep.c
index 0c76feeaedf82..6d0c588a6a21b 100644
--- a/sys/sun4v/sun4v/bus_machdep.c
+++ b/sys/sun4v/sun4v/bus_machdep.c
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/bus_machdep.c,v 1.4 2007/05/29 06:30:26 yongari Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/sun4v/sun4v/db_hwwatch.c b/sys/sun4v/sun4v/db_hwwatch.c
index 0a878ca0b9dd6..830ce3bdf5814 100644
--- a/sys/sun4v/sun4v/db_hwwatch.c
+++ b/sys/sun4v/sun4v/db_hwwatch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/db_hwwatch.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sun4v/sun4v/db_interface.c b/sys/sun4v/sun4v/db_interface.c
index 77e1493652eb7..c8e0e9a4ad367 100644
--- a/sys/sun4v/sun4v/db_interface.c
+++ b/sys/sun4v/sun4v/db_interface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/db_interface.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $
  */
 
 #include <sys/param.h> 
diff --git a/sys/sun4v/sun4v/db_trace.c b/sys/sun4v/sun4v/db_trace.c
index 5c07ecc04bcaa..a0e962742b1b6 100644
--- a/sys/sun4v/sun4v/db_trace.c
+++ b/sys/sun4v/sun4v/db_trace.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/db_trace.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sun4v/sun4v/dump_machdep.c b/sys/sun4v/sun4v/dump_machdep.c
index 3558b53275ddf..1b4a37b98386d 100644
--- a/sys/sun4v/sun4v/dump_machdep.c
+++ b/sys/sun4v/sun4v/dump_machdep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.1.4.1 2008/01/30 21:21:51 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sun4v/sun4v/exception.S b/sys/sun4v/sun4v/exception.S
index 9daa3d38db15b..27b0b88e10b28 100644
--- a/sys/sun4v/sun4v/exception.S
+++ b/sys/sun4v/sun4v/exception.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/exception.S,v 1.14 2007/01/19 11:15:34 marius Exp $")
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/sun4v/sun4v/hcall.S b/sys/sun4v/sun4v/hcall.S
index 1e5309800a79a..bca2200ed062e 100644
--- a/sys/sun4v/sun4v/hcall.S
+++ b/sys/sun4v/sun4v/hcall.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.18 2006/12/17 01:22:51 kmacy Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/sun4v/sun4v/hv_pci.c b/sys/sun4v/sun4v/hv_pci.c
index d4ed288577dda..750acd5d354c7 100644
--- a/sys/sun4v/sun4v/hv_pci.c
+++ b/sys/sun4v/sun4v/hv_pci.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hv_pci.c,v 1.4 2007/09/30 11:05:17 marius Exp $");
 
 /*
  * Support for the Hypervisor PCI bus.
diff --git a/sys/sun4v/sun4v/hvcons.c b/sys/sun4v/sun4v/hvcons.c
index 201b22c004c0a..ea15d465cddaa 100644
--- a/sys/sun4v/sun4v/hvcons.c
+++ b/sys/sun4v/sun4v/hvcons.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hvcons.c,v 1.6 2007/02/23 12:19:07 piso Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/sun4v/sun4v/hviommu.c b/sys/sun4v/sun4v/hviommu.c
index 5724d752c0e28..61440fd37e98b 100644
--- a/sys/sun4v/sun4v/hviommu.c
+++ b/sys/sun4v/sun4v/hviommu.c
@@ -97,7 +97,7 @@
  *	from: @(#)sbus.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: iommu.c,v 1.42 2001/08/06 22:02:58 eeh Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/hviommu.c,v 1.5 2007/05/20 13:06:45 marius Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sun4v/sun4v/interrupt.S b/sys/sun4v/sun4v/interrupt.S
index 61f3bbe8688a3..861ecf86e19f9 100644
--- a/sys/sun4v/sun4v/interrupt.S
+++ b/sys/sun4v/sun4v/interrupt.S
@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/interrupt.S,v 1.10 2007/01/19 11:15:34 marius Exp $");
 
 #include "opt_simulator.h"
 #include "opt_trap_trace.h"
diff --git a/sys/sun4v/sun4v/intr_machdep.c b/sys/sun4v/sun4v/intr_machdep.c
index 6b9f1fb0a5349..231e415a30ad9 100644
--- a/sys/sun4v/sun4v/intr_machdep.c
+++ b/sys/sun4v/sun4v/intr_machdep.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/intr_machdep.c,v 1.7 2007/05/31 19:25:35 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sun4v/sun4v/locore.S b/sys/sun4v/sun4v/locore.S
index dade43292df7b..412850439b491 100644
--- a/sys/sun4v/sun4v/locore.S
+++ b/sys/sun4v/sun4v/locore.S
@@ -27,7 +27,7 @@
 
 	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/locore.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); 
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sun4v/sun4v/machdep.c b/sys/sun4v/sun4v/machdep.c
index 16a508a43a1a3..a2e6d7d33404c 100644
--- a/sys/sun4v/sun4v/machdep.c
+++ b/sys/sun4v/sun4v/machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/machdep.c,v 1.15.4.1 2008/01/19 18:15:06 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
diff --git a/sys/sun4v/sun4v/mp_exception.S b/sys/sun4v/sun4v/mp_exception.S
index 699d766fa7c30..733524096c107 100644
--- a/sys/sun4v/sun4v/mp_exception.S
+++ b/sys/sun4v/sun4v/mp_exception.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_exception.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $");
 
 #include <machine/asi.h>
 #include <machine/ktr.h>
diff --git a/sys/sun4v/sun4v/mp_locore.S b/sys/sun4v/sun4v/mp_locore.S
index 5d34eeec678b8..8deafd9b04362 100644
--- a/sys/sun4v/sun4v/mp_locore.S
+++ b/sys/sun4v/sun4v/mp_locore.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_locore.S,v 1.3 2007/01/19 11:15:34 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sun4v/sun4v/mp_machdep.c b/sys/sun4v/sun4v/mp_machdep.c
index 5c13b328eb2a7..7292c882385ad 100644
--- a/sys/sun4v/sun4v/mp_machdep.c
+++ b/sys/sun4v/sun4v/mp_machdep.c
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_machdep.c,v 1.8 2007/07/06 00:41:53 peter Exp $");
 
 #include "opt_trap_trace.h"
 
diff --git a/sys/sun4v/sun4v/nexus.c b/sys/sun4v/sun4v/nexus.c
index def050b8d2d35..08ee14187a371 100644
--- a/sys/sun4v/sun4v/nexus.c
+++ b/sys/sun4v/sun4v/nexus.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/nexus.c,v 1.4 2007/05/20 09:31:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sun4v/sun4v/pmap.c b/sys/sun4v/sun4v/pmap.c
index ecfe3db411d92..91b41b5a234f3 100644
--- a/sys/sun4v/sun4v/pmap.c
+++ b/sys/sun4v/sun4v/pmap.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.39.4.1 2008/01/19 18:15:06 kib Exp $");
 
 #include "opt_kstack_pages.h"
 #include "opt_msgbuf.h"
diff --git a/sys/sun4v/sun4v/rtc.c b/sys/sun4v/sun4v/rtc.c
index eb8c1e36de4b0..57bd682864d53 100644
--- a/sys/sun4v/sun4v/rtc.c
+++ b/sys/sun4v/sun4v/rtc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/rtc.c,v 1.3 2006/11/24 05:27:49 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sun4v/sun4v/simdisk.c b/sys/sun4v/sun4v/simdisk.c
index 1320927c0cad3..b10ceff524534 100644
--- a/sys/sun4v/sun4v/simdisk.c
+++ b/sys/sun4v/sun4v/simdisk.c
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/simdisk.c,v 1.2 2006/11/24 05:27:49 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sun4v/sun4v/support.S b/sys/sun4v/sun4v/support.S
index e6bac5d8206d4..64861298098b5 100644
--- a/sys/sun4v/sun4v/support.S
+++ b/sys/sun4v/sun4v/support.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/support.S,v 1.5 2007/01/19 11:15:34 marius Exp $");
 
 #include <sys/errno.h>
 
diff --git a/sys/sun4v/sun4v/swtch.S b/sys/sun4v/sun4v/swtch.S
index a3d8324a62ba2..e12bc1efa7036 100644
--- a/sys/sun4v/sun4v/swtch.S
+++ b/sys/sun4v/sun4v/swtch.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/swtch.S,v 1.2 2007/01/19 11:15:34 marius Exp $");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sun4v/sun4v/tick.c b/sys/sun4v/sun4v/tick.c
index 1a9672ea8797a..8e74c6aa6d1d1 100644
--- a/sys/sun4v/sun4v/tick.c
+++ b/sys/sun4v/sun4v/tick.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tick.c,v 1.3 2007/05/20 09:31:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sun4v/sun4v/trap.c b/sys/sun4v/sun4v/trap.c
index 7ccb5a83cc5f3..f1f68c46444c7 100644
--- a/sys/sun4v/sun4v/trap.c
+++ b/sys/sun4v/sun4v/trap.c
@@ -37,7 +37,7 @@
  *
  *      from: @(#)trap.c        7.4 (Berkeley) 5/13/91
  * 	from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/trap.c,v 1.15 2007/06/16 22:30:38 marius Exp $
  */
 
 #include "opt_ddb.h"
diff --git a/sys/sun4v/sun4v/trap_trace.S b/sys/sun4v/sun4v/trap_trace.S
index 03341c90751fc..ed44a260fd6ec 100644
--- a/sys/sun4v/sun4v/trap_trace.S
+++ b/sys/sun4v/sun4v/trap_trace.S
@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")				
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/trap_trace.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $")				
 	
 #include "opt_trap_trace.h"
 
diff --git a/sys/sun4v/sun4v/tsb.c b/sys/sun4v/sun4v/tsb.c
index 7ea8d04426456..56afe8805e793 100644
--- a/sys/sun4v/sun4v/tsb.c
+++ b/sys/sun4v/sun4v/tsb.c
@@ -25,7 +25,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tsb.c,v 1.10 2007/05/31 22:52:14 attilio Exp $");
 
 
 #include "opt_ddb.h"
diff --git a/sys/sun4v/sun4v/tte.c b/sys/sun4v/sun4v/tte.c
index 9976336908176..073913fa876fe 100644
--- a/sys/sun4v/sun4v/tte.c
+++ b/sys/sun4v/sun4v/tte.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tte.c,v 1.4 2007/02/02 04:57:11 kmacy Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap.h"
diff --git a/sys/sun4v/sun4v/tte_hash.c b/sys/sun4v/sun4v/tte_hash.c
index a60185e1a4c1e..fb1d69bac97b8 100644
--- a/sys/sun4v/sun4v/tte_hash.c
+++ b/sys/sun4v/sun4v/tte_hash.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tte_hash.c,v 1.13 2007/05/31 22:52:14 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/sun4v/sun4v/uio_machdep.c b/sys/sun4v/sun4v/uio_machdep.c
index bee80d68fc678..5bbc0301a23b5 100644
--- a/sys/sun4v/sun4v/uio_machdep.c
+++ b/sys/sun4v/sun4v/uio_machdep.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/uio_machdep.c,v 1.2 2006/12/07 02:03:18 kmacy Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/sun4v/sun4v/vm_machdep.c b/sys/sun4v/sun4v/vm_machdep.c
index fbfa4a06d20d9..0b2ed84d057d3 100644
--- a/sys/sun4v/sun4v/vm_machdep.c
+++ b/sys/sun4v/sun4v/vm_machdep.c
@@ -40,7 +40,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * 	from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12
- * $FreeBSD$
+ * $FreeBSD: src/sys/sun4v/sun4v/vm_machdep.c,v 1.7 2007/09/15 18:47:02 alc Exp $
  */
 
 #include "opt_pmap.h"
diff --git a/sys/sun4v/sun4v/vnex.c b/sys/sun4v/sun4v/vnex.c
index a35999a59f687..04d13551ca345 100644
--- a/sys/sun4v/sun4v/vnex.c
+++ b/sys/sun4v/sun4v/vnex.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/vnex.c,v 1.6 2007/05/20 09:31:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sun4v/sun4v/wbuf.S b/sys/sun4v/sun4v/wbuf.S
index baf868a80ec4d..326f4acd5c511 100644
--- a/sys/sun4v/sun4v/wbuf.S
+++ b/sys/sun4v/sun4v/wbuf.S
@@ -1,5 +1,5 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/wbuf.S,v 1.6 2007/01/19 11:15:34 marius Exp $")
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
diff --git a/sys/sys/_bus_dma.h b/sys/sys/_bus_dma.h
index 91318d01c21c1..1a272b41015a2 100644
--- a/sys/sys/_bus_dma.h
+++ b/sys/sys/_bus_dma.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_bus_dma.h,v 1.1 2006/09/03 00:26:17 jmg Exp $
  *
  */
 
diff --git a/sys/sys/_elf_solaris.h b/sys/sys/_elf_solaris.h
index b054a64dd6870..cfe8419da38e2 100644
--- a/sys/sys/_elf_solaris.h
+++ b/sys/sys/_elf_solaris.h
@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_elf_solaris.h,v 1.1 2006/10/04 07:19:39 jb Exp $
  *
  * ELF compatibility definitions for OpenSolaris source.
  *
diff --git a/sys/sys/_iovec.h b/sys/sys/_iovec.h
index bd7207332938f..12499c3421617 100644
--- a/sys/sys/_iovec.h
+++ b/sys/sys/_iovec.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_iovec.h,v 1.4 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS__IOVEC_H_
diff --git a/sys/sys/_lock.h b/sys/sys/_lock.h
index cc1ea0ab80d87..854705f6209a3 100644
--- a/sys/sys/_lock.h
+++ b/sys/sys/_lock.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_lock.h,v 1.14 2006/11/13 05:41:26 kmacy Exp $
  */
 
 #ifndef _SYS__LOCK_H_
diff --git a/sys/sys/_mutex.h b/sys/sys/_mutex.h
index 7aa8f4eead059..2ebe7e92ffc29 100644
--- a/sys/sys/_mutex.h
+++ b/sys/sys/_mutex.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_mutex.h,v 1.13 2007/03/21 21:20:51 jhb Exp $
  */
 
 #ifndef _SYS__MUTEX_H_
diff --git a/sys/sys/_null.h b/sys/sys/_null.h
index 9e965f100b1ad..8e497498df100 100644
--- a/sys/sys/_null.h
+++ b/sys/sys/_null.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_null.h,v 1.7 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef NULL
diff --git a/sys/sys/_pthreadtypes.h b/sys/sys/_pthreadtypes.h
index 6337540afba9a..0e7effa437db3 100644
--- a/sys/sys/_pthreadtypes.h
+++ b/sys/sys/_pthreadtypes.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_pthreadtypes.h,v 1.1 2005/05/31 15:18:17 rodrigc Exp $
  */
 
 #ifndef _SYS__PTHREADTYPES_H_
diff --git a/sys/sys/_rwlock.h b/sys/sys/_rwlock.h
index f65d3fa1e88f6..4ab5788ab03b0 100644
--- a/sys/sys/_rwlock.h
+++ b/sys/sys/_rwlock.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_rwlock.h,v 1.4 2007/06/26 21:31:56 attilio Exp $
  */
 
 #ifndef _SYS__RWLOCK_H_
diff --git a/sys/sys/_semaphore.h b/sys/sys/_semaphore.h
index df3c5da1bd656..a93eb5a8272cd 100644
--- a/sys/sys/_semaphore.h
+++ b/sys/sys/_semaphore.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/_semaphore.h,v 1.6 2006/11/11 16:15:35 trhodes Exp $
  */
 #ifndef __SEMAPHORE_H_
 #define __SEMAPHORE_H_
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 06826701f740b..a0a29fd4a815f 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_sigset.h,v 1.36 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS__SIGSET_H_
diff --git a/sys/sys/_sx.h b/sys/sys/_sx.h
index 0d0351c627032..046aacca341e8 100644
--- a/sys/sys/_sx.h
+++ b/sys/sys/_sx.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_sx.h,v 1.1 2007/03/31 23:23:42 jhb Exp $
  */
 
 #ifndef	_SYS__SX_H_
diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index 2a51e1b07b97d..99e097b6434c1 100644
--- a/sys/sys/_task.h
+++ b/sys/sys/_task.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_task.h,v 1.4 2005/04/24 16:52:45 sam Exp $
  */
 
 #ifndef _SYS__TASK_H_
diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h
index 9dcd5f8910dca..c7507690efffd 100644
--- a/sys/sys/_timespec.h
+++ b/sys/sys/_timespec.h
@@ -28,7 +28,7 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/_timespec.h,v 1.5 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/_timeval.h b/sys/sys/_timeval.h
index a35d8a932513c..16c0e5e48195c 100644
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_timeval.h,v 1.3 2006/05/12 05:04:46 jhb Exp $
  */
 
 #ifndef _SYS__TIMEVAL_H_
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 6f1f74a3bc070..fdf371f217256 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/_types.h,v 1.23 2006/03/01 06:29:34 davidxu Exp $
  */
 
 #ifndef _SYS__TYPES_H_
diff --git a/sys/sys/aac_ioctl.h b/sys/sys/aac_ioctl.h
index f01cf70e506e2..25d2029ce17d5 100644
--- a/sys/sys/aac_ioctl.h
+++ b/sys/sys/aac_ioctl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/aac_ioctl.h,v 1.11 2004/12/09 22:20:25 scottl Exp $
  */
 
 /*
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 7c118edea5513..f04d12c11cd39 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/acct.h,v 1.19 2007/05/22 06:51:37 dds Exp $
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/acl.h b/sys/sys/acl.h
index e875385b889a4..8305cac8baaea 100644
--- a/sys/sys/acl.h
+++ b/sys/sys/acl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/acl.h,v 1.30 2007/03/16 13:39:04 rwatson Exp $
  */
 /* 
  * Developed by the TrustedBSD Project.
diff --git a/sys/sys/agpio.h b/sys/sys/agpio.h
index 8c1294f698634..a265415bb3e4e 100644
--- a/sys/sys/agpio.h
+++ b/sys/sys/agpio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/agpio.h,v 1.4 2003/10/23 18:08:56 jhb Exp $
  */
 
 #ifndef _SYS_AGPIO_H_
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 581bdf2f30641..00efa03eaccc3 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/aio.h,v 1.32 2006/03/23 08:47:28 davidxu Exp $
  */
 
 #ifndef _SYS_AIO_H_
diff --git a/sys/sys/alq.h b/sys/sys/alq.h
index bc4961e094c81..32c592f2ec68a 100644
--- a/sys/sys/alq.h
+++ b/sys/sys/alq.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/alq.h,v 1.6 2005/04/16 12:12:26 rwatson Exp $
  *
  */
 #ifndef _SYS_ALQ_H_
diff --git a/sys/sys/apm.h b/sys/sys/apm.h
index f93ed833ee9b9..4aaf31ed0eb78 100644
--- a/sys/sys/apm.h
+++ b/sys/sys/apm.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/apm.h,v 1.1.2.1 2007/10/29 00:11:40 marcel Exp $
  */
 
 #ifndef _SYS_APM_H_
diff --git a/sys/sys/assym.h b/sys/sys/assym.h
index 9316a4e4996c6..c9dc097a94699 100644
--- a/sys/sys/assym.h
+++ b/sys/sys/assym.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/assym.h,v 1.5 2004/03/12 21:45:32 trhodes Exp $
  */
 
 #ifndef _SYS_ASSYM_H_
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index 5c9be35d7ee19..97fd78d328f8b 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ata.h,v 1.36.2.1 2007/11/15 16:29:33 scottl Exp $
  */
 
 #ifndef _SYS_ATA_H_
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 36359637daa7b..af029fa83b41b 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bio.h,v 1.147 2006/10/31 21:11:21 pjd Exp $
  */
 
 #ifndef _SYS_BIO_H_
diff --git a/sys/sys/bitstring.h b/sys/sys/bitstring.h
index 125ef51d8895d..ab91c81c2d32b 100644
--- a/sys/sys/bitstring.h
+++ b/sys/sys/bitstring.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bitstring.h,v 1.5 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_BITSTRING_H_
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index 5f4d66ee8c98e..132ec236e640b 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -49,7 +49,7 @@
  *		that.  Managing something like 512MB worth of 4K blocks 
  *		eats around 32 KBytes of memory. 
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/blist.h,v 1.9 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_BLIST_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 810d7bae837c0..389d71cd69f84 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/buf.h,v 1.196 2007/03/08 06:44:34 julian Exp $
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index 66507020ea895..03edc76afa256 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bufobj.h,v 1.18 2007/01/23 10:01:18 kib Exp $
  */
 
 /*
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 14634371b2602..a706aeea0aa97 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/bus.h,v 1.78.4.1 2008/02/06 03:35:40 iwasaki Exp $
  */
 
 #ifndef _SYS_BUS_H_
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index cc790ff1e7500..24a46d0565e2d 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.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/bus_dma.h,v 1.30 2006/09/03 00:26:17 jmg Exp $ */
 
 #ifndef _BUS_DMA_H_
 #define _BUS_DMA_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index a554562546404..bf969cd5f8e8a 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/callout.h,v 1.31 2007/09/15 12:33:24 rwatson Exp $
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 5a2564b194d1c..35088701699c3 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.93.2.1 2007/12/13 19:34:23 alc Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
@@ -399,7 +399,7 @@
  * Embed the rcs id of a source file in the resulting library.  Note that in
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *	__FBSDID("$FreeBSD$");
+ *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.93.2.1 2007/12/13 19:34:23 alc Exp $");
  */
 #ifndef	__FBSDID
 #if !defined(lint) && !defined(STRIP_FBSDID)
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 3614d19ee0d2b..7b3a1d679c28f 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdio.h,v 1.26 2005/01/30 08:12:37 sobomax Exp $
  */
 
 /*
diff --git a/sys/sys/cdrio.h b/sys/sys/cdrio.h
index b664a585af151..f3258551adb75 100644
--- a/sys/sys/cdrio.h
+++ b/sys/sys/cdrio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cdrio.h,v 1.9 2002/10/18 22:03:38 njl Exp $
  */
 
 #ifndef	_SYS_CDRIO_H_
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index aa55f7cbc02c3..d36a1ed10e34f 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/chio.h,v 1.17 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_SYS_CHIO_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 5edc145a976d7..cda18a5bf2de3 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/clist.h,v 1.11 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_CLIST_H_
diff --git a/sys/sys/clock.h b/sys/sys/clock.h
index 00f682148238a..b938dea9af668 100644
--- a/sys/sys/clock.h
+++ b/sys/sys/clock.h
@@ -35,7 +35,7 @@
  *
  *	$NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/clock.h,v 1.7 2006/10/24 10:27:23 phk Exp $
  */
 
 #ifndef _SYS_CLOCK_H_
diff --git a/sys/sys/condvar.h b/sys/sys/condvar.h
index a7ef748ecc3a0..c1e18afe1e2d4 100644
--- a/sys/sys/condvar.h
+++ b/sys/sys/condvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/condvar.h,v 1.14 2007/03/21 22:22:13 jhb Exp $
  */
 
 #ifndef	_SYS_CONDVAR_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 97eea5c74a82f..abfa7f963fca4 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/conf.h,v 1.233.4.1 2008/01/30 21:21:51 ru Exp $
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index a3229c3f5c811..f01e896e91be3 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cons.h,v 1.40 2006/11/01 04:54:51 jb Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index 7b18ade1b541c..51b7617a879aa 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/consio.h,v 1.18 2006/09/27 19:57:01 ru Exp $
  */
 
 #ifndef	_SYS_CONSIO_H_
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index b0841e19f133b..b9e536cfe1c50 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/copyright.h,v 1.25.4.1 2007/12/26 16:47:43 imp Exp $
  */
 
 
diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h
index d282d300695f0..c1260440aaf31 100644
--- a/sys/sys/cpu.h
+++ b/sys/sys/cpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/cpu.h,v 1.4 2007/03/26 18:03:28 njl Exp $
  */
 
 #ifndef _SYS_CPU_H_
diff --git a/sys/sys/ctype.h b/sys/sys/ctype.h
index 5022d40c15b2e..507085326799f 100644
--- a/sys/sys/ctype.h
+++ b/sys/sys/ctype.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ctype.h,v 1.4 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_CTYPE_H_
diff --git a/sys/sys/dataacq.h b/sys/sys/dataacq.h
index 69afbf9a08c42..300fadcdf359c 100644
--- a/sys/sys/dataacq.h
+++ b/sys/sys/dataacq.h
@@ -1,7 +1,7 @@
 /*
  * Header for general data acquisition definitions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dataacq.h,v 1.5 2000/05/01 20:11:13 peter Exp $
  */
 
 #ifndef	_SYS_DATAACQ_H_
diff --git a/sys/sys/device_port.h b/sys/sys/device_port.h
index 51010bd8babc4..3abd3b7992a91 100644
--- a/sys/sys/device_port.h
+++ b/sys/sys/device_port.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/device_port.h,v 1.2 2005/01/19 01:31:33 imp Exp $
  */
 
 #if defined(__NetBSD__)
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 1a017cb31ca5f..07fd4d455b91a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/devicestat.h,v 1.26 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _DEVICESTAT_H
diff --git a/sys/sys/digiio.h b/sys/sys/digiio.h
index 57824dcd19a5e..30a6ba2fba04c 100644
--- a/sys/sys/digiio.h
+++ b/sys/sys/digiio.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/digiio.h,v 1.5 2006/09/27 19:57:02 ru Exp $
  */
 
 /*
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index 799ad9ed353cf..1bdefdb42fb12 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dir.h,v 1.10 2005/03/02 21:33:29 joerg Exp $
  */
 
 #ifndef _SYS_DIR_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index dfaacffb6187d..147d78394d94e 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dirent.h,v 1.15 2006/08/16 09:34:56 maxim Exp $
  */
 
 #ifndef	_SYS_DIRENT_H_
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 71e775e5e26f5..b21f29e624669 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/disk.h,v 1.42 2007/05/05 17:02:19 pjd Exp $
  *
  */
 
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 74fd9af34bd28..b6c2ef103be0f 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/disklabel.h,v 1.108 2006/05/12 05:04:46 jhb Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 932d4f4d148c5..ab098a149b037 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/diskmbr.h,v 1.100 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_DISKMBR_H_
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 3b2dc94802a2a..3ff28f9442cda 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/diskpc98.h,v 1.103 2005/05/08 11:30:26 nyan Exp $
  */
 
 #ifndef _SYS_DISKPC98_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index a9bdf45d549ed..a4b7bdb904286 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dkstat.h,v 1.18 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index cf2e92cce1ef3..83b428c4f6c0d 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/domain.h,v 1.22 2006/08/07 12:02:43 rwatson Exp $
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/dvdio.h b/sys/sys/dvdio.h
index 37940719a1b6e..eac709e510272 100644
--- a/sys/sys/dvdio.h
+++ b/sys/sys/dvdio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/dvdio.h,v 1.5 2002/03/04 21:08:35 sos Exp $
  */
 
 #ifndef _SYS_DVDIO_H_
diff --git a/sys/sys/elf.h b/sys/sys/elf.h
index 54df9336ab9cb..e3defb778c9dd 100644
--- a/sys/sys/elf.h
+++ b/sys/sys/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf.h,v 1.1 2006/10/04 07:23:31 jb Exp $
  */
 
 /*
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index 62bf7be680bce..676736bf1122e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf32.h,v 1.13 2006/10/17 05:43:30 jkoshy Exp $
  */
 
 #ifndef _SYS_ELF32_H_
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 0fbb8ee7c3953..de348ae39f802 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf64.h,v 1.17 2006/10/17 05:43:30 jkoshy Exp $
  */
 
 #ifndef _SYS_ELF64_H_
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index b941fd70aaf30..eb3a43438bf42 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf_common.h,v 1.22 2007/04/03 01:47:07 kan Exp $
  */
 
 #ifndef _SYS_ELF_COMMON_H_
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index ff1b6f7346b04..9d540733a1f15 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/elf_generic.h,v 1.8 2005/12/18 19:43:33 kan Exp $
  */
 
 #ifndef _SYS_ELF_GENERIC_H_
diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index 35a43804b92c8..33b43072d8800 100644
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/endian.h,v 1.6 2003/10/15 20:05:57 obrien Exp $
  */
 
 #ifndef _SYS_ENDIAN_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 77b5f67a17345..87146c5ac1a7b 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/errno.h,v 1.28 2005/04/02 12:33:28 das Exp $
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/eui64.h b/sys/sys/eui64.h
index 33300a779d3b0..129215028fef2 100644
--- a/sys/sys/eui64.h
+++ b/sys/sys/eui64.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/eui64.h,v 1.2 2005/01/07 02:29:23 imp Exp $
  */
 #ifndef _SYS_EUI64_H
 #define _SYS_EUI64_H
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 81edb1020930f..da6693d8bd2ca 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/event.h,v 1.37.4.1 2008/01/28 10:43:11 dumbbell Exp $
  */
 
 #ifndef _SYS_EVENT_H_
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index 00d124d91e0f8..7d56743a86119 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/eventhandler.h,v 1.37.2.1 2007/12/14 13:41:09 rrs Exp $
  */
 
 #ifndef SYS_EVENTHANDLER_H
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index bdb3adf572719..778befe0e6fa3 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/eventvar.h,v 1.6 2004/08/15 06:24:42 jmg Exp $
  */
 
 #ifndef _SYS_EVENTVAR_H_
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 8c95c36e6874b..ff4c4651cc268 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/exec.h,v 1.32 2005/03/23 08:27:59 das Exp $
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h
index 4b8ed82540519..58eb8cf5a3ba4 100644
--- a/sys/sys/extattr.h
+++ b/sys/sys/extattr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/extattr.h,v 1.18 2007/03/16 19:18:49 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index c7183dfc38c00..7f92efb8d7078 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -32,7 +32,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fbio.h,v 1.16 2005/05/21 20:40:51 marius Exp $
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 4b7b511f0cfa5..2fb656eaee733 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fcntl.h,v 1.16 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index e3ffc249cb7c6..f6a44daad07fb 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fdcio.h,v 1.21 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 58501fa83f37f..d091639729dc5 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/file.h,v 1.73 2007/01/05 19:59:46 jhb Exp $
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index da4a87cc3c855..48db9d85579df 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/filedesc.h,v 1.78 2007/05/31 11:51:52 kib Exp $
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 5f13288b70ce2..bb88501385f1e 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/filio.h,v 1.10 2007/04/05 21:10:53 pjd Exp $
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/firmware.h b/sys/sys/firmware.h
index ce02831a589f3..3193e11326cb6 100644
--- a/sys/sys/firmware.h
+++ b/sys/sys/firmware.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/firmware.h,v 1.4 2007/02/15 17:21:31 luigi Exp $
  */
 #ifndef _SYS_FIRMWARE_H_
 #define _SYS_FIRMWARE_H_
diff --git a/sys/sys/fnv_hash.h b/sys/sys/fnv_hash.h
index 2dbed339113ff..5f05ac81632e5 100644
--- a/sys/sys/fnv_hash.h
+++ b/sys/sys/fnv_hash.h
@@ -5,7 +5,7 @@
  * This is an implementation of the algorithms posted above.
  * This file is placed in the public domain by Peter Wemm.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/fnv_hash.h,v 1.3 2005/01/07 02:29:23 imp Exp $
  */
 
 typedef u_int32_t Fnv32_t;
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index 1fb850798b5e1..16daf76409511 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/gmon.h,v 1.20 2006/03/29 18:17:03 jhb Exp $
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/gpt.h b/sys/sys/gpt.h
index 0c5fb061c79ab..791e23a0685aa 100644
--- a/sys/sys/gpt.h
+++ b/sys/sys/gpt.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/gpt.h,v 1.10.2.1 2007/10/29 00:11:40 marcel Exp $
  */
 
 #ifndef _SYS_GPT_H_
diff --git a/sys/sys/hash.h b/sys/sys/hash.h
index 6ad89c5ef9054..4a515b0cf3777 100644
--- a/sys/sys/hash.h
+++ b/sys/sys/hash.h
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $OpenBSD: hash.h,v 1.4 2004/05/25 18:37:23 jmc Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/hash.h,v 1.3 2007/04/09 22:55:14 thompsa Exp $
  */
 
 #ifndef _SYS_HASH_H_
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index 914522d9b7fc9..3798baeea1c83 100644
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/iconv.h,v 1.12 2005/09/05 17:03:40 imura Exp $
  */
 #ifndef _SYS_ICONV_H_
 #define _SYS_ICONV_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index 6560d1c1454d1..31a62653d3755 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact.h,v 1.40 2006/08/15 12:10:57 netchild Exp $
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index 1c1596fdcec4b..5a7368b8bf770 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact_aout.h,v 1.23 2005/05/08 02:20:10 maxim Exp $
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 663a09078fa8a..43b5a8ec4df79 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.29 2005/12/26 21:23:56 sobomax Exp $
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index b8461a6cf4e43..54a9381f8a175 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/inflate.h,v 1.14 2005/01/07 02:29:23 imp Exp $
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index b110374a6b283..5efed437ed81c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/interrupt.h,v 1.37 2007/05/06 17:02:50 piso Exp $
  */
 
 #ifndef _SYS_INTERRUPT_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index acbd0ebf9be9f..de6b2040b8442 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioccom.h,v 1.16 2006/09/27 19:57:02 ru Exp $
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 7abb328c7a5b9..23757aaba8a85 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioctl.h,v 1.15 2006/01/10 09:19:10 phk Exp $
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index a8269fffc3587..f08e644424703 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ioctl_compat.h,v 1.10 2007/04/27 11:19:05 benjsc Exp $
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 57b3186f5c5c0..77be86b108763 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ipc.h,v 1.25 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/ipmi.h b/sys/sys/ipmi.h
index 578d78c8188e4..d5a16711adbde 100644
--- a/sys/sys/ipmi.h
+++ b/sys/sys/ipmi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ipmi.h,v 1.2 2006/09/22 22:11:29 jhb Exp $
  */
 
 #ifndef __SYS_IPMI_H__
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index b8972f83d64d5..0bfc15a6fd4e1 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/jail.h,v 1.29 2007/04/05 23:19:13 pjd Exp $
  *
  */
 
diff --git a/sys/sys/joystick.h b/sys/sys/joystick.h
index 6f2eb5bc28290..a205c8d61fff2 100644
--- a/sys/sys/joystick.h
+++ b/sys/sys/joystick.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/joystick.h,v 1.6 2005/01/07 19:31:43 keramida Exp $
  */
 
 #ifndef	_SYS_JOYSTICK_H_
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index 00bcacfac37f7..d5c0eedff1add 100644
--- a/sys/sys/kbio.h
+++ b/sys/sys/kbio.h
@@ -1,5 +1,5 @@
 /*-
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kbio.h,v 1.11 2006/09/27 19:57:02 ru Exp $
  */
 
 #ifndef	_SYS_KBIO_H_
diff --git a/sys/sys/kdb.h b/sys/sys/kdb.h
index ece16fc5aff89..d9fd7ce800b2b 100644
--- a/sys/sys/kdb.h
+++ b/sys/sys/kdb.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kdb.h,v 1.5 2005/04/20 20:52:46 ps Exp $
  */
 
 #ifndef _SYS_KDB_H_
diff --git a/sys/sys/kenv.h b/sys/sys/kenv.h
index 0a30ddb35d160..efca13adcbebb 100644
--- a/sys/sys/kenv.h
+++ b/sys/sys/kenv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kenv.h,v 1.1 2002/04/17 13:06:36 mux Exp $
  */
 
 #ifndef _SYS_KENV_H_
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index f9f1889d2775d..becb04f4f5d4f 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
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kernel.h,v 1.136 2007/07/27 11:59:57 rwatson Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h
index b508b6e0dac4c..6bad248a0c7a9 100644
--- a/sys/sys/kerneldump.h
+++ b/sys/sys/kerneldump.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kerneldump.h,v 1.8 2005/10/03 14:06:00 cognet Exp $
  */
 
 #ifndef _SYS_KERNELDUMP_H
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index b744db8de2592..34dcbfc68662f 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/kobj.h,v 1.11 2006/08/24 21:09:39 rik Exp $
  */
 
 #ifndef _SYS_KOBJ_H_
diff --git a/sys/sys/kse.h b/sys/sys/kse.h
index 9eb5449128443..07f3d7f97a95c 100644
--- a/sys/sys/kse.h
+++ b/sys/sys/kse.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kse.h,v 1.28 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_KSE_H_
diff --git a/sys/sys/ksem.h b/sys/sys/ksem.h
index 71979da328bb3..d999bde92590e 100644
--- a/sys/sys/ksem.h
+++ b/sys/sys/ksem.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ksem.h,v 1.3 2006/11/11 16:15:35 trhodes Exp $
  */
 
 #ifndef _POSIX4_KSEM_H_
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index 5f41cfc3c0082..fe270225102bf 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/kthread.h,v 1.8 2002/10/02 07:44:28 scottl Exp $
  */
 
 #ifndef _SYS_KTHREAD_H_
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 5a262dbfa193b..40c6818396227 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ktr.h,v 1.37 2006/01/25 14:57:23 jhb Exp $
  */
 
 /*
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 45721416bd284..61e0cf8588433 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ktrace.h,v 1.33 2005/12/26 22:09:09 cognet Exp $
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index e3deb2db35bb3..c1166a0a60d74 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/libkern.h,v 1.56 2007/04/10 21:42:12 wkoszek Exp $
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/limits.h b/sys/sys/limits.h
index 6f4b8a57ca6b0..4ecf363496561 100644
--- a/sys/sys/limits.h
+++ b/sys/sys/limits.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/limits.h,v 1.10 2005/12/02 07:45:28 davidxu Exp $
  */
 
 #ifndef _SYS_LIMITS_H_
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 659aa4b560252..25fb238887cd4 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linedisc.h,v 1.192 2004/06/26 08:44:04 phk Exp $
  */
 
 #ifndef _SYS_LINEDISC_H_
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 6695c268c8429..3cc9bc60f4a11 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/link_aout.h,v 1.25 2005/01/07 02:29:23 imp Exp $
  */
 
 /*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 6e6660f88bb82..7ef536aef2883 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/link_elf.h,v 1.27 2007/04/03 18:33:41 kan Exp $
  */
 
 /*
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index e35180a2e06e2..3ae4be23583ef 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linker.h,v 1.46 2006/06/20 20:59:55 jhb Exp $
  */
 
 #ifndef _SYS_LINKER_H_
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index 5f55beb5a3b7a..2e8d9e0099a0e 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/linker_set.h,v 1.17 2005/03/02 21:33:29 joerg Exp $
  */
 
 #ifndef _SYS_LINKER_SET_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 6d35ce58be32e..c7bdff129f4b7 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lock.h,v 1.68 2007/04/03 17:57:50 kmacy Exp $
  */
 
 #ifndef _SYS_LOCK_H_
diff --git a/sys/sys/lock_profile.h b/sys/sys/lock_profile.h
index f2861ac11a667..00ce4d095eadc 100644
--- a/sys/sys/lock_profile.h
+++ b/sys/sys/lock_profile.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lock_profile.h,v 1.15 2007/09/14 01:12:39 attilio Exp $
  */
 
 
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 880b487e75094..7435a693532ef 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lockf.h,v 1.20 2007/05/17 16:03:14 csjp Exp $
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index 79a51308fdc59..a530e36cbf9f7 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/lockmgr.h,v 1.53 2007/03/30 18:07:24 jhb Exp $
  */
 
 #ifndef	_SYS_LOCKMGR_H_
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index 0aa8960874065..9b8da15930d01 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mac.h,v 1.74 2007/02/06 16:24:57 rwatson Exp $
  */
 /*
  * Userland interface for Mandatory Access Control.  Loosely based on the
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index e59b9ac645604..05e1381032844 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/malloc.h,v 1.83 2005/12/30 11:45:07 pjd Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbpool.h b/sys/sys/mbpool.h
index f292f29721aba..df709548249c1 100644
--- a/sys/sys/mbpool.h
+++ b/sys/sys/mbpool.h
@@ -34,7 +34,7 @@
  * interfaces on 64bit machines). This assists network interfaces that may need
  * huge numbers of mbufs.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mbpool.h,v 1.2 2005/01/07 02:29:23 imp Exp $
  */
 #ifndef _SYS_MBPOOL_H_
 #define	_SYS_MBPOOL_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 7ed39131a811a..14b1b48a51a31 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mbuf.h,v 1.217 2007/10/06 21:42:39 kmacy Exp $
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index 69775ffe23724..1366edb990aaa 100644
--- a/sys/sys/mchain.h
+++ b/sys/sys/mchain.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mchain.h,v 1.10 2005/09/19 08:07:18 imura Exp $
  */
 #ifndef _SYS_MCHAIN_H_
 #define _SYS_MCHAIN_H_
diff --git a/sys/sys/md4.h b/sys/sys/md4.h
index 5ad9e99421ac8..21e6c94a1f49a 100644
--- a/sys/sys/md4.h
+++ b/sys/sys/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/md4.h,v 1.2 2005/01/07 02:29:23 imp Exp $
  */
 
 /*-
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index e98b7afb6ef7a..b07c6f0b800de 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,5 +1,5 @@
 /* MD5.H - header file for MD5C.C
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/md5.h,v 1.20 2006/03/15 19:47:12 andre Exp $
  */
 
 /*-
diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h
index be63b8c701900..901986cebb627 100644
--- a/sys/sys/mdioctl.h
+++ b/sys/sys/mdioctl.h
@@ -37,7 +37,7 @@
  *
  * From: src/sys/sys/vnioctl.h,v 1.4
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mdioctl.h,v 1.21 2005/11/11 11:31:22 pjd Exp $
  */
 
 #ifndef _SYS_MDIOCTL_H_
diff --git a/sys/sys/memrange.h b/sys/sys/memrange.h
index ace778d5bfd43..8adb04bc723be 100644
--- a/sys/sys/memrange.h
+++ b/sys/sys/memrange.h
@@ -1,7 +1,7 @@
 /*
  * Memory range attribute operations, peformed on /dev/mem
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/memrange.h,v 1.7 2004/08/04 18:30:31 markm Exp $
  */
 
 /* Memory range attributes */
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 0f7416f183e26..ff55bd2f9a2ff 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mman.h,v 1.40 2005/04/02 12:33:31 das Exp $
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/module.h b/sys/sys/module.h
index b621ba3d12e62..19f27da7bffe7 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/module.h,v 1.22 2006/04/17 19:44:44 jhb Exp $
  */
 
 #ifndef _SYS_MODULE_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 40617200de439..6fc7349f090a2 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mount.h,v 1.228 2007/09/12 16:31:32 kib Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index f8039ae873ab6..4fe4c71ef2526 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mouse.h,v 1.25 2006/12/18 18:48:28 keramida Exp $
  */
 
 #ifndef _SYS_MOUSE_H_
diff --git a/sys/sys/mqueue.h b/sys/sys/mqueue.h
index 36e89fa21e340..b19ac306f3042 100644
--- a/sys/sys/mqueue.h
+++ b/sys/sys/mqueue.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mqueue.h,v 1.2 2005/11/30 05:12:02 davidxu Exp $
  */
 
 #ifndef _SYS_MQUEUE_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 325df939a3624..6f08d16565328 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/msg.h,v 1.20 2005/01/07 02:29:23 imp Exp $ */
 /*	$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 61c79a1b6f7ea..39f1c2a69ed65 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/msgbuf.h,v 1.28 2006/09/03 00:33:19 jmg Exp $
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 1ad8004e95aff..b8aca6764da82 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mtio.h,v 1.29 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 85efb8384855c..cd1ad6fac5f48 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/mutex.h,v 1.101.2.1 2007/11/21 02:21:55 attilio Exp $
  */
 
 #ifndef _SYS_MUTEX_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 69148cc1831ab..e50c667669b68 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/namei.h,v 1.48 2006/02/05 15:42:01 rwatson Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index a4e11c3975a9c..6537470f5f31c 100644
--- a/sys/sys/nlist_aout.h
+++ b/sys/sys/nlist_aout.h
@@ -33,7 +33,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/nlist_aout.h,v 1.11 2004/04/07 04:19:49 imp Exp $
  */
 
 #ifndef _SYS_NLIST_AOUT_H_
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 211ba35e1a2de..0cddf62b4f603 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/param.h,v 1.308.2.3 2007/12/07 23:18:42 kmacy Exp $
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h
index 29771e4f7bcaf..70a6e159c4dc5 100644
--- a/sys/sys/pciio.h
+++ b/sys/sys/pciio.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.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/pciio.h,v 1.7.2.1 2007/10/28 17:31:52 marius Exp $
  *
  */
 
diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h
index b2fd6281a6fe0..194d518226cbe 100644
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pcpu.h,v 1.22 2007/06/06 07:35:08 davidxu Exp $
  */
 
 #ifndef _SYS_PCPU_H_
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 91a3229b31c0f..20f3befe5eb11 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -33,7 +33,7 @@
 /*
  * procfs ioctl definitions.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pioctl.h,v 1.15 2006/09/27 19:57:02 ru Exp $
  */
 
 #ifndef _SYS_PIOCTL_H
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index 1d3729fc38c94..7f599f59e6808 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pipe.h,v 1.29 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_PIPE_H_
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index c0329afedaa30..3af25381d4944 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pmc.h,v 1.11 2006/03/28 16:20:29 jkoshy Exp $
  */
 
 #ifndef _SYS_PMC_H_
diff --git a/sys/sys/pmckern.h b/sys/sys/pmckern.h
index 5ae31019a7d98..7766bd3c7988f 100644
--- a/sys/sys/pmckern.h
+++ b/sys/sys/pmckern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pmckern.h,v 1.6 2006/03/26 12:20:54 jkoshy Exp $
  */
 
 /*
diff --git a/sys/sys/pmclog.h b/sys/sys/pmclog.h
index 8d1b25c39b7f4..67e97884967f9 100644
--- a/sys/sys/pmclog.h
+++ b/sys/sys/pmclog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/pmclog.h,v 1.4 2006/03/28 16:20:29 jkoshy Exp $
  */
 
 #ifndef	_SYS_PMCLOG_H_
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index c955f321c7528..9ea42b9ddfc50 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
  */
 
 #ifndef _SYS_POLL_H_
diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h
index ea379c0be3852..5afb9ed20e282 100644
--- a/sys/sys/posix4.h
+++ b/sys/sys/posix4.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/posix4.h,v 1.16 2006/11/11 16:19:12 trhodes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/sys/power.h b/sys/sys/power.h
index 62784b2e49d3d..941a7329c8387 100644
--- a/sys/sys/power.h
+++ b/sys/sys/power.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/power.h,v 1.3 2002/07/15 14:06:03 markm Exp $
  */
 
 #ifndef _SYS_POWER_H_
diff --git a/sys/sys/priority.h b/sys/sys/priority.h
index 9bbd2de878ffe..ba827722f77f1 100644
--- a/sys/sys/priority.h
+++ b/sys/sys/priority.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/priority.h,v 1.4 2007/01/08 21:21:45 imp Exp $
  */
 
 #ifndef _SYS_PRIORITY_H_
diff --git a/sys/sys/priv.h b/sys/sys/priv.h
index ec8be5a8162cc..57ff6654917ff 100644
--- a/sys/sys/priv.h
+++ b/sys/sys/priv.h
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/priv.h,v 1.15 2007/06/18 07:54:27 rwatson Exp $
  */
 
 /*
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 3062a42507e6e..26926fd477c7d 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/proc.h,v 1.491.2.1.2.1 2008/01/19 18:15:06 kib Exp $
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index b03e73dd8c424..9a1e025062815 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/procfs.h,v 1.5 2004/07/15 03:52:17 davidxu Exp $
  */
 
 #ifndef _SYS_PROCFS_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 367d5b63e45ba..c51c123087881 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/protosw.h,v 1.57 2006/07/24 15:20:08 rwatson Exp $
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index 1292280528d3d..f1d60e12cde2a 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ptio.h,v 1.3 1999/08/28 00:51:57 peter Exp $
  */
 
 #ifndef _SYS_PTIO_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 8fd52cb4451e1..9590381fea0aa 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ptrace.h,v 1.28 2006/02/06 09:41:56 davidxu Exp $
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index eefd620784028..d62afcc8472f2 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/queue.h,v 1.68 2006/10/24 11:20:29 ru Exp $
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 5cf1611e359cb..1070c397f874f 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/random.h,v 1.34 2004/10/12 14:55:59 rwatson Exp $
  */
 
 #ifndef	_SYS_RANDOM_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 6b8e25e61cdd1..8713597ed82ab 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/reboot.h,v 1.26 2005/01/07 02:29:23 imp Exp $
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h
index 5316dd938f788..b0a8f7bb96995 100644
--- a/sys/sys/refcount.h
+++ b/sys/sys/refcount.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/refcount.h,v 1.1 2005/09/27 18:01:33 jhb Exp $
  */
 
 #ifndef __SYS_REFCOUNT_H__
diff --git a/sys/sys/regression.h b/sys/sys/regression.h
index 8ee757ed170a4..0ce5be6d9ec8c 100644
--- a/sys/sys/regression.h
+++ b/sys/sys/regression.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/regression.h,v 1.3 2004/05/10 18:38:07 rwatson Exp $
  */
 #ifndef _SYS_REGRESSION_H_
 #define	_SYS_REGRESSION_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index c1b16f431f58c..cb5dafc855f88 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/resource.h,v 1.31 2007/06/01 01:12:45 jeff Exp $
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index ea8bbdbe00405..7525ced9cfb6a 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/resourcevar.h,v 1.52 2007/06/09 21:48:44 attilio Exp $
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index ba06cc043cb61..49a403fb47a4d 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rman.h,v 1.34 2006/06/12 04:06:20 imp Exp $
  */
 
 #ifndef _SYS_RMAN_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 7ffdb732b61a0..30be9b34abcec 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rtprio.h,v 1.18 2007/01/08 21:21:45 imp Exp $
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/runq.h b/sys/sys/runq.h
index 4b14e2d42d0d1..83ab0c19de6fd 100644
--- a/sys/sys/runq.h
+++ b/sys/sys/runq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/runq.h,v 1.10 2007/02/08 01:52:24 jeff Exp $
  */
 
 #ifndef	_RUNQ_H_
diff --git a/sys/sys/rwlock.h b/sys/sys/rwlock.h
index d6cdaac128b02..afe2c46b63687 100644
--- a/sys/sys/rwlock.h
+++ b/sys/sys/rwlock.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/rwlock.h,v 1.14 2007/07/20 08:43:42 attilio Exp $
  */
 
 #ifndef _SYS_RWLOCK_H_
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index 0c1e6e1e0cf82..dd35beb49cccc 100644
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.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.
  *
- *      $FreeBSD$
+ *      $FreeBSD: src/sys/sys/sbuf.h,v 1.14 2004/07/09 11:35:30 des Exp $
  */
 
 #ifndef _SYS_SBUF_H_
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
index 5f225e1dcf043..6efd412dd738e 100644
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.h
@@ -56,7 +56,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sched.h,v 1.33 2007/06/12 19:49:39 jeff Exp $
  */
 
 #ifndef _SCHED_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 511895b3c81fb..674ce0ec0e43f 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/select.h,v 1.20 2006/01/06 22:12:46 marcel Exp $
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index 946da8c9de44f..add8f5e54d247 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/selinfo.h,v 1.18 2004/08/15 06:24:42 jmg Exp $
  */
 
 #ifndef _SYS_SELINFO_H_
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index ecd78a30bfffb..f694cdd07d77e 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/sem.h,v 1.31 2006/11/07 18:56:48 jhb Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/sema.h b/sys/sys/sema.h
index cdce5982311c7..588cadb3a09be 100644
--- a/sys/sys/sema.h
+++ b/sys/sys/sema.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sema.h,v 1.4 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef	_SYS_SEMA_H_
diff --git a/sys/sys/semaphore.h b/sys/sys/semaphore.h
index 180625221f2e0..d5c829276b58b 100644
--- a/sys/sys/semaphore.h
+++ b/sys/sys/semaphore.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/semaphore.h,v 1.12 2006/11/11 16:15:35 trhodes Exp $
  */
 
 /* semaphore.h: POSIX 1003.1b semaphores */
diff --git a/sys/sys/serial.h b/sys/sys/serial.h
index 1a149a96252f7..7374a73053ac5 100644
--- a/sys/sys/serial.h
+++ b/sys/sys/serial.h
@@ -27,7 +27,7 @@
  * (both async and sync), but which do not necessarily have anything to
  * do with tty processing.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/serial.h,v 1.5 2006/03/30 17:24:42 marcel Exp $
  */
 
 #ifndef _SYS_SERIAL_H_
diff --git a/sys/sys/sf_buf.h b/sys/sys/sf_buf.h
index af420652029b7..82a6f4ee74c88 100644
--- a/sys/sys/sf_buf.h
+++ b/sys/sys/sf_buf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sf_buf.h,v 1.5 2004/11/08 00:43:46 alc Exp $
  */
 
 #ifndef _SYS_SF_BUF_H_
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 88eaf0624d0fe..b793a0ebaae99 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/shm.h,v 1.24 2005/08/06 07:20:17 csjp Exp $ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*-
diff --git a/sys/sys/sigio.h b/sys/sys/sigio.h
index 62ece6d4c28a0..c72c18f3bb274 100644
--- a/sys/sys/sigio.h
+++ b/sys/sys/sigio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sigio.h,v 1.3 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SIGIO_H_
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index fd4384d00ce42..7b25e2b705aa5 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/signal.h,v 1.56.2.1 2007/12/17 03:05:56 davidxu Exp $
  */
 
 #ifndef _SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index dc09226c90189..71aa4cb563326 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/signalvar.h,v 1.77.4.1 2008/01/19 18:15:06 kib Exp $
  */
 
 #ifndef _SYS_SIGNALVAR_H_
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
index 58d667e3ddf7a..452656a4ce704 100644
--- a/sys/sys/sleepqueue.h
+++ b/sys/sys/sleepqueue.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sleepqueue.h,v 1.12 2007/03/31 23:23:42 jhb Exp $
  */
 
 #ifndef _SYS_SLEEPQUEUE_H_
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index f2b2f523213f1..e45afe187d9ff 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/smp.h,v 1.85 2005/10/24 21:04:19 jhb Exp $
  */
 
 #ifndef _SYS_SMP_H_
diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h
index b25aa494ff8e7..68c68547b4fd8 100644
--- a/sys/sys/snoop.h
+++ b/sys/sys/snoop.h
@@ -12,7 +12,7 @@
  *
  * Snoop stuff.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/snoop.h,v 1.25 2005/09/18 19:23:35 cognet Exp $
  */
 
 #ifndef _SYS_SNOOP_H_
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 5b12357ed2795..a9ee7ac1f2aac 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/socket.h,v 1.95 2007/09/18 09:22:16 alfred Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index edb1ecd791a3d..166145eed5a49 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/socketvar.h,v 1.158.4.1 2008/02/02 12:44:14 rwatson Exp $
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 18acd3f5307da..b917611e1480b 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sockio.h,v 1.31 2006/07/09 06:04:00 sam Exp $
  */
 
 #ifndef _SYS_SOCKIO_H_
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 0ae5969828598..2cf3a2c5bfb89 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -29,7 +29,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/soundcard.h,v 1.48 2006/11/26 11:55:48 netchild Exp $
  */
 
 /*
diff --git a/sys/sys/stack.h b/sys/sys/stack.h
index a7ac114537beb..d7b164cb1ee64 100644
--- a/sys/sys/stack.h
+++ b/sys/sys/stack.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stack.h,v 1.2 2005/08/29 11:34:08 pjd Exp $
  */
 
 #ifndef _SYS_STACK_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index d3572c34e0ea6..04e1f225d000e 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stat.h,v 1.42 2006/08/04 23:47:30 jb Exp $
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/statvfs.h b/sys/sys/statvfs.h
index 24fd8e02f6a6f..4db5bc040c794 100644
--- a/sys/sys/statvfs.h
+++ b/sys/sys/statvfs.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/statvfs.h,v 1.4 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_STATVFS_H_
diff --git a/sys/sys/stddef.h b/sys/sys/stddef.h
index 8e7f206d61971..3e0b15dff51e3 100644
--- a/sys/sys/stddef.h
+++ b/sys/sys/stddef.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stddef.h,v 1.2 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _SYS_STDDEF_H_
diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h
index 27f6dae997fda..b0d6632637fea 100644
--- a/sys/sys/stdint.h
+++ b/sys/sys/stdint.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/stdint.h,v 1.4 2002/08/21 16:20:01 mike Exp $
  */
 
 #ifndef _SYS_STDINT_H_
diff --git a/sys/sys/sun_disklabel.h b/sys/sys/sun_disklabel.h
index ac85e19706a5a..c135ac4bf95dd 100644
--- a/sys/sys/sun_disklabel.h
+++ b/sys/sys/sun_disklabel.h
@@ -34,7 +34,7 @@
  *	@(#)sun_disklabel.h	8.1 (Berkeley) 6/11/93
  *	$NetBSD: disklabel.h,v 1.2 1998/08/22 14:55:28 mrg Exp $
  *
- * $FreeBSD$ 
+ * $FreeBSD: src/sys/sys/sun_disklabel.h,v 1.11 2005/03/30 09:33:10 joerg Exp $ 
  */
 
 #ifndef _SYS_SUN_DISKLABEL_H_
diff --git a/sys/sys/sx.h b/sys/sys/sx.h
index 47fdae63c1a75..be95378e8c47b 100644
--- a/sys/sys/sx.h
+++ b/sys/sys/sx.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sx.h,v 1.37 2007/07/06 13:20:44 attilio Exp $
  */
 
 #ifndef	_SYS_SX_H_
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 05f89bfe4d08c..b448d93b76f4e 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syscall.h,v 1.211 2007/08/16 05:32:26 davidxu Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp 
  */
 
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 44e128b4df8c9..85de2e5e66e22 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,6 +1,6 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD$
+# $FreeBSD: src/sys/sys/syscall.mk,v 1.166 2007/08/16 05:32:26 davidxu Exp $
 # created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp 
 MIASM =  \
 	syscall.o \
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 1cba85dcfed25..6ae5016c02c28 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.46 2007/06/07 19:45:19 jhb Exp $
  */
 
 #ifndef _SYS_SYSCALLSUBR_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 5d07d6b40f5bd..3fea4848ce019 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysctl.h,v 1.148 2007/06/04 18:14:28 dwmalone Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index e0ea4b02fa0d3..0d61d70ca85bf 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysent.h,v 1.55 2007/07/12 18:01:31 jhb Exp $
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 28a5eba076160..0cd6023cf6365 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syslimits.h,v 1.23 2007/05/29 15:14:46 cognet Exp $
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index fe2d0fee7cb37..914334148e648 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/syslog.h,v 1.26 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 83a9ce70688bb..8218ce4a87ac0 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/sysproto.h,v 1.215 2007/08/16 05:32:26 davidxu Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp 
  */
 
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 10946db37c9c3..f0c939731bece 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/systm.h,v 1.260.2.1 2007/12/06 14:19:43 kib Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index 6d6d9ad6997e6..407c7a63c532f 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/taskqueue.h,v 1.16 2006/01/14 01:55:24 scottl Exp $
  */
 
 #ifndef _SYS_TASKQUEUE_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index f9e173cfe9f23..9a3cb2e1ce30e 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/termios.h,v 1.20 2005/01/07 02:29:24 imp Exp $
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/thr.h b/sys/sys/thr.h
index ae4a65d368f2b..7e9f4fde9ad15 100644
--- a/sys/sys/thr.h
+++ b/sys/sys/thr.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/thr.h,v 1.14 2007/08/16 05:26:42 davidxu Exp $
  *
  */
 
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index 442dceb012c06..7b4dca4465fed 100644
--- a/sys/sys/tiio.h
+++ b/sys/sys/tiio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/tiio.h,v 1.1 2002/06/26 03:37:47 ken Exp $
  */
 /*
  * The ti_stats structure below is from code with the following copyright, 
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 0350c203eeb93..cd914dba0cdcc 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/time.h,v 1.73 2006/10/03 04:01:30 jb Exp $
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 2a88f6b3f7d89..ccd83fb4471a7 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timeb.h,v 1.9 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index cde9396145fda..53308f62c6a84 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timepps.h,v 1.19 2005/01/07 02:29:24 imp Exp $
  *
  * The is a FreeBSD version of the RFC 2783 API for Pulse Per Second 
  * timing interfaces.  
diff --git a/sys/sys/timers.h b/sys/sys/timers.h
index 3ef079c7318ad..b79fc1760536d 100644
--- a/sys/sys/timers.h
+++ b/sys/sys/timers.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timers.h,v 1.11 2006/03/01 06:48:31 davidxu Exp $
  *
  * Description : Basic timers header.
  */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index b6b1e1dba1ea5..d5c34f13bf785 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/times.h,v 1.9 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timespec.h b/sys/sys/timespec.h
index 8986c094c6abe..c8f3e04f29ebd 100644
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
@@ -28,7 +28,7 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD$
+ *	$FreeBSD: src/sys/sys/timespec.h,v 1.5 2005/10/23 04:22:56 davidxu Exp $
  */
 
 /*
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index d5a818b4c0e95..37094977bf5cb 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timetc.h,v 1.58 2003/08/16 08:23:52 phk Exp $
  */
 
 #ifndef _SYS_TIMETC_H_
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index cf877ffc47dd5..df3ed74d2ce3d 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -45,7 +45,7 @@
  * 17 Sep 93    David L. Mills
  *      Created file
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/timex.h,v 1.18 2005/01/07 02:29:24 imp Exp $
  */
 /*
  * This header file defines the Network Time Protocol (NTP) interfaces
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 3af9a2b144068..a2b8e430b4efa 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $	*/
 /*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/sys/tree.h,v 1.6 2007/06/15 16:09:47 jasone Exp $ */
 
 /*-
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 81f4f9c6b943b..27fcb218495bd 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/tty.h,v 1.101 2006/01/04 09:59:06 phk Exp $
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 56a55d4f87d6f..2bfd20e8ac2ea 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttychars.h,v 1.10 2006/01/10 09:19:10 phk Exp $
  */
 
 #ifndef _SYS_TTYCHARS_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index 6e59577ada9af..f80069dfd1bd5 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttycom.h,v 1.25 2006/09/27 19:57:02 ru Exp $
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index d21dddf5afe61..6517cbbc7ffca 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.19 2004/11/03 19:16:55 phk Exp $
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index d6d6b4c41dc62..86f49d03d6f5b 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ttydev.h,v 1.12 2006/01/10 09:19:10 phk Exp $
  */
 
 /* COMPATIBILITY HEADER FILE */
diff --git a/sys/sys/turnstile.h b/sys/sys/turnstile.h
index ce48790b21adf..6f6d4b721176d 100644
--- a/sys/sys/turnstile.h
+++ b/sys/sys/turnstile.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/turnstile.h,v 1.12 2007/06/04 23:51:44 jeff Exp $
  */
 
 #ifndef _SYS_TURNSTILE_H_
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 6273f7cbfc000..3be2aaff02ec8 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/types.h,v 1.96 2006/08/04 22:54:10 jb Exp $
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
index baa179ed4f73e..2095ea4c33995 100644
--- a/sys/sys/ucontext.h
+++ b/sys/sys/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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ucontext.h,v 1.12 2006/05/12 05:04:46 jhb Exp $
  */
 
 #ifndef _SYS_UCONTEXT_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index b7587da4bb674..8346ecb2e1cc3 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/ucred.h,v 1.55.2.1 2007/12/07 05:46:09 kmacy Exp $
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index c46cc6fb16af2..d48fd87d5a50a 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/uio.h,v 1.40 2006/11/29 19:08:45 alfred Exp $
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h
index 6631be744f662..c4f60297e11f2 100644
--- a/sys/sys/umtx.h
+++ b/sys/sys/umtx.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/umtx.h,v 1.29 2007/06/06 07:35:08 davidxu Exp $
  *
  */
 
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 97aebb5be2e0b..5365a772b736c 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/un.h,v 1.29 2005/04/13 00:01:46 mdodd Exp $
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index f65a1987ffa97..02487024f21af 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/unistd.h,v 1.49 2007/04/07 18:31:40 pjd Exp $
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index c7b3a44588ef1..91c4110f3d09e 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/unpcb.h,v 1.22 2007/02/26 20:47:51 rwatson Exp $
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 348b3e0edab00..85ca7e28d106e 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/user.h,v 1.70 2007/09/17 05:27:21 jeff Exp $
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 410e06566b368..50876a54d9007 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/utsname.h,v 1.11 2004/04/07 04:19:50 imp Exp $
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/uuid.h b/sys/sys/uuid.h
index 0f40bb20e31b8..946272bbb4bfc 100644
--- a/sys/sys/uuid.h
+++ b/sys/sys/uuid.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/uuid.h,v 1.6 2005/10/07 13:37:10 marcel Exp $
  */
 
 #ifndef _SYS_UUID_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 2b4794a44a8e3..e817520c4f264 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vmmeter.h,v 1.34 2007/09/25 06:25:06 alc Exp $
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index d1170f2095a2a..bc4294b2820d1 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/vnode.h,v 1.326 2007/05/31 11:51:52 kib Exp $
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index e5691dbcb29b9..193496360b21f 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/wait.h,v 1.22 2005/11/10 05:00:20 davidxu Exp $
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h
index 9410775933845..3c2c9f5c8b784 100644
--- a/sys/sys/watchdog.h
+++ b/sys/sys/watchdog.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/watchdog.h,v 1.4 2006/12/15 21:44:49 n_hibma Exp $
  */
 #ifndef _SYS_WATCHDOG_H
 #define	_SYS_WATCHDOG_H
diff --git a/sys/sys/xrpuio.h b/sys/sys/xrpuio.h
index 94bd38d0a3efb..928e200f5587e 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
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/sys/xrpuio.h,v 1.3 2005/01/07 02:29:24 imp Exp $
  *
  */
 
diff --git a/sys/tools/acpi_quirks2h.awk b/sys/tools/acpi_quirks2h.awk
index 3b4a0aea594b0..fb53e8981ab9e 100644
--- a/sys/tools/acpi_quirks2h.awk
+++ b/sys/tools/acpi_quirks2h.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/acpi_quirks2h.awk,v 1.4 2007/03/22 18:16:43 jkim Exp $
 
 #-
 # Copyright (c) 2004 Mark Santcroos <marks@ripe.net>
diff --git a/sys/tools/bus_macro.sh b/sys/tools/bus_macro.sh
index 95b06e529a720..951c4ae62f145 100644
--- a/sys/tools/bus_macro.sh
+++ b/sys/tools/bus_macro.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/bus_macro.sh,v 1.1 2005/09/24 20:11:07 phk Exp $
 #
 # Generate the convenience macros at the bottom of sys/bus.h
 #
diff --git a/sys/tools/emu10k1-mkalsa.sh b/sys/tools/emu10k1-mkalsa.sh
index 2e78f5bd0499a..c83c9b0868b4e 100644
--- a/sys/tools/emu10k1-mkalsa.sh
+++ b/sys/tools/emu10k1-mkalsa.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/emu10k1-mkalsa.sh,v 1.1 2004/02/05 22:51:16 peter Exp $
 
 GREP=${GREP:-grep}
 CC=${CC:-cc}
diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk
index ddcca017f4246..c996340901072 100644
--- a/sys/tools/fw_stub.awk
+++ b/sys/tools/fw_stub.awk
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz Exp $
 
 #
 # Script to generate module .c file from a list of firmware images
diff --git a/sys/tools/makeobjops.awk b/sys/tools/makeobjops.awk
index 61994f36e5889..c74f712b79a8b 100644
--- a/sys/tools/makeobjops.awk
+++ b/sys/tools/makeobjops.awk
@@ -34,7 +34,7 @@
 # From src/sys/kern/makedevops.pl,v 1.12 1999/11/22 14:40:04 n_hibma Exp
 # From src/sys/kern/makeobjops.pl,v 1.8 2001/11/16 02:02:42 joe Exp
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/makeobjops.awk,v 1.6 2005/01/07 02:29:25 imp Exp $
 
 #
 #   Script to produce kobj front-end sugar.
diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk
index 01d3a5ca4318c..b0c0680669950 100644
--- a/sys/tools/miidevs2h.awk
+++ b/sys/tools/miidevs2h.awk
@@ -65,7 +65,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/miidevs2h.awk,v 1.6 2005/01/07 02:29:25 imp Exp $
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/pccarddevs2h.awk b/sys/tools/pccarddevs2h.awk
index 2e52290b8e835..508ab34a6332e 100644
--- a/sys/tools/pccarddevs2h.awk
+++ b/sys/tools/pccarddevs2h.awk
@@ -1,6 +1,6 @@
 #! /usr/bin/awk -f
 #	$NetBSD: devlist2h.awk,v 1.3 1998/09/05 14:42:06 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/pccarddevs2h.awk,v 1.4 2005/01/07 02:29:25 imp Exp $
 
 #-
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/tools/usbdevs2h.awk b/sys/tools/usbdevs2h.awk
index e6db3bdef9797..fe3bd3d3f907e 100644
--- a/sys/tools/usbdevs2h.awk
+++ b/sys/tools/usbdevs2h.awk
@@ -1,7 +1,7 @@
 #! /usr/bin/awk -f
 #-
 #	$NetBSD: usb/devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $
-#  $FreeBSD$
+#  $FreeBSD: src/sys/tools/usbdevs2h.awk,v 1.7 2005/01/07 02:29:25 imp Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
 # All rights reserved.
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index fa168cb54a882..af8b014c48e59 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -30,7 +30,7 @@
 
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/tools/vnode_if.awk,v 1.55 2006/05/30 21:13:28 dds Exp $
 #
 # Script to produce VFS front-end sugar.
 #
@@ -148,7 +148,7 @@ common_head = \
     " * This file is produced automatically.\n" \
     " * Do not modify anything in here by hand.\n" \
     " *\n" \
-    " * Created from $FreeBSD$\n" \
+    " * Created from $FreeBSD: src/sys/tools/vnode_if.awk,v 1.55 2006/05/30 21:13:28 dds Exp $\n" \
     " */\n" \
     "\n";
 
diff --git a/sys/ufs/ffs/README.snapshot b/sys/ufs/ffs/README.snapshot
index 7704c7ee3475b..2ca5a1937fa76 100644
--- a/sys/ufs/ffs/README.snapshot
+++ b/sys/ufs/ffs/README.snapshot
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ffs/README.snapshot,v 1.4 2002/12/12 00:31:45 trhodes Exp $
 
 Soft Updates Status
 
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 16f9396c69871..2ab9f8d333af5 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.147 2007/09/10 14:12:29 bz Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 1badab653bf6a..64dc9c1b9acdc 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.50.14.1 2008/01/19 18:12:25 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 67986c12a8037..a496542b29f03 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.74 2007/02/17 08:25:43 mckusick Exp $
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index dc4f339654a04..e50ce225fb841 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.108 2007/06/01 01:12:45 jeff Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c
index ae26c1d8cd9ac..8890bab728d47 100644
--- a/sys/ufs/ffs/ffs_rawread.c
+++ b/sys/ufs/ffs/ffs_rawread.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_rawread.c,v 1.29 2007/02/04 23:42:02 tegge Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index 792b375158f10..3cd14f026ced0 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.136 2007/06/05 00:00:56 jeff Exp $");
 
 #include "opt_quota.h"
 
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 94368fd76a3c6..db7ab7d7dfada 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.211 2007/06/22 13:22:36 kib Exp $");
 
 /*
  * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index e34bc1372a2e1..71ec3197801a7 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.40 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index 848d47805c31c..dcb936763cbd6 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_tables.c,v 1.12 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 4eb89148204be..8f4edcf61e5be 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.329 2007/04/04 07:29:53 delphij Exp $");
 
 #include "opt_mac.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 7792cc423ea3c..d85644e778274 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.173 2007/07/13 18:51:08 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 9aaf0409835c4..168a98d544f1f 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.49 2006/10/31 21:48:53 pjd Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index b00183bcfd2cc..71c3d1da2323a 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)softdep.h	9.7 (McKusick) 6/21/00
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ffs/softdep.h,v 1.19 2006/03/02 05:50:23 jeff Exp $
  */
 
 #include <sys/queue.h>
diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls
index 28a9d4f59d875..ef752c73b2553 100644
--- a/sys/ufs/ufs/README.acls
+++ b/sys/ufs/ufs/README.acls
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ufs/README.acls,v 1.6 2002/10/19 16:09:16 rwatson Exp $
 
   UFS Access Control Lists Copyright
 
diff --git a/sys/ufs/ufs/README.extattr b/sys/ufs/ufs/README.extattr
index a3be6e6a45dcb..a6e07d02c4c03 100644
--- a/sys/ufs/ufs/README.extattr
+++ b/sys/ufs/ufs/README.extattr
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/ufs/ufs/README.extattr,v 1.5 2002/10/18 21:11:36 rwatson Exp $
 
   UFS Extended Attributes Copyright
 
diff --git a/sys/ufs/ufs/acl.h b/sys/ufs/ufs/acl.h
index b53e3284df1e7..6c3cc990470b1 100644
--- a/sys/ufs/ufs/acl.h
+++ b/sys/ufs/ufs/acl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/acl.h,v 1.5 2003/08/04 03:29:13 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index aba4348b4b3df..700cf4f22c9db 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -62,7 +62,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.17 2006/05/21 21:55:29 maxim Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 62ee745c55922..c95327206b19c 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dir.h,v 1.12 2007/07/02 01:31:43 peter Exp $
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/dirhash.h b/sys/ufs/ufs/dirhash.h
index e81913938a473..d1946710ac050 100644
--- a/sys/ufs/ufs/dirhash.h
+++ b/sys/ufs/ufs/dirhash.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/dirhash.h,v 1.5 2005/01/07 02:29:26 imp Exp $
  */
 
 #ifndef _UFS_UFS_DIRHASH_H_
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index c1ceee58e738c..c314712051f7f 100644
--- a/sys/ufs/ufs/extattr.h
+++ b/sys/ufs/ufs/extattr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/extattr.h,v 1.21 2007/03/06 08:13:20 mckusick Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/sys/ufs/ufs/gjournal.h b/sys/ufs/ufs/gjournal.h
index f4036b5dfa7a2..3635f29429107 100644
--- a/sys/ufs/ufs/gjournal.h
+++ b/sys/ufs/ufs/gjournal.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/gjournal.h,v 1.1 2006/10/31 21:48:54 pjd Exp $
  */
 
 #ifndef _UFS_UFS_GJOURNAL_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 2fc333693b7cc..3b35b42834937 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/inode.h,v 1.51 2006/10/10 09:20:54 kib Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 42c59fe9cdb8b..e3bf238b10421 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/quota.h,v 1.30 2007/03/14 08:54:07 kib Exp $
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c
index 732009f72fb7f..23acb399569c4 100644
--- a/sys/ufs/ufs/ufs_acl.c
+++ b/sys/ufs/ufs/ufs_acl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_acl.c,v 1.21 2007/01/08 17:55:32 rwatson Exp $");
 
 #include "opt_ufs.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 805d33ed64d5b..211052aa14584 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_bmap.c,v 1.66 2007/06/01 01:12:45 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index 093e195771b5c..3d6552592d845 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.23 2005/10/31 15:41:28 rwatson Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 3692329796803..63bc1816ef35f 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_extattr.c,v 1.86 2007/06/01 14:33:11 kib Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 40a659dfdac64..1de0bc9649c82 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufs_extern.h,v 1.55 2005/03/14 10:21:16 phk Exp $
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_gjournal.c b/sys/ufs/ufs/ufs_gjournal.c
index dfa8531c67d02..21c626b338bed 100644
--- a/sys/ufs/ufs/ufs_gjournal.c
+++ b/sys/ufs/ufs/ufs_gjournal.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_gjournal.c,v 1.2 2007/05/28 00:28:15 pjd Exp $");
 
 #include "opt_ufs.h"
 
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 57ede1e3ebf78..448f43659eed5 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_inode.c,v 1.69 2007/06/22 13:22:37 kib Exp $");
 
 #include "opt_quota.h"
 #include "opt_ufs.h"
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 78366594d6c5f..031e82dd3d2ad 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.83 2007/03/14 08:50:27 kib Exp $");
 
 #include "opt_ffs_broken_fixme.h"
 #include "opt_ufs.h"
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 49ee1c8f4e177..8c99a1f250fb3 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.95 2007/06/12 00:12:01 rwatson Exp $");
 
 #include "opt_ffs.h"
 
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 1280cdbe95371..6bec3a9adfe40 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vfsops.c,v 1.48 2007/02/01 02:13:53 mpp Exp $");
 
 #include "opt_quota.h"
 #include "opt_ufs.h"
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index ec28c2d0505d4..332bfb75214fc 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.291 2007/06/12 00:12:01 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 5057991db5148..80fe3fa974fa9 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
+ * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.37 2006/04/03 22:23:23 tegge Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 485571b5b904e..6f345741e90ed 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/default_pager.c,v 1.35 2005/01/07 02:29:26 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 19ba75f3411e1..f0d661f360284 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/device_pager.c,v 1.84 2007/08/18 16:41:31 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c
index 9a4f98b17ab74..86e90a7aef1ac 100644
--- a/sys/vm/memguard.c
+++ b/sys/vm/memguard.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/memguard.c,v 1.6 2005/12/30 11:45:07 pjd Exp $");
 
 /*
  * MemGuard is a simple replacement allocator for debugging only
diff --git a/sys/vm/memguard.h b/sys/vm/memguard.h
index 34d79cf0f3cb9..3bfadb4ddb15b 100644
--- a/sys/vm/memguard.h
+++ b/sys/vm/memguard.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/memguard.h,v 1.3 2005/12/30 11:45:07 pjd Exp $
  */
 
 extern u_int vm_memguard_divisor;
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index a26dd5184f946..03a86867cbc74 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/phys_pager.c,v 1.28.2.1 2007/11/10 11:21:17 remko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 3d9045f270aec..2b75c534b3d2e 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/pmap.h,v 1.79.4.1 2008/01/19 18:15:07 kib Exp $
  */
 
 /*
diff --git a/sys/vm/redzone.c b/sys/vm/redzone.c
index 5598b5defb6f1..094b46f04486f 100644
--- a/sys/vm/redzone.c
+++ b/sys/vm/redzone.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/redzone.c,v 1.1 2006/01/31 11:09:20 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/redzone.h b/sys/vm/redzone.h
index 8738d7e02fb22..7cbc54c9540a0 100644
--- a/sys/vm/redzone.h
+++ b/sys/vm/redzone.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/redzone.h,v 1.1 2006/01/31 11:09:20 pjd Exp $
  */
 
 #ifndef	_VM_REDZONE_H_
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index eb825795fa8a3..f45428d700044 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.295 2007/08/05 21:04:32 alc Exp $");
 
 #include "opt_mac.h"
 #include "opt_swap.h"
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index c3366e8e87783..87831713cd66f 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/swap_pager.h,v 1.52 2007/02/07 17:43:11 jhb Exp $
  */
 
 #ifndef	_VM_SWAP_PAGER_H_
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index c082e9633f120..c91a7ffa3dd71 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/uma.h,v 1.31 2007/02/11 20:13:52 rwatson Exp $
  *
  */
 
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index c32f4d78e0ca0..9dfcceda7daf3 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.147.2.1 2007/10/18 18:45:17 jhb Exp $");
 
 /* I should really use ktr.. */
 /*
diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c
index 9075bf9608582..ff673102b94d6 100644
--- a/sys/vm/uma_dbg.c
+++ b/sys/vm/uma_dbg.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/uma_dbg.c,v 1.21 2005/07/16 09:51:52 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/uma_dbg.h b/sys/vm/uma_dbg.h
index 341cecbf8de38..279e208d0c443 100644
--- a/sys/vm/uma_dbg.h
+++ b/sys/vm/uma_dbg.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/uma_dbg.h,v 1.9 2005/07/16 09:51:52 rwatson Exp $
  *
  */
 
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index c4ea69c456df8..6fa7ed6c746dc 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/uma_int.h,v 1.38 2007/05/09 22:53:34 rwatson Exp $
  *
  */
 
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 491872bf69ae7..646e3be11452b 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -55,7 +55,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm.h,v 1.27 2006/07/21 23:22:49 alc Exp $
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_contig.c b/sys/vm/vm_contig.c
index b40a9514f1ba8..c243881f0a754 100644
--- a/sys/vm/vm_contig.c
+++ b/sys/vm/vm_contig.c
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.63 2007/09/25 06:25:06 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 27580bd99149a..4c155d6a13197 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_extern.h,v 1.78.4.1 2008/01/19 18:15:07 kib Exp $
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 49a4077046a8b..1b204e5036751 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.237 2007/10/08 20:09:53 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 258b886f4f8bb..590a16c2e36db 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.225.4.1 2008/01/19 18:15:07 kib Exp $");
 
 #include "opt_vm.h"
 #include "opt_kstack_pages.h"
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 9125366fc78a8..e466da4b263cf 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_init.c,v 1.46 2005/04/25 19:22:05 kris Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index cd6dafab77d9a..27de1189beb2f 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.128.4.1 2008/01/17 14:57:50 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 3b86892b43ac7..93cd5708cd9c2 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_kern.h,v 1.29 2006/11/20 16:23:34 ru Exp $
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 239d183bab062..08740ed8d1829 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.388.2.1.2.2 2008/01/19 18:15:07 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index fe5090589f322..49a2df6b7cd37 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_map.h,v 1.120 2007/08/20 12:05:45 kib Exp $
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index d949fbf7a63f8..01d5db6733c5f 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.96 2007/07/27 20:01:21 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index fa3e58f9ca705..a720b8aab642b 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.213 2007/08/20 12:05:45 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 0426bb94342d0..b49dece1e440c 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.385.2.1 2007/10/19 05:48:45 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index b0da10b012845..e2c56ec642136 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_object.h,v 1.114 2007/09/25 06:25:06 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index e199f06cf6b53..7c648dfb78f9f 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.357.2.3 2007/11/28 22:23:35 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index c13511db62972..b1a5a4c4775e7 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_page.h,v 1.152 2007/09/27 04:21:59 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 2c267271b3258..2f9c983fe3583 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.292 2007/09/25 06:25:06 alc Exp $");
 
 #include "opt_vm.h"
 #include <sys/param.h>
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 1b74fab74f0e7..e82b1ae819f45 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.41 2005/01/07 02:29:27 imp Exp $
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c
index 055bac513b1b2..132f3b304f91c 100644
--- a/sys/vm/vm_pageq.c
+++ b/sys/vm/vm_pageq.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.35 2007/09/25 06:25:06 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index f03b951715ea7..3197e07c405e0 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pager.c,v 1.108 2007/08/05 21:04:32 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 652073cac339a..7ebffda10318e 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_pager.h,v 1.50 2005/05/18 22:08:52 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 3c1938a74784e..4b1d722cefd03 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -57,7 +57,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_param.h,v 1.22 2007/04/19 04:52:47 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
index 8efdf3df84054..2e7d5f240f6ca 100644
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_phys.c,v 1.4 2007/09/25 06:25:06 alc Exp $");
 
 #include "opt_ddb.h"
 
diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h
index 3e35f9b2cb180..bd6a5fd3b06c4 100644
--- a/sys/vm/vm_phys.h
+++ b/sys/vm/vm_phys.h
@@ -28,7 +28,7 @@
  * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vm_phys.h,v 1.3 2007/09/25 06:25:06 alc Exp $
  */
 
 /*
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index cd98be975e34a..e502b3b81baae 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_unix.c,v 1.46 2005/01/07 02:29:27 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/lock.h>
diff --git a/sys/vm/vm_zeroidle.c b/sys/vm/vm_zeroidle.c
index 06842139e9fa6..1919f231590d3 100644
--- a/sys/vm/vm_zeroidle.c
+++ b/sys/vm/vm_zeroidle.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.49 2007/07/14 19:00:44 alc Exp $");
 
 #include <opt_sched.h>
 
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index fd60f7e12c927..e76f2b96ec1b9 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/vm/vnode_pager.c,v 1.236.2.1 2007/10/26 00:12:23 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index aa9be03c17ba9..f88c8460ac2b8 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/vm/vnode_pager.h,v 1.20 2005/01/24 21:21:59 phk Exp $
  */
 
 #ifndef	_VNODE_PAGER_
diff --git a/tools/KSE/ksetest/Makefile b/tools/KSE/ksetest/Makefile
index 885d06993c7ba..fa9640b8fe79c 100644
--- a/tools/KSE/ksetest/Makefile
+++ b/tools/KSE/ksetest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/KSE/ksetest/Makefile,v 1.4 2004/12/21 08:47:20 ru Exp $
 
 PROG=		ksetest
 NO_MAN=
diff --git a/tools/KSE/ksetest/kse_asm.S b/tools/KSE/ksetest/kse_asm.S
index 20dc1dbba258a..e37f24d2b4403 100644
--- a/tools/KSE/ksetest/kse_asm.S
+++ b/tools/KSE/ksetest/kse_asm.S
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/ksetest/kse_asm.S,v 1.8 2002/11/23 04:39:52 davidxu Exp $
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/KSE/ksetest/kse_asm.S,v 1.8 2002/11/23 04:39:52 davidxu Exp $");
 
 /*
  * Where do we define these?
diff --git a/tools/KSE/ksetest/kse_threads_test.c b/tools/KSE/ksetest/kse_threads_test.c
index 3ab09f98a1e38..908c042a57865 100644
--- a/tools/KSE/ksetest/kse_threads_test.c
+++ b/tools/KSE/ksetest/kse_threads_test.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/ksetest/kse_threads_test.c,v 1.6 2003/02/20 08:24:22 davidxu Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/KSE/ksetest/simplelock.h b/tools/KSE/ksetest/simplelock.h
index 2dae6abd5d08b..b1af67833b873 100644
--- a/tools/KSE/ksetest/simplelock.h
+++ b/tools/KSE/ksetest/simplelock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/ksetest/simplelock.h,v 1.3 2003/02/08 06:33:37 davidxu Exp $
  */
 
 #ifndef _SIMPLELOCK_H
diff --git a/tools/KSE/rr/Makefile b/tools/KSE/rr/Makefile
index 45e1dbb7923a9..b3abb62c5d0cb 100644
--- a/tools/KSE/rr/Makefile
+++ b/tools/KSE/rr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/KSE/rr/Makefile,v 1.2 2004/12/21 08:47:20 ru Exp $
 
 PROG=		rr	
 NO_MAN=
diff --git a/tools/KSE/rr/kse_asm.S b/tools/KSE/rr/kse_asm.S
index 20dc1dbba258a..c079d9ed6147c 100644
--- a/tools/KSE/rr/kse_asm.S
+++ b/tools/KSE/rr/kse_asm.S
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/rr/kse_asm.S,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/KSE/rr/kse_asm.S,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $");
 
 /*
  * Where do we define these?
diff --git a/tools/KSE/rr/rr.c b/tools/KSE/rr/rr.c
index a75ce2e505e2a..a82d67365e3a0 100644
--- a/tools/KSE/rr/rr.c
+++ b/tools/KSE/rr/rr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/rr/rr.c,v 1.2 2003/03/21 08:21:39 davidxu Exp $
  */
 
 /*
diff --git a/tools/KSE/rr/simplelock.h b/tools/KSE/rr/simplelock.h
index 2dae6abd5d08b..7b60d13274fdb 100644
--- a/tools/KSE/rr/simplelock.h
+++ b/tools/KSE/rr/simplelock.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/KSE/rr/simplelock.h,v 1.1.1.1 2003/02/26 01:05:09 davidxu Exp $
  */
 
 #ifndef _SIMPLELOCK_H
diff --git a/tools/LibraryReport/LibraryReport.tcl b/tools/LibraryReport/LibraryReport.tcl
index fbf63896c71d1..963a6e56cc138 100755
--- a/tools/LibraryReport/LibraryReport.tcl
+++ b/tools/LibraryReport/LibraryReport.tcl
@@ -50,7 +50,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/LibraryReport/LibraryReport.tcl,v 1.5 1999/08/28 00:54:21 peter Exp $
 #
 
 #########################################################################################
diff --git a/tools/README b/tools/README
index 99ec8e9241f7a..eedb1fa1bb61d 100644
--- a/tools/README
+++ b/tools/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/README,v 1.3 2000/08/13 14:46:31 alex Exp $
 
 This directory tree contains tools used for the maintenance and
 testing of FreeBSD.  There is no toplevel Makefile structure since
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 9f0faddd13d8f..dbd1e24f66ded 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/Makefile,v 1.12 2005/05/16 09:32:41 ru Exp $
 
 .PATH: ${.CURDIR}/../../include
 
diff --git a/tools/build/cross-build/Makefile b/tools/build/cross-build/Makefile
index 69c1e9c498441..9a26024ef4931 100644
--- a/tools/build/cross-build/Makefile
+++ b/tools/build/cross-build/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/cross-build/Makefile,v 1.1 2005/03/02 16:40:51 ru Exp $
 
 NO_OBJ=
 SCRIPTS=	date.sh hostname.sh
diff --git a/tools/build/cross-build/date.sh b/tools/build/cross-build/date.sh
index f697a7f0cd542..56040f5a8f1a5 100644
--- a/tools/build/cross-build/date.sh
+++ b/tools/build/cross-build/date.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/build/cross-build/date.sh,v 1.1 2005/03/02 16:40:51 ru Exp $
 #
 
 exec /bin/date -r0 "$@"
diff --git a/tools/build/cross-build/hostname.sh b/tools/build/cross-build/hostname.sh
index 855741beca850..4e133840d3e38 100644
--- a/tools/build/cross-build/hostname.sh
+++ b/tools/build/cross-build/hostname.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/build/cross-build/hostname.sh,v 1.1 2005/03/02 16:40:51 ru Exp $
 #
 
 echo dummy
diff --git a/tools/build/dummy.c b/tools/build/dummy.c
index b656a0305a976..562d0b6fb3377 100644
--- a/tools/build/dummy.c
+++ b/tools/build/dummy.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/build/dummy.c,v 1.1 2003/04/05 20:30:30 imp Exp $
  *
  * Empty file to keep linker happy.
  */
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index e57e70c32db46..12cd88b93c928 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/make_check/Makefile,v 1.29 2007/10/01 18:09:42 ru Exp $
 
 # Test for broken LHS expansion.
 # This *must* cause make(1) to detect a recursive variable, and fail as such.
diff --git a/tools/build/make_check/regress.t b/tools/build/make_check/regress.t
index e37f3328bdf68..92389088a82ca 100644
--- a/tools/build/make_check/regress.t
+++ b/tools/build/make_check/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/build/make_check/regress.t,v 1.2 2005/03/02 12:33:22 harti Exp $
 
 cd `dirname $0`
 make all
diff --git a/tools/build/make_check/shell_test.sh b/tools/build/make_check/shell_test.sh
index 46169eb6efc2b..60d63605a819b 100644
--- a/tools/build/make_check/shell_test.sh
+++ b/tools/build/make_check/shell_test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/build/make_check/shell_test.sh,v 1.2 2005/03/02 12:33:22 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot
index 0707ae2b0d673..176c930db1d30 100644
--- a/tools/build/mk/Makefile.boot
+++ b/tools/build/mk/Makefile.boot
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/Makefile.boot,v 1.2 2005/02/27 11:22:58 ru Exp $
 
 CFLAGS+=	-I${WORLDTMP}/legacy/usr/include
 DPADD+=		${WORLDTMP}/legacy/usr/lib/libegacy.a
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 65bc6c1d128c8..4ce5ec49f5b26 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/OptionalObsoleteFiles.inc,v 1.11.4.1 2008/01/21 22:02:21 brueffer Exp $
 #
 # This file add support for the WITHOUT_* and WITH_* knobs in src.conf(5) to
 # the check-old and delete-old* targets.
diff --git a/tools/build/mk/bsd.lib.mk b/tools/build/mk/bsd.lib.mk
index 744f5b5a8b9d4..3be67c2168cb3 100644
--- a/tools/build/mk/bsd.lib.mk
+++ b/tools/build/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/bsd.lib.mk,v 1.1 2003/04/12 15:07:46 ru Exp $
 
 .include "../../../share/mk/bsd.lib.mk"
 .include "Makefile.boot"
diff --git a/tools/build/mk/bsd.prog.mk b/tools/build/mk/bsd.prog.mk
index d650665d6200a..3172e159084ca 100644
--- a/tools/build/mk/bsd.prog.mk
+++ b/tools/build/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/build/mk/bsd.prog.mk,v 1.1 2003/04/12 15:07:46 ru Exp $
 
 .include "../../../share/mk/bsd.prog.mk"
 .include "Makefile.boot"
diff --git a/tools/build/options/WITHOUT_ACPI b/tools/build/options/WITHOUT_ACPI
index b046a1775e742..0288dd24676d8 100644
--- a/tools/build/options/WITHOUT_ACPI
+++ b/tools/build/options/WITHOUT_ACPI
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_ACPI,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr acpiconf 8 ,
 .Xr acpidump 8
diff --git a/tools/build/options/WITHOUT_ASSERT_DEBUG b/tools/build/options/WITHOUT_ASSERT_DEBUG
index 2bc179cc81363..4a835aacdc657 100644
--- a/tools/build/options/WITHOUT_ASSERT_DEBUG
+++ b/tools/build/options/WITHOUT_ASSERT_DEBUG
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_ASSERT_DEBUG,v 1.1 2006/09/11 13:55:27 ru Exp $
 Set to compile programs and libraries without the
 .Xr assert 3
 checks.
diff --git a/tools/build/options/WITHOUT_ATM b/tools/build/options/WITHOUT_ATM
index 6e362d3fdcb7d..a8b7b782e9c48 100644
--- a/tools/build/options/WITHOUT_ATM
+++ b/tools/build/options/WITHOUT_ATM
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_ATM,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 programs and libraries related to ATM networking.
diff --git a/tools/build/options/WITHOUT_AUDIT b/tools/build/options/WITHOUT_AUDIT
index 8dfe0fc887d8b..2e358ab5b5486 100644
--- a/tools/build/options/WITHOUT_AUDIT
+++ b/tools/build/options/WITHOUT_AUDIT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_AUDIT,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build audit support into system programs.
diff --git a/tools/build/options/WITHOUT_AUTHPF b/tools/build/options/WITHOUT_AUTHPF
index 1e50a4fda4459..b86204d428baf 100644
--- a/tools/build/options/WITHOUT_AUTHPF
+++ b/tools/build/options/WITHOUT_AUTHPF
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_AUTHPF,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr authpf 8 .
diff --git a/tools/build/options/WITHOUT_BIND b/tools/build/options/WITHOUT_BIND
index c61a4c7e58550..faea04935862a 100644
--- a/tools/build/options/WITHOUT_BIND
+++ b/tools/build/options/WITHOUT_BIND
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND,v 1.1 2006/03/21 07:50:49 ru Exp $
 Setting this variable will prevent any part of BIND from being built.
diff --git a/tools/build/options/WITHOUT_BIND_DNSSEC b/tools/build/options/WITHOUT_BIND_DNSSEC
index 12d0b5f1f7fff..e3b615772a552 100644
--- a/tools/build/options/WITHOUT_BIND_DNSSEC
+++ b/tools/build/options/WITHOUT_BIND_DNSSEC
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND_DNSSEC,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to avoid building or installing the DNSSEC related binaries,
 .Xr dnssec-keygen 8
 and
diff --git a/tools/build/options/WITHOUT_BIND_ETC b/tools/build/options/WITHOUT_BIND_ETC
index 48a2a7eb6db77..98db150ac36d9 100644
--- a/tools/build/options/WITHOUT_BIND_ETC
+++ b/tools/build/options/WITHOUT_BIND_ETC
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND_ETC,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to avoid installing the default files to
 .Pa /var/named/etc/namedb .
diff --git a/tools/build/options/WITHOUT_BIND_LIBS_LWRES b/tools/build/options/WITHOUT_BIND_LIBS_LWRES
index b4c9d4c9ebc60..3a698764ac315 100644
--- a/tools/build/options/WITHOUT_BIND_LIBS_LWRES
+++ b/tools/build/options/WITHOUT_BIND_LIBS_LWRES
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND_LIBS_LWRES,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to avoid installing the lightweight resolver library in
 .Pa /usr/lib .
diff --git a/tools/build/options/WITHOUT_BIND_MTREE b/tools/build/options/WITHOUT_BIND_MTREE
index 84b2512491a60..c81e1505277a5 100644
--- a/tools/build/options/WITHOUT_BIND_MTREE
+++ b/tools/build/options/WITHOUT_BIND_MTREE
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND_MTREE,v 1.3 2006/04/13 10:37:29 ru Exp $
 Set to avoid running
 .Xr mtree 8
 to create the chroot directory structure under
diff --git a/tools/build/options/WITHOUT_BIND_NAMED b/tools/build/options/WITHOUT_BIND_NAMED
index fddc0058110db..d7cd634aa1cf2 100644
--- a/tools/build/options/WITHOUT_BIND_NAMED
+++ b/tools/build/options/WITHOUT_BIND_NAMED
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND_NAMED,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to avoid building or installing
 .Xr named 8 ,
 .Xr named.reload 8 ,
diff --git a/tools/build/options/WITHOUT_BIND_UTILS b/tools/build/options/WITHOUT_BIND_UTILS
index 02695908af99b..1f19b8f56f03b 100644
--- a/tools/build/options/WITHOUT_BIND_UTILS
+++ b/tools/build/options/WITHOUT_BIND_UTILS
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BIND_UTILS,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to avoid building or installing the BIND userland utilities,
 .Xr dig 1 ,
 .Xr host 1 ,
diff --git a/tools/build/options/WITHOUT_BLUETOOTH b/tools/build/options/WITHOUT_BLUETOOTH
index d0c6863fcb4aa..59575a0ae6b30 100644
--- a/tools/build/options/WITHOUT_BLUETOOTH
+++ b/tools/build/options/WITHOUT_BLUETOOTH
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BLUETOOTH,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build Bluetooth related kernel modules, programs and libraries.
diff --git a/tools/build/options/WITHOUT_BOOT b/tools/build/options/WITHOUT_BOOT
index 0ba78e2fffc3f..091c54bf99244 100644
--- a/tools/build/options/WITHOUT_BOOT
+++ b/tools/build/options/WITHOUT_BOOT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BOOT,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build the boot blocks and loader.
diff --git a/tools/build/options/WITHOUT_BZIP2 b/tools/build/options/WITHOUT_BZIP2
index baf71254dbcd3..f56a881281cee 100644
--- a/tools/build/options/WITHOUT_BZIP2
+++ b/tools/build/options/WITHOUT_BZIP2
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BZIP2,v 1.1 2007/01/26 10:19:08 delphij Exp $
 Set to not build contributed bzip2 software as a part of the base system.
 .Sy "The option has no effect yet."
diff --git a/tools/build/options/WITHOUT_BZIP2_SUPPORT b/tools/build/options/WITHOUT_BZIP2_SUPPORT
index 12b1c7b132f8d..fbc10d3178636 100644
--- a/tools/build/options/WITHOUT_BZIP2_SUPPORT
+++ b/tools/build/options/WITHOUT_BZIP2_SUPPORT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_BZIP2_SUPPORT,v 1.1 2007/01/26 10:19:08 delphij Exp $
 Set to build some programs without optional bzip2 support.
diff --git a/tools/build/options/WITHOUT_CALENDAR b/tools/build/options/WITHOUT_CALENDAR
index 6944e3fb6705f..bfef47f0db688 100644
--- a/tools/build/options/WITHOUT_CALENDAR
+++ b/tools/build/options/WITHOUT_CALENDAR
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_CALENDAR,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr calendar 1 .
diff --git a/tools/build/options/WITHOUT_CDDL b/tools/build/options/WITHOUT_CDDL
index 909c52ba7166d..ebf26b9e43ad8 100644
--- a/tools/build/options/WITHOUT_CDDL
+++ b/tools/build/options/WITHOUT_CDDL
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_CDDL,v 1.1 2006/11/01 09:02:11 jb Exp $
 Set to not build code licensed under Sun's CDDL.
diff --git a/tools/build/options/WITHOUT_CPP b/tools/build/options/WITHOUT_CPP
index 78094191f694c..3167f84ee27e6 100644
--- a/tools/build/options/WITHOUT_CPP
+++ b/tools/build/options/WITHOUT_CPP
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_CPP,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr cpp 1 .
diff --git a/tools/build/options/WITHOUT_CRYPT b/tools/build/options/WITHOUT_CRYPT
index 044055d884410..3d0a86d1766d3 100644
--- a/tools/build/options/WITHOUT_CRYPT
+++ b/tools/build/options/WITHOUT_CRYPT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_CRYPT,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build any crypto code.
diff --git a/tools/build/options/WITHOUT_CVS b/tools/build/options/WITHOUT_CVS
index ba431f5632c0f..d60db1a64b6c7 100644
--- a/tools/build/options/WITHOUT_CVS
+++ b/tools/build/options/WITHOUT_CVS
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_CVS,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build CVS.
diff --git a/tools/build/options/WITHOUT_CXX b/tools/build/options/WITHOUT_CXX
index 104eda8a586c4..f5544a2c3a5a1 100644
--- a/tools/build/options/WITHOUT_CXX
+++ b/tools/build/options/WITHOUT_CXX
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_CXX,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr g++ 1
 and related libraries.
diff --git a/tools/build/options/WITHOUT_DICT b/tools/build/options/WITHOUT_DICT
index dc3d28167109d..c24304f7c2bdc 100644
--- a/tools/build/options/WITHOUT_DICT
+++ b/tools/build/options/WITHOUT_DICT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_DICT,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build the Webster dictionary files.
diff --git a/tools/build/options/WITHOUT_DYNAMICROOT b/tools/build/options/WITHOUT_DYNAMICROOT
index b10f0f2bb269d..086355bf74114 100644
--- a/tools/build/options/WITHOUT_DYNAMICROOT
+++ b/tools/build/options/WITHOUT_DYNAMICROOT
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_DYNAMICROOT,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set this if you do not want to link
 .Pa /bin
 and
diff --git a/tools/build/options/WITHOUT_EXAMPLES b/tools/build/options/WITHOUT_EXAMPLES
index 5e60b73bb5328..5f28daf9831c8 100644
--- a/tools/build/options/WITHOUT_EXAMPLES
+++ b/tools/build/options/WITHOUT_EXAMPLES
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_EXAMPLES,v 1.2 2006/03/21 09:06:24 ru Exp $
 Set to avoid installing examples to
 .Pa /usr/share/examples/ .
diff --git a/tools/build/options/WITHOUT_FORTH b/tools/build/options/WITHOUT_FORTH
index db409964f34e6..cad3f20f46ea4 100644
--- a/tools/build/options/WITHOUT_FORTH
+++ b/tools/build/options/WITHOUT_FORTH
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_FORTH,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to build bootloaders without Forth support.
diff --git a/tools/build/options/WITHOUT_FP_LIBC b/tools/build/options/WITHOUT_FP_LIBC
index 5d591b5150315..2da150b45f34a 100644
--- a/tools/build/options/WITHOUT_FP_LIBC
+++ b/tools/build/options/WITHOUT_FP_LIBC
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_FP_LIBC,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to build
 .Nm libc
 without floating-point support.
diff --git a/tools/build/options/WITHOUT_GAMES b/tools/build/options/WITHOUT_GAMES
index 13067bf05a8b7..b5c2020223677 100644
--- a/tools/build/options/WITHOUT_GAMES
+++ b/tools/build/options/WITHOUT_GAMES
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GAMES,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build games.
diff --git a/tools/build/options/WITHOUT_GCOV b/tools/build/options/WITHOUT_GCOV
index 1872e1479b558..58792fed3561f 100644
--- a/tools/build/options/WITHOUT_GCOV
+++ b/tools/build/options/WITHOUT_GCOV
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GCOV,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build the
 .Xr gcov 1
 tool.
diff --git a/tools/build/options/WITHOUT_GDB b/tools/build/options/WITHOUT_GDB
index 68f4801a3997f..b70bd647ecf6c 100644
--- a/tools/build/options/WITHOUT_GDB
+++ b/tools/build/options/WITHOUT_GDB
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GDB,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr gdb 1 .
diff --git a/tools/build/options/WITHOUT_GNU b/tools/build/options/WITHOUT_GNU
index 3a37c92a1f7a7..8314ac2e1f17e 100644
--- a/tools/build/options/WITHOUT_GNU
+++ b/tools/build/options/WITHOUT_GNU
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.2 2006/07/31 13:53:27 yar Exp $
 Set to not build contributed GNU software as a part of the base system.
 This option can be useful if the system built must not contain any code
 covered by the GNU Public License due to legal reasons.
diff --git a/tools/build/options/WITHOUT_GNU_SUPPORT b/tools/build/options/WITHOUT_GNU_SUPPORT
index ed2e4ae294d4a..28603805ec9ae 100644
--- a/tools/build/options/WITHOUT_GNU_SUPPORT
+++ b/tools/build/options/WITHOUT_GNU_SUPPORT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GNU_SUPPORT,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to build some programs without optional GNU support.
diff --git a/tools/build/options/WITHOUT_GPIB b/tools/build/options/WITHOUT_GPIB
index 82cec15d57c52..071c1ca384a30 100644
--- a/tools/build/options/WITHOUT_GPIB
+++ b/tools/build/options/WITHOUT_GPIB
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GPIB,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build GPIB bus support.
diff --git a/tools/build/options/WITHOUT_GROFF b/tools/build/options/WITHOUT_GROFF
index 56fbad24205ff..ffe1838dd8a8f 100644
--- a/tools/build/options/WITHOUT_GROFF
+++ b/tools/build/options/WITHOUT_GROFF
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GROFF,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build
 .Xr groff 1 .
diff --git a/tools/build/options/WITHOUT_GSSAPI b/tools/build/options/WITHOUT_GSSAPI
index 0f31dd98ed5a1..81696c9c3267e 100644
--- a/tools/build/options/WITHOUT_GSSAPI
+++ b/tools/build/options/WITHOUT_GSSAPI
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_GSSAPI,v 1.1.4.1 2008/01/28 08:57:11 dougb Exp $
 Set to not build libgssapi.
diff --git a/tools/build/options/WITHOUT_HTML b/tools/build/options/WITHOUT_HTML
index 03cbdc4a2a99f..88368e2793066 100644
--- a/tools/build/options/WITHOUT_HTML
+++ b/tools/build/options/WITHOUT_HTML
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_HTML,v 1.1 2006/03/21 07:50:49 ru Exp $
 Set to not build HTML docs.
diff --git a/tools/build/options/WITHOUT_I4B b/tools/build/options/WITHOUT_I4B
index 51da618cbb7bd..d37f3dc2228aa 100644
--- a/tools/build/options/WITHOUT_I4B
+++ b/tools/build/options/WITHOUT_I4B
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_I4B,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build isdn4bsd package.
diff --git a/tools/build/options/WITHOUT_INET6 b/tools/build/options/WITHOUT_INET6
index 32c657b9476ad..01fdc884a273f 100644
--- a/tools/build/options/WITHOUT_INET6
+++ b/tools/build/options/WITHOUT_INET6
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_INET6,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 programs and libraries related to IPv6 networking.
diff --git a/tools/build/options/WITHOUT_INET6_SUPPORT b/tools/build/options/WITHOUT_INET6_SUPPORT
index 1e36fed1f5458..ffba038dcac46 100644
--- a/tools/build/options/WITHOUT_INET6_SUPPORT
+++ b/tools/build/options/WITHOUT_INET6_SUPPORT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_INET6_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to build libraries, programs, and kernel modules without IPv6 support.
diff --git a/tools/build/options/WITHOUT_INFO b/tools/build/options/WITHOUT_INFO
index de46159d101a5..41b82ff99603a 100644
--- a/tools/build/options/WITHOUT_INFO
+++ b/tools/build/options/WITHOUT_INFO
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_INFO,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not make or install
 .Xr info 5
 files.
diff --git a/tools/build/options/WITHOUT_IPFILTER b/tools/build/options/WITHOUT_IPFILTER
index 9d02c0358438a..16610b699480e 100644
--- a/tools/build/options/WITHOUT_IPFILTER
+++ b/tools/build/options/WITHOUT_IPFILTER
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_IPFILTER,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build IP Filter package.
diff --git a/tools/build/options/WITHOUT_IPX b/tools/build/options/WITHOUT_IPX
index 6198d409f67bf..20c10ff71aa38 100644
--- a/tools/build/options/WITHOUT_IPX
+++ b/tools/build/options/WITHOUT_IPX
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_IPX,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build programs and libraries related to IPX networking.
diff --git a/tools/build/options/WITHOUT_IPX_SUPPORT b/tools/build/options/WITHOUT_IPX_SUPPORT
index b15cbf05a0e1b..c98bc99ae3856 100644
--- a/tools/build/options/WITHOUT_IPX_SUPPORT
+++ b/tools/build/options/WITHOUT_IPX_SUPPORT
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_IPX_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to build some programs without IPX support.
diff --git a/tools/build/options/WITHOUT_KERBEROS b/tools/build/options/WITHOUT_KERBEROS
index 8f562ec13146e..0ed6fadef501b 100644
--- a/tools/build/options/WITHOUT_KERBEROS
+++ b/tools/build/options/WITHOUT_KERBEROS
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set this if you do not want to build Kerberos 5 (KTH Heimdal).
diff --git a/tools/build/options/WITHOUT_KERBEROS_SUPPORT b/tools/build/options/WITHOUT_KERBEROS_SUPPORT
index a724fbf5713cf..0bd65c7cf09f9 100644
--- a/tools/build/options/WITHOUT_KERBEROS_SUPPORT
+++ b/tools/build/options/WITHOUT_KERBEROS_SUPPORT
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_KERBEROS_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to build some programs without Kerberos support, like
 .Xr cvs 1 ,
 .Xr ssh 1 ,
diff --git a/tools/build/options/WITHOUT_KVM b/tools/build/options/WITHOUT_KVM
index 121186a958a8a..e57fb6d788e1d 100644
--- a/tools/build/options/WITHOUT_KVM
+++ b/tools/build/options/WITHOUT_KVM
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_KVM,v 1.1 2007/06/13 02:08:04 sepotvin Exp $
 Set to not build the
 .Nm libkvm
 library as a part of the base system.
diff --git a/tools/build/options/WITHOUT_KVM_SUPPORT b/tools/build/options/WITHOUT_KVM_SUPPORT
index 16c91a78e0396..d1705de835ccb 100644
--- a/tools/build/options/WITHOUT_KVM_SUPPORT
+++ b/tools/build/options/WITHOUT_KVM_SUPPORT
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_KVM_SUPPORT,v 1.1 2007/06/13 02:08:04 sepotvin Exp $
 Set to build some programs without optional
 .Nm libkvm
 support.
diff --git a/tools/build/options/WITHOUT_LIB32 b/tools/build/options/WITHOUT_LIB32
index 4786a153605d9..2a4c086c1ad66 100644
--- a/tools/build/options/WITHOUT_LIB32
+++ b/tools/build/options/WITHOUT_LIB32
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_LIB32,v 1.1 2006/03/21 07:50:50 ru Exp $
 On amd64, set to not build 32-bit library set and a
 .Nm ld-elf32.so.1
 runtime linker.
diff --git a/tools/build/options/WITHOUT_LIBKSE b/tools/build/options/WITHOUT_LIBKSE
index 08d071a898355..90d89a2c28403 100644
--- a/tools/build/options/WITHOUT_LIBKSE
+++ b/tools/build/options/WITHOUT_LIBKSE
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_LIBKSE,v 1.2 2007/10/09 17:22:00 obrien Exp $
 Set to not build the
 .Nm libkse
 (M:N threading)
diff --git a/tools/build/options/WITHOUT_LIBPTHREAD b/tools/build/options/WITHOUT_LIBPTHREAD
index 85286c9a19feb..7883b62726503 100644
--- a/tools/build/options/WITHOUT_LIBPTHREAD
+++ b/tools/build/options/WITHOUT_LIBPTHREAD
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.3 2007/10/09 17:53:33 obrien Exp $
 Set to not build either of the
 .Nm libpthread
 providing libraries
diff --git a/tools/build/options/WITHOUT_LIBTHR b/tools/build/options/WITHOUT_LIBTHR
index 8364735119830..7272d9d18be3d 100644
--- a/tools/build/options/WITHOUT_LIBTHR
+++ b/tools/build/options/WITHOUT_LIBTHR
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_LIBTHR,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build the
 .Nm libthr
 (1:1 threading)
diff --git a/tools/build/options/WITHOUT_LOCALES b/tools/build/options/WITHOUT_LOCALES
index c1fdaa8668cf1..f8f813eed32e4 100644
--- a/tools/build/options/WITHOUT_LOCALES
+++ b/tools/build/options/WITHOUT_LOCALES
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_LOCALES,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build localization files; see
 .Xr locale 1 .
diff --git a/tools/build/options/WITHOUT_LPR b/tools/build/options/WITHOUT_LPR
index 9b6dabd7f2b10..5050d5cce9b62 100644
--- a/tools/build/options/WITHOUT_LPR
+++ b/tools/build/options/WITHOUT_LPR
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_LPR,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr lpr 1
 and related programs.
diff --git a/tools/build/options/WITHOUT_MAILWRAPPER b/tools/build/options/WITHOUT_MAILWRAPPER
index e30b17aceaee2..45ac4c1a8d6ec 100644
--- a/tools/build/options/WITHOUT_MAILWRAPPER
+++ b/tools/build/options/WITHOUT_MAILWRAPPER
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_MAILWRAPPER,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build the
 .Xr mailwrapper 8
 MTA selector.
diff --git a/tools/build/options/WITHOUT_MAN b/tools/build/options/WITHOUT_MAN
index 777225427d337..33b4f84c68463 100644
--- a/tools/build/options/WITHOUT_MAN
+++ b/tools/build/options/WITHOUT_MAN
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_MAN,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build manual pages.
diff --git a/tools/build/options/WITHOUT_NCP b/tools/build/options/WITHOUT_NCP
index 8c58283028074..412b92111ea2a 100644
--- a/tools/build/options/WITHOUT_NCP
+++ b/tools/build/options/WITHOUT_NCP
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_NCP,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build programs, libraries, and kernel modules
 related to NetWare Core protocol.
diff --git a/tools/build/options/WITHOUT_NETCAT b/tools/build/options/WITHOUT_NETCAT
index 2ee46080bd286..a92659b2251fa 100644
--- a/tools/build/options/WITHOUT_NETCAT
+++ b/tools/build/options/WITHOUT_NETCAT
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_NETCAT,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr nc 1
 utility.
diff --git a/tools/build/options/WITHOUT_NIS b/tools/build/options/WITHOUT_NIS
index 61f74b8112507..56c4d672cff95 100644
--- a/tools/build/options/WITHOUT_NIS
+++ b/tools/build/options/WITHOUT_NIS
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_NIS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr NIS 8
 support and related programs.
diff --git a/tools/build/options/WITHOUT_NLS b/tools/build/options/WITHOUT_NLS
index ae1aec8f221b3..0e1d3c9df953f 100644
--- a/tools/build/options/WITHOUT_NLS
+++ b/tools/build/options/WITHOUT_NLS
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_NLS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build NLS catalogs.
diff --git a/tools/build/options/WITHOUT_NLS_CATALOGS b/tools/build/options/WITHOUT_NLS_CATALOGS
index 3c3843a2cc761..9e4c33966ec4c 100644
--- a/tools/build/options/WITHOUT_NLS_CATALOGS
+++ b/tools/build/options/WITHOUT_NLS_CATALOGS
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_NLS_CATALOGS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build NLS catalog support for
 .Xr csh 1 .
diff --git a/tools/build/options/WITHOUT_NS_CACHING b/tools/build/options/WITHOUT_NS_CACHING
index 71b116ad75ef4..5f9f3f871b946 100644
--- a/tools/build/options/WITHOUT_NS_CACHING
+++ b/tools/build/options/WITHOUT_NS_CACHING
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_NS_CACHING,v 1.1.2.1 2007/10/26 08:14:08 bushman Exp $
 Set to disable name caching in the
 .Pa nsswitch
 subsystem.
diff --git a/tools/build/options/WITHOUT_OBJC b/tools/build/options/WITHOUT_OBJC
index 3a220ac06db9c..128ade570c90b 100644
--- a/tools/build/options/WITHOUT_OBJC
+++ b/tools/build/options/WITHOUT_OBJC
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_OBJC,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build Objective C support.
diff --git a/tools/build/options/WITHOUT_OPENSSH b/tools/build/options/WITHOUT_OPENSSH
index f98fbfd5a9cbd..729d622fb7eb5 100644
--- a/tools/build/options/WITHOUT_OPENSSH
+++ b/tools/build/options/WITHOUT_OPENSSH
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_OPENSSH,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build OpenSSH.
diff --git a/tools/build/options/WITHOUT_OPENSSL b/tools/build/options/WITHOUT_OPENSSL
index e6ee7f7ae53c4..1ae60de746672 100644
--- a/tools/build/options/WITHOUT_OPENSSL
+++ b/tools/build/options/WITHOUT_OPENSSL
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_OPENSSL,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build OpenSSL.
diff --git a/tools/build/options/WITHOUT_PAM b/tools/build/options/WITHOUT_PAM
index b865a51868770..80fce02f12f03 100644
--- a/tools/build/options/WITHOUT_PAM
+++ b/tools/build/options/WITHOUT_PAM
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.2 2006/07/31 13:53:27 yar Exp $
 Set to not build PAM library and modules.
 .Sy "This option is deprecated and does nothing."
diff --git a/tools/build/options/WITHOUT_PAM_SUPPORT b/tools/build/options/WITHOUT_PAM_SUPPORT
index 9b066aaf3185c..42fd6935ca3bb 100644
--- a/tools/build/options/WITHOUT_PAM_SUPPORT
+++ b/tools/build/options/WITHOUT_PAM_SUPPORT
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_PAM_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to build some programs without PAM support, particularly
 .Xr ftpd 8
 and
diff --git a/tools/build/options/WITHOUT_PF b/tools/build/options/WITHOUT_PF
index d790f6e21f261..a20659c93e5c7 100644
--- a/tools/build/options/WITHOUT_PF
+++ b/tools/build/options/WITHOUT_PF
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_PF,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build PF firewall package.
diff --git a/tools/build/options/WITHOUT_PROFILE b/tools/build/options/WITHOUT_PROFILE
index 12fc060aacf41..fa1b1e9752336 100644
--- a/tools/build/options/WITHOUT_PROFILE
+++ b/tools/build/options/WITHOUT_PROFILE
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_PROFILE,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to avoid compiling profiled libraries.
diff --git a/tools/build/options/WITHOUT_RCMDS b/tools/build/options/WITHOUT_RCMDS
index fbde9399c44fd..a92a460d60cb1 100644
--- a/tools/build/options/WITHOUT_RCMDS
+++ b/tools/build/options/WITHOUT_RCMDS
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_RCMDS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Disable building of the
 .Bx
 r-commands.
diff --git a/tools/build/options/WITHOUT_RCS b/tools/build/options/WITHOUT_RCS
index 2a4ddecab4409..75afbd6905dc5 100644
--- a/tools/build/options/WITHOUT_RCS
+++ b/tools/build/options/WITHOUT_RCS
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_RCS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr rcs 1
 and related utilities.
diff --git a/tools/build/options/WITHOUT_RESCUE b/tools/build/options/WITHOUT_RESCUE
index 8e0eb95e4962a..d91b980dab886 100644
--- a/tools/build/options/WITHOUT_RESCUE
+++ b/tools/build/options/WITHOUT_RESCUE
@@ -1,3 +1,3 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_RESCUE,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr rescue 8 .
diff --git a/tools/build/options/WITHOUT_SENDMAIL b/tools/build/options/WITHOUT_SENDMAIL
index 1f66a0666ea17..fa5f3a7872686 100644
--- a/tools/build/options/WITHOUT_SENDMAIL
+++ b/tools/build/options/WITHOUT_SENDMAIL
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_SENDMAIL,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr sendmail 8
 and related programs.
diff --git a/tools/build/options/WITHOUT_SETUID_LOGIN b/tools/build/options/WITHOUT_SETUID_LOGIN
index af073b322947f..8ef52cda2d641 100644
--- a/tools/build/options/WITHOUT_SETUID_LOGIN
+++ b/tools/build/options/WITHOUT_SETUID_LOGIN
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_SETUID_LOGIN,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set this to disable the installation of
 .Xr login 1
 as a set-user-ID root program.
diff --git a/tools/build/options/WITHOUT_SHAREDOCS b/tools/build/options/WITHOUT_SHAREDOCS
index 29f6b3687c576..9a46b34c2af10 100644
--- a/tools/build/options/WITHOUT_SHAREDOCS
+++ b/tools/build/options/WITHOUT_SHAREDOCS
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_SHAREDOCS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build the
 .Bx 4.4
 legacy docs.
diff --git a/tools/build/options/WITHOUT_SSP b/tools/build/options/WITHOUT_SSP
index b95f843bfb245..1266b57725872 100644
--- a/tools/build/options/WITHOUT_SSP
+++ b/tools/build/options/WITHOUT_SSP
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_SSP,v 1.1 2007/05/19 04:42:58 kan Exp $
 Set to not build propolice stack smashing protection library.
diff --git a/tools/build/options/WITHOUT_SYMVER b/tools/build/options/WITHOUT_SYMVER
index c6b0eaeee15e0..82cf885490e68 100644
--- a/tools/build/options/WITHOUT_SYMVER
+++ b/tools/build/options/WITHOUT_SYMVER
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_SYMVER,v 1.1 2007/05/17 05:03:24 deischen Exp $
 Set to disable symbol versioning when building shared libraries.
diff --git a/tools/build/options/WITHOUT_SYSCONS b/tools/build/options/WITHOUT_SYSCONS
index 257438b990f9c..27e4ddbc90d7d 100644
--- a/tools/build/options/WITHOUT_SYSCONS
+++ b/tools/build/options/WITHOUT_SYSCONS
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_SYSCONS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build
 .Xr syscons 4
 support files such as keyboard maps, fonts, and screen output maps.
diff --git a/tools/build/options/WITHOUT_TCSH b/tools/build/options/WITHOUT_TCSH
index 11bc076d870e1..427e97fc057c9 100644
--- a/tools/build/options/WITHOUT_TCSH
+++ b/tools/build/options/WITHOUT_TCSH
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_TCSH,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build and install
 .Pa /bin/csh
 (which is
diff --git a/tools/build/options/WITHOUT_TOOLCHAIN b/tools/build/options/WITHOUT_TOOLCHAIN
index d55214e335d03..365f330ee9ad2 100644
--- a/tools/build/options/WITHOUT_TOOLCHAIN
+++ b/tools/build/options/WITHOUT_TOOLCHAIN
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_TOOLCHAIN,v 1.2 2007/07/19 08:14:28 bz Exp $
 Set to not install
 programs used for program development,
 compilers, debuggers etc.
diff --git a/tools/build/options/WITHOUT_USB b/tools/build/options/WITHOUT_USB
index c3197954cc253..13a7d9c63e5e6 100644
--- a/tools/build/options/WITHOUT_USB
+++ b/tools/build/options/WITHOUT_USB
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_USB,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to not build USB-related programs and libraries.
diff --git a/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL b/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL
index d895ef93127d0..1509f24c380f7 100644
--- a/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL
+++ b/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL,v 1.1 2006/03/21 07:50:50 ru Exp $
 Build
 .Xr wpa_supplicant 8
 without support for the IEEE 802.1X protocol and without
diff --git a/tools/build/options/WITHOUT_ZFS b/tools/build/options/WITHOUT_ZFS
index bd21b7889e77f..f8f233d5d81e5 100644
--- a/tools/build/options/WITHOUT_ZFS
+++ b/tools/build/options/WITHOUT_ZFS
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_ZFS,v 1.1 2007/04/06 02:13:30 pjd Exp $
 Set to not build ZFS file system.
diff --git a/tools/build/options/WITHOUT_ZONEINFO b/tools/build/options/WITHOUT_ZONEINFO
index d6c1c9d9ca480..37028e4c79302 100644
--- a/tools/build/options/WITHOUT_ZONEINFO
+++ b/tools/build/options/WITHOUT_ZONEINFO
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITHOUT_ZONEINFO,v 1.1 2007/08/27 20:01:08 remko Exp $
 Set to not build the timezone database
diff --git a/tools/build/options/WITH_BIND_LIBS b/tools/build/options/WITH_BIND_LIBS
index 92312c8915c55..a3c2eb0b00cdc 100644
--- a/tools/build/options/WITH_BIND_LIBS
+++ b/tools/build/options/WITH_BIND_LIBS
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITH_BIND_LIBS,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to install BIND libraries and include files.
diff --git a/tools/build/options/WITH_HESIOD b/tools/build/options/WITH_HESIOD
index db2f45bb55a74..b9adcb9cfaebb 100644
--- a/tools/build/options/WITH_HESIOD
+++ b/tools/build/options/WITH_HESIOD
@@ -1,2 +1,2 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITH_HESIOD,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to build Hesiod support.
diff --git a/tools/build/options/WITH_IDEA b/tools/build/options/WITH_IDEA
index 785dfc6640ecb..956fcb86e9385 100644
--- a/tools/build/options/WITH_IDEA
+++ b/tools/build/options/WITH_IDEA
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/tools/build/options/WITH_IDEA,v 1.1 2006/03/21 07:50:50 ru Exp $
 Set to build the IDEA encryption code.
 This code is patented in the USA and many European countries.
 It is
diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index c3c87585cb6c0..3be93839f4a0b 100644
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -2,7 +2,7 @@
 #
 # This file is in the public domain.
 
-ident='$FreeBSD$'
+ident='$FreeBSD: src/tools/build/options/makeman,v 1.6.2.1.2.1 2008/01/28 08:57:11 dougb Exp $'
 
 #
 # usage: show { settings | options } ...
diff --git a/tools/debugscripts/README b/tools/debugscripts/README
index bd28cdc547af0..c10dc625e966c 100644
--- a/tools/debugscripts/README
+++ b/tools/debugscripts/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/debugscripts/README,v 1.2 2004/08/04 18:03:43 jmg Exp $
 
 This directory contains gdb macros for kernel debugging.  When you
 build a debug kernel, the target "gdbinit" in the kernel Makefile will
diff --git a/tools/debugscripts/dot.gdbinit b/tools/debugscripts/dot.gdbinit
index e57ac16764765..6ddd5d84b2c36 100644
--- a/tools/debugscripts/dot.gdbinit
+++ b/tools/debugscripts/dot.gdbinit
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/dot.gdbinit,v 1.9 2006/05/22 07:12:25 maxim Exp $
 # .gdbinit file for remote serial debugging.
 #
 # XXX Do not use this file directly.  It contains parameters which are
diff --git a/tools/debugscripts/gdbinit.i386 b/tools/debugscripts/gdbinit.i386
index e02b2063f509c..95b2af22f19a6 100644
--- a/tools/debugscripts/gdbinit.i386
+++ b/tools/debugscripts/gdbinit.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.i386,v 1.4 2004/11/20 02:32:42 das Exp $
 # Assembler-level macros for i386
 # Disassemble the next 10 instructions.
 define xi
diff --git a/tools/debugscripts/gdbinit.kernel b/tools/debugscripts/gdbinit.kernel
index 91d85c22a57c7..1e712c02c7a11 100644
--- a/tools/debugscripts/gdbinit.kernel
+++ b/tools/debugscripts/gdbinit.kernel
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/gdbinit.kernel,v 1.8 2004/11/20 02:32:42 das Exp $
 # General kernel macros
 
 # Print the command name of the current process
diff --git a/tools/debugscripts/kgdb b/tools/debugscripts/kgdb
index ae580b301d417..c57fa4ced6e22 100644
--- a/tools/debugscripts/kgdb
+++ b/tools/debugscripts/kgdb
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/kgdb,v 1.2 2005/03/20 02:08:21 jmg Exp $
 
 crashpath="/var/crash"
 kld_debpy="kld_deb.py"
diff --git a/tools/debugscripts/kld_deb.py b/tools/debugscripts/kld_deb.py
index 0ea12ab87b97b..edbc6a1417c27 100644
--- a/tools/debugscripts/kld_deb.py
+++ b/tools/debugscripts/kld_deb.py
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/debugscripts/kld_deb.py,v 1.2 2005/03/20 02:08:21 jmg Exp $
 
 import sys
 import os
diff --git a/tools/diag/README b/tools/diag/README
index 814794367921e..6a5fda3064e0d 100644
--- a/tools/diag/README
+++ b/tools/diag/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/diag/README,v 1.6 2002/02/06 17:50:05 phantom Exp $
 
 This directory is for diagnostic programs.
 
diff --git a/tools/diag/ac/README b/tools/diag/ac/README
index 48c1cad0db797..d7087a05f6da6 100644
--- a/tools/diag/ac/README
+++ b/tools/diag/ac/README
@@ -6,4 +6,4 @@ ac              check if the contributors article is in sync with the
 ent.sh          check for ordering/content problems in .ent files (authors.ent,
                 teams.ent, etc)
 
-$FreeBSD$
+$FreeBSD: src/tools/diag/ac/README,v 1.1 2002/02/06 17:49:13 phantom Exp $
diff --git a/tools/diag/ac/cknames.pl b/tools/diag/ac/cknames.pl
index a3ffe3192f3cd..d3f3055efd294 100644
--- a/tools/diag/ac/cknames.pl
+++ b/tools/diag/ac/cknames.pl
@@ -30,7 +30,7 @@
 #
 # NOTE: This script is supposed to run at freefall.freebsd.org *only*
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/ac/cknames.pl,v 1.4 2003/11/26 10:43:05 phantom Exp $
 #
 
 $debug = 0;
diff --git a/tools/diag/ac/ent.sh b/tools/diag/ac/ent.sh
index fbc2219dd4de0..0901978e1ed95 100644
--- a/tools/diag/ac/ent.sh
+++ b/tools/diag/ac/ent.sh
@@ -3,7 +3,7 @@
 #
 # ent.sh -- this script checks {authors,teams}.ent files for correctness
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/ac/ent.sh,v 1.3 2003/11/26 10:43:05 phantom Exp $
 
 : ${CVSROOT=/home/dcvs}
 prefix=doc/en_US.ISO8859-1/share/sgml
diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile
index 167bf8aa82456..ab31d0e63e210 100644
--- a/tools/diag/dumpvfscache/Makefile
+++ b/tools/diag/dumpvfscache/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/dumpvfscache/Makefile,v 1.4 2004/12/21 08:47:20 ru Exp $
 
 PROG=	dumpvfscache
 DPADD=	${LIBKVM}
diff --git a/tools/diag/dumpvfscache/dumpvfscache.c b/tools/diag/dumpvfscache/dumpvfscache.c
index 3f5eb5793a8a0..83ff5490e8395 100644
--- a/tools/diag/dumpvfscache/dumpvfscache.c
+++ b/tools/diag/dumpvfscache/dumpvfscache.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/diag/dumpvfscache/dumpvfscache.c,v 1.4 2002/01/02 06:25:39 kbyanc Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tools/diag/httpd-error/httpd-error b/tools/diag/httpd-error/httpd-error
index a7f35be90cdc6..60699c2d2f186 100755
--- a/tools/diag/httpd-error/httpd-error
+++ b/tools/diag/httpd-error/httpd-error
@@ -26,7 +26,7 @@
 #
 # httpd-error - check for Web files which do not exist on your host
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/httpd-error/httpd-error,v 1.6 2002/09/24 20:05:01 ache Exp $
 
 mode=${1}
 
diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile
index da4fe7fa15150..964241a92150a 100644
--- a/tools/diag/localeck/Makefile
+++ b/tools/diag/localeck/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/localeck/Makefile,v 1.5 2004/12/21 08:47:20 ru Exp $
 
 PROG=	localeck
 NO_MAN=
diff --git a/tools/diag/localeck/docheck.sh b/tools/diag/localeck/docheck.sh
index 7f47851f7bdf6..7075b56420acf 100644
--- a/tools/diag/localeck/docheck.sh
+++ b/tools/diag/localeck/docheck.sh
@@ -3,7 +3,7 @@
 # Validate all locales installed in specified directory
 # (by default check system locales)
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/diag/localeck/docheck.sh,v 1.2 2002/02/04 16:17:19 phantom Exp $
 #
 
 LOCALEDIR=/usr/share/locale
diff --git a/tools/diag/localeck/localeck.c b/tools/diag/localeck/localeck.c
index 4ce7e458f147d..d85667165ddc0 100644
--- a/tools/diag/localeck/localeck.c
+++ b/tools/diag/localeck/localeck.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/diag/localeck/localeck.c,v 1.4 2002/04/22 13:44:35 des Exp $
  */
 
 #include <locale.h>
diff --git a/tools/install.sh b/tools/install.sh
index 594d4de7a1353..b1388ea73469e 100644
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/install.sh,v 1.7 2004/07/07 09:38:14 ru Exp $
 
 # parse install's options and ignore them completely.
 while [ $# -gt 0 ]; do
diff --git a/tools/kerneldoc/Doxyfile b/tools/kerneldoc/Doxyfile
index 146afc32ba0f4..d35fc477d377b 100644
--- a/tools/kerneldoc/Doxyfile
+++ b/tools/kerneldoc/Doxyfile
@@ -1,5 +1,5 @@
 # Doxyfile 1.3.6
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/Doxyfile,v 1.2 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/Makefile b/tools/kerneldoc/Makefile
index ec665a7b02569..9b792f9a980b9 100644
--- a/tools/kerneldoc/Makefile
+++ b/tools/kerneldoc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/Makefile,v 1.2 2006/07/08 12:31:33 netchild Exp $
 
 .PATH:	${.CURDIR}/../kern
 
diff --git a/tools/kerneldoc/subsys/Dependencies b/tools/kerneldoc/subsys/Dependencies
index 2eda312d20852..34f3b0aa5f218 100644
--- a/tools/kerneldoc/subsys/Dependencies
+++ b/tools/kerneldoc/subsys/Dependencies
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Dependencies,v 1.2 2006/07/08 12:31:33 netchild Exp $
 #
 # makefile dependencies for doxygen tag files
 #
diff --git a/tools/kerneldoc/subsys/Doxyfile-cam b/tools/kerneldoc/subsys/Doxyfile-cam
index 006cdcb12ddbe..471e67ab7c6bc 100644
--- a/tools/kerneldoc/subsys/Doxyfile-cam
+++ b/tools/kerneldoc/subsys/Doxyfile-cam
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-cam,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-crypto b/tools/kerneldoc/subsys/Doxyfile-crypto
index f3e6c5a7c0829..4ac370b2a938c 100644
--- a/tools/kerneldoc/subsys/Doxyfile-crypto
+++ b/tools/kerneldoc/subsys/Doxyfile-crypto
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-crypto,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-dev_pci b/tools/kerneldoc/subsys/Doxyfile-dev_pci
index d8d91a7ca9c2e..f580af7083ee7 100644
--- a/tools/kerneldoc/subsys/Doxyfile-dev_pci
+++ b/tools/kerneldoc/subsys/Doxyfile-dev_pci
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-dev_pci,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-dev_sound b/tools/kerneldoc/subsys/Doxyfile-dev_sound
index 5a55398759e79..9f9d454b32c9d 100644
--- a/tools/kerneldoc/subsys/Doxyfile-dev_sound
+++ b/tools/kerneldoc/subsys/Doxyfile-dev_sound
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-dev_sound,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-dev_usb b/tools/kerneldoc/subsys/Doxyfile-dev_usb
index 731a018d82ebc..19ba85895e72b 100644
--- a/tools/kerneldoc/subsys/Doxyfile-dev_usb
+++ b/tools/kerneldoc/subsys/Doxyfile-dev_usb
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-dev_usb,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-geom b/tools/kerneldoc/subsys/Doxyfile-geom
index 374665f3f6eb7..faedaab6fd4c2 100644
--- a/tools/kerneldoc/subsys/Doxyfile-geom
+++ b/tools/kerneldoc/subsys/Doxyfile-geom
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-geom,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-i4b b/tools/kerneldoc/subsys/Doxyfile-i4b
index 5573e840a9d16..d0950abc8ee05 100644
--- a/tools/kerneldoc/subsys/Doxyfile-i4b
+++ b/tools/kerneldoc/subsys/Doxyfile-i4b
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-i4b,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-kern b/tools/kerneldoc/subsys/Doxyfile-kern
index 5857465d76add..3f97cce7b92b7 100644
--- a/tools/kerneldoc/subsys/Doxyfile-kern
+++ b/tools/kerneldoc/subsys/Doxyfile-kern
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-kern,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-libkern b/tools/kerneldoc/subsys/Doxyfile-libkern
index 42c53de0d9dc5..8d8fff3536c2f 100644
--- a/tools/kerneldoc/subsys/Doxyfile-libkern
+++ b/tools/kerneldoc/subsys/Doxyfile-libkern
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-libkern,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-linux b/tools/kerneldoc/subsys/Doxyfile-linux
index 3f21047944449..591a485b6a11c 100644
--- a/tools/kerneldoc/subsys/Doxyfile-linux
+++ b/tools/kerneldoc/subsys/Doxyfile-linux
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-linux,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-net80211 b/tools/kerneldoc/subsys/Doxyfile-net80211
index 869f06b4af7a0..bc8c5d58cf311 100644
--- a/tools/kerneldoc/subsys/Doxyfile-net80211
+++ b/tools/kerneldoc/subsys/Doxyfile-net80211
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-net80211,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-netgraph b/tools/kerneldoc/subsys/Doxyfile-netgraph
index 5641cb08bf9dd..0a850944f9306 100644
--- a/tools/kerneldoc/subsys/Doxyfile-netgraph
+++ b/tools/kerneldoc/subsys/Doxyfile-netgraph
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-netgraph,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-netinet b/tools/kerneldoc/subsys/Doxyfile-netinet
index 7fedb3db11b48..a5a9b7f0e2e5d 100644
--- a/tools/kerneldoc/subsys/Doxyfile-netinet
+++ b/tools/kerneldoc/subsys/Doxyfile-netinet
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-netinet,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-netinet6 b/tools/kerneldoc/subsys/Doxyfile-netinet6
index 2f902d3a00c20..15adb72ed2034 100644
--- a/tools/kerneldoc/subsys/Doxyfile-netinet6
+++ b/tools/kerneldoc/subsys/Doxyfile-netinet6
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-netinet6,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-netipsec b/tools/kerneldoc/subsys/Doxyfile-netipsec
index b7038f2440c8d..a51b99ef37807 100644
--- a/tools/kerneldoc/subsys/Doxyfile-netipsec
+++ b/tools/kerneldoc/subsys/Doxyfile-netipsec
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-netipsec,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-opencrypto b/tools/kerneldoc/subsys/Doxyfile-opencrypto
index 33f1654d9d862..416ae5c9b0849 100644
--- a/tools/kerneldoc/subsys/Doxyfile-opencrypto
+++ b/tools/kerneldoc/subsys/Doxyfile-opencrypto
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-opencrypto,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Doxyfile-vm b/tools/kerneldoc/subsys/Doxyfile-vm
index 22bb8c56cc9a0..3a6feb747a6f5 100644
--- a/tools/kerneldoc/subsys/Doxyfile-vm
+++ b/tools/kerneldoc/subsys/Doxyfile-vm
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Doxyfile-vm,v 1.3 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/Makefile b/tools/kerneldoc/subsys/Makefile
index f0e2613132c67..ae2990f183793 100644
--- a/tools/kerneldoc/subsys/Makefile
+++ b/tools/kerneldoc/subsys/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/Makefile,v 1.7 2007/07/11 05:01:14 delphij Exp $
 #
 
 _ALL!=	cd ${.CURDIR} && ls Doxyfile-*
diff --git a/tools/kerneldoc/subsys/README b/tools/kerneldoc/subsys/README
index 9a70bf0b577ec..e3d751c1dcdcc 100644
--- a/tools/kerneldoc/subsys/README
+++ b/tools/kerneldoc/subsys/README
@@ -29,4 +29,4 @@ Programs needed to generate the API docs:
  - graphics/graphviz
 
 -- 
-$FreeBSD$
+$FreeBSD: src/tools/kerneldoc/subsys/README,v 1.2 2006/07/08 12:31:33 netchild Exp $
diff --git a/tools/kerneldoc/subsys/common-Doxyfile b/tools/kerneldoc/subsys/common-Doxyfile
index 537241877b188..ba010644f74c7 100644
--- a/tools/kerneldoc/subsys/common-Doxyfile
+++ b/tools/kerneldoc/subsys/common-Doxyfile
@@ -1,6 +1,6 @@
 # Doxyfile 1.4.1
 
-# $FreeBSD$
+# $FreeBSD: src/tools/kerneldoc/subsys/common-Doxyfile,v 1.2 2006/07/08 12:31:33 netchild Exp $
 
 #---------------------------------------------------------------------------
 # Project related configuration options
diff --git a/tools/kerneldoc/subsys/notreviewed.dox b/tools/kerneldoc/subsys/notreviewed.dox
index bcc4bed1f61a8..2cc632a396878 100644
--- a/tools/kerneldoc/subsys/notreviewed.dox
+++ b/tools/kerneldoc/subsys/notreviewed.dox
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/kerneldoc/subsys/notreviewed.dox,v 1.2 2006/07/08 12:31:33 netchild Exp $ */
 
 /** @mainpage
  * <b>IMPORTANT:</b> This API documentation may contain both functions which
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index f03f01edcca48..3e09069b7ade2 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/make_libdeps.sh,v 1.9 2007/10/01 18:11:43 ru Exp $
 
 export PATH=/bin:/usr/bin
 
diff --git a/tools/regression/README b/tools/regression/README
index edc090adb7c2b..7fb8b88b1a445 100644
--- a/tools/regression/README
+++ b/tools/regression/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/README,v 1.15 2007/05/22 06:11:44 dds Exp $
 
 This directory is for regression test programs.
 
diff --git a/tools/regression/TODO b/tools/regression/TODO
index e8fb9f73c6737..3912983e7eb94 100644
--- a/tools/regression/TODO
+++ b/tools/regression/TODO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/TODO,v 1.1 2004/11/11 19:47:50 nik Exp $
 ---
 
 A lot of the tests written in C use assert(), only printing 'ok' at the end
diff --git a/tools/regression/acct/Makefile b/tools/regression/acct/Makefile
index 6834fcbe283bf..1d7b46409482a 100644
--- a/tools/regression/acct/Makefile
+++ b/tools/regression/acct/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/acct/Makefile,v 1.1 2007/05/22 05:52:04 dds Exp $
 #
 # "make" will compile what is needed and run the regression tests.
 #
diff --git a/tools/regression/acct/pack.c b/tools/regression/acct/pack.c
index 122b623206f81..9a83b093f066e 100644
--- a/tools/regression/acct/pack.c
+++ b/tools/regression/acct/pack.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/acct/pack.c,v 1.1 2007/05/22 05:52:04 dds Exp $");
 
 #include <assert.h>
 #include <float.h>
diff --git a/tools/regression/acct/regress.t b/tools/regression/acct/regress.t
index c078caa924ec7..f3cbd23630e6b 100644
--- a/tools/regression/acct/regress.t
+++ b/tools/regression/acct/regress.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/acct/regress.t,v 1.1 2007/05/22 05:52:04 dds Exp $
 #
 
 DIR=`dirname $0`
diff --git a/tools/regression/aio/aiotest/Makefile b/tools/regression/aio/aiotest/Makefile
index bc8add23339a5..77514ebe13211 100644
--- a/tools/regression/aio/aiotest/Makefile
+++ b/tools/regression/aio/aiotest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/aio/aiotest/Makefile,v 1.3 2006/03/15 10:46:34 ru Exp $
 
 PROG=	aiotest
 NO_MAN=
diff --git a/tools/regression/aio/aiotest/aiotest.c b/tools/regression/aio/aiotest/aiotest.c
index 8769dc1a93d22..ac358395ba2bc 100644
--- a/tools/regression/aio/aiotest/aiotest.c
+++ b/tools/regression/aio/aiotest/aiotest.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/aio/aiotest/aiotest.c,v 1.2 2004/12/06 13:15:23 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/aio/kqueue/Makefile b/tools/regression/aio/kqueue/Makefile
index ba0fd68ef8101..6e616e6cd350d 100644
--- a/tools/regression/aio/kqueue/Makefile
+++ b/tools/regression/aio/kqueue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/aio/kqueue/Makefile,v 1.2 2006/03/15 10:46:34 ru Exp $
 
 PROG=	aio_kqueue
 NO_MAN=
diff --git a/tools/regression/aio/kqueue/aio_kqueue.c b/tools/regression/aio/kqueue/aio_kqueue.c
index 1c0089f7d4edf..8ddb16a64129f 100644
--- a/tools/regression/aio/kqueue/aio_kqueue.c
+++ b/tools/regression/aio/kqueue/aio_kqueue.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/aio/kqueue/aio_kqueue.c,v 1.2 2006/01/22 03:46:03 davidxu Exp $
  */
 
 /* 
diff --git a/tools/regression/aio/kqueue/lio/Makefile b/tools/regression/aio/kqueue/lio/Makefile
index 77377e5b24cfc..abff053b10a6f 100644
--- a/tools/regression/aio/kqueue/lio/Makefile
+++ b/tools/regression/aio/kqueue/lio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/aio/kqueue/lio/Makefile,v 1.3 2006/03/15 10:46:34 ru Exp $
 
 PROG=	lio_kqueue
 NO_MAN=
diff --git a/tools/regression/aio/kqueue/lio/lio_kqueue.c b/tools/regression/aio/kqueue/lio/lio_kqueue.c
index b486ec376279d..01a36b2f1a70e 100644
--- a/tools/regression/aio/kqueue/lio/lio_kqueue.c
+++ b/tools/regression/aio/kqueue/lio/lio_kqueue.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/aio/kqueue/lio/lio_kqueue.c,v 1.2 2006/01/22 03:46:03 davidxu Exp $
  */
 
 /*
diff --git a/tools/regression/atm/Funcs.sh b/tools/regression/atm/Funcs.sh
index c981f101df944..453cf0c726d6b 100644
--- a/tools/regression/atm/Funcs.sh
+++ b/tools/regression/atm/Funcs.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/Funcs.sh,v 1.1 2004/01/29 16:01:56 harti Exp $
 
 fatal() {
 	echo -e "$*" >&2
diff --git a/tools/regression/atm/README b/tools/regression/atm/README
index 509a08dad6db3..bbb8b12ac889a 100644
--- a/tools/regression/atm/README
+++ b/tools/regression/atm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/atm/README,v 1.2 2004/08/13 09:27:21 harti Exp $
 
 This directory contains tests for the ATM stuff. Specific tests for HARP
 are in the harp subdirectory and are not automatically run. All
diff --git a/tools/regression/atm/RunTest.sh b/tools/regression/atm/RunTest.sh
index 90f69658d4aa5..b5dda42d35e7c 100644
--- a/tools/regression/atm/RunTest.sh
+++ b/tools/regression/atm/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/RunTest.sh,v 1.4 2007/06/14 20:11:48 harti Exp $
 
 . ./Funcs.sh
 
diff --git a/tools/regression/atm/harp/atm_udp.ng b/tools/regression/atm/harp/atm_udp.ng
index 329b6967858bf..bb37e127d0bb1 100644
--- a/tools/regression/atm/harp/atm_udp.ng
+++ b/tools/regression/atm/harp/atm_udp.ng
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/harp/atm_udp.ng,v 1.1 2004/01/29 15:58:06 harti Exp $
 #
 err() {
 	echo "$*" >&2
diff --git a/tools/regression/atm/harp/memory_leak.sh b/tools/regression/atm/harp/memory_leak.sh
index ac6cebb01a13b..44b18a95b7d31 100644
--- a/tools/regression/atm/harp/memory_leak.sh
+++ b/tools/regression/atm/harp/memory_leak.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/harp/memory_leak.sh,v 1.1 2004/01/29 15:58:06 harti Exp $
 #
 # Perform memory leak test
 #
diff --git a/tools/regression/atm/proto_cc/RunTest.sh b/tools/regression/atm/proto_cc/RunTest.sh
index f6c7ce00d3362..1acba631d7ed0 100644
--- a/tools/regression/atm/proto_cc/RunTest.sh
+++ b/tools/regression/atm/proto_cc/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_cc/RunTest.sh,v 1.1 2004/08/13 09:27:21 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/atm/proto_sscfu/RunTest.sh b/tools/regression/atm/proto_sscfu/RunTest.sh
index 2f08659372244..81cb5a89585c2 100644
--- a/tools/regression/atm/proto_sscfu/RunTest.sh
+++ b/tools/regression/atm/proto_sscfu/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_sscfu/RunTest.sh,v 1.1 2004/01/29 16:01:57 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/atm/proto_sscop/RunTest.sh b/tools/regression/atm/proto_sscop/RunTest.sh
index 60812deeb6edb..160cf604fba1c 100644
--- a/tools/regression/atm/proto_sscop/RunTest.sh
+++ b/tools/regression/atm/proto_sscop/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_sscop/RunTest.sh,v 1.1 2004/01/29 16:01:57 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/atm/proto_uni/RunTest.sh b/tools/regression/atm/proto_uni/RunTest.sh
index 8b9c9e5e38c96..d070629b903b7 100644
--- a/tools/regression/atm/proto_uni/RunTest.sh
+++ b/tools/regression/atm/proto_uni/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/atm/proto_uni/RunTest.sh,v 1.1 2004/01/29 16:01:57 harti Exp $
 
 . ../Funcs.sh
 
diff --git a/tools/regression/audit/audit_pipe_ioctl/Makefile b/tools/regression/audit/audit_pipe_ioctl/Makefile
index 9ba9e74faf787..a23d7ac98740b 100644
--- a/tools/regression/audit/audit_pipe_ioctl/Makefile
+++ b/tools/regression/audit/audit_pipe_ioctl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/audit/audit_pipe_ioctl/Makefile,v 1.1 2006/03/19 15:47:53 rwatson Exp $
 #
 
 PROG=	audit_pipe_ioctl
diff --git a/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c b/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c
index 7594ca8432593..967b8057b71ed 100644
--- a/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c
+++ b/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c,v 1.1 2006/03/19 15:47:53 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/bin/sh/Makefile b/tools/regression/bin/sh/Makefile
index 2c9ca5943505c..41b5fbec57ca3 100644
--- a/tools/regression/bin/sh/Makefile
+++ b/tools/regression/bin/sh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/Makefile,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 
 all:
 	sh regress.sh
diff --git a/tools/regression/bin/sh/builtins/alias.0 b/tools/regression/bin/sh/builtins/alias.0
index 39c748adca6d8..97bde55782f07 100644
--- a/tools/regression/bin/sh/builtins/alias.0
+++ b/tools/regression/bin/sh/builtins/alias.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/alias.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 
 unalias -a
diff --git a/tools/regression/bin/sh/builtins/alias.1 b/tools/regression/bin/sh/builtins/alias.1
index 31403dc760bf9..841c7bc37b569 100644
--- a/tools/regression/bin/sh/builtins/alias.1
+++ b/tools/regression/bin/sh/builtins/alias.1
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/alias.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 unalias -a
 alias foo
diff --git a/tools/regression/bin/sh/builtins/case1.0 b/tools/regression/bin/sh/builtins/case1.0
index 860fc67dacdac..aa5a90e9930a0 100644
--- a/tools/regression/bin/sh/builtins/case1.0
+++ b/tools/regression/bin/sh/builtins/case1.0
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/tools/regression/bin/sh/builtins/case1.0,v 1.1 2007/10/04 16:14:48 stefanf Exp $
 f()
 {
 	false
diff --git a/tools/regression/bin/sh/builtins/command1.0 b/tools/regression/bin/sh/builtins/command1.0
index fd0afdfa0300f..01b6c5bf77352 100644
--- a/tools/regression/bin/sh/builtins/command1.0
+++ b/tools/regression/bin/sh/builtins/command1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/command1.0,v 1.1 2005/10/28 14:02:42 stefanf Exp $
 true() {
 	false
 }
diff --git a/tools/regression/bin/sh/builtins/command2.0 b/tools/regression/bin/sh/builtins/command2.0
index ff7b5f2c8dc82..213b7a747fa54 100644
--- a/tools/regression/bin/sh/builtins/command2.0
+++ b/tools/regression/bin/sh/builtins/command2.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/command2.0,v 1.1 2005/10/28 14:02:42 stefanf Exp $
 PATH=
 command -p cat < /dev/null
diff --git a/tools/regression/bin/sh/builtins/command3.0 b/tools/regression/bin/sh/builtins/command3.0
index f4ca12090fa48..d74e2fd2aeb4d 100644
--- a/tools/regression/bin/sh/builtins/command3.0
+++ b/tools/regression/bin/sh/builtins/command3.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/command3.0,v 1.1 2005/10/28 14:02:42 stefanf Exp $
 command -v ls
 command -v true
 command -v /bin/ls
diff --git a/tools/regression/bin/sh/builtins/command4.127 b/tools/regression/bin/sh/builtins/command4.127
index c66f60fda25c8..7622cf5152284 100644
--- a/tools/regression/bin/sh/builtins/command4.127
+++ b/tools/regression/bin/sh/builtins/command4.127
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/command4.127,v 1.1 2005/10/28 14:02:42 stefanf Exp $
 command -v nonexisting
diff --git a/tools/regression/bin/sh/builtins/command5.0 b/tools/regression/bin/sh/builtins/command5.0
index d94d2f463435f..863cb57652c5b 100644
--- a/tools/regression/bin/sh/builtins/command5.0
+++ b/tools/regression/bin/sh/builtins/command5.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/command5.0,v 1.1 2005/10/28 14:02:42 stefanf Exp $
 command -V ls
 command -V true
 command -V /bin/ls
diff --git a/tools/regression/bin/sh/builtins/hash1.0 b/tools/regression/bin/sh/builtins/hash1.0
index 45cc3003fb593..4f0ac3b379b67 100644
--- a/tools/regression/bin/sh/builtins/hash1.0
+++ b/tools/regression/bin/sh/builtins/hash1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/hash1.0,v 1.1 2005/09/05 09:42:09 stefanf Exp $
 cat /dev/null
 hash
 hash -r
diff --git a/tools/regression/bin/sh/builtins/hash2.0 b/tools/regression/bin/sh/builtins/hash2.0
index e5cd21bc57dd4..5b5f0a492b5e7 100644
--- a/tools/regression/bin/sh/builtins/hash2.0
+++ b/tools/regression/bin/sh/builtins/hash2.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/hash2.0,v 1.1 2005/09/05 09:42:09 stefanf Exp $
 hash
 hash cat
 hash
diff --git a/tools/regression/bin/sh/builtins/hash3.0 b/tools/regression/bin/sh/builtins/hash3.0
index eade0b3195461..7eaeea0a23f75 100644
--- a/tools/regression/bin/sh/builtins/hash3.0
+++ b/tools/regression/bin/sh/builtins/hash3.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/hash3.0,v 1.1 2005/09/05 09:42:09 stefanf Exp $
 hash -v cat
 hash
diff --git a/tools/regression/bin/sh/builtins/return1.0 b/tools/regression/bin/sh/builtins/return1.0
index 787e892a76980..9a08320641262 100644
--- a/tools/regression/bin/sh/builtins/return1.0
+++ b/tools/regression/bin/sh/builtins/return1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/return1.0,v 1.1 2005/09/05 09:42:09 stefanf Exp $
 f() {
 	return 0
 	exit 1
diff --git a/tools/regression/bin/sh/builtins/return2.1 b/tools/regression/bin/sh/builtins/return2.1
index 0ef817179d73f..3de71ddbf10d3 100644
--- a/tools/regression/bin/sh/builtins/return2.1
+++ b/tools/regression/bin/sh/builtins/return2.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/return2.1,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 f() {
 	true && return 1
 	return 0
diff --git a/tools/regression/bin/sh/builtins/return3.1 b/tools/regression/bin/sh/builtins/return3.1
index 605ec680d66a2..18eb37b8f81e2 100644
--- a/tools/regression/bin/sh/builtins/return3.1
+++ b/tools/regression/bin/sh/builtins/return3.1
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/return3.1,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 return 1
 exit 0
diff --git a/tools/regression/bin/sh/builtins/type1.0 b/tools/regression/bin/sh/builtins/type1.0
index c5e456437946b..438886b9ebee1 100644
--- a/tools/regression/bin/sh/builtins/type1.0
+++ b/tools/regression/bin/sh/builtins/type1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/type1.0,v 1.1 2007/01/11 00:25:20 stefanf Exp $
 command -v not-here && exit 1
 command -v /not-here && exit 1
 command -V not-here && exit 1
diff --git a/tools/regression/bin/sh/builtins/unalias.0 b/tools/regression/bin/sh/builtins/unalias.0
index 34d8d6e07d2e1..cd275ac855993 100644
--- a/tools/regression/bin/sh/builtins/unalias.0
+++ b/tools/regression/bin/sh/builtins/unalias.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/unalias.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 
 alias false=true
diff --git a/tools/regression/bin/sh/builtins/var-assign.0 b/tools/regression/bin/sh/builtins/var-assign.0
index 2e57a3190ca18..d809580893772 100644
--- a/tools/regression/bin/sh/builtins/var-assign.0
+++ b/tools/regression/bin/sh/builtins/var-assign.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/builtins/var-assign.0,v 1.1 2006/04/09 09:38:29 stefanf Exp $
 IFS=,
 
 SPECIAL="break,\
diff --git a/tools/regression/bin/sh/errors/bad-parm-exp1.0 b/tools/regression/bin/sh/errors/bad-parm-exp1.0
index 6e949945f9f32..cab51eb1bb19e 100644
--- a/tools/regression/bin/sh/errors/bad-parm-exp1.0
+++ b/tools/regression/bin/sh/errors/bad-parm-exp1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/bad-parm-exp1.0,v 1.1 2006/11/05 18:41:23 stefanf Exp $
 false && {
 	${}
 	${foo/}
diff --git a/tools/regression/bin/sh/errors/bad-parm-exp2.2 b/tools/regression/bin/sh/errors/bad-parm-exp2.2
index 7e13d2b895d21..3df05dd080c91 100644
--- a/tools/regression/bin/sh/errors/bad-parm-exp2.2
+++ b/tools/regression/bin/sh/errors/bad-parm-exp2.2
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/bad-parm-exp2.2,v 1.1 2006/11/05 18:41:23 stefanf Exp $
 ${}
diff --git a/tools/regression/bin/sh/errors/bad-parm-exp3.2 b/tools/regression/bin/sh/errors/bad-parm-exp3.2
index a5ecba5a7e528..ccf45a0176d77 100644
--- a/tools/regression/bin/sh/errors/bad-parm-exp3.2
+++ b/tools/regression/bin/sh/errors/bad-parm-exp3.2
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/bad-parm-exp3.2,v 1.1 2006/11/05 18:41:23 stefanf Exp $
 ${foo/}
diff --git a/tools/regression/bin/sh/errors/bad-parm-exp4.2 b/tools/regression/bin/sh/errors/bad-parm-exp4.2
index 9eec8d08470db..7050181985812 100644
--- a/tools/regression/bin/sh/errors/bad-parm-exp4.2
+++ b/tools/regression/bin/sh/errors/bad-parm-exp4.2
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/bad-parm-exp4.2,v 1.1 2006/11/05 18:41:23 stefanf Exp $
 ${foo:@abc}
diff --git a/tools/regression/bin/sh/errors/bad-parm-exp5.2 b/tools/regression/bin/sh/errors/bad-parm-exp5.2
index 459281f04c3ad..1243c8990981a 100644
--- a/tools/regression/bin/sh/errors/bad-parm-exp5.2
+++ b/tools/regression/bin/sh/errors/bad-parm-exp5.2
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/bad-parm-exp5.2,v 1.1 2006/11/05 18:41:23 stefanf Exp $
 ${/}
diff --git a/tools/regression/bin/sh/errors/option-error.0 b/tools/regression/bin/sh/errors/option-error.0
index f599d59072cc6..e5d6573bdb0b0 100644
--- a/tools/regression/bin/sh/errors/option-error.0
+++ b/tools/regression/bin/sh/errors/option-error.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/option-error.0,v 1.1 2006/04/02 19:02:49 stefanf Exp $
 IFS=,
 
 SPECIAL="break abc,\
diff --git a/tools/regression/bin/sh/errors/redirection-error.0 b/tools/regression/bin/sh/errors/redirection-error.0
index d11118a9c9fae..42db55336f7c2 100644
--- a/tools/regression/bin/sh/errors/redirection-error.0
+++ b/tools/regression/bin/sh/errors/redirection-error.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/errors/redirection-error.0,v 1.1 2006/04/02 19:02:49 stefanf Exp $
 IFS=,
 
 SPECIAL="break,\
diff --git a/tools/regression/bin/sh/regress.sh b/tools/regression/bin/sh/regress.sh
index a6889af501295..74999d8782ea8 100644
--- a/tools/regression/bin/sh/regress.sh
+++ b/tools/regression/bin/sh/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/regress.sh,v 1.3 2005/10/28 14:02:42 stefanf Exp $
 
 COUNTER=1
 
diff --git a/tools/regression/bin/sh/regress.t b/tools/regression/bin/sh/regress.t
index c36d8342d32a2..5416af7df53b0 100644
--- a/tools/regression/bin/sh/regress.t
+++ b/tools/regression/bin/sh/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/regress.t,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/bin/sh/set-e/and1.0 b/tools/regression/bin/sh/set-e/and1.0
index 607b7c3500203..c6bbe13eb0f90 100644
--- a/tools/regression/bin/sh/set-e/and1.0
+++ b/tools/regression/bin/sh/set-e/and1.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/and1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 true && true
diff --git a/tools/regression/bin/sh/set-e/and2.1 b/tools/regression/bin/sh/set-e/and2.1
index 78e203ab00590..78919d41fb0d6 100644
--- a/tools/regression/bin/sh/set-e/and2.1
+++ b/tools/regression/bin/sh/set-e/and2.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/and2.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 true && false
 exit 0
diff --git a/tools/regression/bin/sh/set-e/and3.0 b/tools/regression/bin/sh/set-e/and3.0
index 9fafb1c45dd84..273d03bafa6a6 100644
--- a/tools/regression/bin/sh/set-e/and3.0
+++ b/tools/regression/bin/sh/set-e/and3.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/and3.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false && true
 exit 0
diff --git a/tools/regression/bin/sh/set-e/and4.0 b/tools/regression/bin/sh/set-e/and4.0
index 25d0e6147dea2..5f91ab9f69aab 100644
--- a/tools/regression/bin/sh/set-e/and4.0
+++ b/tools/regression/bin/sh/set-e/and4.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/and4.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false && false
 exit 0
diff --git a/tools/regression/bin/sh/set-e/background1.0 b/tools/regression/bin/sh/set-e/background1.0
index 21577f4f78c7a..fee9b1124c54b 100644
--- a/tools/regression/bin/sh/set-e/background1.0
+++ b/tools/regression/bin/sh/set-e/background1.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/background1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false &
diff --git a/tools/regression/bin/sh/set-e/cmd1.0 b/tools/regression/bin/sh/set-e/cmd1.0
index 67fdcbc3d83e0..f9d84eb4c9c1c 100644
--- a/tools/regression/bin/sh/set-e/cmd1.0
+++ b/tools/regression/bin/sh/set-e/cmd1.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/cmd1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 true
diff --git a/tools/regression/bin/sh/set-e/cmd2.1 b/tools/regression/bin/sh/set-e/cmd2.1
index 7cd8b09d64a86..bd548a4259a6f 100644
--- a/tools/regression/bin/sh/set-e/cmd2.1
+++ b/tools/regression/bin/sh/set-e/cmd2.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/cmd2.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false
 exit 0
diff --git a/tools/regression/bin/sh/set-e/elif1.0 b/tools/regression/bin/sh/set-e/elif1.0
index 80c7af6424aad..16da922f995b7 100644
--- a/tools/regression/bin/sh/set-e/elif1.0
+++ b/tools/regression/bin/sh/set-e/elif1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/elif1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 if false; then
 elif false; then
diff --git a/tools/regression/bin/sh/set-e/elif2.0 b/tools/regression/bin/sh/set-e/elif2.0
index 028938b81833f..e5eb0c72cbffa 100644
--- a/tools/regression/bin/sh/set-e/elif2.0
+++ b/tools/regression/bin/sh/set-e/elif2.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/elif2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 if false; then
 elif false; false; then
diff --git a/tools/regression/bin/sh/set-e/for1.0 b/tools/regression/bin/sh/set-e/for1.0
index 67eb718ee614c..bbb8e54e5143b 100644
--- a/tools/regression/bin/sh/set-e/for1.0
+++ b/tools/regression/bin/sh/set-e/for1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/for1.0,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 set -e
 f() {
 	for i in a b c; do
diff --git a/tools/regression/bin/sh/set-e/func1.0 b/tools/regression/bin/sh/set-e/func1.0
index 3c6b70492fa22..11227369609fb 100644
--- a/tools/regression/bin/sh/set-e/func1.0
+++ b/tools/regression/bin/sh/set-e/func1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/func1.0,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 set -e
 f() {
 	false
diff --git a/tools/regression/bin/sh/set-e/func2.1 b/tools/regression/bin/sh/set-e/func2.1
index cc76d6edfa536..8893af1538442 100644
--- a/tools/regression/bin/sh/set-e/func2.1
+++ b/tools/regression/bin/sh/set-e/func2.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/func2.1,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 set -e
 f() {
 	false
diff --git a/tools/regression/bin/sh/set-e/if1.0 b/tools/regression/bin/sh/set-e/if1.0
index 0be254bb28b71..c1d0c4c75d5de 100644
--- a/tools/regression/bin/sh/set-e/if1.0
+++ b/tools/regression/bin/sh/set-e/if1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/if1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 if false; then
 fi
diff --git a/tools/regression/bin/sh/set-e/if2.0 b/tools/regression/bin/sh/set-e/if2.0
index 4955408540994..0b0af9f1cbd72 100644
--- a/tools/regression/bin/sh/set-e/if2.0
+++ b/tools/regression/bin/sh/set-e/if2.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/if2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 # PR 28852
 if true; then
diff --git a/tools/regression/bin/sh/set-e/if3.0 b/tools/regression/bin/sh/set-e/if3.0
index b23d5ba02cb66..4d73fff6119c6 100644
--- a/tools/regression/bin/sh/set-e/if3.0
+++ b/tools/regression/bin/sh/set-e/if3.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/if3.0,v 1.2 2005/09/04 18:12:21 stefanf Exp $
 set -e
 if false; false; then
 fi
diff --git a/tools/regression/bin/sh/set-e/not1.0 b/tools/regression/bin/sh/set-e/not1.0
index 21c089a23221f..9cc4ba1f26b5f 100644
--- a/tools/regression/bin/sh/set-e/not1.0
+++ b/tools/regression/bin/sh/set-e/not1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/not1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 ! true
 exit 0
diff --git a/tools/regression/bin/sh/set-e/not2.0 b/tools/regression/bin/sh/set-e/not2.0
index 59b9c1cfed01e..1da9ce350133f 100644
--- a/tools/regression/bin/sh/set-e/not2.0
+++ b/tools/regression/bin/sh/set-e/not2.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/not2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 ! false
diff --git a/tools/regression/bin/sh/set-e/or1.0 b/tools/regression/bin/sh/set-e/or1.0
index c2dcbe9b682a9..b05614b0de90f 100644
--- a/tools/regression/bin/sh/set-e/or1.0
+++ b/tools/regression/bin/sh/set-e/or1.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/or1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 true || false
diff --git a/tools/regression/bin/sh/set-e/or2.0 b/tools/regression/bin/sh/set-e/or2.0
index 934e2a68de9e4..82a47aab8eed5 100644
--- a/tools/regression/bin/sh/set-e/or2.0
+++ b/tools/regression/bin/sh/set-e/or2.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/or2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false || true
diff --git a/tools/regression/bin/sh/set-e/or3.1 b/tools/regression/bin/sh/set-e/or3.1
index 7a617a14b4a4c..87b7146c6d4e1 100644
--- a/tools/regression/bin/sh/set-e/or3.1
+++ b/tools/regression/bin/sh/set-e/or3.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/or3.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false || false
 exit 0
diff --git a/tools/regression/bin/sh/set-e/pipe1.1 b/tools/regression/bin/sh/set-e/pipe1.1
index c0bad0fa732dd..5a6b9e2d6a3a0 100644
--- a/tools/regression/bin/sh/set-e/pipe1.1
+++ b/tools/regression/bin/sh/set-e/pipe1.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/pipe1.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 true | false
 exit 0
diff --git a/tools/regression/bin/sh/set-e/pipe2.0 b/tools/regression/bin/sh/set-e/pipe2.0
index 1e25566a156b2..d21fd775343d4 100644
--- a/tools/regression/bin/sh/set-e/pipe2.0
+++ b/tools/regression/bin/sh/set-e/pipe2.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/pipe2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false | true
diff --git a/tools/regression/bin/sh/set-e/return1.0 b/tools/regression/bin/sh/set-e/return1.0
index 961bd41208651..f4f65c6f861a5 100644
--- a/tools/regression/bin/sh/set-e/return1.0
+++ b/tools/regression/bin/sh/set-e/return1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/return1.0,v 1.2 2005/09/04 21:29:09 stefanf Exp $
 set -e
 
 # PR 77067, 85267
diff --git a/tools/regression/bin/sh/set-e/semi1.1 b/tools/regression/bin/sh/set-e/semi1.1
index 90476a98f1ecd..3740f0894ee89 100644
--- a/tools/regression/bin/sh/set-e/semi1.1
+++ b/tools/regression/bin/sh/set-e/semi1.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/semi1.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 false; true
 exit 0
diff --git a/tools/regression/bin/sh/set-e/semi2.1 b/tools/regression/bin/sh/set-e/semi2.1
index 8f510ac9c164e..73edf81f16754 100644
--- a/tools/regression/bin/sh/set-e/semi2.1
+++ b/tools/regression/bin/sh/set-e/semi2.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/semi2.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 true; false
 exit 0
diff --git a/tools/regression/bin/sh/set-e/subshell1.0 b/tools/regression/bin/sh/set-e/subshell1.0
index 8e5831bd19074..59f5e7137b7b9 100644
--- a/tools/regression/bin/sh/set-e/subshell1.0
+++ b/tools/regression/bin/sh/set-e/subshell1.0
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/subshell1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 (true)
diff --git a/tools/regression/bin/sh/set-e/subshell2.1 b/tools/regression/bin/sh/set-e/subshell2.1
index 619e98a7d2df8..28d75233eb054 100644
--- a/tools/regression/bin/sh/set-e/subshell2.1
+++ b/tools/regression/bin/sh/set-e/subshell2.1
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/subshell2.1,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 (false)
 exit 0
diff --git a/tools/regression/bin/sh/set-e/until1.0 b/tools/regression/bin/sh/set-e/until1.0
index 71ea7f2cf7046..1df7c1f7b44b4 100644
--- a/tools/regression/bin/sh/set-e/until1.0
+++ b/tools/regression/bin/sh/set-e/until1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/until1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 until false; do
 	break
diff --git a/tools/regression/bin/sh/set-e/until2.0 b/tools/regression/bin/sh/set-e/until2.0
index 24ea2760400b1..15058183a1ba5 100644
--- a/tools/regression/bin/sh/set-e/until2.0
+++ b/tools/regression/bin/sh/set-e/until2.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/until2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 until false; false; do
 	break
diff --git a/tools/regression/bin/sh/set-e/until3.0 b/tools/regression/bin/sh/set-e/until3.0
index 597db593bdaf2..f58b45ad08fe7 100644
--- a/tools/regression/bin/sh/set-e/until3.0
+++ b/tools/regression/bin/sh/set-e/until3.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/until3.0,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 set -e
 f() {
 	until false; do
diff --git a/tools/regression/bin/sh/set-e/while1.0 b/tools/regression/bin/sh/set-e/while1.0
index e4c893895726f..2f3eeb615bd98 100644
--- a/tools/regression/bin/sh/set-e/while1.0
+++ b/tools/regression/bin/sh/set-e/while1.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/while1.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 while false; do
 done
diff --git a/tools/regression/bin/sh/set-e/while2.0 b/tools/regression/bin/sh/set-e/while2.0
index a331237ab3ef3..277f7aefbeded 100644
--- a/tools/regression/bin/sh/set-e/while2.0
+++ b/tools/regression/bin/sh/set-e/while2.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/while2.0,v 1.1 2005/09/04 11:59:59 stefanf Exp $
 set -e
 while false; false; do
 done
diff --git a/tools/regression/bin/sh/set-e/while3.0 b/tools/regression/bin/sh/set-e/while3.0
index dd3c790252366..78bc1f55501fc 100644
--- a/tools/regression/bin/sh/set-e/while3.0
+++ b/tools/regression/bin/sh/set-e/while3.0
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/bin/sh/set-e/while3.0,v 1.1 2005/09/05 09:42:10 stefanf Exp $
 set -e
 f() {
 	while true; do
diff --git a/tools/regression/ccd/layout/Makefile b/tools/regression/ccd/layout/Makefile
index 1e6b4dfe59e89..d3f40deb2c7b7 100644
--- a/tools/regression/ccd/layout/Makefile
+++ b/tools/regression/ccd/layout/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ccd/layout/Makefile,v 1.1 2003/01/17 12:23:44 phk Exp $
 #
 # Regression test for ccd's layout.
 #
diff --git a/tools/regression/ccd/layout/a.c b/tools/regression/ccd/layout/a.c
index 33eea10f2a3cd..5f4bd284c346b 100644
--- a/tools/regression/ccd/layout/a.c
+++ b/tools/regression/ccd/layout/a.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/ccd/layout/a.c,v 1.1 2003/01/17 12:23:44 phk Exp $ */
 #include <unistd.h>
 
 static uint32_t buf[512/4];
diff --git a/tools/regression/ccd/layout/b.c b/tools/regression/ccd/layout/b.c
index 5b4ae8ed6a9e1..556d9eea8cbd4 100644
--- a/tools/regression/ccd/layout/b.c
+++ b/tools/regression/ccd/layout/b.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/ccd/layout/b.c,v 1.1 2003/01/17 12:23:44 phk Exp $ */
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/tools/regression/ccd/layout/ccd.sh b/tools/regression/ccd/layout/ccd.sh
index 62d4726528a83..d8102e67ede2a 100644
--- a/tools/regression/ccd/layout/ccd.sh
+++ b/tools/regression/ccd/layout/ccd.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ccd/layout/ccd.sh,v 1.2 2003/06/02 19:49:09 phk Exp $
 
 set -e
 
diff --git a/tools/regression/ccd/layout/ccd0.sh b/tools/regression/ccd/layout/ccd0.sh
index 0f71b18dc96ee..f540575c345b2 100644
--- a/tools/regression/ccd/layout/ccd0.sh
+++ b/tools/regression/ccd/layout/ccd0.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ccd/layout/ccd0.sh,v 1.1 2003/01/17 12:23:44 phk Exp $
 
 set -e
 
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0
index 470f2dce2c0a0..d6f1f036c13ac 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks concatenated
 76089c8ed2249882ae0bb260dcb4a913
 4cc57a9dd953d032ae7e07edaef31203
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4
index 470f2dce2c0a0..e01885b782e32 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks concatenated
 76089c8ed2249882ae0bb260dcb4a913
 4cc57a9dd953d032ae7e07edaef31203
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0
index 593c413f5966f..f3829abaa6029 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c3019ef8e08259f8748931f225e5cebf
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2
index 593c413f5966f..dfde539ffe42c 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c3019ef8e08259f8748931f225e5cebf
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4 b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4
index 9f8aebc122697..5e74f49982f95 100644
--- a/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4
+++ b/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 4 blocks
 a77c5edd8917abb32dc165750f1af781
 8db0b90ec1fa54feca98ad8fd292b07c
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0
index 44a28186e4a1a..5f3be5c8e7325 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1216 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4
index 44a28186e4a1a..65b368b70bbb9 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1216 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0
index 6fc421a38ea6b..a9a5437560260 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1216 blocks interleaved at 4 blocks
 85853375739fe031c97c20e6226aae0e
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2
index 53cfc79854667..807870af00ca4 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c7d32c7a0aacde7259cac3ab214bda77
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4 b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4
index ba42742e6745d..73ac82f20edbb 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 4 blocks
 ab2274c3b7241753a015c243417c0c29
 8db0b90ec1fa54feca98ad8fd292b07c
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0
index 12de5a4b7df4a..65bcd43c6957e 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4
index 12de5a4b7df4a..ebd1df34e9d3e 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks concatenated
 50ca80e7defff2928b09d9e6c22d14ff
 a5f4fb6b17d948b83b8685b3adfe0926
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0
index caf85b195ec96..cc1f3b8fede40 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks interleaved at 16 blocks
 9f63a6ab2d5bd7c183e338387d9c4b59
 89518c095e85649516fa08fe98bf0a3e
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2
index e00fa6c6caec0..c114365db31a1 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 16 blocks
 ebe23f400e868c343240761b0b52c2fd
 89518c095e85649516fa08fe98bf0a3e
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4
index 06c4890d96e18..4abab576f633f 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 16 blocks
 f3f609d828a50cca082f6b6f499ca4b5
 721d9967a8e2608d111cfc24304255ca
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0
index 3b57123ba46f1..432834f136114 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 1728 blocks interleaved at 4 blocks
 50f78fd6083bea22e664f78350e24f2f
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2
index 7cccecf330e74..31fafe269c48b 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 960 blocks interleaved at 4 blocks
 c7d32c7a0aacde7259cac3ab214bda77
 ddef760dcef4784565cfe7d76e5aa3ce
diff --git a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4 b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4
index db2dcd80af23d..24103c02fa83f 100644
--- a/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4
+++ b/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4,v 1.1 2003/01/17 12:23:44 phk Exp $
 ccd3: 4 components (md90, md91, md92, md93), 480 blocks interleaved at 4 blocks
 ab2274c3b7241753a015c243417c0c29
 8db0b90ec1fa54feca98ad8fd292b07c
diff --git a/tools/regression/environ/Makefile b/tools/regression/environ/Makefile
index 62720d28abd19..a94ffc902f53a 100644
--- a/tools/regression/environ/Makefile
+++ b/tools/regression/environ/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/environ/Makefile,v 1.1 2007/07/04 00:00:39 scf Exp $
 #
 PROGS=	envctl retention timings
 
diff --git a/tools/regression/environ/Makefile.envctl b/tools/regression/environ/Makefile.envctl
index 6298a20646dd4..2e248b4fbaad6 100644
--- a/tools/regression/environ/Makefile.envctl
+++ b/tools/regression/environ/Makefile.envctl
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/environ/Makefile.envctl,v 1.1 2007/07/04 00:00:39 scf Exp $
 #
 SRCS=	envctl.c
 PROG=	envctl
diff --git a/tools/regression/environ/Makefile.retention b/tools/regression/environ/Makefile.retention
index 9e0687f484fee..7dc0935a20232 100644
--- a/tools/regression/environ/Makefile.retention
+++ b/tools/regression/environ/Makefile.retention
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/environ/Makefile.retention,v 1.1 2007/07/04 00:00:39 scf Exp $
 #
 SRCS=	retention.c
 PROG=	retention
diff --git a/tools/regression/environ/Makefile.timings b/tools/regression/environ/Makefile.timings
index 88c4f7c7280bd..2a0a37a840e32 100644
--- a/tools/regression/environ/Makefile.timings
+++ b/tools/regression/environ/Makefile.timings
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/environ/Makefile.timings,v 1.1 2007/07/04 00:00:39 scf Exp $
 #
 SRCS=	timings.c
 PROG=	timings
diff --git a/tools/regression/environ/envctl.c b/tools/regression/environ/envctl.c
index e077e42fa4076..389dcf60b457e 100644
--- a/tools/regression/environ/envctl.c
+++ b/tools/regression/environ/envctl.c
@@ -33,7 +33,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/environ/envctl.c,v 1.2 2007/07/20 23:30:13 scf Exp $");
 
 
 extern char **environ;
diff --git a/tools/regression/environ/envtest.t b/tools/regression/environ/envtest.t
index 2b2c548553bc1..f358f2cb168d7 100644
--- a/tools/regression/environ/envtest.t
+++ b/tools/regression/environ/envtest.t
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/environ/envtest.t,v 1.2 2007/07/20 23:30:13 scf Exp $
 
 
 # Initialization.
diff --git a/tools/regression/environ/retention.c b/tools/regression/environ/retention.c
index 7f75cd100e15e..63dc835f9ec8d 100644
--- a/tools/regression/environ/retention.c
+++ b/tools/regression/environ/retention.c
@@ -29,7 +29,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/environ/retention.c,v 1.1 2007/07/04 00:00:39 scf Exp $");
 
 
 extern char **environ;
diff --git a/tools/regression/environ/timings.c b/tools/regression/environ/timings.c
index 7999fa156d7e7..202da0b0c994a 100644
--- a/tools/regression/environ/timings.c
+++ b/tools/regression/environ/timings.c
@@ -34,7 +34,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/environ/timings.c,v 1.2 2007/07/20 23:30:13 scf Exp $");
 
 
 const char value1[] = "Large ------------------ value";
diff --git a/tools/regression/ethernet/ethermulti/Makefile b/tools/regression/ethernet/ethermulti/Makefile
index e0770b6a638ca..19ab2d9d438a3 100644
--- a/tools/regression/ethernet/ethermulti/Makefile
+++ b/tools/regression/ethernet/ethermulti/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/ethernet/ethermulti/Makefile,v 1.1 2007/02/25 01:58:02 bms Exp $
 
 PROG=	ethermulti
 SRCS+=	ethermulti.c
diff --git a/tools/regression/ethernet/ethermulti/ethermulti.c b/tools/regression/ethernet/ethermulti/ethermulti.c
index 61f0cddb4a101..28c109277071f 100644
--- a/tools/regression/ethernet/ethermulti/ethermulti.c
+++ b/tools/regression/ethernet/ethermulti/ethermulti.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/ethernet/ethermulti/ethermulti.c,v 1.1 2007/02/25 01:58:02 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tools/regression/execve/Makefile b/tools/regression/execve/Makefile
index b553b33a1a941..c7c8cea8cda9b 100644
--- a/tools/regression/execve/Makefile
+++ b/tools/regression/execve/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/Makefile,v 1.4 2006/10/09 06:47:08 maxim Exp $
 
 PROG=	doexec
 NO_MAN=
diff --git a/tools/regression/execve/doexec.c b/tools/regression/execve/doexec.c
index 0aa82ec879597..4140b2a61bc57 100644
--- a/tools/regression/execve/doexec.c
+++ b/tools/regression/execve/doexec.c
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/execve/doexec.c,v 1.1 2006/05/31 11:13:10 maxim Exp $
  */
 
 #include <errno.h>
diff --git a/tools/regression/execve/execve.t b/tools/regression/execve/execve.t
index dd2be9a9d0ea1..a4f096021ad2b 100644
--- a/tools/regression/execve/execve.t
+++ b/tools/regression/execve/execve.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/execve.t,v 1.3 2006/10/09 06:47:08 maxim Exp $
 
 cd `dirname $0`
 cmd="./`basename $0 .t`"
diff --git a/tools/regression/execve/tests/badinterplen b/tools/regression/execve/tests/badinterplen
index 96c049fdc839b..06728c4cae60b 100644
--- a/tools/regression/execve/tests/badinterplen
+++ b/tools/regression/execve/tests/badinterplen
@@ -1,4 +1,4 @@
 #! 456789012345678 0123456789012345 789012345678 012345678901234 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/tests/badinterplen,v 1.1 2006/05/31 11:13:10 maxim Exp $
 
 echo succeeded
diff --git a/tools/regression/execve/tests/devnullscript b/tools/regression/execve/tests/devnullscript
index 73b10205cdbb8..fb07258c6cdca 100644
--- a/tools/regression/execve/tests/devnullscript
+++ b/tools/regression/execve/tests/devnullscript
@@ -1,4 +1,4 @@
 #! /dev/null
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/tests/devnullscript,v 1.1 2006/05/31 11:13:10 maxim Exp $
 
 echo succeeded
diff --git a/tools/regression/execve/tests/goodaout.c b/tools/regression/execve/tests/goodaout.c
index ebf476b2cf7f7..782a24b85a7a7 100644
--- a/tools/regression/execve/tests/goodaout.c
+++ b/tools/regression/execve/tests/goodaout.c
@@ -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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/execve/tests/goodaout.c,v 1.1 2006/05/31 11:13:10 maxim Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/execve/tests/goodscript b/tools/regression/execve/tests/goodscript
index 51270dc38da15..18cde3f4753b7 100644
--- a/tools/regression/execve/tests/goodscript
+++ b/tools/regression/execve/tests/goodscript
@@ -1,4 +1,4 @@
 #! /bin/csh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/tests/goodscript,v 1.1 2006/05/31 11:13:10 maxim Exp $
 
 echo succeeded
diff --git a/tools/regression/execve/tests/nonexistshell b/tools/regression/execve/tests/nonexistshell
index f9ee705bd9e98..65982a3b3819d 100644
--- a/tools/regression/execve/tests/nonexistshell
+++ b/tools/regression/execve/tests/nonexistshell
@@ -1,4 +1,4 @@
 #! /foo/bar/baz
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/tests/nonexistshell,v 1.1 2006/05/31 11:13:10 maxim Exp $
 
 echo foo
diff --git a/tools/regression/execve/tests/scriptarg b/tools/regression/execve/tests/scriptarg
index 2700f1c3a38f0..5737748fa8df3 100644
--- a/tools/regression/execve/tests/scriptarg
+++ b/tools/regression/execve/tests/scriptarg
@@ -1,4 +1,4 @@
 #! /bin/sh -x
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/tests/scriptarg,v 1.1 2006/05/31 11:13:10 maxim Exp $
 
 echo succeeded
diff --git a/tools/regression/execve/tests/scriptarg-nospace b/tools/regression/execve/tests/scriptarg-nospace
index 6731ad50f4ac6..ae167da4af553 100644
--- a/tools/regression/execve/tests/scriptarg-nospace
+++ b/tools/regression/execve/tests/scriptarg-nospace
@@ -1,4 +1,4 @@
 #!/bin/sh -x
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/execve/tests/scriptarg-nospace,v 1.1 2006/05/31 11:13:10 maxim Exp $
 
 echo succeeded
diff --git a/tools/regression/fifo/fifo_create/Makefile b/tools/regression/fifo/fifo_create/Makefile
index f398b23e9de2a..b3388b69b0b6f 100644
--- a/tools/regression/fifo/fifo_create/Makefile
+++ b/tools/regression/fifo/fifo_create/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fifo/fifo_create/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
 
 PROG=	fifo_create
 NO_MAN=
diff --git a/tools/regression/fifo/fifo_create/fifo_create.c b/tools/regression/fifo/fifo_create/fifo_create.c
index 691360e14f245..12420a8cf63e8 100644
--- a/tools/regression/fifo/fifo_create/fifo_create.c
+++ b/tools/regression/fifo/fifo_create/fifo_create.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fifo/fifo_create/fifo_create.c,v 1.1 2005/09/10 21:09:26 rwatson Exp $
  */
 
 #include <sys/stat.h>
diff --git a/tools/regression/fifo/fifo_io/Makefile b/tools/regression/fifo/fifo_io/Makefile
index c7d2ffba68199..8b888c29457c2 100644
--- a/tools/regression/fifo/fifo_io/Makefile
+++ b/tools/regression/fifo/fifo_io/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fifo/fifo_io/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
 
 PROG=	fifo_io
 NO_MAN=
diff --git a/tools/regression/fifo/fifo_io/fifo_io.c b/tools/regression/fifo/fifo_io/fifo_io.c
index 96ef9b4543c47..6f9f67e067a99 100644
--- a/tools/regression/fifo/fifo_io/fifo_io.c
+++ b/tools/regression/fifo/fifo_io/fifo_io.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fifo/fifo_io/fifo_io.c,v 1.6 2006/11/07 23:28:30 jkim Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/fifo/fifo_misc/Makefile b/tools/regression/fifo/fifo_misc/Makefile
index 976bce847a9ec..4a2abe84040cc 100644
--- a/tools/regression/fifo/fifo_misc/Makefile
+++ b/tools/regression/fifo/fifo_misc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fifo/fifo_misc/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
 
 PROG=	fifo_misc
 NO_MAN=
diff --git a/tools/regression/fifo/fifo_misc/fifo_misc.c b/tools/regression/fifo/fifo_misc/fifo_misc.c
index b379d18c057fd..b7701bbf2277b 100644
--- a/tools/regression/fifo/fifo_misc/fifo_misc.c
+++ b/tools/regression/fifo/fifo_misc/fifo_misc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fifo/fifo_misc/fifo_misc.c,v 1.5 2006/05/29 10:56:27 maxim Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/fifo/fifo_open/Makefile b/tools/regression/fifo/fifo_open/Makefile
index 43bdbaed0ef9c..494ac8af9209a 100644
--- a/tools/regression/fifo/fifo_open/Makefile
+++ b/tools/regression/fifo/fifo_open/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fifo/fifo_open/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
 
 PROG=	fifo_open
 NO_MAN=
diff --git a/tools/regression/fifo/fifo_open/fifo_open.c b/tools/regression/fifo/fifo_open/fifo_open.c
index 6899a3ac9ccf9..5e875f25940f4 100644
--- a/tools/regression/fifo/fifo_open/fifo_open.c
+++ b/tools/regression/fifo/fifo_open/fifo_open.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fifo/fifo_open/fifo_open.c,v 1.3 2005/09/12 11:43:51 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/file/dup/Makefile b/tools/regression/file/dup/Makefile
index 4de0815684299..cfde46c299872 100644
--- a/tools/regression/file/dup/Makefile
+++ b/tools/regression/file/dup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/file/dup/Makefile,v 1.1 2006/11/11 18:32:50 maxim Exp $
 
 PROG=	dup
 NO_MAN=
diff --git a/tools/regression/file/dup/dup.c b/tools/regression/file/dup/dup.c
index ad1f6df4f0787..c53b446fc275a 100644
--- a/tools/regression/file/dup/dup.c
+++ b/tools/regression/file/dup/dup.c
@@ -5,7 +5,7 @@
  *
  * Written by Artur Grabowski <art@openbsd.org> 2002 Public Domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/file/dup/dup.c,v 1.2 2006/11/11 18:45:20 maxim Exp $
  */
 
 /*
diff --git a/tools/regression/file/dup/dup.t b/tools/regression/file/dup/dup.t
index 8bdfd03be81b6..3cf88aed4737e 100644
--- a/tools/regression/file/dup/dup.t
+++ b/tools/regression/file/dup/dup.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/file/dup/dup.t,v 1.1 2006/11/11 18:32:50 maxim Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/file/ftruncate/Makefile b/tools/regression/file/ftruncate/Makefile
index c3285ef5a83cc..5a1ca2b53d0da 100644
--- a/tools/regression/file/ftruncate/Makefile
+++ b/tools/regression/file/ftruncate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/file/ftruncate/Makefile,v 1.2 2006/07/09 11:51:11 maxim Exp $
 
 PROG=	ftruncate
 NO_MAN=
diff --git a/tools/regression/file/ftruncate/ftruncate.c b/tools/regression/file/ftruncate/ftruncate.c
index aebcdcd85b2c7..d0ad4e6249a56 100644
--- a/tools/regression/file/ftruncate/ftruncate.c
+++ b/tools/regression/file/ftruncate/ftruncate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/file/ftruncate/ftruncate.c,v 1.3 2006/07/09 10:56:36 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/fstest/LICENSE b/tools/regression/fstest/LICENSE
index 0638aadfedf62..7a5a5b0e4c3bf 100644
--- a/tools/regression/fstest/LICENSE
+++ b/tools/regression/fstest/LICENSE
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/fstest/LICENSE,v 1.1 2007/01/17 01:42:07 pjd Exp $
 
 License for all regression tests available with fstest:
 
diff --git a/tools/regression/fstest/Makefile b/tools/regression/fstest/Makefile
index 0781730e6da12..50976f2924640 100644
--- a/tools/regression/fstest/Makefile
+++ b/tools/regression/fstest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/Makefile,v 1.1 2007/01/17 01:42:07 pjd Exp $
 
 CFLAGS+=-DHAS_LCHMOD
 CFLAGS+=-DHAS_CHFLAGS
diff --git a/tools/regression/fstest/README b/tools/regression/fstest/README
index 841ed402bd25e..2f00f24143a92 100644
--- a/tools/regression/fstest/README
+++ b/tools/regression/fstest/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/fstest/README,v 1.1 2007/01/28 00:10:28 pjd Exp $
 
 Few notes on how to use fstest in short steps:
 
diff --git a/tools/regression/fstest/fstest.c b/tools/regression/fstest/fstest.c
index 886b90ffc18d0..fbe5ef78e720d 100644
--- a/tools/regression/fstest/fstest.c
+++ b/tools/regression/fstest/fstest.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fstest/fstest.c,v 1.2 2007/07/18 18:07:14 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/fstest/tests/chflags/00.t b/tools/regression/fstest/tests/chflags/00.t
index af144b08e1bfa..96050ad4f8e4b 100644
--- a/tools/regression/fstest/tests/chflags/00.t
+++ b/tools/regression/fstest/tests/chflags/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/00.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags changes flags"
 
diff --git a/tools/regression/fstest/tests/chflags/01.t b/tools/regression/fstest/tests/chflags/01.t
index efdee5c8a1a53..8be8a098e0b88 100644
--- a/tools/regression/fstest/tests/chflags/01.t
+++ b/tools/regression/fstest/tests/chflags/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/01.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/chflags/02.t b/tools/regression/fstest/tests/chflags/02.t
index 7579061e64b07..00bc09a5a5137 100644
--- a/tools/regression/fstest/tests/chflags/02.t
+++ b/tools/regression/fstest/tests/chflags/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/02.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/chflags/03.t b/tools/regression/fstest/tests/chflags/03.t
index 06a0c04c54f29..2130dae5dd71f 100644
--- a/tools/regression/fstest/tests/chflags/03.t
+++ b/tools/regression/fstest/tests/chflags/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/03.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/chflags/04.t b/tools/regression/fstest/tests/chflags/04.t
index 105732ca3e9d1..4581d5a8edcfc 100644
--- a/tools/regression/fstest/tests/chflags/04.t
+++ b/tools/regression/fstest/tests/chflags/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/04.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/fstest/tests/chflags/05.t b/tools/regression/fstest/tests/chflags/05.t
index a534ff5b3a233..00710735e1620 100644
--- a/tools/regression/fstest/tests/chflags/05.t
+++ b/tools/regression/fstest/tests/chflags/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/05.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/chflags/06.t b/tools/regression/fstest/tests/chflags/06.t
index cebfcdd52bf47..80c089c5af396 100644
--- a/tools/regression/fstest/tests/chflags/06.t
+++ b/tools/regression/fstest/tests/chflags/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/06.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/chflags/07.t b/tools/regression/fstest/tests/chflags/07.t
index ef7c19cfe19c7..240e65bc9aca0 100644
--- a/tools/regression/fstest/tests/chflags/07.t
+++ b/tools/regression/fstest/tests/chflags/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/07.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EPERM when the effective user ID does not match the owner of the file and the effective user ID is not the super-user"
 
diff --git a/tools/regression/fstest/tests/chflags/08.t b/tools/regression/fstest/tests/chflags/08.t
index 9fa97b760b8b2..e076980faf8f2 100644
--- a/tools/regression/fstest/tests/chflags/08.t
+++ b/tools/regression/fstest/tests/chflags/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/08.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EPERM when one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK is set and the user is not the super-user"
 
diff --git a/tools/regression/fstest/tests/chflags/09.t b/tools/regression/fstest/tests/chflags/09.t
index 7b6a2cb7dbdb9..58a2f61386f04 100644
--- a/tools/regression/fstest/tests/chflags/09.t
+++ b/tools/regression/fstest/tests/chflags/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/09.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EPERM when one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK is set and securelevel is greater than 0"
 
diff --git a/tools/regression/fstest/tests/chflags/10.t b/tools/regression/fstest/tests/chflags/10.t
index 57b33f4e261d9..1f62a3e7bc1ca 100644
--- a/tools/regression/fstest/tests/chflags/10.t
+++ b/tools/regression/fstest/tests/chflags/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/10.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EPERM if non-super-user tries to set one of SF_IMMUTABLE, SF_APPEND, or SF_NOUNLINK"
 
diff --git a/tools/regression/fstest/tests/chflags/11.t b/tools/regression/fstest/tests/chflags/11.t
index 6c3887f9af97c..a4823d4f8c7ab 100644
--- a/tools/regression/fstest/tests/chflags/11.t
+++ b/tools/regression/fstest/tests/chflags/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/11.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EPERM if a user tries to set or remove the SF_SNAPSHOT flag"
 
diff --git a/tools/regression/fstest/tests/chflags/12.t b/tools/regression/fstest/tests/chflags/12.t
index 7b03436cf4da7..e4671d1dbb4dc 100644
--- a/tools/regression/fstest/tests/chflags/12.t
+++ b/tools/regression/fstest/tests/chflags/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/12.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/chflags/13.t b/tools/regression/fstest/tests/chflags/13.t
index edab3a95528b8..6da6bf039ba40 100644
--- a/tools/regression/fstest/tests/chflags/13.t
+++ b/tools/regression/fstest/tests/chflags/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chflags/13.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chflags returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/chmod/00.t b/tools/regression/fstest/tests/chmod/00.t
index e6349e8cc9ed4..74dc5524afbd6 100644
--- a/tools/regression/fstest/tests/chmod/00.t
+++ b/tools/regression/fstest/tests/chmod/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/00.t,v 1.2 2007/01/25 20:48:14 pjd Exp $
 
 desc="chmod changes permission"
 
diff --git a/tools/regression/fstest/tests/chmod/01.t b/tools/regression/fstest/tests/chmod/01.t
index 469daa47bd961..6f84c7c8fbcd3 100644
--- a/tools/regression/fstest/tests/chmod/01.t
+++ b/tools/regression/fstest/tests/chmod/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/01.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/chmod/02.t b/tools/regression/fstest/tests/chmod/02.t
index c6343a64a440c..7a5b4a4bb721d 100644
--- a/tools/regression/fstest/tests/chmod/02.t
+++ b/tools/regression/fstest/tests/chmod/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/02.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/chmod/03.t b/tools/regression/fstest/tests/chmod/03.t
index 7b424d03872a5..92aa1d4141a68 100644
--- a/tools/regression/fstest/tests/chmod/03.t
+++ b/tools/regression/fstest/tests/chmod/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/03.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/chmod/04.t b/tools/regression/fstest/tests/chmod/04.t
index a8987c29be8df..2e59773d7d21a 100644
--- a/tools/regression/fstest/tests/chmod/04.t
+++ b/tools/regression/fstest/tests/chmod/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/04.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/fstest/tests/chmod/05.t b/tools/regression/fstest/tests/chmod/05.t
index 31fe859c3fdf0..1753e0915e3dd 100644
--- a/tools/regression/fstest/tests/chmod/05.t
+++ b/tools/regression/fstest/tests/chmod/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/05.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/chmod/06.t b/tools/regression/fstest/tests/chmod/06.t
index fc5f3625308d5..bb13ff523d4c8 100644
--- a/tools/regression/fstest/tests/chmod/06.t
+++ b/tools/regression/fstest/tests/chmod/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/06.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/chmod/07.t b/tools/regression/fstest/tests/chmod/07.t
index dfa1b2799b38b..b3c95e8d83d75 100644
--- a/tools/regression/fstest/tests/chmod/07.t
+++ b/tools/regression/fstest/tests/chmod/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/07.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns EPERM if the operation would change the ownership, but the effective user ID is not the super-user"
 
diff --git a/tools/regression/fstest/tests/chmod/08.t b/tools/regression/fstest/tests/chmod/08.t
index 110baceb7858c..f88239696e7ff 100644
--- a/tools/regression/fstest/tests/chmod/08.t
+++ b/tools/regression/fstest/tests/chmod/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/08.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns EPERM if the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/chmod/09.t b/tools/regression/fstest/tests/chmod/09.t
index edf1f3ad992d2..68580c30095d5 100644
--- a/tools/regression/fstest/tests/chmod/09.t
+++ b/tools/regression/fstest/tests/chmod/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/09.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/chmod/10.t b/tools/regression/fstest/tests/chmod/10.t
index 867a6536e09d2..2a996bf7833c9 100644
--- a/tools/regression/fstest/tests/chmod/10.t
+++ b/tools/regression/fstest/tests/chmod/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/10.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/chmod/11.t b/tools/regression/fstest/tests/chmod/11.t
index f7bc0568c99be..1cba21a52bf81 100644
--- a/tools/regression/fstest/tests/chmod/11.t
+++ b/tools/regression/fstest/tests/chmod/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chmod/11.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chmod returns EFTYPE if the effective user ID is not the super-user, the mode includes the sticky bit (S_ISVTX), and path does not refer to a directory"
 
diff --git a/tools/regression/fstest/tests/chown/00.t b/tools/regression/fstest/tests/chown/00.t
index 154129aac7a87..5d0208db948e3 100644
--- a/tools/regression/fstest/tests/chown/00.t
+++ b/tools/regression/fstest/tests/chown/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/00.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown changes ownership"
 
diff --git a/tools/regression/fstest/tests/chown/01.t b/tools/regression/fstest/tests/chown/01.t
index 9559e6e586e28..b1cb2f0fb41c9 100644
--- a/tools/regression/fstest/tests/chown/01.t
+++ b/tools/regression/fstest/tests/chown/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/01.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/chown/02.t b/tools/regression/fstest/tests/chown/02.t
index 12e6b2e1df8c0..e9814bd32efbb 100644
--- a/tools/regression/fstest/tests/chown/02.t
+++ b/tools/regression/fstest/tests/chown/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/02.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/chown/03.t b/tools/regression/fstest/tests/chown/03.t
index bb3f74b1d1635..ebbb8b4582487 100644
--- a/tools/regression/fstest/tests/chown/03.t
+++ b/tools/regression/fstest/tests/chown/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/03.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/chown/04.t b/tools/regression/fstest/tests/chown/04.t
index 8575de7a9b7a6..1395c3b68d3e2 100644
--- a/tools/regression/fstest/tests/chown/04.t
+++ b/tools/regression/fstest/tests/chown/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/04.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/fstest/tests/chown/05.t b/tools/regression/fstest/tests/chown/05.t
index 844ffca2eb5bb..dda8060851394 100644
--- a/tools/regression/fstest/tests/chown/05.t
+++ b/tools/regression/fstest/tests/chown/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/05.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/chown/06.t b/tools/regression/fstest/tests/chown/06.t
index 8e6d2cc638987..661fd864c4205 100644
--- a/tools/regression/fstest/tests/chown/06.t
+++ b/tools/regression/fstest/tests/chown/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/06.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/chown/07.t b/tools/regression/fstest/tests/chown/07.t
index a9789ebdf8ce0..ef47e39514842 100644
--- a/tools/regression/fstest/tests/chown/07.t
+++ b/tools/regression/fstest/tests/chown/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/07.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns EPERM if the operation would change the ownership, but the effective user ID is not the super-user and the process is not an owner of the file"
 
diff --git a/tools/regression/fstest/tests/chown/08.t b/tools/regression/fstest/tests/chown/08.t
index 9fed4556f3d9c..a5bbed79f6d56 100644
--- a/tools/regression/fstest/tests/chown/08.t
+++ b/tools/regression/fstest/tests/chown/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/08.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns EPERM if the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/chown/09.t b/tools/regression/fstest/tests/chown/09.t
index 9751f97320126..5097d00c4a1c2 100644
--- a/tools/regression/fstest/tests/chown/09.t
+++ b/tools/regression/fstest/tests/chown/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/09.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/chown/10.t b/tools/regression/fstest/tests/chown/10.t
index 1ef6f850f7a58..bb79067c23fc1 100644
--- a/tools/regression/fstest/tests/chown/10.t
+++ b/tools/regression/fstest/tests/chown/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/chown/10.t,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 desc="chown returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/conf b/tools/regression/fstest/tests/conf
index 54183e45ec1b9..fa298a9281cd9 100644
--- a/tools/regression/fstest/tests/conf
+++ b/tools/regression/fstest/tests/conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/conf,v 1.1 2007/01/17 01:42:08 pjd Exp $
 # fstest configuration file
 
 # Known operating systems: FreeBSD, SunOS, Linux
diff --git a/tools/regression/fstest/tests/link/00.t b/tools/regression/fstest/tests/link/00.t
index e5ac67d57aaa3..3e096f5b604b0 100644
--- a/tools/regression/fstest/tests/link/00.t
+++ b/tools/regression/fstest/tests/link/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/00.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link creates hardlinks"
 
diff --git a/tools/regression/fstest/tests/link/01.t b/tools/regression/fstest/tests/link/01.t
index 9a740ed9451f9..be003b92f60d1 100644
--- a/tools/regression/fstest/tests/link/01.t
+++ b/tools/regression/fstest/tests/link/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/01.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ENOTDIR if a component of either path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/link/02.t b/tools/regression/fstest/tests/link/02.t
index 436b627ba7ec8..6c34e8ea9db14 100644
--- a/tools/regression/fstest/tests/link/02.t
+++ b/tools/regression/fstest/tests/link/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/02.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ENAMETOOLONG if a component of either pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/link/03.t b/tools/regression/fstest/tests/link/03.t
index 8fcb77fbafcc4..358b669cafabb 100644
--- a/tools/regression/fstest/tests/link/03.t
+++ b/tools/regression/fstest/tests/link/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/03.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ENAMETOOLONG if an entire length of either path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/link/04.t b/tools/regression/fstest/tests/link/04.t
index d27beef1760d3..a3b8f7f3dc913 100644
--- a/tools/regression/fstest/tests/link/04.t
+++ b/tools/regression/fstest/tests/link/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/04.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ENOENT if a component of either path prefix does not exist"
 
diff --git a/tools/regression/fstest/tests/link/05.t b/tools/regression/fstest/tests/link/05.t
index c1da717484273..a95d3d1f8be61 100644
--- a/tools/regression/fstest/tests/link/05.t
+++ b/tools/regression/fstest/tests/link/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/05.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EMLINK if the link count of the file named by name1 would exceed 32767"
 
diff --git a/tools/regression/fstest/tests/link/06.t b/tools/regression/fstest/tests/link/06.t
index 3ce0919187651..b0391dce807e9 100644
--- a/tools/regression/fstest/tests/link/06.t
+++ b/tools/regression/fstest/tests/link/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/06.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EACCES when a component of either path prefix denies search permission"
 
diff --git a/tools/regression/fstest/tests/link/07.t b/tools/regression/fstest/tests/link/07.t
index f9d35e76f9ae6..9760e35c50d95 100644
--- a/tools/regression/fstest/tests/link/07.t
+++ b/tools/regression/fstest/tests/link/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/07.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EACCES when the requested link requires writing in a directory with a mode that denies write permission"
 
diff --git a/tools/regression/fstest/tests/link/08.t b/tools/regression/fstest/tests/link/08.t
index f9d9445db5f0c..24b764b20c3d4 100644
--- a/tools/regression/fstest/tests/link/08.t
+++ b/tools/regression/fstest/tests/link/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/08.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ELOOP if too many symbolic links were encountered in translating one of the pathnames"
 
diff --git a/tools/regression/fstest/tests/link/09.t b/tools/regression/fstest/tests/link/09.t
index 224395f421878..7899fcbc3b29f 100644
--- a/tools/regression/fstest/tests/link/09.t
+++ b/tools/regression/fstest/tests/link/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/09.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ENOENT if the source file does not exist"
 
diff --git a/tools/regression/fstest/tests/link/10.t b/tools/regression/fstest/tests/link/10.t
index beb141c81d8d8..61612e6b6553c 100644
--- a/tools/regression/fstest/tests/link/10.t
+++ b/tools/regression/fstest/tests/link/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/10.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EEXIST if the destination file does exist"
 
diff --git a/tools/regression/fstest/tests/link/11.t b/tools/regression/fstest/tests/link/11.t
index cf31c9ee31fdf..8a7c571cf0169 100644
--- a/tools/regression/fstest/tests/link/11.t
+++ b/tools/regression/fstest/tests/link/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/11.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EPERM if the source file is a directory"
 
diff --git a/tools/regression/fstest/tests/link/12.t b/tools/regression/fstest/tests/link/12.t
index 1f1efdc016ed4..a9366a3449839 100644
--- a/tools/regression/fstest/tests/link/12.t
+++ b/tools/regression/fstest/tests/link/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/12.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EPERM if the source file has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/link/13.t b/tools/regression/fstest/tests/link/13.t
index f6a00eaa437dd..82dca471277f7 100644
--- a/tools/regression/fstest/tests/link/13.t
+++ b/tools/regression/fstest/tests/link/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/13.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EPERM if the parent directory of the destination file has its immutable flag set"
 
diff --git a/tools/regression/fstest/tests/link/14.t b/tools/regression/fstest/tests/link/14.t
index 2b0dca332b6a9..40a91bca41827 100644
--- a/tools/regression/fstest/tests/link/14.t
+++ b/tools/regression/fstest/tests/link/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/14.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EXDEV if the source and the destination files are on different file systems"
 
diff --git a/tools/regression/fstest/tests/link/15.t b/tools/regression/fstest/tests/link/15.t
index 42c6ccf4cc1e6..943df52fa36fe 100644
--- a/tools/regression/fstest/tests/link/15.t
+++ b/tools/regression/fstest/tests/link/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/15.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns ENOSPC if the directory in which the entry for the new link is being placed cannot be extended because there is no space left on the file system containing the directory"
 
diff --git a/tools/regression/fstest/tests/link/16.t b/tools/regression/fstest/tests/link/16.t
index 0adb225041ef2..fad792edbc2d8 100644
--- a/tools/regression/fstest/tests/link/16.t
+++ b/tools/regression/fstest/tests/link/16.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/16.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EROFS if the requested link requires writing in a directory on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/link/17.t b/tools/regression/fstest/tests/link/17.t
index cb56128642bc5..278e27cf812cd 100644
--- a/tools/regression/fstest/tests/link/17.t
+++ b/tools/regression/fstest/tests/link/17.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/link/17.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="link returns EFAULT if one of the pathnames specified is outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/misc.sh b/tools/regression/fstest/tests/misc.sh
index 0ca80651a6087..51339a88d3fc8 100644
--- a/tools/regression/fstest/tests/misc.sh
+++ b/tools/regression/fstest/tests/misc.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/misc.sh,v 1.1 2007/01/17 01:42:08 pjd Exp $
 
 ntest=1
 
diff --git a/tools/regression/fstest/tests/mkdir/00.t b/tools/regression/fstest/tests/mkdir/00.t
index d640de9b1a2d5..cd39339d2980e 100644
--- a/tools/regression/fstest/tests/mkdir/00.t
+++ b/tools/regression/fstest/tests/mkdir/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/00.t,v 1.2 2007/01/25 20:50:02 pjd Exp $
 
 desc="mkdir creates directories"
 
diff --git a/tools/regression/fstest/tests/mkdir/01.t b/tools/regression/fstest/tests/mkdir/01.t
index 43717e6484743..b8b5eb10bbd6c 100644
--- a/tools/regression/fstest/tests/mkdir/01.t
+++ b/tools/regression/fstest/tests/mkdir/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/01.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/mkdir/02.t b/tools/regression/fstest/tests/mkdir/02.t
index 8a4c47a7673d6..b23f9f56c0c52 100644
--- a/tools/regression/fstest/tests/mkdir/02.t
+++ b/tools/regression/fstest/tests/mkdir/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/02.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/mkdir/03.t b/tools/regression/fstest/tests/mkdir/03.t
index 36213af8187be..e6e02fa29b49a 100644
--- a/tools/regression/fstest/tests/mkdir/03.t
+++ b/tools/regression/fstest/tests/mkdir/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/03.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/mkdir/04.t b/tools/regression/fstest/tests/mkdir/04.t
index cd65819641558..4de4a9dc5e480 100644
--- a/tools/regression/fstest/tests/mkdir/04.t
+++ b/tools/regression/fstest/tests/mkdir/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/04.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns ENOENT if a component of the path prefix does not exist"
 
diff --git a/tools/regression/fstest/tests/mkdir/05.t b/tools/regression/fstest/tests/mkdir/05.t
index 7e97d9bc6ed69..3631ddeefd0c3 100644
--- a/tools/regression/fstest/tests/mkdir/05.t
+++ b/tools/regression/fstest/tests/mkdir/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/05.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/mkdir/06.t b/tools/regression/fstest/tests/mkdir/06.t
index 79aa5395615aa..27057394a7d8e 100644
--- a/tools/regression/fstest/tests/mkdir/06.t
+++ b/tools/regression/fstest/tests/mkdir/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/06.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns EACCES when write permission is denied on the parent directory of the directory to be created"
 
diff --git a/tools/regression/fstest/tests/mkdir/07.t b/tools/regression/fstest/tests/mkdir/07.t
index dbb00df16a877..fe311e87feb77 100644
--- a/tools/regression/fstest/tests/mkdir/07.t
+++ b/tools/regression/fstest/tests/mkdir/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/07.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/mkdir/08.t b/tools/regression/fstest/tests/mkdir/08.t
index f87c7bc2d5596..f8d8eca64e519 100644
--- a/tools/regression/fstest/tests/mkdir/08.t
+++ b/tools/regression/fstest/tests/mkdir/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/08.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns EPERM if the parent directory of the directory to be created has its immutable flag set"
 
diff --git a/tools/regression/fstest/tests/mkdir/09.t b/tools/regression/fstest/tests/mkdir/09.t
index c36d0308a3f7e..1c5eb4d462890 100644
--- a/tools/regression/fstest/tests/mkdir/09.t
+++ b/tools/regression/fstest/tests/mkdir/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/09.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/mkdir/10.t b/tools/regression/fstest/tests/mkdir/10.t
index 217bdedf82885..06b5c60831bc9 100644
--- a/tools/regression/fstest/tests/mkdir/10.t
+++ b/tools/regression/fstest/tests/mkdir/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/10.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns EEXIST if the named file exists"
 
diff --git a/tools/regression/fstest/tests/mkdir/11.t b/tools/regression/fstest/tests/mkdir/11.t
index 8b9758b800185..1413b5f52a1f0 100644
--- a/tools/regression/fstest/tests/mkdir/11.t
+++ b/tools/regression/fstest/tests/mkdir/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/11.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns ENOSPC if there are no free inodes on the file system on which the directory is being created"
 
diff --git a/tools/regression/fstest/tests/mkdir/12.t b/tools/regression/fstest/tests/mkdir/12.t
index af322c4247aa1..dfc868cd8fba6 100644
--- a/tools/regression/fstest/tests/mkdir/12.t
+++ b/tools/regression/fstest/tests/mkdir/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkdir/12.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkdir returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/mkfifo/00.t b/tools/regression/fstest/tests/mkfifo/00.t
index eda7b1789f739..ba4843198dff4 100644
--- a/tools/regression/fstest/tests/mkfifo/00.t
+++ b/tools/regression/fstest/tests/mkfifo/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/00.t,v 1.2 2007/01/25 20:50:02 pjd Exp $
 
 desc="mkfifo creates fifo files"
 
diff --git a/tools/regression/fstest/tests/mkfifo/01.t b/tools/regression/fstest/tests/mkfifo/01.t
index 69bfff5826527..90a9307ed61e5 100644
--- a/tools/regression/fstest/tests/mkfifo/01.t
+++ b/tools/regression/fstest/tests/mkfifo/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/01.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/mkfifo/02.t b/tools/regression/fstest/tests/mkfifo/02.t
index 1f3a64e16e86a..f0d5cae12909b 100644
--- a/tools/regression/fstest/tests/mkfifo/02.t
+++ b/tools/regression/fstest/tests/mkfifo/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/02.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/mkfifo/03.t b/tools/regression/fstest/tests/mkfifo/03.t
index aa48201ae31ed..9ea314afb3843 100644
--- a/tools/regression/fstest/tests/mkfifo/03.t
+++ b/tools/regression/fstest/tests/mkfifo/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/03.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/mkfifo/04.t b/tools/regression/fstest/tests/mkfifo/04.t
index d9ad951144182..9fbfcb2929485 100644
--- a/tools/regression/fstest/tests/mkfifo/04.t
+++ b/tools/regression/fstest/tests/mkfifo/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/04.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns ENOENT if a component of the path prefix does not exist"
 
diff --git a/tools/regression/fstest/tests/mkfifo/05.t b/tools/regression/fstest/tests/mkfifo/05.t
index d93d568e733d1..0c98abc02c158 100644
--- a/tools/regression/fstest/tests/mkfifo/05.t
+++ b/tools/regression/fstest/tests/mkfifo/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/05.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/mkfifo/06.t b/tools/regression/fstest/tests/mkfifo/06.t
index 47f199b311187..be99141098ca2 100644
--- a/tools/regression/fstest/tests/mkfifo/06.t
+++ b/tools/regression/fstest/tests/mkfifo/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/06.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns EACCES when write permission is denied on the parent directory of the file to be created"
 
diff --git a/tools/regression/fstest/tests/mkfifo/07.t b/tools/regression/fstest/tests/mkfifo/07.t
index 44271b6df5346..3bb381e9be5d4 100644
--- a/tools/regression/fstest/tests/mkfifo/07.t
+++ b/tools/regression/fstest/tests/mkfifo/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/07.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/mkfifo/08.t b/tools/regression/fstest/tests/mkfifo/08.t
index a4b00020b7067..9ea2e79e04194 100644
--- a/tools/regression/fstest/tests/mkfifo/08.t
+++ b/tools/regression/fstest/tests/mkfifo/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/08.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/mkfifo/09.t b/tools/regression/fstest/tests/mkfifo/09.t
index 102e12bae65d3..e3931b70f6d87 100644
--- a/tools/regression/fstest/tests/mkfifo/09.t
+++ b/tools/regression/fstest/tests/mkfifo/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/09.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns EEXIST if the named file exists"
 
diff --git a/tools/regression/fstest/tests/mkfifo/10.t b/tools/regression/fstest/tests/mkfifo/10.t
index beeacabca00d3..d65f191e9d0dc 100644
--- a/tools/regression/fstest/tests/mkfifo/10.t
+++ b/tools/regression/fstest/tests/mkfifo/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/10.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns EPERM if the parent directory of the file to be created has its immutable flag set"
 
diff --git a/tools/regression/fstest/tests/mkfifo/11.t b/tools/regression/fstest/tests/mkfifo/11.t
index f9937fa46d323..6ca965b08bfb1 100644
--- a/tools/regression/fstest/tests/mkfifo/11.t
+++ b/tools/regression/fstest/tests/mkfifo/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/11.t,v 1.1 2007/01/17 01:42:09 pjd Exp $
 
 desc="mkfifo returns ENOSPC if there are no free inodes on the file system on which the file is being created"
 
diff --git a/tools/regression/fstest/tests/mkfifo/12.t b/tools/regression/fstest/tests/mkfifo/12.t
index 40c1455ad395f..2280194d762dc 100644
--- a/tools/regression/fstest/tests/mkfifo/12.t
+++ b/tools/regression/fstest/tests/mkfifo/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/mkfifo/12.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="mkfifo returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/open/00.t b/tools/regression/fstest/tests/open/00.t
index caa24f0a8b13f..75d99b83ba553 100644
--- a/tools/regression/fstest/tests/open/00.t
+++ b/tools/regression/fstest/tests/open/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/00.t,v 1.2 2007/01/25 20:50:02 pjd Exp $
 
 desc="open opens (and eventually creates) a file"
 
diff --git a/tools/regression/fstest/tests/open/01.t b/tools/regression/fstest/tests/open/01.t
index 39446baf75801..a25ec8edd2797 100644
--- a/tools/regression/fstest/tests/open/01.t
+++ b/tools/regression/fstest/tests/open/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/01.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/open/02.t b/tools/regression/fstest/tests/open/02.t
index ebd47e364518d..6ac818e5f5af3 100644
--- a/tools/regression/fstest/tests/open/02.t
+++ b/tools/regression/fstest/tests/open/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/02.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/open/03.t b/tools/regression/fstest/tests/open/03.t
index ad78e5bb68f6e..c68ae450fe29f 100644
--- a/tools/regression/fstest/tests/open/03.t
+++ b/tools/regression/fstest/tests/open/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/03.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/open/04.t b/tools/regression/fstest/tests/open/04.t
index 1ce99cbb63412..10ac17a79ed4c 100644
--- a/tools/regression/fstest/tests/open/04.t
+++ b/tools/regression/fstest/tests/open/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/04.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ENOENT if a component of the path name that must exist does not exist or O_CREAT is not set and the named file does not exist"
 
diff --git a/tools/regression/fstest/tests/open/05.t b/tools/regression/fstest/tests/open/05.t
index 25ad7daed1654..60b4dc38f8089 100644
--- a/tools/regression/fstest/tests/open/05.t
+++ b/tools/regression/fstest/tests/open/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/05.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/open/06.t b/tools/regression/fstest/tests/open/06.t
index e72d191b27c55..ea99f736b0166 100644
--- a/tools/regression/fstest/tests/open/06.t
+++ b/tools/regression/fstest/tests/open/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/06.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EACCES when the required permissions (for reading and/or writing) are denied for the given flags"
 
diff --git a/tools/regression/fstest/tests/open/07.t b/tools/regression/fstest/tests/open/07.t
index a41d1933a810f..ddf337c0ad0e3 100644
--- a/tools/regression/fstest/tests/open/07.t
+++ b/tools/regression/fstest/tests/open/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/07.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EACCES when O_TRUNC is specified and write permission is denied"
 
diff --git a/tools/regression/fstest/tests/open/08.t b/tools/regression/fstest/tests/open/08.t
index 22ea29be5631d..1323d31022335 100644
--- a/tools/regression/fstest/tests/open/08.t
+++ b/tools/regression/fstest/tests/open/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/08.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EACCES when O_CREAT is specified, the file does not exist, and the directory in which it is to be created does not permit writing"
 
diff --git a/tools/regression/fstest/tests/open/09.t b/tools/regression/fstest/tests/open/09.t
index 4614a40e62bb4..bb5bbba2a3172 100644
--- a/tools/regression/fstest/tests/open/09.t
+++ b/tools/regression/fstest/tests/open/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/09.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="O_CREAT is specified, the file does not exist, and the directory in which it is to be created has its immutable flag set"
 
diff --git a/tools/regression/fstest/tests/open/10.t b/tools/regression/fstest/tests/open/10.t
index d56ceb1e8a71b..7602904cc1c9a 100644
--- a/tools/regression/fstest/tests/open/10.t
+++ b/tools/regression/fstest/tests/open/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/10.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EPERM when the named file has its immutable flag set and the file is to be modified"
 
diff --git a/tools/regression/fstest/tests/open/11.t b/tools/regression/fstest/tests/open/11.t
index feb0ffe19d37a..0af364c5e0113 100644
--- a/tools/regression/fstest/tests/open/11.t
+++ b/tools/regression/fstest/tests/open/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/11.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EPERM when the named file has its append-only flag set, the file is to be modified, and O_TRUNC is specified or O_APPEND is not specified"
 
diff --git a/tools/regression/fstest/tests/open/12.t b/tools/regression/fstest/tests/open/12.t
index 2726dc1f9fe96..060822028c415 100644
--- a/tools/regression/fstest/tests/open/12.t
+++ b/tools/regression/fstest/tests/open/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/12.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/open/13.t b/tools/regression/fstest/tests/open/13.t
index 4d05a61c128b0..7f37e4455ce0c 100644
--- a/tools/regression/fstest/tests/open/13.t
+++ b/tools/regression/fstest/tests/open/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/13.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EISDIR when he named file is a directory, and the arguments specify it is to be modified"
 
diff --git a/tools/regression/fstest/tests/open/14.t b/tools/regression/fstest/tests/open/14.t
index 771f451a4f28a..2d662838f08dc 100644
--- a/tools/regression/fstest/tests/open/14.t
+++ b/tools/regression/fstest/tests/open/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/14.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EROFS if the named file resides on a read-only file system, and the file is to be modified"
 
diff --git a/tools/regression/fstest/tests/open/15.t b/tools/regression/fstest/tests/open/15.t
index 76b57d39e273f..261f6f715d4b3 100644
--- a/tools/regression/fstest/tests/open/15.t
+++ b/tools/regression/fstest/tests/open/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/15.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EROFS when O_CREAT is specified and the named file would reside on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/open/16.t b/tools/regression/fstest/tests/open/16.t
index ec317686563b7..f8a9ab71dfa7b 100644
--- a/tools/regression/fstest/tests/open/16.t
+++ b/tools/regression/fstest/tests/open/16.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/16.t,v 1.2 2007/07/18 18:07:15 pjd Exp $
 
 desc="open returns EMLINK/ELOOP when O_NOFOLLOW was specified and the target is a symbolic link"
 
diff --git a/tools/regression/fstest/tests/open/17.t b/tools/regression/fstest/tests/open/17.t
index 2224daf5ea59a..d662d37c67479 100644
--- a/tools/regression/fstest/tests/open/17.t
+++ b/tools/regression/fstest/tests/open/17.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/17.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ENXIO when O_NONBLOCK is set, the named file is a fifo, O_WRONLY is set, and no process has the file open for reading"
 
diff --git a/tools/regression/fstest/tests/open/18.t b/tools/regression/fstest/tests/open/18.t
index 978ba169fe261..6b2251b1c5662 100644
--- a/tools/regression/fstest/tests/open/18.t
+++ b/tools/regression/fstest/tests/open/18.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/18.t,v 1.2 2007/07/18 18:07:15 pjd Exp $
 
 desc="open returns EWOULDBLOCK when O_NONBLOCK and one of O_SHLOCK or O_EXLOCK is specified and the file is locked"
 
diff --git a/tools/regression/fstest/tests/open/19.t b/tools/regression/fstest/tests/open/19.t
index aa2d909aaa965..9022d94bbbf2d 100644
--- a/tools/regression/fstest/tests/open/19.t
+++ b/tools/regression/fstest/tests/open/19.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/19.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ENOSPC when O_CREAT is specified, the file does not exist, and there are no free inodes on the file system on which the file is being created"
 
diff --git a/tools/regression/fstest/tests/open/20.t b/tools/regression/fstest/tests/open/20.t
index fc926f47c9999..db1eadaed6bde 100644
--- a/tools/regression/fstest/tests/open/20.t
+++ b/tools/regression/fstest/tests/open/20.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/20.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns ETXTBSY when the file is a pure procedure (shared text) file that is being executed and the open() system call requests write access"
 
diff --git a/tools/regression/fstest/tests/open/21.t b/tools/regression/fstest/tests/open/21.t
index c43d7fd70faab..f969c82afbe72 100644
--- a/tools/regression/fstest/tests/open/21.t
+++ b/tools/regression/fstest/tests/open/21.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/21.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/open/22.t b/tools/regression/fstest/tests/open/22.t
index 5e3d22827f746..0ab17cd650110 100644
--- a/tools/regression/fstest/tests/open/22.t
+++ b/tools/regression/fstest/tests/open/22.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/22.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EEXIST when O_CREAT and O_EXCL were specified and the file exists"
 
diff --git a/tools/regression/fstest/tests/open/23.t b/tools/regression/fstest/tests/open/23.t
index ea6335f2b53d4..00d21b447d9f7 100644
--- a/tools/regression/fstest/tests/open/23.t
+++ b/tools/regression/fstest/tests/open/23.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/open/23.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="open returns EINVAL when an attempt was made to open a descriptor with an illegal combination of O_RDONLY, O_WRONLY, and O_RDWR"
 
diff --git a/tools/regression/fstest/tests/rename/00.t b/tools/regression/fstest/tests/rename/00.t
index db1feab4fe8ea..85d1014d1340d 100644
--- a/tools/regression/fstest/tests/rename/00.t
+++ b/tools/regression/fstest/tests/rename/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/00.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename changes file name"
 
diff --git a/tools/regression/fstest/tests/rename/01.t b/tools/regression/fstest/tests/rename/01.t
index 7749b90046c28..ec2910156d1ff 100644
--- a/tools/regression/fstest/tests/rename/01.t
+++ b/tools/regression/fstest/tests/rename/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/01.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns ENAMETOOLONG if a component of either pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/rename/02.t b/tools/regression/fstest/tests/rename/02.t
index cbe2622d37faa..39158e0074bce 100644
--- a/tools/regression/fstest/tests/rename/02.t
+++ b/tools/regression/fstest/tests/rename/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/02.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns ENAMETOOLONG if an entire length of either path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/rename/03.t b/tools/regression/fstest/tests/rename/03.t
index 8404dbe27d0fd..a768393c3b658 100644
--- a/tools/regression/fstest/tests/rename/03.t
+++ b/tools/regression/fstest/tests/rename/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/03.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns ENOENT if a component of the 'from' path does not exist, or a path prefix of 'to' does not exist"
 
diff --git a/tools/regression/fstest/tests/rename/04.t b/tools/regression/fstest/tests/rename/04.t
index af3801f949835..43406289f8132 100644
--- a/tools/regression/fstest/tests/rename/04.t
+++ b/tools/regression/fstest/tests/rename/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/04.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EACCES when a component of either path prefix denies search permission"
 
diff --git a/tools/regression/fstest/tests/rename/05.t b/tools/regression/fstest/tests/rename/05.t
index 39aa28f2f54c6..3b9e9b94fac71 100644
--- a/tools/regression/fstest/tests/rename/05.t
+++ b/tools/regression/fstest/tests/rename/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/05.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EACCES when the requested link requires writing in a directory with a mode that denies write permission"
 
diff --git a/tools/regression/fstest/tests/rename/06.t b/tools/regression/fstest/tests/rename/06.t
index 880c6045081af..fd88e3106afaa 100644
--- a/tools/regression/fstest/tests/rename/06.t
+++ b/tools/regression/fstest/tests/rename/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/06.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EPERM if the file pointed at by the 'from' argument has its immutable, undeletable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/rename/07.t b/tools/regression/fstest/tests/rename/07.t
index 40d04763a3707..642e0728f6e79 100644
--- a/tools/regression/fstest/tests/rename/07.t
+++ b/tools/regression/fstest/tests/rename/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/07.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EPERM if the parent directory of the file pointed at by the 'from' argument has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/rename/08.t b/tools/regression/fstest/tests/rename/08.t
index 962eea10ab02d..70227f11143ec 100644
--- a/tools/regression/fstest/tests/rename/08.t
+++ b/tools/regression/fstest/tests/rename/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/08.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EPERM if the parent directory of the file pointed at by the 'to' argument has its immutable flag set"
 
diff --git a/tools/regression/fstest/tests/rename/09.t b/tools/regression/fstest/tests/rename/09.t
index 41270f1113387..2586719fb9282 100644
--- a/tools/regression/fstest/tests/rename/09.t
+++ b/tools/regression/fstest/tests/rename/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/09.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EACCES or EPERM if the directory containing 'from' is marked sticky, and neither the containing directory nor 'from' are owned by the effective user ID"
 
diff --git a/tools/regression/fstest/tests/rename/10.t b/tools/regression/fstest/tests/rename/10.t
index 6d5e8315af26d..3441f2e91009d 100644
--- a/tools/regression/fstest/tests/rename/10.t
+++ b/tools/regression/fstest/tests/rename/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/10.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EACCES or EPERM if the file pointed at by the 'to' argument exists, the directory containing 'to' is marked sticky, and neither the containing directory nor 'to' are owned by the effective user ID"
 
diff --git a/tools/regression/fstest/tests/rename/11.t b/tools/regression/fstest/tests/rename/11.t
index 6120e648120ac..53e15538d445f 100644
--- a/tools/regression/fstest/tests/rename/11.t
+++ b/tools/regression/fstest/tests/rename/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/11.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns ELOOP if too many symbolic links were encountered in translating one of the pathnames"
 
diff --git a/tools/regression/fstest/tests/rename/12.t b/tools/regression/fstest/tests/rename/12.t
index 504980ca512ce..c5b03a3d35576 100644
--- a/tools/regression/fstest/tests/rename/12.t
+++ b/tools/regression/fstest/tests/rename/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/12.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns ENOTDIR if a component of either path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/rename/13.t b/tools/regression/fstest/tests/rename/13.t
index 5697311e86b94..984351bff86eb 100644
--- a/tools/regression/fstest/tests/rename/13.t
+++ b/tools/regression/fstest/tests/rename/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/13.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns ENOTDIR when the 'from' argument is a directory, but 'to' is not a directory"
 
diff --git a/tools/regression/fstest/tests/rename/14.t b/tools/regression/fstest/tests/rename/14.t
index 806e09d9ed64f..0b708c23329d9 100644
--- a/tools/regression/fstest/tests/rename/14.t
+++ b/tools/regression/fstest/tests/rename/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/14.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EISDIR when the 'to' argument is a directory, but 'from' is not a directory"
 
diff --git a/tools/regression/fstest/tests/rename/15.t b/tools/regression/fstest/tests/rename/15.t
index 0ef6cc3068006..64a75ccb11cee 100644
--- a/tools/regression/fstest/tests/rename/15.t
+++ b/tools/regression/fstest/tests/rename/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/15.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EXDEV if the link named by 'to' and the file named by 'from' are on different file systems"
 
diff --git a/tools/regression/fstest/tests/rename/16.t b/tools/regression/fstest/tests/rename/16.t
index cda8e99a66a73..ba2a9271e0f16 100644
--- a/tools/regression/fstest/tests/rename/16.t
+++ b/tools/regression/fstest/tests/rename/16.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/16.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EROFS if the requested link requires writing in a directory on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/rename/17.t b/tools/regression/fstest/tests/rename/17.t
index a3913499d44e8..c949b9641f9f7 100644
--- a/tools/regression/fstest/tests/rename/17.t
+++ b/tools/regression/fstest/tests/rename/17.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/17.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EFAULT if one of the pathnames specified is outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/rename/18.t b/tools/regression/fstest/tests/rename/18.t
index a69913bdc2106..d3fb3a4c86321 100644
--- a/tools/regression/fstest/tests/rename/18.t
+++ b/tools/regression/fstest/tests/rename/18.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/18.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EINVAL when the 'from' argument is a parent directory of 'to'"
 
diff --git a/tools/regression/fstest/tests/rename/19.t b/tools/regression/fstest/tests/rename/19.t
index b068a0102f5e2..ae10c07e8e41e 100644
--- a/tools/regression/fstest/tests/rename/19.t
+++ b/tools/regression/fstest/tests/rename/19.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/19.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EINVAL when an attempt is made to rename '.' or '..'"
 
diff --git a/tools/regression/fstest/tests/rename/20.t b/tools/regression/fstest/tests/rename/20.t
index 8a00d1f942995..82ea13a2902a6 100644
--- a/tools/regression/fstest/tests/rename/20.t
+++ b/tools/regression/fstest/tests/rename/20.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rename/20.t,v 1.1 2007/01/17 01:42:10 pjd Exp $
 
 desc="rename returns EEXIST or ENOTEMPTY if the 'to' argument is a directory and is not empty"
 
diff --git a/tools/regression/fstest/tests/rmdir/00.t b/tools/regression/fstest/tests/rmdir/00.t
index 4381e6643d796..8e49f035b33bc 100644
--- a/tools/regression/fstest/tests/rmdir/00.t
+++ b/tools/regression/fstest/tests/rmdir/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/00.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir removes directories"
 
diff --git a/tools/regression/fstest/tests/rmdir/01.t b/tools/regression/fstest/tests/rmdir/01.t
index d2d407dd0e244..d7b8345b58968 100644
--- a/tools/regression/fstest/tests/rmdir/01.t
+++ b/tools/regression/fstest/tests/rmdir/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/01.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns ENOTDIR if a component of the path is not a directory"
 
diff --git a/tools/regression/fstest/tests/rmdir/02.t b/tools/regression/fstest/tests/rmdir/02.t
index dba59aee988ff..a37a7a46c5c84 100644
--- a/tools/regression/fstest/tests/rmdir/02.t
+++ b/tools/regression/fstest/tests/rmdir/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/02.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/rmdir/03.t b/tools/regression/fstest/tests/rmdir/03.t
index 1f70eca396682..3a1f8bd128262 100644
--- a/tools/regression/fstest/tests/rmdir/03.t
+++ b/tools/regression/fstest/tests/rmdir/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/03.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/rmdir/04.t b/tools/regression/fstest/tests/rmdir/04.t
index 77e1d30e57c35..1984c0a1a6313 100644
--- a/tools/regression/fstest/tests/rmdir/04.t
+++ b/tools/regression/fstest/tests/rmdir/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/04.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns ENOENT if the named directory does not exist"
 
diff --git a/tools/regression/fstest/tests/rmdir/05.t b/tools/regression/fstest/tests/rmdir/05.t
index fd973a93af5fd..f4a39d52ecbd9 100644
--- a/tools/regression/fstest/tests/rmdir/05.t
+++ b/tools/regression/fstest/tests/rmdir/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/05.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/rmdir/06.t b/tools/regression/fstest/tests/rmdir/06.t
index dbb378b02c102..e552f95bdd000 100644
--- a/tools/regression/fstest/tests/rmdir/06.t
+++ b/tools/regression/fstest/tests/rmdir/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/06.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EEXIST or ENOTEMPTY the named directory contains files other than '.' and '..' in it"
 
diff --git a/tools/regression/fstest/tests/rmdir/07.t b/tools/regression/fstest/tests/rmdir/07.t
index 2528245c0a41c..78af4755fec99 100644
--- a/tools/regression/fstest/tests/rmdir/07.t
+++ b/tools/regression/fstest/tests/rmdir/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/07.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/rmdir/08.t b/tools/regression/fstest/tests/rmdir/08.t
index c1fb819732c33..a8994d0eea868 100644
--- a/tools/regression/fstest/tests/rmdir/08.t
+++ b/tools/regression/fstest/tests/rmdir/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/08.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EACCES when write permission is denied on the directory containing the link to be removed"
 
diff --git a/tools/regression/fstest/tests/rmdir/09.t b/tools/regression/fstest/tests/rmdir/09.t
index 6b3959df2c3e4..0471f670777c2 100644
--- a/tools/regression/fstest/tests/rmdir/09.t
+++ b/tools/regression/fstest/tests/rmdir/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/09.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EPERM if the named file has its immutable, undeletable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/rmdir/10.t b/tools/regression/fstest/tests/rmdir/10.t
index 225804133d796..9d2ae7a86e287 100644
--- a/tools/regression/fstest/tests/rmdir/10.t
+++ b/tools/regression/fstest/tests/rmdir/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/10.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EPERM if the parent directory of the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/rmdir/11.t b/tools/regression/fstest/tests/rmdir/11.t
index b899948d11eb5..2ed725769cb49 100644
--- a/tools/regression/fstest/tests/rmdir/11.t
+++ b/tools/regression/fstest/tests/rmdir/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/11.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EACCES or EPERM if the directory containing the directory to be removed is marked sticky, and neither the containing directory nor the directory to be removed are owned by the effective user ID"
 
diff --git a/tools/regression/fstest/tests/rmdir/12.t b/tools/regression/fstest/tests/rmdir/12.t
index 06852f4361c97..2f8192a3f630a 100644
--- a/tools/regression/fstest/tests/rmdir/12.t
+++ b/tools/regression/fstest/tests/rmdir/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/12.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EINVAL if the last component of the path is '.' or '..'"
 
diff --git a/tools/regression/fstest/tests/rmdir/13.t b/tools/regression/fstest/tests/rmdir/13.t
index 65fb78e393ba3..8f9d04cb4ea23 100644
--- a/tools/regression/fstest/tests/rmdir/13.t
+++ b/tools/regression/fstest/tests/rmdir/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/13.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EBUSY if the directory to be removed is the mount point for a mounted file system"
 
diff --git a/tools/regression/fstest/tests/rmdir/14.t b/tools/regression/fstest/tests/rmdir/14.t
index b195933cf1bc8..a1e136d8a2c84 100644
--- a/tools/regression/fstest/tests/rmdir/14.t
+++ b/tools/regression/fstest/tests/rmdir/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/14.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/rmdir/15.t b/tools/regression/fstest/tests/rmdir/15.t
index 8bfa1491f7ba2..5468863309615 100644
--- a/tools/regression/fstest/tests/rmdir/15.t
+++ b/tools/regression/fstest/tests/rmdir/15.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/rmdir/15.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="rmdir returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/symlink/00.t b/tools/regression/fstest/tests/symlink/00.t
index 6e6d46d918fff..26c80a8808f68 100644
--- a/tools/regression/fstest/tests/symlink/00.t
+++ b/tools/regression/fstest/tests/symlink/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/00.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink creates symbolic links"
 
diff --git a/tools/regression/fstest/tests/symlink/01.t b/tools/regression/fstest/tests/symlink/01.t
index f19870cf31de7..bf9495b94fd50 100644
--- a/tools/regression/fstest/tests/symlink/01.t
+++ b/tools/regression/fstest/tests/symlink/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/01.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns ENOTDIR if a component of the name2 path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/symlink/02.t b/tools/regression/fstest/tests/symlink/02.t
index 630ce8ae61431..2ab046ca54001 100644
--- a/tools/regression/fstest/tests/symlink/02.t
+++ b/tools/regression/fstest/tests/symlink/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/02.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns ENAMETOOLONG if a component of the name2 pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/symlink/03.t b/tools/regression/fstest/tests/symlink/03.t
index dc642d489a823..8023266a77526 100644
--- a/tools/regression/fstest/tests/symlink/03.t
+++ b/tools/regression/fstest/tests/symlink/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/03.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns ENAMETOOLONG if an entire length of either path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/symlink/04.t b/tools/regression/fstest/tests/symlink/04.t
index cc5e7b7f3db13..e6b1d20ae4c08 100644
--- a/tools/regression/fstest/tests/symlink/04.t
+++ b/tools/regression/fstest/tests/symlink/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/04.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns ENOENT if a component of the name2 path prefix does not exist"
 
diff --git a/tools/regression/fstest/tests/symlink/05.t b/tools/regression/fstest/tests/symlink/05.t
index c823a59401300..932eabc5b6d61 100644
--- a/tools/regression/fstest/tests/symlink/05.t
+++ b/tools/regression/fstest/tests/symlink/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/05.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns EACCES when a component of the name2 path prefix denies search permission"
 
diff --git a/tools/regression/fstest/tests/symlink/06.t b/tools/regression/fstest/tests/symlink/06.t
index 1f27818651379..0a93657ec5fb5 100644
--- a/tools/regression/fstest/tests/symlink/06.t
+++ b/tools/regression/fstest/tests/symlink/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/06.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns EACCES if the parent directory of the file to be created denies write permission"
 
diff --git a/tools/regression/fstest/tests/symlink/07.t b/tools/regression/fstest/tests/symlink/07.t
index aa60b771fe969..596df07d39114 100644
--- a/tools/regression/fstest/tests/symlink/07.t
+++ b/tools/regression/fstest/tests/symlink/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/07.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns ELOOP if too many symbolic links were encountered in translating the name2 path name"
 
diff --git a/tools/regression/fstest/tests/symlink/08.t b/tools/regression/fstest/tests/symlink/08.t
index c4843e5aaed16..55ec809c49337 100644
--- a/tools/regression/fstest/tests/symlink/08.t
+++ b/tools/regression/fstest/tests/symlink/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/08.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns EEXIST if the name2 argument already exists"
 
diff --git a/tools/regression/fstest/tests/symlink/09.t b/tools/regression/fstest/tests/symlink/09.t
index 174b5bd981a0a..6458925bcae34 100644
--- a/tools/regression/fstest/tests/symlink/09.t
+++ b/tools/regression/fstest/tests/symlink/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/09.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns EPERM if the parent directory of the file named by name2 has its immutable flag set"
 
diff --git a/tools/regression/fstest/tests/symlink/10.t b/tools/regression/fstest/tests/symlink/10.t
index a8c43bf38ad42..c7697d797c54b 100644
--- a/tools/regression/fstest/tests/symlink/10.t
+++ b/tools/regression/fstest/tests/symlink/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/10.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns EROFS if the file name2 would reside on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/symlink/11.t b/tools/regression/fstest/tests/symlink/11.t
index 045985101066b..bdf177197f3f1 100644
--- a/tools/regression/fstest/tests/symlink/11.t
+++ b/tools/regression/fstest/tests/symlink/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/11.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns ENOSPC if there are no free inodes on the file system on which the symbolic link is being created"
 
diff --git a/tools/regression/fstest/tests/symlink/12.t b/tools/regression/fstest/tests/symlink/12.t
index 8606a38acf358..2893e64c55ed0 100644
--- a/tools/regression/fstest/tests/symlink/12.t
+++ b/tools/regression/fstest/tests/symlink/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/symlink/12.t,v 1.1 2007/01/17 01:42:11 pjd Exp $
 
 desc="symlink returns EFAULT if one of the pathnames specified is outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/truncate/00.t b/tools/regression/fstest/tests/truncate/00.t
index c09f0680865d0..ad43b5353f325 100644
--- a/tools/regression/fstest/tests/truncate/00.t
+++ b/tools/regression/fstest/tests/truncate/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/00.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate descrease/increase file size"
 
diff --git a/tools/regression/fstest/tests/truncate/01.t b/tools/regression/fstest/tests/truncate/01.t
index ac504a1f51244..7e477d1ab853a 100644
--- a/tools/regression/fstest/tests/truncate/01.t
+++ b/tools/regression/fstest/tests/truncate/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/01.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/truncate/02.t b/tools/regression/fstest/tests/truncate/02.t
index e418b968455a3..b104ec63c7807 100644
--- a/tools/regression/fstest/tests/truncate/02.t
+++ b/tools/regression/fstest/tests/truncate/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/02.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/truncate/03.t b/tools/regression/fstest/tests/truncate/03.t
index 6a4cd64fb2a91..739b5f4bb9978 100644
--- a/tools/regression/fstest/tests/truncate/03.t
+++ b/tools/regression/fstest/tests/truncate/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/03.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/truncate/04.t b/tools/regression/fstest/tests/truncate/04.t
index 14f513c847955..44891ed28a4c1 100644
--- a/tools/regression/fstest/tests/truncate/04.t
+++ b/tools/regression/fstest/tests/truncate/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/04.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/fstest/tests/truncate/05.t b/tools/regression/fstest/tests/truncate/05.t
index 9aa65c84afcbd..fe5a7d5428a89 100644
--- a/tools/regression/fstest/tests/truncate/05.t
+++ b/tools/regression/fstest/tests/truncate/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/05.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/truncate/06.t b/tools/regression/fstest/tests/truncate/06.t
index 8e0ca5bd55c5e..66f73ac9b05b5 100644
--- a/tools/regression/fstest/tests/truncate/06.t
+++ b/tools/regression/fstest/tests/truncate/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/06.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EACCES if the named file is not writable by the user"
 
diff --git a/tools/regression/fstest/tests/truncate/07.t b/tools/regression/fstest/tests/truncate/07.t
index 60b8b907bf460..1954d83324fab 100644
--- a/tools/regression/fstest/tests/truncate/07.t
+++ b/tools/regression/fstest/tests/truncate/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/07.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/truncate/08.t b/tools/regression/fstest/tests/truncate/08.t
index e4ea0fa128631..6adfb69c4032f 100644
--- a/tools/regression/fstest/tests/truncate/08.t
+++ b/tools/regression/fstest/tests/truncate/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/08.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EPERM if the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/truncate/09.t b/tools/regression/fstest/tests/truncate/09.t
index 1d95c7fe918cf..735cfe5448da2 100644
--- a/tools/regression/fstest/tests/truncate/09.t
+++ b/tools/regression/fstest/tests/truncate/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/09.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EISDIR if the named file is a directory"
 
diff --git a/tools/regression/fstest/tests/truncate/10.t b/tools/regression/fstest/tests/truncate/10.t
index 2dc0b451f6945..436cc10137b64 100644
--- a/tools/regression/fstest/tests/truncate/10.t
+++ b/tools/regression/fstest/tests/truncate/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/10.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/truncate/11.t b/tools/regression/fstest/tests/truncate/11.t
index f86235b94076a..418b8f5678413 100644
--- a/tools/regression/fstest/tests/truncate/11.t
+++ b/tools/regression/fstest/tests/truncate/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/11.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns ETXTBSY the file is a pure procedure (shared text) file that is being executed"
 
diff --git a/tools/regression/fstest/tests/truncate/12.t b/tools/regression/fstest/tests/truncate/12.t
index cf6a49743e495..4091fdc84c6be 100644
--- a/tools/regression/fstest/tests/truncate/12.t
+++ b/tools/regression/fstest/tests/truncate/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/12.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EFBIG or EINVAL if the length argument was greater than the maximum file size"
 
diff --git a/tools/regression/fstest/tests/truncate/13.t b/tools/regression/fstest/tests/truncate/13.t
index 1084c43cf47fe..3076173b6db92 100644
--- a/tools/regression/fstest/tests/truncate/13.t
+++ b/tools/regression/fstest/tests/truncate/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/13.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EINVAL if the length argument was less than 0"
 
diff --git a/tools/regression/fstest/tests/truncate/14.t b/tools/regression/fstest/tests/truncate/14.t
index 53dca715237e1..67d7b4cf0f989 100644
--- a/tools/regression/fstest/tests/truncate/14.t
+++ b/tools/regression/fstest/tests/truncate/14.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/truncate/14.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="truncate returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fstest/tests/unlink/00.t b/tools/regression/fstest/tests/unlink/00.t
index af4ccbf752ab5..e0e8b618dbf7d 100644
--- a/tools/regression/fstest/tests/unlink/00.t
+++ b/tools/regression/fstest/tests/unlink/00.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/00.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink removes regular files, symbolic links, fifos and sockets"
 
diff --git a/tools/regression/fstest/tests/unlink/01.t b/tools/regression/fstest/tests/unlink/01.t
index 13fa0fe4eab6a..41ca70edabfdf 100644
--- a/tools/regression/fstest/tests/unlink/01.t
+++ b/tools/regression/fstest/tests/unlink/01.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/01.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns ENOTDIR if a component of the path prefix is not a directory"
 
diff --git a/tools/regression/fstest/tests/unlink/02.t b/tools/regression/fstest/tests/unlink/02.t
index 0d4c57925055d..af9a386473c09 100644
--- a/tools/regression/fstest/tests/unlink/02.t
+++ b/tools/regression/fstest/tests/unlink/02.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/02.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns ENAMETOOLONG if a component of a pathname exceeded 255 characters"
 
diff --git a/tools/regression/fstest/tests/unlink/03.t b/tools/regression/fstest/tests/unlink/03.t
index 2c62eef673e02..813ace283b1d3 100644
--- a/tools/regression/fstest/tests/unlink/03.t
+++ b/tools/regression/fstest/tests/unlink/03.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/03.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns ENAMETOOLONG if an entire path name exceeded 1023 characters"
 
diff --git a/tools/regression/fstest/tests/unlink/04.t b/tools/regression/fstest/tests/unlink/04.t
index 7885f27858ffa..d6746d3089857 100644
--- a/tools/regression/fstest/tests/unlink/04.t
+++ b/tools/regression/fstest/tests/unlink/04.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/04.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns ENOENT if the named file does not exist"
 
diff --git a/tools/regression/fstest/tests/unlink/05.t b/tools/regression/fstest/tests/unlink/05.t
index c30c3537e50d3..7593e7f9a4d8a 100644
--- a/tools/regression/fstest/tests/unlink/05.t
+++ b/tools/regression/fstest/tests/unlink/05.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/05.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EACCES when search permission is denied for a component of the path prefix"
 
diff --git a/tools/regression/fstest/tests/unlink/06.t b/tools/regression/fstest/tests/unlink/06.t
index 3a64aa27509f0..e063c6a57e9ba 100644
--- a/tools/regression/fstest/tests/unlink/06.t
+++ b/tools/regression/fstest/tests/unlink/06.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/06.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EACCES when write permission is denied on the directory containing the link to be removed"
 
diff --git a/tools/regression/fstest/tests/unlink/07.t b/tools/regression/fstest/tests/unlink/07.t
index ea9d2a345df1b..48dfd4a975538 100644
--- a/tools/regression/fstest/tests/unlink/07.t
+++ b/tools/regression/fstest/tests/unlink/07.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/07.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns ELOOP if too many symbolic links were encountered in translating the pathname"
 
diff --git a/tools/regression/fstest/tests/unlink/08.t b/tools/regression/fstest/tests/unlink/08.t
index 5b0f03b9bc4a5..cd2cbf8db565f 100644
--- a/tools/regression/fstest/tests/unlink/08.t
+++ b/tools/regression/fstest/tests/unlink/08.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/08.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EPERM if the named file is a directory"
 
diff --git a/tools/regression/fstest/tests/unlink/09.t b/tools/regression/fstest/tests/unlink/09.t
index c069b0dc1e44c..245987d086510 100644
--- a/tools/regression/fstest/tests/unlink/09.t
+++ b/tools/regression/fstest/tests/unlink/09.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/09.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EPERM if the named file has its immutable, undeletable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/unlink/10.t b/tools/regression/fstest/tests/unlink/10.t
index cf4188a59ab19..ab1ee1f2a23fe 100644
--- a/tools/regression/fstest/tests/unlink/10.t
+++ b/tools/regression/fstest/tests/unlink/10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/10.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EPERM if the parent directory of the named file has its immutable or append-only flag set"
 
diff --git a/tools/regression/fstest/tests/unlink/11.t b/tools/regression/fstest/tests/unlink/11.t
index 68084ec71f04f..bc7fa368dcff7 100644
--- a/tools/regression/fstest/tests/unlink/11.t
+++ b/tools/regression/fstest/tests/unlink/11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/11.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EACCES or EPERM if the directory containing the file is marked sticky, and neither the containing directory nor the file to be removed are owned by the effective user ID"
 
diff --git a/tools/regression/fstest/tests/unlink/12.t b/tools/regression/fstest/tests/unlink/12.t
index 65a3aaff5cb1a..eebef25cd1bb8 100644
--- a/tools/regression/fstest/tests/unlink/12.t
+++ b/tools/regression/fstest/tests/unlink/12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/12.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EROFS if the named file resides on a read-only file system"
 
diff --git a/tools/regression/fstest/tests/unlink/13.t b/tools/regression/fstest/tests/unlink/13.t
index da5e718d58de7..984094110f09e 100644
--- a/tools/regression/fstest/tests/unlink/13.t
+++ b/tools/regression/fstest/tests/unlink/13.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fstest/tests/unlink/13.t,v 1.1 2007/01/17 01:42:12 pjd Exp $
 
 desc="unlink returns EFAULT if the path argument points outside the process's allocated address space"
 
diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile
index 687e7dda9a164..3fdfbedfeeed5 100644
--- a/tools/regression/fsx/Makefile
+++ b/tools/regression/fsx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/fsx/Makefile,v 1.3 2004/12/21 08:47:20 ru Exp $
 
 PROG=	fsx
 
diff --git a/tools/regression/fsx/fsx.c b/tools/regression/fsx/fsx.c
index 7da745bfe3d1c..df7281d0cfd2d 100644
--- a/tools/regression/fsx/fsx.c
+++ b/tools/regression/fsx/fsx.c
@@ -36,7 +36,7 @@
  *
  *	Updated license to APSL 2.0, 2004/7/27 - Jordan Hubbard
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/fsx/fsx.c,v 1.5 2007/06/26 13:51:53 delphij Exp $
  *
  */
 
diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile
index 2506e017a3bdd..6e5eeb2d2ec85 100644
--- a/tools/regression/gaithrstress/Makefile
+++ b/tools/regression/gaithrstress/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/gaithrstress/Makefile,v 1.3 2004/12/21 08:47:20 ru Exp $
 
 PROG=	gaithrstress
 LDADD+=	-pthread
diff --git a/tools/regression/gaithrstress/gaithrstress.c b/tools/regression/gaithrstress/gaithrstress.c
index 023e0b57355b0..ed00af9ed3886 100644
--- a/tools/regression/gaithrstress/gaithrstress.c
+++ b/tools/regression/gaithrstress/gaithrstress.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/gaithrstress/gaithrstress.c,v 1.3 2004/02/21 22:42:54 green Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/tools/regression/geom/ConfCmp/ConfCmp.c
index 1ddf502f9110b..9298f028fc200 100644
--- a/tools/regression/geom/ConfCmp/ConfCmp.c
+++ b/tools/regression/geom/ConfCmp/ConfCmp.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/geom/ConfCmp/ConfCmp.c,v 1.9 2003/03/04 19:20:52 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
index 3be5e70f1dfea..49be2096e37c5 100644
--- a/tools/regression/geom/ConfCmp/Makefile
+++ b/tools/regression/geom/ConfCmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/ConfCmp/Makefile,v 1.8 2004/12/21 08:46:55 ru Exp $
 
 PROG=	ConfCmp
 SRCS+=	ConfCmp.c
diff --git a/tools/regression/geom/ConfCmp/a1.conf b/tools/regression/geom/ConfCmp/a1.conf
index 94171cdacb10e..89803598e75f4 100644
--- a/tools/regression/geom/ConfCmp/a1.conf
+++ b/tools/regression/geom/ConfCmp/a1.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1a.conf b/tools/regression/geom/ConfCmp/a1a.conf
index 01110f39f8af2..2d0bfac03cf64 100644
--- a/tools/regression/geom/ConfCmp/a1a.conf
+++ b/tools/regression/geom/ConfCmp/a1a.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1a.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x90712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1b.conf b/tools/regression/geom/ConfCmp/a1b.conf
index 46f423b28ec03..b974a43ac7f6b 100644
--- a/tools/regression/geom/ConfCmp/a1b.conf
+++ b/tools/regression/geom/ConfCmp/a1b.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1b.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1c.conf b/tools/regression/geom/ConfCmp/a1c.conf
index 1b5a2b939c2ea..8c102fe2282e3 100644
--- a/tools/regression/geom/ConfCmp/a1c.conf
+++ b/tools/regression/geom/ConfCmp/a1c.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1c.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a1d.conf b/tools/regression/geom/ConfCmp/a1d.conf
index a9063c554b358..e647487c21b80 100644
--- a/tools/regression/geom/ConfCmp/a1d.conf
+++ b/tools/regression/geom/ConfCmp/a1d.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a1d.conf,v 1.1 2002/03/17 18:53:44 phk Exp $</FreeBSD>
   <method>
     <ref>0x80712c0</ref>
     <name>DEV-method</name>
diff --git a/tools/regression/geom/ConfCmp/a2.conf b/tools/regression/geom/ConfCmp/a2.conf
index 6688fd1ea4514..4fffdd7435d8d 100644
--- a/tools/regression/geom/ConfCmp/a2.conf
+++ b/tools/regression/geom/ConfCmp/a2.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2.conf,v 1.2 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/ConfCmp/a2a.conf b/tools/regression/geom/ConfCmp/a2a.conf
index 3d35fe9d32c9a..54293025c0ba6 100644
--- a/tools/regression/geom/ConfCmp/a2a.conf
+++ b/tools/regression/geom/ConfCmp/a2a.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2a.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x90740e0">
     <name>DEV-class</name>
     <geom id="0x90bce00">
diff --git a/tools/regression/geom/ConfCmp/a2b.conf b/tools/regression/geom/ConfCmp/a2b.conf
index 58c0e15b64f10..cc6decac53fbe 100644
--- a/tools/regression/geom/ConfCmp/a2b.conf
+++ b/tools/regression/geom/ConfCmp/a2b.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2b.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/ConfCmp/a2c.conf b/tools/regression/geom/ConfCmp/a2c.conf
index 381c4106a52f5..6c7cad3010131 100644
--- a/tools/regression/geom/ConfCmp/a2c.conf
+++ b/tools/regression/geom/ConfCmp/a2c.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2c.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/ConfCmp/a2d.conf b/tools/regression/geom/ConfCmp/a2d.conf
index bccaed5e43fab..ff519563a1007 100644
--- a/tools/regression/geom/ConfCmp/a2d.conf
+++ b/tools/regression/geom/ConfCmp/a2d.conf
@@ -1,5 +1,5 @@
 <mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/ConfCmp/a2d.conf,v 1.1 2002/04/24 20:33:04 phk Exp $</FreeBSD>
   <class id="0x80740e0">
     <name>DEV-class</name>
     <geom id="0x80bce00">
diff --git a/tools/regression/geom/Data/disk.alpha.da0.xml b/tools/regression/geom/Data/disk.alpha.da0.xml
index 670fcc38d596f..57b1ea9db8646 100644
--- a/tools/regression/geom/Data/disk.alpha.da0.xml
+++ b/tools/regression/geom/Data/disk.alpha.da0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.alpha.da0.xml,v 1.1 2002/03/27 21:21:29 phk Exp $</FreeBSD>
   <comment>
     Yet an alpha disklabel.
   </comment>
diff --git a/tools/regression/geom/Data/disk.alpha2.da0.xml b/tools/regression/geom/Data/disk.alpha2.da0.xml
index 5b341b174d6db..933c369446412 100644
--- a/tools/regression/geom/Data/disk.alpha2.da0.xml
+++ b/tools/regression/geom/Data/disk.alpha2.da0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.alpha2.da0.xml,v 1.1 2002/03/27 21:21:29 phk Exp $</FreeBSD>
   <comment>
     alpha label which O'brien says blows up libdisk
   </comment>
diff --git a/tools/regression/geom/Data/disk.apple.xml b/tools/regression/geom/Data/disk.apple.xml
index ecdd5236497ce..b9fac69013ba3 100644
--- a/tools/regression/geom/Data/disk.apple.xml
+++ b/tools/regression/geom/Data/disk.apple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.apple.xml,v 1.1 2003/01/31 18:31:47 phk Exp $</FreeBSD>
   <sectorsize>512</sectorsize>
   <mediasize>366530560</mediasize>
   <fwsectors>0</fwsectors>
diff --git a/tools/regression/geom/Data/disk.beast.da0.xml b/tools/regression/geom/Data/disk.beast.da0.xml
index 96ad5f74ddef7..cf51f17ac215b 100644
--- a/tools/regression/geom/Data/disk.beast.da0.xml
+++ b/tools/regression/geom/Data/disk.beast.da0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.beast.da0.xml,v 1.1 2002/03/24 13:54:01 phk Exp $
     alpha BSD label from beast.freebsd.org
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.critter.ad0.xml b/tools/regression/geom/Data/disk.critter.ad0.xml
index 9e93b24143459..dcb987827a8b9 100644
--- a/tools/regression/geom/Data/disk.critter.ad0.xml
+++ b/tools/regression/geom/Data/disk.critter.ad0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.critter.ad0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     This image contains the MBR and disklabel sectors from my Asus M1300
     laptop.
   </comment>
diff --git a/tools/regression/geom/Data/disk.empty.flp.xml b/tools/regression/geom/Data/disk.empty.flp.xml
index 88c603ac95677..128ede7730707 100644
--- a/tools/regression/geom/Data/disk.empty.flp.xml
+++ b/tools/regression/geom/Data/disk.empty.flp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.empty.flp.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     An empty floppy disk
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.far.ad0.xml b/tools/regression/geom/Data/disk.far.ad0.xml
index 0a8d3ca9379b2..de0beb17de9ba 100644
--- a/tools/regression/geom/Data/disk.far.ad0.xml
+++ b/tools/regression/geom/Data/disk.far.ad0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.far.ad0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A Windows laptop.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.flat.da1.xml b/tools/regression/geom/Data/disk.flat.da1.xml
index 2302a7c66c993..81eae7e63c43c 100644
--- a/tools/regression/geom/Data/disk.flat.da1.xml
+++ b/tools/regression/geom/Data/disk.flat.da1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.flat.da1.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     This image contains an interesting setup: there is an MBR+BSD
     but also another BSD at sector one which is valid but bogus.
   </comment>
diff --git a/tools/regression/geom/Data/disk.kern.flp.xml b/tools/regression/geom/Data/disk.kern.flp.xml
index 6640c4875167c..5ed7adcf9ff12 100644
--- a/tools/regression/geom/Data/disk.kern.flp.xml
+++ b/tools/regression/geom/Data/disk.kern.flp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.kern.flp.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A FreeBSD kern.flp image.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.msdos.ext.xml b/tools/regression/geom/Data/disk.msdos.ext.xml
index 868a88f782379..36deb5faf6c23 100644
--- a/tools/regression/geom/Data/disk.msdos.ext.xml
+++ b/tools/regression/geom/Data/disk.msdos.ext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.msdos.ext.xml,v 1.2 2002/09/06 08:41:48 phk Exp $
     A MSDOS 6.22 disk with maximal number of extended partitions.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.msdos.flp.xml b/tools/regression/geom/Data/disk.msdos.flp.xml
index d057d1ac75d50..eaebf39f7baac 100644
--- a/tools/regression/geom/Data/disk.msdos.flp.xml
+++ b/tools/regression/geom/Data/disk.msdos.flp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.msdos.flp.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A MSDOS floppy image.
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.pc98.wdc0.xml b/tools/regression/geom/Data/disk.pc98.wdc0.xml
index 6bae97fd2d923..d69a0ea59cbe7 100644
--- a/tools/regression/geom/Data/disk.pc98.wdc0.xml
+++ b/tools/regression/geom/Data/disk.pc98.wdc0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
+  <FreeBSD>$FreeBSD: src/tools/regression/geom/Data/disk.pc98.wdc0.xml,v 1.2 2002/03/28 21:42:14 phk Exp $</FreeBSD>
   <comment>
     A PC98 disklabel from Warner
   </comment>
diff --git a/tools/regression/geom/Data/disk.sun.da0.xml b/tools/regression/geom/Data/disk.sun.da0.xml
index 826581f086b02..2fb2bfdfdf451 100644
--- a/tools/regression/geom/Data/disk.sun.da0.xml
+++ b/tools/regression/geom/Data/disk.sun.da0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.sun.da0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A Solaris 8 disklabel
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.sun.da1.xml b/tools/regression/geom/Data/disk.sun.da1.xml
index 0aac8e584d4ad..cb59b18c4b7a6 100644
--- a/tools/regression/geom/Data/disk.sun.da1.xml
+++ b/tools/regression/geom/Data/disk.sun.da1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$	
+    $FreeBSD: src/tools/regression/geom/Data/disk.sun.da1.xml,v 1.1 2002/03/17 18:53:45 phk Exp $	
     A Solaris 8 disklabel
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/Data/disk.typo.ad0.xml b/tools/regression/geom/Data/disk.typo.ad0.xml
index 56383abf1c4cc..8bc7a196bf2c7 100644
--- a/tools/regression/geom/Data/disk.typo.ad0.xml
+++ b/tools/regression/geom/Data/disk.typo.ad0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <DISKIMAGE>
   <comment>
-    $FreeBSD$
+    $FreeBSD: src/tools/regression/geom/Data/disk.typo.ad0.xml,v 1.1 2002/03/17 18:53:45 phk Exp $
     A multislice FreeBSD disk
   </comment>
   <sectorsize>512</sectorsize>
diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile
index 7bf18af772e27..677e71fdaa723 100644
--- a/tools/regression/geom/MdLoad/Makefile
+++ b/tools/regression/geom/MdLoad/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/MdLoad/Makefile,v 1.5 2004/12/21 08:47:21 ru Exp $
 
 PROG=	MdLoad
 DPADD=	${LIBSBUF} ${LIBBSDXML}
diff --git a/tools/regression/geom/MdLoad/MdLoad.c b/tools/regression/geom/MdLoad/MdLoad.c
index 710d7d385ed59..ff1b4a86c5c20 100644
--- a/tools/regression/geom/MdLoad/MdLoad.c
+++ b/tools/regression/geom/MdLoad/MdLoad.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/geom/MdLoad/MdLoad.c,v 1.1 2003/04/09 12:34:20 phk Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/geom/Ref/disk.alpha.da0.xml b/tools/regression/geom/Ref/disk.alpha.da0.xml
index a300f0d5734d6..d7284e78f4ce5 100644
--- a/tools/regression/geom/Ref/disk.alpha.da0.xml
+++ b/tools/regression/geom/Ref/disk.alpha.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.alpha.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	251658240	491520
 /dev/md34b	512	1086291968	2121664
diff --git a/tools/regression/geom/Ref/disk.alpha2.da0.xml b/tools/regression/geom/Ref/disk.alpha2.da0.xml
index 7ef7573e729e8..388505796fe42 100644
--- a/tools/regression/geom/Ref/disk.alpha2.da0.xml
+++ b/tools/regression/geom/Ref/disk.alpha2.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.alpha2.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	24675840	48195
 /dev/md34b	512	4178442240	8161020
diff --git a/tools/regression/geom/Ref/disk.apple.xml b/tools/regression/geom/Ref/disk.apple.xml
index a2a0f984b47ec..110b55443d72e 100644
--- a/tools/regression/geom/Ref/disk.apple.xml
+++ b/tools/regression/geom/Ref/disk.apple.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.apple.xml,v 1.2 2003/04/09 13:36:28 phk Exp $
 /dev/md34	512	366530560	715880
 /dev/md34s1	512	366481408	715784
 /dev/md34s2	512	32256	63
diff --git a/tools/regression/geom/Ref/disk.beast.da0.xml b/tools/regression/geom/Ref/disk.beast.da0.xml
index b6aa32e2e031f..2777cffd69d04 100644
--- a/tools/regression/geom/Ref/disk.beast.da0.xml
+++ b/tools/regression/geom/Ref/disk.beast.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.beast.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	4064280576	7938048
 /dev/md34b	512	270925824	529152
diff --git a/tools/regression/geom/Ref/disk.critter.ad0.xml b/tools/regression/geom/Ref/disk.critter.ad0.xml
index 0620bfebb1a44..a8440f5071495 100644
--- a/tools/regression/geom/Ref/disk.critter.ad0.xml
+++ b/tools/regression/geom/Ref/disk.critter.ad0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.critter.ad0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	2671841280	5218440
 /dev/md34s1	512	20003848704	39070017
 /dev/md34s1a	512	1073741824	2097152
diff --git a/tools/regression/geom/Ref/disk.empty.flp.xml b/tools/regression/geom/Ref/disk.empty.flp.xml
index 659b4167ff60a..c5f987fcfb31b 100644
--- a/tools/regression/geom/Ref/disk.empty.flp.xml
+++ b/tools/regression/geom/Ref/disk.empty.flp.xml
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.empty.flp.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	1474560	2880	80	2	18
diff --git a/tools/regression/geom/Ref/disk.far.ad0.xml b/tools/regression/geom/Ref/disk.far.ad0.xml
index 629816a448cde..21c3d60200d77 100644
--- a/tools/regression/geom/Ref/disk.far.ad0.xml
+++ b/tools/regression/geom/Ref/disk.far.ad0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.far.ad0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5632	11
 /dev/md34s1	512	296821760	579730
 /dev/md34s2	512	4564740096	8915508
diff --git a/tools/regression/geom/Ref/disk.flat.da1.xml b/tools/regression/geom/Ref/disk.flat.da1.xml
index 89e2df4941af8..94af3345e81b9 100644
--- a/tools/regression/geom/Ref/disk.flat.da1.xml
+++ b/tools/regression/geom/Ref/disk.flat.da1.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.flat.da1.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	37888	74
 /dev/md34a	512	37748736	73728
 /dev/md34b	512	268435456	524288
diff --git a/tools/regression/geom/Ref/disk.kern.flp.xml b/tools/regression/geom/Ref/disk.kern.flp.xml
index 6ff67a03c1355..8009efa8b5521 100644
--- a/tools/regression/geom/Ref/disk.kern.flp.xml
+++ b/tools/regression/geom/Ref/disk.kern.flp.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.kern.flp.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5632	11
 /dev/md34a	512	1474560	2880
 /dev/md34b	512	1474560	2880
diff --git a/tools/regression/geom/Ref/disk.msdos.ext.xml b/tools/regression/geom/Ref/disk.msdos.ext.xml
index dc2aced401573..2d27fe57622ea 100644
--- a/tools/regression/geom/Ref/disk.msdos.ext.xml
+++ b/tools/regression/geom/Ref/disk.msdos.ext.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.msdos.ext.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	2327759360	4546405
 /dev/md34s1	512	2146765824	4192902
 /dev/md34s10	512	8193024	16002
diff --git a/tools/regression/geom/Ref/disk.msdos.flp.xml b/tools/regression/geom/Ref/disk.msdos.flp.xml
index c176c587ff433..9bc043f3fa08d 100644
--- a/tools/regression/geom/Ref/disk.msdos.flp.xml
+++ b/tools/regression/geom/Ref/disk.msdos.flp.xml
@@ -1,2 +1,2 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.msdos.flp.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5632	11
diff --git a/tools/regression/geom/Ref/disk.pc98.wdc0.xml b/tools/regression/geom/Ref/disk.pc98.wdc0.xml
index 5ffb0c98d86fd..33bc9d51602c6 100644
--- a/tools/regression/geom/Ref/disk.pc98.wdc0.xml
+++ b/tools/regression/geom/Ref/disk.pc98.wdc0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.pc98.wdc0.xml,v 1.2 2003/04/09 13:36:28 phk Exp $
 /dev/md34	512	75264	147	1	8	17
 /dev/md34s1	512	1626603520	3176960	23360	8	17
 /dev/md34s1a	512	78643200	153600	1129	8	17
diff --git a/tools/regression/geom/Ref/disk.sun.da0.xml b/tools/regression/geom/Ref/disk.sun.da0.xml
index 15b97c821b124..9a5399e002492 100644
--- a/tools/regression/geom/Ref/disk.sun.da0.xml
+++ b/tools/regression/geom/Ref/disk.sun.da0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.sun.da0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	1529708544	2987712
 /dev/md34b	512	539320320	1053360
diff --git a/tools/regression/geom/Ref/disk.sun.da1.xml b/tools/regression/geom/Ref/disk.sun.da1.xml
index 004771be96e73..b971d32e8b1d8 100644
--- a/tools/regression/geom/Ref/disk.sun.da1.xml
+++ b/tools/regression/geom/Ref/disk.sun.da1.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.sun.da1.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	5120	10
 /dev/md34a	512	262967296	513608
 /dev/md34b	512	1075994624	2101552
diff --git a/tools/regression/geom/Ref/disk.typo.ad0.xml b/tools/regression/geom/Ref/disk.typo.ad0.xml
index 6d537ddc26507..756caa807a1e0 100644
--- a/tools/regression/geom/Ref/disk.typo.ad0.xml
+++ b/tools/regression/geom/Ref/disk.typo.ad0.xml
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/geom/Ref/disk.typo.ad0.xml,v 1.1 2003/04/09 12:40:12 phk Exp $
 /dev/md34	512	8585262592	16768091
 /dev/md34s1	512	3220406784	6289857
 /dev/md34s1a	512	104857600	204800
diff --git a/tools/regression/geom/RunTest.sh b/tools/regression/geom/RunTest.sh
index 46a14b4ab828b..2358f2df1d504 100644
--- a/tools/regression/geom/RunTest.sh
+++ b/tools/regression/geom/RunTest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/RunTest.sh,v 1.2 2003/04/13 09:06:39 phk Exp $
 
 MD=34
 TMP=/tmp/$$
diff --git a/tools/regression/geom/RunTest.t b/tools/regression/geom/RunTest.t
index 96a353084bc90..76feeea3ad381 100644
--- a/tools/regression/geom/RunTest.t
+++ b/tools/regression/geom/RunTest.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom/RunTest.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 MD=34
 TMP=/tmp/$$
diff --git a/tools/regression/geom_concat/conf.sh b/tools/regression/geom_concat/conf.sh
index 0eaf1baac4640..3d3838b1bde33 100644
--- a/tools/regression/geom_concat/conf.sh
+++ b/tools/regression/geom_concat/conf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/conf.sh,v 1.1 2005/12/07 01:24:25 pjd Exp $
 
 name="test"
 class="concat"
diff --git a/tools/regression/geom_concat/test-1.t b/tools/regression/geom_concat/test-1.t
index 8984f79b1045f..1333df2d39780 100644
--- a/tools/regression/geom_concat/test-1.t
+++ b/tools/regression/geom_concat/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/test-1.t,v 1.2 2005/12/07 01:24:25 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_concat/test-2.t b/tools/regression/geom_concat/test-2.t
index 445d9bc712f94..05c18635a6819 100644
--- a/tools/regression/geom_concat/test-2.t
+++ b/tools/regression/geom_concat/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_concat/test-2.t,v 1.2 2005/12/07 01:24:25 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_eli/attach-d.t b/tools/regression/geom_eli/attach-d.t
index de4602f705ef0..1b4d5825f553c 100644
--- a/tools/regression/geom_eli/attach-d.t
+++ b/tools/regression/geom_eli/attach-d.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/attach-d.t,v 1.1 2005/07/27 22:27:30 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/configure-b-B.t b/tools/regression/geom_eli/configure-b-B.t
index b58138bcb3ab3..ac07867d0d690 100644
--- a/tools/regression/geom_eli/configure-b-B.t
+++ b/tools/regression/geom_eli/configure-b-B.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/configure-b-B.t,v 1.1 2006/09/16 10:44:33 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/delkey.t b/tools/regression/geom_eli/delkey.t
index 2a9ae409feaef..1bda4591026e6 100644
--- a/tools/regression/geom_eli/delkey.t
+++ b/tools/regression/geom_eli/delkey.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/delkey.t,v 1.1 2005/07/27 22:27:30 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/detach-l.t b/tools/regression/geom_eli/detach-l.t
index ae6c3b27eb197..4413f3fc57902 100644
--- a/tools/regression/geom_eli/detach-l.t
+++ b/tools/regression/geom_eli/detach-l.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/detach-l.t,v 1.1 2005/07/27 22:27:30 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/init-a.t b/tools/regression/geom_eli/init-a.t
index e06881efc2e1f..a6ab972d4a935 100644
--- a/tools/regression/geom_eli/init-a.t
+++ b/tools/regression/geom_eli/init-a.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/init-a.t,v 1.2 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/init-i-P.t b/tools/regression/geom_eli/init-i-P.t
index a77c1c6db38e0..af8a08c3aedf3 100644
--- a/tools/regression/geom_eli/init-i-P.t
+++ b/tools/regression/geom_eli/init-i-P.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/init-i-P.t,v 1.1 2006/02/12 02:07:56 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/init.t b/tools/regression/geom_eli/init.t
index 13a5e2d7e1c61..b34a36eea1aea 100644
--- a/tools/regression/geom_eli/init.t
+++ b/tools/regression/geom_eli/init.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/init.t,v 1.3 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/integrity-copy.t b/tools/regression/geom_eli/integrity-copy.t
index 97014e05c97b3..88ab40ba5c8c5 100644
--- a/tools/regression/geom_eli/integrity-copy.t
+++ b/tools/regression/geom_eli/integrity-copy.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/integrity-copy.t,v 1.2 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/integrity-data.t b/tools/regression/geom_eli/integrity-data.t
index ea86039effe75..9d9290d61c2b2 100644
--- a/tools/regression/geom_eli/integrity-data.t
+++ b/tools/regression/geom_eli/integrity-data.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/integrity-data.t,v 1.2 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/integrity-hmac.t b/tools/regression/geom_eli/integrity-hmac.t
index bc8e3c1b40d49..6f2b5c226d55e 100644
--- a/tools/regression/geom_eli/integrity-hmac.t
+++ b/tools/regression/geom_eli/integrity-hmac.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/integrity-hmac.t,v 1.2 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/kill.t b/tools/regression/geom_eli/kill.t
index ecd910af07f4f..48ac766e2699a 100644
--- a/tools/regression/geom_eli/kill.t
+++ b/tools/regression/geom_eli/kill.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/kill.t,v 1.1 2005/07/27 22:27:30 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/nokey.t b/tools/regression/geom_eli/nokey.t
index c2cbecdf0cab6..dc9d931da5c3d 100644
--- a/tools/regression/geom_eli/nokey.t
+++ b/tools/regression/geom_eli/nokey.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/nokey.t,v 1.2 2006/05/01 09:12:52 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/onetime-a.t b/tools/regression/geom_eli/onetime-a.t
index bb69f7b317874..d7837baaedc8e 100644
--- a/tools/regression/geom_eli/onetime-a.t
+++ b/tools/regression/geom_eli/onetime-a.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/onetime-a.t,v 1.2 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/onetime-d.t b/tools/regression/geom_eli/onetime-d.t
index d49cb642e6438..5a7b21c2ec0f0 100644
--- a/tools/regression/geom_eli/onetime-d.t
+++ b/tools/regression/geom_eli/onetime-d.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/onetime-d.t,v 1.1 2005/07/27 22:27:30 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/onetime.t b/tools/regression/geom_eli/onetime.t
index b0ecbf3465568..3e51ae33b0d89 100644
--- a/tools/regression/geom_eli/onetime.t
+++ b/tools/regression/geom_eli/onetime.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/onetime.t,v 1.3 2007/09/01 06:33:02 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/readonly.t b/tools/regression/geom_eli/readonly.t
index f92e9345fdc18..206934ae88686 100644
--- a/tools/regression/geom_eli/readonly.t
+++ b/tools/regression/geom_eli/readonly.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/readonly.t,v 1.1 2006/09/19 11:28:06 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_eli/setkey.t b/tools/regression/geom_eli/setkey.t
index a219188b7b463..499c32ea5e13e 100644
--- a/tools/regression/geom_eli/setkey.t
+++ b/tools/regression/geom_eli/setkey.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_eli/setkey.t,v 1.1 2005/07/27 22:27:30 pjd Exp $
 
 base=`basename $0`
 no=45
diff --git a/tools/regression/geom_gate/Makefile b/tools/regression/geom_gate/Makefile
index c5c24adaa4dcf..7cddc706f7ae3 100644
--- a/tools/regression/geom_gate/Makefile
+++ b/tools/regression/geom_gate/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/Makefile,v 1.1 2004/05/03 18:29:54 pjd Exp $
 #
 # Regression tests for geom_gate.
 #
diff --git a/tools/regression/geom_gate/runtests.sh b/tools/regression/geom_gate/runtests.sh
index 38089c5daedf8..f2e0c519f666d 100644
--- a/tools/regression/geom_gate/runtests.sh
+++ b/tools/regression/geom_gate/runtests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/runtests.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 dir=`dirname $0`
 
diff --git a/tools/regression/geom_gate/test-1.sh b/tools/regression/geom_gate/test-1.sh
index 44a49606ff4c2..f7c55e2550942 100644
--- a/tools/regression/geom_gate/test-1.sh
+++ b/tools/regression/geom_gate/test-1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-1.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-1.t b/tools/regression/geom_gate/test-1.t
index 279e316336176..766c6452d43d5 100644
--- a/tools/regression/geom_gate/test-1.t
+++ b/tools/regression/geom_gate/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-1.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-2.sh b/tools/regression/geom_gate/test-2.sh
index 498ac45d005e3..3f174f153d488 100644
--- a/tools/regression/geom_gate/test-2.sh
+++ b/tools/regression/geom_gate/test-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-2.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-2.t b/tools/regression/geom_gate/test-2.t
index 2e5e254400640..210e2c10445db 100644
--- a/tools/regression/geom_gate/test-2.t
+++ b/tools/regression/geom_gate/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-2.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-3.sh b/tools/regression/geom_gate/test-3.sh
index ca73a5a26ba09..2ea33c67bab8f 100644
--- a/tools/regression/geom_gate/test-3.sh
+++ b/tools/regression/geom_gate/test-3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-3.sh,v 1.1 2004/05/03 18:29:54 pjd Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gate/test-3.t b/tools/regression/geom_gate/test-3.t
index ba2b3c7de3436..69e68a7da7a11 100644
--- a/tools/regression/geom_gate/test-3.t
+++ b/tools/regression/geom_gate/test-3.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gate/test-3.t,v 1.1 2004/11/11 19:47:50 nik Exp $
 
 base=`basename $0`
 us=45
diff --git a/tools/regression/geom_gpt/gctl.t b/tools/regression/geom_gpt/gctl.t
index f99e6d8586fb7..49403fe97912a 100644
--- a/tools/regression/geom_gpt/gctl.t
+++ b/tools/regression/geom_gpt/gctl.t
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_gpt/gctl.t,v 1.6 2006/04/10 04:13:44 marcel Exp $
 
 my $srcdir = `dirname $0`;
 chomp $srcdir;
diff --git a/tools/regression/geom_gpt/test.c b/tools/regression/geom_gpt/test.c
index d750d30e8d55a..d2cb2d9530253 100644
--- a/tools/regression/geom_gpt/test.c
+++ b/tools/regression/geom_gpt/test.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/geom_gpt/test.c,v 1.3 2006/04/10 04:07:20 marcel Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
diff --git a/tools/regression/geom_mirror/conf.sh b/tools/regression/geom_mirror/conf.sh
index 8a60a16360ee2..0e6d46978be12 100644
--- a/tools/regression/geom_mirror/conf.sh
+++ b/tools/regression/geom_mirror/conf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/conf.sh,v 1.1 2005/12/07 01:27:23 pjd Exp $
 
 name="test"
 class="mirror"
diff --git a/tools/regression/geom_mirror/test-1.t b/tools/regression/geom_mirror/test-1.t
index b07a8d1cb1de1..811fdbe846bd3 100644
--- a/tools/regression/geom_mirror/test-1.t
+++ b/tools/regression/geom_mirror/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-1.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_mirror/test-2.t b/tools/regression/geom_mirror/test-2.t
index 3fb08224caf76..437e1429e6cd5 100644
--- a/tools/regression/geom_mirror/test-2.t
+++ b/tools/regression/geom_mirror/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-2.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_mirror/test-3.t b/tools/regression/geom_mirror/test-3.t
index 5bdd2ab354b83..8a7855a19bf57 100644
--- a/tools/regression/geom_mirror/test-3.t
+++ b/tools/regression/geom_mirror/test-3.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-3.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_mirror/test-4.t b/tools/regression/geom_mirror/test-4.t
index 0786bdb1fadbf..a5897497ee385 100644
--- a/tools/regression/geom_mirror/test-4.t
+++ b/tools/regression/geom_mirror/test-4.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-4.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_mirror/test-5.t b/tools/regression/geom_mirror/test-5.t
index 5b0a5ed9f23f5..801b4bb7077f6 100644
--- a/tools/regression/geom_mirror/test-5.t
+++ b/tools/regression/geom_mirror/test-5.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-5.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_mirror/test-6.t b/tools/regression/geom_mirror/test-6.t
index ec86d06f79e29..448dd67d5c194 100644
--- a/tools/regression/geom_mirror/test-6.t
+++ b/tools/regression/geom_mirror/test-6.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-6.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_mirror/test-7.t b/tools/regression/geom_mirror/test-7.t
index c911c03c3df19..3c9cf0a379e65 100644
--- a/tools/regression/geom_mirror/test-7.t
+++ b/tools/regression/geom_mirror/test-7.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_mirror/test-7.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_nop/conf.sh b/tools/regression/geom_nop/conf.sh
index 0dc979713c1da..b5675e850b0c9 100644
--- a/tools/regression/geom_nop/conf.sh
+++ b/tools/regression/geom_nop/conf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/conf.sh,v 1.1 2005/12/07 01:27:23 pjd Exp $
 
 class="nop"
 base=`basename $0`
diff --git a/tools/regression/geom_nop/test-1.t b/tools/regression/geom_nop/test-1.t
index f08f71da8bce3..e6bc3cf1dc266 100644
--- a/tools/regression/geom_nop/test-1.t
+++ b/tools/regression/geom_nop/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/test-1.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_nop/test-2.t b/tools/regression/geom_nop/test-2.t
index e0ddb17abf86d..90a2d9a46a6c3 100644
--- a/tools/regression/geom_nop/test-2.t
+++ b/tools/regression/geom_nop/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_nop/test-2.t,v 1.2 2005/12/07 01:27:23 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/conf.sh b/tools/regression/geom_raid3/conf.sh
index 93e7deaf1c732..37a4bc068a15b 100644
--- a/tools/regression/geom_raid3/conf.sh
+++ b/tools/regression/geom_raid3/conf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/conf.sh,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 name="test"
 class="raid3"
diff --git a/tools/regression/geom_raid3/test-1.t b/tools/regression/geom_raid3/test-1.t
index 9202967884745..856d9286dee25 100644
--- a/tools/regression/geom_raid3/test-1.t
+++ b/tools/regression/geom_raid3/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-1.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-10.t b/tools/regression/geom_raid3/test-10.t
index 1320120006042..16ade621b61bc 100644
--- a/tools/regression/geom_raid3/test-10.t
+++ b/tools/regression/geom_raid3/test-10.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-10.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-11.t b/tools/regression/geom_raid3/test-11.t
index 3382214b8e892..5600bf8707363 100644
--- a/tools/regression/geom_raid3/test-11.t
+++ b/tools/regression/geom_raid3/test-11.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-11.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-12.t b/tools/regression/geom_raid3/test-12.t
index 3dec406f80979..4d569ecb90ef0 100644
--- a/tools/regression/geom_raid3/test-12.t
+++ b/tools/regression/geom_raid3/test-12.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-12.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-2.t b/tools/regression/geom_raid3/test-2.t
index 88daf782492c8..248432c9cc40e 100644
--- a/tools/regression/geom_raid3/test-2.t
+++ b/tools/regression/geom_raid3/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-2.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-3.t b/tools/regression/geom_raid3/test-3.t
index d2c1a5f006b11..055b57145c95d 100644
--- a/tools/regression/geom_raid3/test-3.t
+++ b/tools/regression/geom_raid3/test-3.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-3.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-4.t b/tools/regression/geom_raid3/test-4.t
index d437ec05246a7..9a9fe90408088 100644
--- a/tools/regression/geom_raid3/test-4.t
+++ b/tools/regression/geom_raid3/test-4.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-4.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-5.t b/tools/regression/geom_raid3/test-5.t
index ffd85f6f15ff6..c99f9bb693201 100644
--- a/tools/regression/geom_raid3/test-5.t
+++ b/tools/regression/geom_raid3/test-5.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-5.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-6.t b/tools/regression/geom_raid3/test-6.t
index 97b55036d73a1..adf4e84fb18fe 100644
--- a/tools/regression/geom_raid3/test-6.t
+++ b/tools/regression/geom_raid3/test-6.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-6.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-7.t b/tools/regression/geom_raid3/test-7.t
index 3d89873f8e25b..375768b7f1d91 100644
--- a/tools/regression/geom_raid3/test-7.t
+++ b/tools/regression/geom_raid3/test-7.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-7.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-8.t b/tools/regression/geom_raid3/test-8.t
index b9621f43ef90b..5e4126cb68ac8 100644
--- a/tools/regression/geom_raid3/test-8.t
+++ b/tools/regression/geom_raid3/test-8.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-8.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_raid3/test-9.t b/tools/regression/geom_raid3/test-9.t
index 069501161dced..bcedc77b3561b 100644
--- a/tools/regression/geom_raid3/test-9.t
+++ b/tools/regression/geom_raid3/test-9.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_raid3/test-9.t,v 1.1 2005/12/07 01:28:59 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_shsec/conf.sh b/tools/regression/geom_shsec/conf.sh
index 7648862422f78..9dfb9eb43aa6e 100644
--- a/tools/regression/geom_shsec/conf.sh
+++ b/tools/regression/geom_shsec/conf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/conf.sh,v 1.1 2005/12/07 01:29:50 pjd Exp $
 
 name="test"
 class="shsec"
diff --git a/tools/regression/geom_shsec/test-1.t b/tools/regression/geom_shsec/test-1.t
index 5cb5b4faca130..1fa449e0289f0 100644
--- a/tools/regression/geom_shsec/test-1.t
+++ b/tools/regression/geom_shsec/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/test-1.t,v 1.1 2005/12/07 01:29:50 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_shsec/test-2.t b/tools/regression/geom_shsec/test-2.t
index 19a4e0aa8a897..b72765be42f3b 100644
--- a/tools/regression/geom_shsec/test-2.t
+++ b/tools/regression/geom_shsec/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_shsec/test-2.t,v 1.1 2005/12/07 01:29:50 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_stripe/conf.sh b/tools/regression/geom_stripe/conf.sh
index 22e586498509c..0696d6a66034e 100644
--- a/tools/regression/geom_stripe/conf.sh
+++ b/tools/regression/geom_stripe/conf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/conf.sh,v 1.1 2005/12/07 01:30:44 pjd Exp $
 
 name="test"
 class="stripe"
diff --git a/tools/regression/geom_stripe/test-1.t b/tools/regression/geom_stripe/test-1.t
index 9b398f095e310..bbdb4e0c9fcce 100644
--- a/tools/regression/geom_stripe/test-1.t
+++ b/tools/regression/geom_stripe/test-1.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/test-1.t,v 1.1 2005/12/07 01:30:44 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_stripe/test-2.t b/tools/regression/geom_stripe/test-2.t
index 73937f4e624db..d14d5d26d4800 100644
--- a/tools/regression/geom_stripe/test-2.t
+++ b/tools/regression/geom_stripe/test-2.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_stripe/test-2.t,v 1.1 2005/12/07 01:30:44 pjd Exp $
 
 . `dirname $0`/conf.sh
 
diff --git a/tools/regression/geom_subr.sh b/tools/regression/geom_subr.sh
index 60478297aa74d..976deb0b964a1 100644
--- a/tools/regression/geom_subr.sh
+++ b/tools/regression/geom_subr.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_subr.sh,v 1.1 2005/12/07 01:20:18 pjd Exp $
 
 kldstat -q -m g_${class} || g${class} load || exit 1
 
diff --git a/tools/regression/geom_uzip/.cvsignore b/tools/regression/geom_uzip/.cvsignore
deleted file mode 100644
index 1e4f1642f8696..0000000000000
--- a/tools/regression/geom_uzip/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test-1.img
-test-1.img.gz
diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile
index 6927ff1081259..31c790b682584 100644
--- a/tools/regression/geom_uzip/Makefile
+++ b/tools/regression/geom_uzip/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/Makefile,v 1.2 2005/09/29 22:41:20 fjoe Exp $
 #
 # Regression test for geom_ugz.
 #
diff --git a/tools/regression/geom_uzip/etalon/etalon.txt b/tools/regression/geom_uzip/etalon/etalon.txt
index cb8acf31f650e..7900b58500c02 100644
--- a/tools/regression/geom_uzip/etalon/etalon.txt
+++ b/tools/regression/geom_uzip/etalon/etalon.txt
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/etalon/etalon.txt,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 
 JABBERWOCKY
diff --git a/tools/regression/geom_uzip/runtests.sh b/tools/regression/geom_uzip/runtests.sh
index 60e78b5407467..0f405fee5b91a 100644
--- a/tools/regression/geom_uzip/runtests.sh
+++ b/tools/regression/geom_uzip/runtests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/runtests.sh,v 1.1 2004/08/13 09:53:52 fjoe Exp $
 #
 
 dir=`dirname $0`
diff --git a/tools/regression/geom_uzip/test-1.img.uzip.uue b/tools/regression/geom_uzip/test-1.img.uzip.uue
index ca16f47c794e4..9b00bbe5f4647 100644
--- a/tools/regression/geom_uzip/test-1.img.uzip.uue
+++ b/tools/regression/geom_uzip/test-1.img.uzip.uue
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/test-1.img.uzip.uue,v 1.1 2005/09/29 22:41:20 fjoe Exp $
 #
 
 begin 755 test-1.img.uzip
diff --git a/tools/regression/geom_uzip/test-1.sh b/tools/regression/geom_uzip/test-1.sh
index 7e8f16840b270..741a3a208545d 100644
--- a/tools/regression/geom_uzip/test-1.sh
+++ b/tools/regression/geom_uzip/test-1.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/test-1.sh,v 1.2 2005/09/29 22:41:20 fjoe Exp $
 #
 
 mntpoint="/mnt/test-1"
diff --git a/tools/regression/geom_uzip/test-2.sh b/tools/regression/geom_uzip/test-2.sh
index 866282753e23c..4d6986fab91e9 100644
--- a/tools/regression/geom_uzip/test-2.sh
+++ b/tools/regression/geom_uzip/test-2.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/geom_uzip/test-2.sh,v 1.2 2005/09/29 22:41:20 fjoe Exp $
 #
 
 #
diff --git a/tools/regression/ia64/emulated/brl.t b/tools/regression/ia64/emulated/brl.t
index c47989cf016a7..50c82a3e45fad 100644
--- a/tools/regression/ia64/emulated/brl.t
+++ b/tools/regression/ia64/emulated/brl.t
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ia64/emulated/brl.t,v 1.1 2006/07/17 00:27:12 marcel Exp $
 
 my $srcdir = `dirname $0`;
 chomp $srcdir;
diff --git a/tools/regression/ia64/emulated/test.c b/tools/regression/ia64/emulated/test.c
index 35d4b05cf571b..c87b0c428557c 100644
--- a/tools/regression/ia64/emulated/test.c
+++ b/tools/regression/ia64/emulated/test.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/ia64/emulated/test.c,v 1.1 2006/07/17 00:27:12 marcel Exp $
  */
 
 #include <sys/mman.h>
diff --git a/tools/regression/ia64/unaligned/test.c b/tools/regression/ia64/unaligned/test.c
index 869c86436b808..753d385b049b7 100644
--- a/tools/regression/ia64/unaligned/test.c
+++ b/tools/regression/ia64/unaligned/test.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/ia64/unaligned/test.c,v 1.5 2005/01/28 02:58:32 marcel Exp $
  */
 
 #include <machine/float.h>
diff --git a/tools/regression/ia64/unaligned/unaligned.t b/tools/regression/ia64/unaligned/unaligned.t
index 5d061bdef5741..f7dabfd016b68 100644
--- a/tools/regression/ia64/unaligned/unaligned.t
+++ b/tools/regression/ia64/unaligned/unaligned.t
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ia64/unaligned/unaligned.t,v 1.3 2005/01/27 23:15:58 marcel Exp $
 
 my $srcdir = `dirname $0`;
 chomp $srcdir;
diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile
index 64626c51d3c24..58923771c866e 100644
--- a/tools/regression/include/tgmath/Makefile
+++ b/tools/regression/include/tgmath/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/include/tgmath/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 
 PROG=	tgmath
 CFLAGS+= -fno-builtin -std=c99
diff --git a/tools/regression/include/tgmath/tgmath.c b/tools/regression/include/tgmath/tgmath.c
index 037810ad9df05..c69eb71394172 100644
--- a/tools/regression/include/tgmath/tgmath.c
+++ b/tools/regression/include/tgmath/tgmath.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/include/tgmath/tgmath.c,v 1.2 2004/11/11 19:47:51 nik Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/tools/regression/include/tgmath/tgmath.t b/tools/regression/include/tgmath/tgmath.t
index 8bdfd03be81b6..4577b407201d6 100644
--- a/tools/regression/include/tgmath/tgmath.t
+++ b/tools/regression/include/tgmath/tgmath.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/include/tgmath/tgmath.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/ipsec/ipsec.t b/tools/regression/ipsec/ipsec.t
index 6446bf5869e39..5f62ad75e4100 100644
--- a/tools/regression/ipsec/ipsec.t
+++ b/tools/regression/ipsec/ipsec.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ipsec/ipsec.t,v 1.3 2007/03/26 07:40:51 gnn Exp $
 #
 # IPsec regression test.
 #
diff --git a/tools/regression/ipsec/ipsec6.t b/tools/regression/ipsec/ipsec6.t
index a13edd3611858..95cd7cac12a07 100644
--- a/tools/regression/ipsec/ipsec6.t
+++ b/tools/regression/ipsec/ipsec6.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ipsec/ipsec6.t,v 1.3 2007/03/26 07:40:51 gnn Exp $
 #
 # IPv6 IPsec test based on ipsec.t, in this same directory, which tests
 # IPsec by setting up a set of tunnels and then sending ICMPv6 packets,   
diff --git a/tools/regression/lib/libc/gen/Makefile b/tools/regression/lib/libc/gen/Makefile
index 140b789dec11e..a13667791be12 100644
--- a/tools/regression/lib/libc/gen/Makefile
+++ b/tools/regression/lib/libc/gen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/gen/Makefile,v 1.2 2003/02/05 16:40:18 mike Exp $
 
 TESTS=	test-fpclassify test-wordexp
 
diff --git a/tools/regression/lib/libc/gen/test-fpclassify.c b/tools/regression/lib/libc/gen/test-fpclassify.c
index 8431fe84f557c..ecf520e9b6362 100644
--- a/tools/regression/lib/libc/gen/test-fpclassify.c
+++ b/tools/regression/lib/libc/gen/test-fpclassify.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/gen/test-fpclassify.c,v 1.3 2003/03/27 05:32:28 das Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/libc/gen/test-wordexp.c b/tools/regression/lib/libc/gen/test-wordexp.c
index 49490d8c52acb..a6bb86db447d2 100644
--- a/tools/regression/lib/libc/gen/test-wordexp.c
+++ b/tools/regression/lib/libc/gen/test-wordexp.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/gen/test-wordexp.c,v 1.1 2003/01/04 05:50:35 tjr Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/locale/Makefile b/tools/regression/lib/libc/locale/Makefile
index 5fb9a945daf70..9912592f88aac 100644
--- a/tools/regression/lib/libc/locale/Makefile
+++ b/tools/regression/lib/libc/locale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/Makefile,v 1.8 2004/11/21 03:21:22 tjr Exp $
 
 TESTS=	test-mbrtowc	\
 	test-wcrtomb	\
diff --git a/tools/regression/lib/libc/locale/test-btowc.c b/tools/regression/lib/libc/locale/test-btowc.c
index 9ed45821e3a45..558effdae1010 100644
--- a/tools/regression/lib/libc/locale/test-btowc.c
+++ b/tools/regression/lib/libc/locale/test-btowc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-btowc.c,v 1.4 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-btowc.t b/tools/regression/lib/libc/locale/test-btowc.t
index 8bdfd03be81b6..330d3890af785 100644
--- a/tools/regression/lib/libc/locale/test-btowc.t
+++ b/tools/regression/lib/libc/locale/test-btowc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-btowc.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-iswctype.c b/tools/regression/lib/libc/locale/test-iswctype.c
index ca9621a7d3420..7269bd90fdcd1 100644
--- a/tools/regression/lib/libc/locale/test-iswctype.c
+++ b/tools/regression/lib/libc/locale/test-iswctype.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-iswctype.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <locale.h>
diff --git a/tools/regression/lib/libc/locale/test-iswctype.t b/tools/regression/lib/libc/locale/test-iswctype.t
index 8bdfd03be81b6..c3995f6f6ffe3 100644
--- a/tools/regression/lib/libc/locale/test-iswctype.t
+++ b/tools/regression/lib/libc/locale/test-iswctype.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-iswctype.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mblen.c b/tools/regression/lib/libc/locale/test-mblen.c
index dd073594b13a3..de215e7fb57e7 100644
--- a/tools/regression/lib/libc/locale/test-mblen.c
+++ b/tools/regression/lib/libc/locale/test-mblen.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mblen.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-mblen.t b/tools/regression/lib/libc/locale/test-mblen.t
index 8bdfd03be81b6..12ab8d7237d43 100644
--- a/tools/regression/lib/libc/locale/test-mblen.t
+++ b/tools/regression/lib/libc/locale/test-mblen.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mblen.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbrlen.c b/tools/regression/lib/libc/locale/test-mbrlen.c
index 3198a77922d51..4ff30ff447a1f 100644
--- a/tools/regression/lib/libc/locale/test-mbrlen.c
+++ b/tools/regression/lib/libc/locale/test-mbrlen.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbrlen.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbrlen.t b/tools/regression/lib/libc/locale/test-mbrlen.t
index 8bdfd03be81b6..b14e256a701dc 100644
--- a/tools/regression/lib/libc/locale/test-mbrlen.t
+++ b/tools/regression/lib/libc/locale/test-mbrlen.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbrlen.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbrtowc.c b/tools/regression/lib/libc/locale/test-mbrtowc.c
index e9a2ea0bfab38..cd82ce60169c2 100644
--- a/tools/regression/lib/libc/locale/test-mbrtowc.c
+++ b/tools/regression/lib/libc/locale/test-mbrtowc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbrtowc.c,v 1.5 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbrtowc.t b/tools/regression/lib/libc/locale/test-mbrtowc.t
index 8bdfd03be81b6..b559b7f754430 100644
--- a/tools/regression/lib/libc/locale/test-mbrtowc.t
+++ b/tools/regression/lib/libc/locale/test-mbrtowc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbrtowc.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbsnrtowcs.c b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
index 585dd4eb116b5..fb830dab6bd87 100644
--- a/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
+++ b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbsnrtowcs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbsnrtowcs.t b/tools/regression/lib/libc/locale/test-mbsnrtowcs.t
index 8bdfd03be81b6..45b790c896e2c 100644
--- a/tools/regression/lib/libc/locale/test-mbsnrtowcs.t
+++ b/tools/regression/lib/libc/locale/test-mbsnrtowcs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbsnrtowcs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbsrtowcs.c b/tools/regression/lib/libc/locale/test-mbsrtowcs.c
index dd6a7e10c02cd..a96828a7b94ea 100644
--- a/tools/regression/lib/libc/locale/test-mbsrtowcs.c
+++ b/tools/regression/lib/libc/locale/test-mbsrtowcs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbsrtowcs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbsrtowcs.t b/tools/regression/lib/libc/locale/test-mbsrtowcs.t
index 8bdfd03be81b6..242d194759fd3 100644
--- a/tools/regression/lib/libc/locale/test-mbsrtowcs.t
+++ b/tools/regression/lib/libc/locale/test-mbsrtowcs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbsrtowcs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbstowcs.c b/tools/regression/lib/libc/locale/test-mbstowcs.c
index 18039dd9e66c0..e0125226aa4d2 100644
--- a/tools/regression/lib/libc/locale/test-mbstowcs.c
+++ b/tools/regression/lib/libc/locale/test-mbstowcs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbstowcs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-mbstowcs.t b/tools/regression/lib/libc/locale/test-mbstowcs.t
index 8bdfd03be81b6..faf005b154a73 100644
--- a/tools/regression/lib/libc/locale/test-mbstowcs.t
+++ b/tools/regression/lib/libc/locale/test-mbstowcs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbstowcs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-mbtowc.c b/tools/regression/lib/libc/locale/test-mbtowc.c
index 5ee070c57e26f..d285615f97524 100644
--- a/tools/regression/lib/libc/locale/test-mbtowc.c
+++ b/tools/regression/lib/libc/locale/test-mbtowc.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-mbtowc.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tools/regression/lib/libc/locale/test-mbtowc.t b/tools/regression/lib/libc/locale/test-mbtowc.t
index 8bdfd03be81b6..e8b70c12df10e 100644
--- a/tools/regression/lib/libc/locale/test-mbtowc.t
+++ b/tools/regression/lib/libc/locale/test-mbtowc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-mbtowc.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-towctrans.c b/tools/regression/lib/libc/locale/test-towctrans.c
index 6c0e428db65a1..172e5d6c1efd5 100644
--- a/tools/regression/lib/libc/locale/test-towctrans.c
+++ b/tools/regression/lib/libc/locale/test-towctrans.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-towctrans.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <locale.h>
diff --git a/tools/regression/lib/libc/locale/test-towctrans.t b/tools/regression/lib/libc/locale/test-towctrans.t
index 8bdfd03be81b6..69dc4be902f52 100644
--- a/tools/regression/lib/libc/locale/test-towctrans.t
+++ b/tools/regression/lib/libc/locale/test-towctrans.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-towctrans.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcrtomb.c b/tools/regression/lib/libc/locale/test-wcrtomb.c
index d7ec029e8c686..bf49311173129 100644
--- a/tools/regression/lib/libc/locale/test-wcrtomb.c
+++ b/tools/regression/lib/libc/locale/test-wcrtomb.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcrtomb.c,v 1.4 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcrtomb.t b/tools/regression/lib/libc/locale/test-wcrtomb.t
index 8bdfd03be81b6..47dbaf81913f9 100644
--- a/tools/regression/lib/libc/locale/test-wcrtomb.t
+++ b/tools/regression/lib/libc/locale/test-wcrtomb.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcrtomb.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcsnrtombs.c b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
index 2290cac06784b..bf36d648fa2a7 100644
--- a/tools/regression/lib/libc/locale/test-wcsnrtombs.c
+++ b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcsnrtombs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcsnrtombs.t b/tools/regression/lib/libc/locale/test-wcsnrtombs.t
index 8bdfd03be81b6..f4cbfe772f2f2 100644
--- a/tools/regression/lib/libc/locale/test-wcsnrtombs.t
+++ b/tools/regression/lib/libc/locale/test-wcsnrtombs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcsnrtombs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcsrtombs.c b/tools/regression/lib/libc/locale/test-wcsrtombs.c
index 48fe3668f5a65..5ef3cad069c17 100644
--- a/tools/regression/lib/libc/locale/test-wcsrtombs.c
+++ b/tools/regression/lib/libc/locale/test-wcsrtombs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcsrtombs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcsrtombs.t b/tools/regression/lib/libc/locale/test-wcsrtombs.t
index 8bdfd03be81b6..67693313bf7dd 100644
--- a/tools/regression/lib/libc/locale/test-wcsrtombs.t
+++ b/tools/regression/lib/libc/locale/test-wcsrtombs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcsrtombs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wcstombs.c b/tools/regression/lib/libc/locale/test-wcstombs.c
index f4a57700f7c47..191367f149de6 100644
--- a/tools/regression/lib/libc/locale/test-wcstombs.c
+++ b/tools/regression/lib/libc/locale/test-wcstombs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wcstombs.c,v 1.2 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wcstombs.t b/tools/regression/lib/libc/locale/test-wcstombs.t
index 8bdfd03be81b6..0bf2368c999ca 100644
--- a/tools/regression/lib/libc/locale/test-wcstombs.t
+++ b/tools/regression/lib/libc/locale/test-wcstombs.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wcstombs.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/locale/test-wctomb.c b/tools/regression/lib/libc/locale/test-wctomb.c
index d55b3db9ec4dd..d0f63d270e5c6 100644
--- a/tools/regression/lib/libc/locale/test-wctomb.c
+++ b/tools/regression/lib/libc/locale/test-wctomb.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/locale/test-wctomb.c,v 1.3 2004/11/11 19:47:51 nik Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/locale/test-wctomb.t b/tools/regression/lib/libc/locale/test-wctomb.t
index 8bdfd03be81b6..a8a9b5a83a0e7 100644
--- a/tools/regression/lib/libc/locale/test-wctomb.t
+++ b/tools/regression/lib/libc/locale/test-wctomb.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/locale/test-wctomb.t,v 1.1 2004/11/11 19:47:51 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/Makefile b/tools/regression/lib/libc/net/Makefile
index a61741b8e647e..b584d66fc1efa 100644
--- a/tools/regression/lib/libc/net/Makefile
+++ b/tools/regression/lib/libc/net/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/Makefile,v 1.3 2007/05/13 14:03:21 rwatson Exp $
 
 TESTS=	test-ether test-eui64_aton test-eui64_line test-eui64_ntoa
 CFLAGS+= -g -Wall
diff --git a/tools/regression/lib/libc/net/test-ether.c b/tools/regression/lib/libc/net/test-ether.c
index 74081019150a3..71c72f158ddb1 100644
--- a/tools/regression/lib/libc/net/test-ether.c
+++ b/tools/regression/lib/libc/net/test-ether.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-ether.c,v 1.1 2007/05/13 14:03:21 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-ether.t b/tools/regression/lib/libc/net/test-ether.t
index 8bdfd03be81b6..0af2262741155 100644
--- a/tools/regression/lib/libc/net/test-ether.t
+++ b/tools/regression/lib/libc/net/test-ether.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-ether.t,v 1.1 2007/05/13 14:03:21 rwatson Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/test-eui64.h b/tools/regression/lib/libc/net/test-eui64.h
index ea82a10c14878..477e3b76d9e4d 100644
--- a/tools/regression/lib/libc/net/test-eui64.h
+++ b/tools/regression/lib/libc/net/test-eui64.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64.h,v 1.2 2004/05/27 17:23:32 brooks Exp $
  */
 #ifndef _TEST_EUI64_H
 #define _TEST_EUI64_H
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.c b/tools/regression/lib/libc/net/test-eui64_aton.c
index e10f9854e9a03..e41e6490ecbeb 100644
--- a/tools/regression/lib/libc/net/test-eui64_aton.c
+++ b/tools/regression/lib/libc/net/test-eui64_aton.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_aton.c,v 1.3 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_aton.t b/tools/regression/lib/libc/net/test-eui64_aton.t
index 8bdfd03be81b6..1e7e08cd940d3 100644
--- a/tools/regression/lib/libc/net/test-eui64_aton.t
+++ b/tools/regression/lib/libc/net/test-eui64_aton.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_aton.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/test-eui64_line.c b/tools/regression/lib/libc/net/test-eui64_line.c
index 714b4609d6137..a7d1f420d26f9 100644
--- a/tools/regression/lib/libc/net/test-eui64_line.c
+++ b/tools/regression/lib/libc/net/test-eui64_line.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_line.c,v 1.3 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_line.t b/tools/regression/lib/libc/net/test-eui64_line.t
index 8bdfd03be81b6..f53345e9022b7 100644
--- a/tools/regression/lib/libc/net/test-eui64_line.t
+++ b/tools/regression/lib/libc/net/test-eui64_line.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_line.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.c b/tools/regression/lib/libc/net/test-eui64_ntoa.c
index f7582f0a0bca1..eef49ce19b80d 100644
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.c
+++ b/tools/regression/lib/libc/net/test-eui64_ntoa.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_ntoa.c,v 1.3 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.t b/tools/regression/lib/libc/net/test-eui64_ntoa.t
index 8bdfd03be81b6..ab7104fbdcb09 100644
--- a/tools/regression/lib/libc/net/test-eui64_ntoa.t
+++ b/tools/regression/lib/libc/net/test-eui64_ntoa.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/net/test-eui64_ntoa.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/nss/Makefile b/tools/regression/lib/libc/nss/Makefile
index 8c8a5143f0fee..f3e77b8c8369a 100644
--- a/tools/regression/lib/libc/nss/Makefile
+++ b/tools/regression/lib/libc/nss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/Makefile,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 TESTS=	test-getaddr test-getgr test-gethostby test-getpw test-getproto\
 	test-getrpc test-getserv test-getusershell
diff --git a/tools/regression/lib/libc/nss/README b/tools/regression/lib/libc/nss/README
index ba0373d92ace1..894bbcced74a6 100644
--- a/tools/regression/lib/libc/nss/README
+++ b/tools/regression/lib/libc/nss/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/lib/libc/nss/README,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 A brief how-to
 --------------
diff --git a/tools/regression/lib/libc/nss/mach b/tools/regression/lib/libc/nss/mach
index d25d8d6ac5221..7e65c1b5e0d98 100644
--- a/tools/regression/lib/libc/nss/mach
+++ b/tools/regression/lib/libc/nss/mach
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/mach,v 1.1 2007/04/15 11:02:31 bushman Exp $
 localhost
 above.warped.net
 anoncvs.cirr.com
diff --git a/tools/regression/lib/libc/nss/test-getaddr.c b/tools/regression/lib/libc/nss/test-getaddr.c
index 046d9db4e363d..6727f311800ee 100644
--- a/tools/regression/lib/libc/nss/test-getaddr.c
+++ b/tools/regression/lib/libc/nss/test-getaddr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getaddr.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/tools/regression/lib/libc/nss/test-getaddr.t b/tools/regression/lib/libc/nss/test-getaddr.t
index b3020f0db6df8..084e66d073af4 100644
--- a/tools/regression/lib/libc/nss/test-getaddr.t
+++ b/tools/regression/lib/libc/nss/test-getaddr.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getaddr.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-getgr.c b/tools/regression/lib/libc/nss/test-getgr.c
index 1b573e862ec32..c0f7efbfe25b9 100644
--- a/tools/regression/lib/libc/nss/test-getgr.c
+++ b/tools/regression/lib/libc/nss/test-getgr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getgr.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/tools/regression/lib/libc/nss/test-getgr.t b/tools/regression/lib/libc/nss/test-getgr.t
index e2cf8e588b686..59f59b754afa4 100644
--- a/tools/regression/lib/libc/nss/test-getgr.t
+++ b/tools/regression/lib/libc/nss/test-getgr.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getgr.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-gethostby.c b/tools/regression/lib/libc/nss/test-gethostby.c
index 61e4ca2af4cee..9bd6281c1dc29 100644
--- a/tools/regression/lib/libc/nss/test-gethostby.c
+++ b/tools/regression/lib/libc/nss/test-gethostby.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-gethostby.c,v 1.2 2007/06/24 06:14:18 bushman Exp $");
 
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/tools/regression/lib/libc/nss/test-gethostby.t b/tools/regression/lib/libc/nss/test-gethostby.t
index 42bed00008318..109ac5b695d27 100644
--- a/tools/regression/lib/libc/nss/test-gethostby.t
+++ b/tools/regression/lib/libc/nss/test-gethostby.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-gethostby.t,v 1.2 2007/06/24 06:14:18 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-getproto.c b/tools/regression/lib/libc/nss/test-getproto.c
index b94f204bd1d06..c85520b6e93ce 100644
--- a/tools/regression/lib/libc/nss/test-getproto.c
+++ b/tools/regression/lib/libc/nss/test-getproto.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getproto.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/tools/regression/lib/libc/nss/test-getproto.t b/tools/regression/lib/libc/nss/test-getproto.t
index f582d31ce7879..57828bd8cabd6 100644
--- a/tools/regression/lib/libc/nss/test-getproto.t
+++ b/tools/regression/lib/libc/nss/test-getproto.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getproto.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-getpw.c b/tools/regression/lib/libc/nss/test-getpw.c
index 88277d38672ef..480196c62e98c 100644
--- a/tools/regression/lib/libc/nss/test-getpw.c
+++ b/tools/regression/lib/libc/nss/test-getpw.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getpw.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/nss/test-getpw.t b/tools/regression/lib/libc/nss/test-getpw.t
index 517217751ed42..e16fe4e5edcfd 100644
--- a/tools/regression/lib/libc/nss/test-getpw.t
+++ b/tools/regression/lib/libc/nss/test-getpw.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getpw.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-getrpc.c b/tools/regression/lib/libc/nss/test-getrpc.c
index df0bc839a6f15..0ca586543880d 100644
--- a/tools/regression/lib/libc/nss/test-getrpc.c
+++ b/tools/regression/lib/libc/nss/test-getrpc.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getrpc.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <arpa/inet.h>
 #include <rpc/rpc.h>
diff --git a/tools/regression/lib/libc/nss/test-getrpc.t b/tools/regression/lib/libc/nss/test-getrpc.t
index 831a0866aa741..d053822a8eb72 100644
--- a/tools/regression/lib/libc/nss/test-getrpc.t
+++ b/tools/regression/lib/libc/nss/test-getrpc.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getrpc.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-getserv.c b/tools/regression/lib/libc/nss/test-getserv.c
index 79d42f017af24..1540f18c78d92 100644
--- a/tools/regression/lib/libc/nss/test-getserv.c
+++ b/tools/regression/lib/libc/nss/test-getserv.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getserv.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <arpa/inet.h>
 #include <assert.h>
diff --git a/tools/regression/lib/libc/nss/test-getserv.t b/tools/regression/lib/libc/nss/test-getserv.t
index 60a6c506ce1de..c87c3079dc99f 100644
--- a/tools/regression/lib/libc/nss/test-getserv.t
+++ b/tools/regression/lib/libc/nss/test-getserv.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getserv.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/test-getusershell.c b/tools/regression/lib/libc/nss/test-getusershell.c
index 20faaacefecbc..c576221d235fd 100644
--- a/tools/regression/lib/libc/nss/test-getusershell.c
+++ b/tools/regression/lib/libc/nss/test-getusershell.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/nss/test-getusershell.c,v 1.1 2007/04/15 11:02:31 bushman Exp $");
 
 #include <assert.h>
 #include <errno.h>
diff --git a/tools/regression/lib/libc/nss/test-getusershell.t b/tools/regression/lib/libc/nss/test-getusershell.t
index 16a392a9294f4..26cf7d71948f8 100644
--- a/tools/regression/lib/libc/nss/test-getusershell.t
+++ b/tools/regression/lib/libc/nss/test-getusershell.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/nss/test-getusershell.t,v 1.1 2007/04/15 11:02:31 bushman Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/nss/testutil.h b/tools/regression/lib/libc/nss/testutil.h
index f1e91c2ea6a36..180809daaa9b1 100644
--- a/tools/regression/lib/libc/nss/testutil.h
+++ b/tools/regression/lib/libc/nss/testutil.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/nss/testutil.h,v 1.1 2007/04/15 11:02:31 bushman Exp $
  */
 
 #include <sys/queue.h>
diff --git a/tools/regression/lib/libc/regex/Makefile b/tools/regression/lib/libc/regex/Makefile
index f91bef24ffe99..e522a8febfeef 100644
--- a/tools/regression/lib/libc/regex/Makefile
+++ b/tools/regression/lib/libc/regex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/regex/Makefile,v 1.1 2004/07/19 09:00:26 tjr Exp $
 
 GROT=	../../../../../lib/libc/regex/grot
 
diff --git a/tools/regression/lib/libc/resolv/Makefile b/tools/regression/lib/libc/resolv/Makefile
index 9b4e6b1c34614..423308f1420d9 100644
--- a/tools/regression/lib/libc/resolv/Makefile
+++ b/tools/regression/lib/libc/resolv/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 2004/05/13 19:17:12 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/resolv/Makefile,v 1.4 2006/03/15 10:46:34 ru Exp $
 
 PROG=		resolv
 NO_MAN=
diff --git a/tools/regression/lib/libc/resolv/resolv.c b/tools/regression/lib/libc/resolv/resolv.c
index dc925d3424cee..7e94e320088b6 100644
--- a/tools/regression/lib/libc/resolv/resolv.c
+++ b/tools/regression/lib/libc/resolv/resolv.c
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/lib/libc/resolv/resolv.c,v 1.2 2005/05/04 12:02:10 ume Exp $ */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: resolv.c,v 1.6 2004/05/23 16:59:11 christos Exp $");
 
diff --git a/tools/regression/lib/libc/resolv/resolv.t b/tools/regression/lib/libc/resolv/resolv.t
index 278ba06d93ffe..6ef72d1734b79 100644
--- a/tools/regression/lib/libc/resolv/resolv.t
+++ b/tools/regression/lib/libc/resolv/resolv.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/resolv/resolv.t,v 1.1 2005/05/05 11:26:47 ume Exp $
 
 do_test() {
 	number=$1
diff --git a/tools/regression/lib/libc/stdio/Makefile b/tools/regression/lib/libc/stdio/Makefile
index 35131e2a67c5b..3e234967cc635 100644
--- a/tools/regression/lib/libc/stdio/Makefile
+++ b/tools/regression/lib/libc/stdio/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/Makefile,v 1.4 2005/03/01 01:43:05 das Exp $
 
 TESTS=	test-perror test-printfloat test-scanfloat
 CFLAGS+= -lm
diff --git a/tools/regression/lib/libc/stdio/test-perror.c b/tools/regression/lib/libc/stdio/test-perror.c
index 992b734dfa393..3eef29115e2c0 100644
--- a/tools/regression/lib/libc/stdio/test-perror.c
+++ b/tools/regression/lib/libc/stdio/test-perror.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-perror.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/tools/regression/lib/libc/stdio/test-perror.t b/tools/regression/lib/libc/stdio/test-perror.t
index 8bdfd03be81b6..6bfb9568ac031 100644
--- a/tools/regression/lib/libc/stdio/test-perror.t
+++ b/tools/regression/lib/libc/stdio/test-perror.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/test-perror.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdio/test-printfloat.c b/tools/regression/lib/libc/stdio/test-printfloat.c
index fcacee5313ecf..08d426aac89e3 100644
--- a/tools/regression/lib/libc/stdio/test-printfloat.c
+++ b/tools/regression/lib/libc/stdio/test-printfloat.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-printfloat.c,v 1.9 2005/03/01 01:43:04 das Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/tools/regression/lib/libc/stdio/test-printfloat.t b/tools/regression/lib/libc/stdio/test-printfloat.t
index 8bdfd03be81b6..190ba19870eac 100644
--- a/tools/regression/lib/libc/stdio/test-printfloat.t
+++ b/tools/regression/lib/libc/stdio/test-printfloat.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/test-printfloat.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdio/test-scanfloat.c b/tools/regression/lib/libc/stdio/test-scanfloat.c
index ef6faaebfe000..098b5eab4d4fd 100644
--- a/tools/regression/lib/libc/stdio/test-scanfloat.c
+++ b/tools/regression/lib/libc/stdio/test-scanfloat.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-scanfloat.c,v 1.7 2007/01/03 21:28:26 das Exp $");
 
 #include <assert.h>
 #include <fenv.h>
diff --git a/tools/regression/lib/libc/stdio/test-scanfloat.t b/tools/regression/lib/libc/stdio/test-scanfloat.t
index 8bdfd03be81b6..e202d7948b056 100644
--- a/tools/regression/lib/libc/stdio/test-scanfloat.t
+++ b/tools/regression/lib/libc/stdio/test-scanfloat.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdio/test-scanfloat.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/Makefile b/tools/regression/lib/libc/stdlib/Makefile
index c707795b65203..72b8ce2e54931 100644
--- a/tools/regression/lib/libc/stdlib/Makefile
+++ b/tools/regression/lib/libc/stdlib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/Makefile,v 1.1 2004/06/25 12:31:12 sobomax Exp $
 
 TESTS=	test-qsort	\
 	test-heapsort	\
diff --git a/tools/regression/lib/libc/stdlib/test-heapsort.c b/tools/regression/lib/libc/stdlib/test-heapsort.c
index 6ce8924907144..94cbaf3fb7008 100644
--- a/tools/regression/lib/libc/stdlib/test-heapsort.c
+++ b/tools/regression/lib/libc/stdlib/test-heapsort.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdlib/test-heapsort.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-heapsort.t b/tools/regression/lib/libc/stdlib/test-heapsort.t
index 8bdfd03be81b6..683f43dc6981c 100644
--- a/tools/regression/lib/libc/stdlib/test-heapsort.t
+++ b/tools/regression/lib/libc/stdlib/test-heapsort.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/test-heapsort.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/test-mergesort.c b/tools/regression/lib/libc/stdlib/test-mergesort.c
index 729d481d96e36..57bf8592df3be 100644
--- a/tools/regression/lib/libc/stdlib/test-mergesort.c
+++ b/tools/regression/lib/libc/stdlib/test-mergesort.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdlib/test-mergesort.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-mergesort.t b/tools/regression/lib/libc/stdlib/test-mergesort.t
index 8bdfd03be81b6..131fa34f23d57 100644
--- a/tools/regression/lib/libc/stdlib/test-mergesort.t
+++ b/tools/regression/lib/libc/stdlib/test-mergesort.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/test-mergesort.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/test-qsort.c b/tools/regression/lib/libc/stdlib/test-qsort.c
index 8a508e80dbc64..1e4396d9dfad0 100644
--- a/tools/regression/lib/libc/stdlib/test-qsort.c
+++ b/tools/regression/lib/libc/stdlib/test-qsort.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdlib/test-qsort.c,v 1.2 2004/11/11 19:47:52 nik Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libc/stdlib/test-qsort.t b/tools/regression/lib/libc/stdlib/test-qsort.t
index 8bdfd03be81b6..e2c6c70f9fec9 100644
--- a/tools/regression/lib/libc/stdlib/test-qsort.t
+++ b/tools/regression/lib/libc/stdlib/test-qsort.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/stdlib/test-qsort.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libc/stdlib/test-sort.h b/tools/regression/lib/libc/stdlib/test-sort.h
index e060f72c9f62a..263ff8bcf42eb 100644
--- a/tools/regression/lib/libc/stdlib/test-sort.h
+++ b/tools/regression/lib/libc/stdlib/test-sort.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/stdlib/test-sort.h,v 1.1 2004/06/25 12:31:12 sobomax Exp $
  */
 
 #ifndef _TEST_SORT_H
diff --git a/tools/regression/lib/libc/string/Makefile b/tools/regression/lib/libc/string/Makefile
index af76f9d9777da..b790ffc4a931a 100644
--- a/tools/regression/lib/libc/string/Makefile
+++ b/tools/regression/lib/libc/string/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/string/Makefile,v 1.3 2005/02/01 09:26:34 nik Exp $
 
 CFLAGS+=	-I/usr/local/include 
 LDFLAGS+=	-L/usr/local/lib
diff --git a/tools/regression/lib/libc/string/test-strerror.c b/tools/regression/lib/libc/string/test-strerror.c
index f5274ed7f2271..e31857bf5ccc3 100644
--- a/tools/regression/lib/libc/string/test-strerror.c
+++ b/tools/regression/lib/libc/string/test-strerror.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libc/string/test-strerror.c,v 1.3 2005/02/01 01:53:35 nik Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/libc/string/test-strerror.t b/tools/regression/lib/libc/string/test-strerror.t
index 8bdfd03be81b6..43f3de3c05e76 100644
--- a/tools/regression/lib/libc/string/test-strerror.t
+++ b/tools/regression/lib/libc/string/test-strerror.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libc/string/test-strerror.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libmp/Makefile b/tools/regression/lib/libmp/Makefile
index a6f60b63bdbd8..d5921c7a7d260 100644
--- a/tools/regression/lib/libmp/Makefile
+++ b/tools/regression/lib/libmp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libmp/Makefile,v 1.1 2006/07/28 16:00:59 simon Exp $
 
 TESTS=	test-libmp
 CFLAGS+= -g -Wall -lcrypto -lmp
diff --git a/tools/regression/lib/libmp/test-libmp.c b/tools/regression/lib/libmp/test-libmp.c
index 519656ade3b3b..9d756f498158a 100644
--- a/tools/regression/lib/libmp/test-libmp.c
+++ b/tools/regression/lib/libmp/test-libmp.c
@@ -25,7 +25,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libmp/test-libmp.c,v 1.1 2006/07/28 16:00:59 simon Exp $");
 
 #include <mp.h>
 #include <stdio.h>
diff --git a/tools/regression/lib/libmp/test-libmp.t b/tools/regression/lib/libmp/test-libmp.t
index 8bdfd03be81b6..3ca0399da80b2 100644
--- a/tools/regression/lib/libmp/test-libmp.t
+++ b/tools/regression/lib/libmp/test-libmp.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libmp/test-libmp.t,v 1.1 2006/07/28 16:00:59 simon Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libutil/Makefile b/tools/regression/lib/libutil/Makefile
index 653bb3fc21702..0b6fcbeb7bfbb 100644
--- a/tools/regression/lib/libutil/Makefile
+++ b/tools/regression/lib/libutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libutil/Makefile,v 1.2 2007/08/03 11:29:49 des Exp $
 
 TESTS=	test-trimdomain test-trimdomain-nodomain test-flopen
 CFLAGS+= -g -Wall -lutil
diff --git a/tools/regression/lib/libutil/test-flopen.c b/tools/regression/lib/libutil/test-flopen.c
index 62fa699350a92..7abaecea80ebf 100644
--- a/tools/regression/lib/libutil/test-flopen.c
+++ b/tools/regression/lib/libutil/test-flopen.c
@@ -24,11 +24,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/libutil/test-flopen.c,v 1.1 2007/08/03 11:29:49 des Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libutil/test-flopen.c,v 1.1 2007/08/03 11:29:49 des Exp $");
 
 #include <sys/types.h>
 #include <sys/fcntl.h>
diff --git a/tools/regression/lib/libutil/test-flopen.t b/tools/regression/lib/libutil/test-flopen.t
index cbb7c8cfed269..27e69ba261565 100644
--- a/tools/regression/lib/libutil/test-flopen.t
+++ b/tools/regression/lib/libutil/test-flopen.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libutil/test-flopen.t,v 1.1 2007/08/03 11:29:49 des Exp $
 #
 
 base=$(realpath $(dirname $0))
diff --git a/tools/regression/lib/libutil/test-trimdomain-nodomain.c b/tools/regression/lib/libutil/test-trimdomain-nodomain.c
index 344bc17e439e6..38bbd6752dcdd 100644
--- a/tools/regression/lib/libutil/test-trimdomain-nodomain.c
+++ b/tools/regression/lib/libutil/test-trimdomain-nodomain.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libutil/test-trimdomain-nodomain.c,v 1.1 2005/10/05 04:46:10 brooks Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/tools/regression/lib/libutil/test-trimdomain-nodomain.t b/tools/regression/lib/libutil/test-trimdomain-nodomain.t
index 8bdfd03be81b6..086496d3de3f6 100644
--- a/tools/regression/lib/libutil/test-trimdomain-nodomain.t
+++ b/tools/regression/lib/libutil/test-trimdomain-nodomain.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libutil/test-trimdomain-nodomain.t,v 1.1 2005/10/05 04:46:10 brooks Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/libutil/test-trimdomain.c b/tools/regression/lib/libutil/test-trimdomain.c
index d1c7823805031..0acc63b36b371 100644
--- a/tools/regression/lib/libutil/test-trimdomain.c
+++ b/tools/regression/lib/libutil/test-trimdomain.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/libutil/test-trimdomain.c,v 1.1 2005/10/05 04:46:10 brooks Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/tools/regression/lib/libutil/test-trimdomain.t b/tools/regression/lib/libutil/test-trimdomain.t
index 8bdfd03be81b6..3895f683b6c6e 100644
--- a/tools/regression/lib/libutil/test-trimdomain.t
+++ b/tools/regression/lib/libutil/test-trimdomain.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/libutil/test-trimdomain.t,v 1.1 2005/10/05 04:46:10 brooks Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
index 696cf30c15905..892adeb66f070 100644
--- a/tools/regression/lib/msun/Makefile
+++ b/tools/regression/lib/msun/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.6 2006/08/22 07:58:54 ru Exp $
 
 TESTS=	test-fenv test-ilogb test-lrint test-lround test-next test-rem
 CFLAGS+= -O0 -lm
diff --git a/tools/regression/lib/msun/test-fenv.c b/tools/regression/lib/msun/test-fenv.c
index 71e8eedb3bc98..60618e9cfb783 100644
--- a/tools/regression/lib/msun/test-fenv.c
+++ b/tools/regression/lib/msun/test-fenv.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-fenv.c,v 1.4 2005/03/16 19:04:45 das Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/tools/regression/lib/msun/test-fenv.t b/tools/regression/lib/msun/test-fenv.t
index 8bdfd03be81b6..bd12123a711c0 100644
--- a/tools/regression/lib/msun/test-fenv.t
+++ b/tools/regression/lib/msun/test-fenv.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-fenv.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-ilogb.c b/tools/regression/lib/msun/test-ilogb.c
index a1440c4a20a43..f54c22f148341 100644
--- a/tools/regression/lib/msun/test-ilogb.c
+++ b/tools/regression/lib/msun/test-ilogb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/lib/msun/test-ilogb.c,v 1.2 2004/11/11 19:47:52 nik Exp $
  */
 
 #include <assert.h>
diff --git a/tools/regression/lib/msun/test-ilogb.t b/tools/regression/lib/msun/test-ilogb.t
index 8bdfd03be81b6..a8ff9de661389 100644
--- a/tools/regression/lib/msun/test-ilogb.t
+++ b/tools/regression/lib/msun/test-ilogb.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-ilogb.t,v 1.1 2004/11/11 19:47:52 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-lrint.c b/tools/regression/lib/msun/test-lrint.c
index 44bcee7cb04c8..f5b4b2afac028 100644
--- a/tools/regression/lib/msun/test-lrint.c
+++ b/tools/regression/lib/msun/test-lrint.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-lrint.c,v 1.1 2005/01/11 23:13:36 das Exp $");
 
 #include <assert.h>
 #include <fenv.h>
diff --git a/tools/regression/lib/msun/test-lrint.t b/tools/regression/lib/msun/test-lrint.t
index 8bdfd03be81b6..cc8fcf4976d93 100644
--- a/tools/regression/lib/msun/test-lrint.t
+++ b/tools/regression/lib/msun/test-lrint.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-lrint.t,v 1.1 2005/01/11 23:13:36 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-lround.c b/tools/regression/lib/msun/test-lround.c
index 4904abe8eefdc..ee885e260e240 100644
--- a/tools/regression/lib/msun/test-lround.c
+++ b/tools/regression/lib/msun/test-lround.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-lround.c,v 1.1 2005/01/11 23:13:36 das Exp $");
 
 #include <assert.h>
 #include <fenv.h>
diff --git a/tools/regression/lib/msun/test-lround.t b/tools/regression/lib/msun/test-lround.t
index 8bdfd03be81b6..bf04300809d35 100644
--- a/tools/regression/lib/msun/test-lround.t
+++ b/tools/regression/lib/msun/test-lround.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-lround.t,v 1.1 2005/01/11 23:13:36 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-next.c b/tools/regression/lib/msun/test-next.c
index c8dd0724a1a30..2e9a195e9846d 100644
--- a/tools/regression/lib/msun/test-next.c
+++ b/tools/regression/lib/msun/test-next.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-next.c,v 1.1 2005/03/07 05:03:46 das Exp $");
 
 #include <fenv.h>
 #include <float.h>
diff --git a/tools/regression/lib/msun/test-next.t b/tools/regression/lib/msun/test-next.t
index 8bdfd03be81b6..ca25a9ea3c27b 100644
--- a/tools/regression/lib/msun/test-next.t
+++ b/tools/regression/lib/msun/test-next.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-next.t,v 1.1 2005/03/07 05:03:46 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/lib/msun/test-rem.c b/tools/regression/lib/msun/test-rem.c
index a4b09c98a7518..4023cdcc62278 100644
--- a/tools/regression/lib/msun/test-rem.c
+++ b/tools/regression/lib/msun/test-rem.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-rem.c,v 1.2 2007/01/07 09:25:22 das Exp $");
 
 #include <assert.h>
 #include <math.h>
diff --git a/tools/regression/lib/msun/test-rem.t b/tools/regression/lib/msun/test-rem.t
index 8bdfd03be81b6..cca2d80934074 100644
--- a/tools/regression/lib/msun/test-rem.t
+++ b/tools/regression/lib/msun/test-rem.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/lib/msun/test-rem.t,v 1.1 2005/04/02 12:50:28 das Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/mac/mac_bsdextended/Makefile b/tools/regression/mac/mac_bsdextended/Makefile
index e19d62d989e3b..24cfab4eb2081 100644
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ b/tools/regression/mac/mac_bsdextended/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mac/mac_bsdextended/Makefile,v 1.1 2005/04/16 12:06:40 rwatson Exp $
 
 PROG=	test_ugidfw
 DPADD=	${LIBUGIDFW}
diff --git a/tools/regression/mac/mac_bsdextended/test_matches.sh b/tools/regression/mac/mac_bsdextended/test_matches.sh
index 99d6b621cfb4e..956b5dee475bf 100644
--- a/tools/regression/mac/mac_bsdextended/test_matches.sh
+++ b/tools/regression/mac/mac_bsdextended/test_matches.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mac/mac_bsdextended/test_matches.sh,v 1.1 2006/04/23 17:06:18 dwmalone Exp $
 #
 
 uidrange="60000:100000"
diff --git a/tools/regression/mac/mac_bsdextended/test_ugidfw.c b/tools/regression/mac/mac_bsdextended/test_ugidfw.c
index 63e25f0beae59..29a50da81a45d 100644
--- a/tools/regression/mac/mac_bsdextended/test_ugidfw.c
+++ b/tools/regression/mac/mac_bsdextended/test_ugidfw.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/mac/mac_bsdextended/test_ugidfw.c,v 1.3 2006/04/23 17:06:18 dwmalone Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/mlock/Makefile b/tools/regression/mlock/Makefile
index a4617888d2e62..111ca15aa62a9 100644
--- a/tools/regression/mlock/Makefile
+++ b/tools/regression/mlock/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mlock/Makefile,v 1.2 2006/03/15 10:46:35 ru Exp $
 
 PROG=	mlock
 NO_MAN=
diff --git a/tools/regression/mlock/mlock.c b/tools/regression/mlock/mlock.c
index d371b2bee1d71..591f067824630 100644
--- a/tools/regression/mlock/mlock.c
+++ b/tools/regression/mlock/mlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/mlock/mlock.c,v 1.1 2005/01/03 19:56:20 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/mqueue/Makefile b/tools/regression/mqueue/Makefile
index a4f386b6839d3..160c7e80f4813 100644
--- a/tools/regression/mqueue/Makefile
+++ b/tools/regression/mqueue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mqueue/Makefile,v 1.1 2005/11/26 13:19:08 davidxu Exp $
 
 SUBDIR=mqtest1 mqtest2 mqtest3 mqtest4 mqtest5
 
diff --git a/tools/regression/mqueue/mqtest1/Makefile b/tools/regression/mqueue/mqtest1/Makefile
index 4e04d1d2ad9c9..d183926ab4411 100644
--- a/tools/regression/mqueue/mqtest1/Makefile
+++ b/tools/regression/mqueue/mqtest1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mqueue/mqtest1/Makefile,v 1.2 2007/01/06 11:32:15 davidxu Exp $
 
 PROG=mqtest1
 LDADD+=-lrt
diff --git a/tools/regression/mqueue/mqtest1/mqtest1.c b/tools/regression/mqueue/mqtest1/mqtest1.c
index 8551b9f98586b..c0809771ac5d4 100644
--- a/tools/regression/mqueue/mqtest1/mqtest1.c
+++ b/tools/regression/mqueue/mqtest1/mqtest1.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/mqueue/mqtest1/mqtest1.c,v 1.2 2007/01/06 11:32:15 davidxu Exp $ */
 
 #include <stdio.h>
 #include <mqueue.h>
diff --git a/tools/regression/mqueue/mqtest2/Makefile b/tools/regression/mqueue/mqtest2/Makefile
index 9d1b92c398879..e3a050c163307 100644
--- a/tools/regression/mqueue/mqtest2/Makefile
+++ b/tools/regression/mqueue/mqtest2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mqueue/mqtest2/Makefile,v 1.2 2007/01/06 11:32:15 davidxu Exp $
 
 PROG=mqtest2
 LDADD+=-lrt
diff --git a/tools/regression/mqueue/mqtest2/mqtest2.c b/tools/regression/mqueue/mqtest2/mqtest2.c
index f37af20c3ec66..fe4ea1949c4ec 100644
--- a/tools/regression/mqueue/mqtest2/mqtest2.c
+++ b/tools/regression/mqueue/mqtest2/mqtest2.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/mqueue/mqtest2/mqtest2.c,v 1.2 2007/01/06 11:32:15 davidxu Exp $ */
 #include <stdio.h>
 #include <mqueue.h>
 #include <fcntl.h>
diff --git a/tools/regression/mqueue/mqtest3/Makefile b/tools/regression/mqueue/mqtest3/Makefile
index d4ea9fa08691f..c2b25ae204ab7 100644
--- a/tools/regression/mqueue/mqtest3/Makefile
+++ b/tools/regression/mqueue/mqtest3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mqueue/mqtest3/Makefile,v 1.2 2007/01/06 11:32:15 davidxu Exp $
 
 PROG=mqtest3
 LDADD+=-lrt
diff --git a/tools/regression/mqueue/mqtest3/mqtest3.c b/tools/regression/mqueue/mqtest3/mqtest3.c
index e2d8a9ef35ad6..db05940870f0f 100644
--- a/tools/regression/mqueue/mqtest3/mqtest3.c
+++ b/tools/regression/mqueue/mqtest3/mqtest3.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/mqueue/mqtest3/mqtest3.c,v 1.2 2007/01/06 11:32:15 davidxu Exp $ */
 #include <stdio.h>
 #include <mqueue.h>
 #include <fcntl.h>
diff --git a/tools/regression/mqueue/mqtest4/Makefile b/tools/regression/mqueue/mqtest4/Makefile
index 3dfec4d6481ef..84b3986bc55bb 100644
--- a/tools/regression/mqueue/mqtest4/Makefile
+++ b/tools/regression/mqueue/mqtest4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mqueue/mqtest4/Makefile,v 1.2 2007/01/06 11:32:15 davidxu Exp $
 
 PROG=mqtest4
 LDADD+=-lrt
diff --git a/tools/regression/mqueue/mqtest4/mqtest4.c b/tools/regression/mqueue/mqtest4/mqtest4.c
index a49c210a22996..00d9830577c30 100644
--- a/tools/regression/mqueue/mqtest4/mqtest4.c
+++ b/tools/regression/mqueue/mqtest4/mqtest4.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/mqueue/mqtest4/mqtest4.c,v 1.2 2007/01/06 11:32:15 davidxu Exp $ */
 #include <stdio.h>
 #include <mqueue.h>
 #include <fcntl.h>
diff --git a/tools/regression/mqueue/mqtest5/Makefile b/tools/regression/mqueue/mqtest5/Makefile
index 25f46adf1e4f6..1cab37dacb43d 100644
--- a/tools/regression/mqueue/mqtest5/Makefile
+++ b/tools/regression/mqueue/mqtest5/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/mqueue/mqtest5/Makefile,v 1.2 2007/01/06 11:32:15 davidxu Exp $
 
 PROG=mqtest5
 LDADD+=-lrt
diff --git a/tools/regression/mqueue/mqtest5/mqtest5.c b/tools/regression/mqueue/mqtest5/mqtest5.c
index adf54dcc65a5f..b33cc70bf0a58 100644
--- a/tools/regression/mqueue/mqtest5/mqtest5.c
+++ b/tools/regression/mqueue/mqtest5/mqtest5.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/mqueue/mqtest5/mqtest5.c,v 1.2 2007/01/06 11:32:15 davidxu Exp $ */
 #include <stdio.h>
 #include <mqueue.h>
 #include <fcntl.h>
diff --git a/tools/regression/msdosfs/msdosfstest-2.sh b/tools/regression/msdosfs/msdosfstest-2.sh
index 2262af803a5dd..22f773f7103f8 100644
--- a/tools/regression/msdosfs/msdosfstest-2.sh
+++ b/tools/regression/msdosfs/msdosfstest-2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-2.sh,v 1.1 2005/04/17 00:56:38 silby Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then test to
 # make sure the case conversion issue described in msdosfs_lookup.c rev 1.46
 # is fixed.
diff --git a/tools/regression/msdosfs/msdosfstest-3.sh b/tools/regression/msdosfs/msdosfstest-3.sh
index 4d3a8fe9f1162..e430be434dbfa 100644
--- a/tools/regression/msdosfs/msdosfstest-3.sh
+++ b/tools/regression/msdosfs/msdosfstest-3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-3.sh,v 1.1 2005/04/18 13:06:43 avatar Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then
 # test to make sure the mbnambuf optimisation(msdosfs_conv.c rev 1.40)
 # doesn't break multi-byte characters.
diff --git a/tools/regression/msdosfs/msdosfstest-4.sh b/tools/regression/msdosfs/msdosfstest-4.sh
index 46b9db96840d1..9d05c23f08cae 100644
--- a/tools/regression/msdosfs/msdosfstest-4.sh
+++ b/tools/regression/msdosfs/msdosfstest-4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-4.sh,v 1.1 2005/07/18 12:15:24 imura Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then
 # test to see if msdosfs_conv.c rev 1.45[1] works properly.
 
diff --git a/tools/regression/msdosfs/msdosfstest-5.sh b/tools/regression/msdosfs/msdosfstest-5.sh
index f6a5581d13b80..4ae78eb4f98e6 100644
--- a/tools/regression/msdosfs/msdosfstest-5.sh
+++ b/tools/regression/msdosfs/msdosfstest-5.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-5.sh,v 1.1 2005/07/18 12:15:24 imura Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then
 # test to see if msdosfs_conv.c rev 1.45[2] works properly.
 # Note that this is a requisite condition but far away from sufficient condition.
diff --git a/tools/regression/msdosfs/msdosfstest-6.sh b/tools/regression/msdosfs/msdosfstest-6.sh
index d64472d4a64f4..0da713024f739 100644
--- a/tools/regression/msdosfs/msdosfstest-6.sh
+++ b/tools/regression/msdosfs/msdosfstest-6.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest-6.sh,v 1.1 2006/01/01 01:28:31 avatar Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, then
 # test to make sure the nmount conversion(mount_msdosfs.c rev 1.37)
 # doesn't break multi-byte characters.
diff --git a/tools/regression/msdosfs/msdosfstest.sh b/tools/regression/msdosfs/msdosfstest.sh
index ba2a434ce5abc..4b76c70da14c1 100644
--- a/tools/regression/msdosfs/msdosfstest.sh
+++ b/tools/regression/msdosfs/msdosfstest.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/msdosfs/msdosfstest.sh,v 1.2 2005/04/17 00:40:27 silby Exp $
 # A really simple script to create a swap-backed msdosfs filesystem, copy a few
 # files to it, unmount/remount the filesystem, and make sure all is well.
 # 
diff --git a/tools/regression/net80211/ccmp/Makefile b/tools/regression/net80211/ccmp/Makefile
index 0d918b1427abc..0fb8470446ab1 100644
--- a/tools/regression/net80211/ccmp/Makefile
+++ b/tools/regression/net80211/ccmp/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/net80211/ccmp/Makefile,v 1.1 2004/12/08 17:45:53 sam Exp $
 
 .PATH:	${.CURDIR}/../../../../sys/net80211
 
diff --git a/tools/regression/net80211/ccmp/test_ccmp.c b/tools/regression/net80211/ccmp/test_ccmp.c
index d78be95fde82a..a48fb13c11cf7 100644
--- a/tools/regression/net80211/ccmp/test_ccmp.c
+++ b/tools/regression/net80211/ccmp/test_ccmp.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/net80211/ccmp/test_ccmp.c,v 1.2 2005/05/05 13:16:30 avatar Exp $
  */
 
 /*
diff --git a/tools/regression/net80211/tkip/Makefile b/tools/regression/net80211/tkip/Makefile
index 1a1f7cacb4d49..928c3c1088797 100644
--- a/tools/regression/net80211/tkip/Makefile
+++ b/tools/regression/net80211/tkip/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/net80211/tkip/Makefile,v 1.1 2004/12/08 17:45:53 sam Exp $
 
 .PATH:	${.CURDIR}/../../../../sys/net80211
 
diff --git a/tools/regression/net80211/tkip/test_tkip.c b/tools/regression/net80211/tkip/test_tkip.c
index 5a6397852a3f7..8dcc0117a81a9 100644
--- a/tools/regression/net80211/tkip/test_tkip.c
+++ b/tools/regression/net80211/tkip/test_tkip.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/net80211/tkip/test_tkip.c,v 1.2 2005/05/05 13:16:30 avatar Exp $
  */
 
 /*
diff --git a/tools/regression/net80211/wep/Makefile b/tools/regression/net80211/wep/Makefile
index 1ab4712b94773..b2116f478d7f7 100644
--- a/tools/regression/net80211/wep/Makefile
+++ b/tools/regression/net80211/wep/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/net80211/wep/Makefile,v 1.1 2004/12/08 17:45:53 sam Exp $
 
 .PATH:	${.CURDIR}/../../../../sys/net80211
 
diff --git a/tools/regression/net80211/wep/test_wep.c b/tools/regression/net80211/wep/test_wep.c
index b498195c2c1dd..ee25d65908a4e 100644
--- a/tools/regression/net80211/wep/test_wep.c
+++ b/tools/regression/net80211/wep/test_wep.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/net80211/wep/test_wep.c,v 1.2 2005/05/05 13:16:30 avatar Exp $
  */
 
 /*
diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile
index e01fcea90eb36..786e85fd54933 100644
--- a/tools/regression/netatalk/simple_send/Makefile
+++ b/tools/regression/netatalk/simple_send/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netatalk/simple_send/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 #
 
 PROG=	simple_send
diff --git a/tools/regression/netatalk/simple_send/simple_send.c b/tools/regression/netatalk/simple_send/simple_send.c
index 9dbbce89f3b75..4ef80be1da723 100644
--- a/tools/regression/netatalk/simple_send/simple_send.c
+++ b/tools/regression/netatalk/simple_send/simple_send.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netatalk/simple_send/simple_send.c,v 1.3 2006/03/17 20:14:25 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/ipbroadcast/Makefile b/tools/regression/netinet/ipbroadcast/Makefile
index 5be8aa81ccb81..8cc0dbd4a3d3d 100644
--- a/tools/regression/netinet/ipbroadcast/Makefile
+++ b/tools/regression/netinet/ipbroadcast/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/ipbroadcast/Makefile,v 1.1 2007/03/01 13:26:13 bms Exp $
 #
 
 PROG=	ipbroadcast
diff --git a/tools/regression/netinet/ipbroadcast/ipbroadcast.c b/tools/regression/netinet/ipbroadcast/ipbroadcast.c
index 8d6f2479aabf1..467ddf0c4f0bc 100644
--- a/tools/regression/netinet/ipbroadcast/ipbroadcast.c
+++ b/tools/regression/netinet/ipbroadcast/ipbroadcast.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/netinet/ipbroadcast/ipbroadcast.c,v 1.5 2007/03/13 23:36:48 bms Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/tools/regression/netinet/ipmulticast/Makefile b/tools/regression/netinet/ipmulticast/Makefile
index a7cd29dbb2f0f..1592290d56a13 100644
--- a/tools/regression/netinet/ipmulticast/Makefile
+++ b/tools/regression/netinet/ipmulticast/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/ipmulticast/Makefile,v 1.1 2007/06/12 16:29:22 bms Exp $
 #
 
 PROG=	ipmulticast
diff --git a/tools/regression/netinet/ipmulticast/ipmulticast.c b/tools/regression/netinet/ipmulticast/ipmulticast.c
index af67fcfb150ae..74ef66ef51c8a 100644
--- a/tools/regression/netinet/ipmulticast/ipmulticast.c
+++ b/tools/regression/netinet/ipmulticast/ipmulticast.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/netinet/ipmulticast/ipmulticast.c,v 1.1 2007/06/12 16:29:22 bms Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/tools/regression/netinet/ipsockopt/Makefile b/tools/regression/netinet/ipsockopt/Makefile
index c49ee6cbd8f7d..c18e235022474 100644
--- a/tools/regression/netinet/ipsockopt/Makefile
+++ b/tools/regression/netinet/ipsockopt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/ipsockopt/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 #
 
 PROG=	ipsockopt
diff --git a/tools/regression/netinet/ipsockopt/ipsockopt.c b/tools/regression/netinet/ipsockopt/ipsockopt.c
index d03ddf652f420..34101102cd6f6 100644
--- a/tools/regression/netinet/ipsockopt/ipsockopt.c
+++ b/tools/regression/netinet/ipsockopt/ipsockopt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/ipsockopt/ipsockopt.c,v 1.8 2007/06/12 16:24:55 bms Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/ipsockopt/ipsockopt.t b/tools/regression/netinet/ipsockopt/ipsockopt.t
index 8bdfd03be81b6..84fbb77214e37 100644
--- a/tools/regression/netinet/ipsockopt/ipsockopt.t
+++ b/tools/regression/netinet/ipsockopt/ipsockopt.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/ipsockopt/ipsockopt.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/netinet/msocket/Makefile b/tools/regression/netinet/msocket/Makefile
index 17c5b80a284a8..a8994fa100e8e 100644
--- a/tools/regression/netinet/msocket/Makefile
+++ b/tools/regression/netinet/msocket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/msocket/Makefile,v 1.2 2006/03/15 10:46:35 ru Exp $
 
 PROG=	msocket
 NO_MAN=
diff --git a/tools/regression/netinet/msocket/msocket.c b/tools/regression/netinet/msocket/msocket.c
index 534e9f4b6041b..34431a22f975e 100644
--- a/tools/regression/netinet/msocket/msocket.c
+++ b/tools/regression/netinet/msocket/msocket.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/msocket/msocket.c,v 1.1 2005/07/22 19:36:29 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/msocket_ifnet_remove/Makefile b/tools/regression/netinet/msocket_ifnet_remove/Makefile
index 07c38160117a2..95a917e9d1ca9 100644
--- a/tools/regression/netinet/msocket_ifnet_remove/Makefile
+++ b/tools/regression/netinet/msocket_ifnet_remove/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/msocket_ifnet_remove/Makefile,v 1.3 2006/07/09 11:51:12 maxim Exp $
 
 PROG=	msocket_ifnet_remove
 WARNS?=	3
diff --git a/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c b/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c
index 51788eff14c74..b5d0d0865e0b9 100644
--- a/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c
+++ b/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c,v 1.1 2005/09/05 13:23:01 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/netinet/rawconnect/Makefile b/tools/regression/netinet/rawconnect/Makefile
index 2ab64936c24ba..5faffbcebd7df 100644
--- a/tools/regression/netinet/rawconnect/Makefile
+++ b/tools/regression/netinet/rawconnect/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/rawconnect/Makefile,v 1.1 2006/05/14 22:03:00 maxim Exp $
 #
 
 PROG=	rawconnect
diff --git a/tools/regression/netinet/rawconnect/rawconnect.c b/tools/regression/netinet/rawconnect/rawconnect.c
index 95f8fc4631791..75302d215e89a 100644
--- a/tools/regression/netinet/rawconnect/rawconnect.c
+++ b/tools/regression/netinet/rawconnect/rawconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/rawconnect/rawconnect.c,v 1.1 2006/05/14 22:03:00 maxim Exp $
  */
 
 /*
diff --git a/tools/regression/netinet/rawconnect/rawconnect.t b/tools/regression/netinet/rawconnect/rawconnect.t
index 03f249dda2371..a1c1a10703aa6 100644
--- a/tools/regression/netinet/rawconnect/rawconnect.t
+++ b/tools/regression/netinet/rawconnect/rawconnect.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/rawconnect/rawconnect.t,v 1.1 2006/05/20 19:18:24 maxim Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/netinet/tcpconnect/Makefile b/tools/regression/netinet/tcpconnect/Makefile
index 3456ff52ffda0..4bdd676ba3fce 100644
--- a/tools/regression/netinet/tcpconnect/Makefile
+++ b/tools/regression/netinet/tcpconnect/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpconnect/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 #
 
 PROG=	tcpconnect
diff --git a/tools/regression/netinet/tcpconnect/tcpconnect.c b/tools/regression/netinet/tcpconnect/tcpconnect.c
index 5037a988d9a5e..8e6741badbe0e 100644
--- a/tools/regression/netinet/tcpconnect/tcpconnect.c
+++ b/tools/regression/netinet/tcpconnect/tcpconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpconnect/tcpconnect.c,v 1.4 2005/05/16 00:54:47 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet/tcpdrop/Makefile b/tools/regression/netinet/tcpdrop/Makefile
index 1707dad23a5b9..f516ab9d0df42 100644
--- a/tools/regression/netinet/tcpdrop/Makefile
+++ b/tools/regression/netinet/tcpdrop/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpdrop/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
 #
 
 PROG=	tcpdrop
diff --git a/tools/regression/netinet/tcpdrop/tcpdrop.c b/tools/regression/netinet/tcpdrop/tcpdrop.c
index bf78d55686703..350ad8a3511c8 100644
--- a/tools/regression/netinet/tcpdrop/tcpdrop.c
+++ b/tools/regression/netinet/tcpdrop/tcpdrop.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpdrop/tcpdrop.c,v 1.1 2006/04/03 11:34:36 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netinet/tcpfullwindowrst/Makefile b/tools/regression/netinet/tcpfullwindowrst/Makefile
index b24f94081b5fa..e82485274ca46 100644
--- a/tools/regression/netinet/tcpfullwindowrst/Makefile
+++ b/tools/regression/netinet/tcpfullwindowrst/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpfullwindowrst/Makefile,v 1.3 2006/03/15 10:46:35 ru Exp $
 
 PROG=	tcpfullwindowrsttest
 NO_MAN=
diff --git a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t
index 49acbccf6e808..be8e25e732ebb 100644
--- a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t
+++ b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t,v 1.1 2004/12/01 12:12:12 nik Exp $
 
 make tcpfullwindowrsttest 2>&1 > /dev/null
 
diff --git a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c
index ac86b9e7627a8..d8647c525b9b0 100644
--- a/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c
+++ b/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c
@@ -24,7 +24,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c,v 1.1 2004/12/01 12:12:12 nik Exp $
 
 */
 
diff --git a/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile b/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile
index 2ac338a85d2fd..a2b60f322a993 100644
--- a/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile
+++ b/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
 #
 
 PROG=	tcpsockclosebeforeaccept
diff --git a/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c b/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c
index b7ef7656b9b7f..93a8f9ad97ed4 100644
--- a/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c
+++ b/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c,v 1.2 2006/04/03 11:57:41 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netinet/tcpsocktimewait/Makefile b/tools/regression/netinet/tcpsocktimewait/Makefile
index f86fefcf1295b..3110e08af8521 100644
--- a/tools/regression/netinet/tcpsocktimewait/Makefile
+++ b/tools/regression/netinet/tcpsocktimewait/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpsocktimewait/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
 #
 
 PROG=	tcpsocktimewait
diff --git a/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c b/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c
index a5e6542a952a9..5b523793a7c51 100644
--- a/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c
+++ b/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpsocktimewait/tcpsocktimewait.c,v 1.3 2006/04/02 11:09:37 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netinet/tcpstream/Makefile b/tools/regression/netinet/tcpstream/Makefile
index 6f6491aedd083..e3737261f9801 100644
--- a/tools/regression/netinet/tcpstream/Makefile
+++ b/tools/regression/netinet/tcpstream/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/tcpstream/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 #
 
 CFLAGS+=	-Wall
diff --git a/tools/regression/netinet/tcpstream/README b/tools/regression/netinet/tcpstream/README
index df2e9b1a21daa..76a7fa6d377ab 100644
--- a/tools/regression/netinet/tcpstream/README
+++ b/tools/regression/netinet/tcpstream/README
@@ -17,4 +17,4 @@ seed of 100:
 
     tcpstream client 192.168.10.10 8080 100
 
-$FreeBSD$
+$FreeBSD: src/tools/regression/netinet/tcpstream/README,v 1.1 2004/09/13 16:53:40 rwatson Exp $
diff --git a/tools/regression/netinet/tcpstream/tcpstream.c b/tools/regression/netinet/tcpstream/tcpstream.c
index c8fe9a3fe098d..ee44e570cf841 100644
--- a/tools/regression/netinet/tcpstream/tcpstream.c
+++ b/tools/regression/netinet/tcpstream/tcpstream.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/tcpstream/tcpstream.c,v 1.2 2004/10/23 22:07:57 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netinet/udpconnectjail/Makefile b/tools/regression/netinet/udpconnectjail/Makefile
index bd5d0b1cba926..15eb0680dfbba 100644
--- a/tools/regression/netinet/udpconnectjail/Makefile
+++ b/tools/regression/netinet/udpconnectjail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet/udpconnectjail/Makefile,v 1.3 2006/03/15 10:46:35 ru Exp $
 
 PROG=	udpconnectjail
 NO_MAN=
diff --git a/tools/regression/netinet/udpconnectjail/udpconnectjail.c b/tools/regression/netinet/udpconnectjail/udpconnectjail.c
index 7151ca4424631..22afad6f858b9 100644
--- a/tools/regression/netinet/udpconnectjail/udpconnectjail.c
+++ b/tools/regression/netinet/udpconnectjail/udpconnectjail.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet/udpconnectjail/udpconnectjail.c,v 1.3 2005/07/23 05:40:17 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/netinet6/inet6_rth/Makefile b/tools/regression/netinet6/inet6_rth/Makefile
index ac284d3465fea..28a57c639572a 100644
--- a/tools/regression/netinet6/inet6_rth/Makefile
+++ b/tools/regression/netinet6/inet6_rth/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet6/inet6_rth/Makefile,v 1.1 2007/04/21 11:23:33 mtm Exp $
 #
 PROG=   inet6_rth-segments
 SRCS=	test_subr.c inet6_rth-segments.c
diff --git a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
index 5ac1d9768565c..8a2317dcedc7b 100644
--- a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
+++ b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c,v 1.1 2007/04/21 11:23:33 mtm Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tools/regression/netinet6/inet6_rth/test_subr.c b/tools/regression/netinet6/inet6_rth/test_subr.c
index ab09ec8038513..ad21a95672008 100644
--- a/tools/regression/netinet6/inet6_rth/test_subr.c
+++ b/tools/regression/netinet6/inet6_rth/test_subr.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/netinet6/inet6_rth/test_subr.c,v 1.1 2007/04/21 11:23:33 mtm Exp $");
 
 #include <sys/types.h>
 
diff --git a/tools/regression/netinet6/inet6_rth/test_subr.h b/tools/regression/netinet6/inet6_rth/test_subr.h
index f0463daed51cf..94c28fadd52d5 100644
--- a/tools/regression/netinet6/inet6_rth/test_subr.h
+++ b/tools/regression/netinet6/inet6_rth/test_subr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet6/inet6_rth/test_subr.h,v 1.1 2007/04/21 11:23:33 mtm Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/netinet6/ip6_sockets/Makefile b/tools/regression/netinet6/ip6_sockets/Makefile
index 4f6bc78cc3ed0..9558d71539ece 100644
--- a/tools/regression/netinet6/ip6_sockets/Makefile
+++ b/tools/regression/netinet6/ip6_sockets/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netinet6/ip6_sockets/Makefile,v 1.2 2006/07/19 12:54:14 rwatson Exp $
 #
 
 PROG=	ip6_sockets
diff --git a/tools/regression/netinet6/ip6_sockets/ip6_sockets.c b/tools/regression/netinet6/ip6_sockets/ip6_sockets.c
index 07e6209297c52..261c1941af671 100644
--- a/tools/regression/netinet6/ip6_sockets/ip6_sockets.c
+++ b/tools/regression/netinet6/ip6_sockets/ip6_sockets.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netinet6/ip6_sockets/ip6_sockets.c,v 1.2 2006/07/19 12:54:14 rwatson Exp $
  */
 
 #include <sys/socket.h>
diff --git a/tools/regression/netipx/README b/tools/regression/netipx/README
index a1a07a4e78559..bae77a4effc7a 100644
--- a/tools/regression/netipx/README
+++ b/tools/regression/netipx/README
@@ -8,4 +8,4 @@ In addition, the loopback interface should be configured with the address
 
 	ifconfig lo0 ipx 0xbebe.1
 
-$FreeBSD$
+$FreeBSD: src/tools/regression/netipx/README,v 1.1 2006/03/26 17:42:04 rwatson Exp $
diff --git a/tools/regression/netipx/ipxdgramloopback/Makefile b/tools/regression/netipx/ipxdgramloopback/Makefile
index 364d787e46b76..f0b007b7a80f7 100644
--- a/tools/regression/netipx/ipxdgramloopback/Makefile
+++ b/tools/regression/netipx/ipxdgramloopback/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netipx/ipxdgramloopback/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
 #
 
 PROG=	ipxdgramloopback
diff --git a/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c b/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c
index b969b48b433cc..2d89a0c834c6d 100644
--- a/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c
+++ b/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netipx/ipxdgramloopback/ipxdgramloopback.c,v 1.1 2006/03/26 18:25:53 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netipx/ipxsocket/Makefile b/tools/regression/netipx/ipxsocket/Makefile
index 65157fa1dd195..fe94a1dc9522d 100644
--- a/tools/regression/netipx/ipxsocket/Makefile
+++ b/tools/regression/netipx/ipxsocket/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netipx/ipxsocket/Makefile,v 1.1 2006/03/26 01:58:39 rwatson Exp $
 #
 
 PROG=	ipxsocket
diff --git a/tools/regression/netipx/ipxsocket/ipxsocket.c b/tools/regression/netipx/ipxsocket/ipxsocket.c
index afcd2dc9a5480..076ed5d53b59f 100644
--- a/tools/regression/netipx/ipxsocket/ipxsocket.c
+++ b/tools/regression/netipx/ipxsocket/ipxsocket.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netipx/ipxsocket/ipxsocket.c,v 1.2 2006/03/26 15:49:35 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netipx/spxabort/Makefile b/tools/regression/netipx/spxabort/Makefile
index b9498a07c6591..95b8b1acb0dcf 100644
--- a/tools/regression/netipx/spxabort/Makefile
+++ b/tools/regression/netipx/spxabort/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netipx/spxabort/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
 #
 
 PROG=	spxabort
diff --git a/tools/regression/netipx/spxabort/spxabort.c b/tools/regression/netipx/spxabort/spxabort.c
index 8b6537f265ebd..e8f6abd6ed4c9 100644
--- a/tools/regression/netipx/spxabort/spxabort.c
+++ b/tools/regression/netipx/spxabort/spxabort.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/netipx/spxabort/spxabort.c,v 1.1 2006/03/27 00:03:37 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/netipx/spxloopback/Makefile b/tools/regression/netipx/spxloopback/Makefile
index edbfbbc5bdd39..e9be6c1fd0460 100644
--- a/tools/regression/netipx/spxloopback/Makefile
+++ b/tools/regression/netipx/spxloopback/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/netipx/spxloopback/Makefile,v 1.2 2006/07/09 11:51:12 maxim Exp $
 #
 
 PROG=	spxloopback
diff --git a/tools/regression/netipx/spxloopback/spxloopback.c b/tools/regression/netipx/spxloopback/spxloopback.c
index 9561cff699f06..0baa305cb178f 100644
--- a/tools/regression/netipx/spxloopback/spxloopback.c
+++ b/tools/regression/netipx/spxloopback/spxloopback.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$Exp $
+ * $FreeBSD: src/tools/regression/netipx/spxloopback/spxloopback.c,v 1.1 2006/03/26 19:10:27 rwatson Exp $Exp $
  */
 
 /*
diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile
index 07c3445fe7c49..9c126f12a18e7 100644
--- a/tools/regression/nfsmmap/test1/Makefile
+++ b/tools/regression/nfsmmap/test1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/nfsmmap/test1/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 
 PROG= test1
 NO_MAN=
diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile
index 113a3b32defab..4f1f35d0eba46 100644
--- a/tools/regression/nfsmmap/test2/Makefile
+++ b/tools/regression/nfsmmap/test2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/nfsmmap/test2/Makefile,v 1.3 2004/12/21 08:47:22 ru Exp $
 
 PROG= test2
 NO_MAN=
diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile
index 85db354b944d6..fc2f0b52daa10 100644
--- a/tools/regression/p1003_1b/Makefile
+++ b/tools/regression/p1003_1b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/p1003_1b/Makefile,v 1.4 2004/12/21 08:47:22 ru Exp $
 
 PROG=p1003_1b
 
diff --git a/tools/regression/p1003_1b/README b/tools/regression/p1003_1b/README
index e0b7037549274..51080b6ab6260 100644
--- a/tools/regression/p1003_1b/README
+++ b/tools/regression/p1003_1b/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/p1003_1b/README,v 1.1 2000/02/16 14:28:39 dufault Exp $
 
 p1003_1b: Regression tests for the scheduling facilities.
 The following should always work as of the release of 4.0:
diff --git a/tools/regression/p1003_1b/fifo.c b/tools/regression/p1003_1b/fifo.c
index 455f7f9adc5fb..803b8c8680ad0 100644
--- a/tools/regression/p1003_1b/fifo.c
+++ b/tools/regression/p1003_1b/fifo.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/fifo.c,v 1.1 2000/02/16 14:28:40 dufault Exp $
  */
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/tools/regression/p1003_1b/main.c b/tools/regression/p1003_1b/main.c
index 0e87c6ca68bf2..4d428a2718af2 100644
--- a/tools/regression/p1003_1b/main.c
+++ b/tools/regression/p1003_1b/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/p1003_1b/main.c,v 1.1 2000/02/16 14:28:40 dufault Exp $ */
 #include <stdio.h>
 
 int fifo(int argc, char *argv[]);
diff --git a/tools/regression/p1003_1b/memlock.c b/tools/regression/p1003_1b/memlock.c
index b55b4056dac84..e58167a9c8af3 100644
--- a/tools/regression/p1003_1b/memlock.c
+++ b/tools/regression/p1003_1b/memlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/memlock.c,v 1.1 2000/02/16 14:28:40 dufault Exp $
  */
 #include <unistd.h>
 #include <stdio.h>
diff --git a/tools/regression/p1003_1b/p26.c b/tools/regression/p1003_1b/p26.c
index 538deaf878639..edd0cec81a629 100644
--- a/tools/regression/p1003_1b/p26.c
+++ b/tools/regression/p1003_1b/p26.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/p26.c,v 1.1 2000/02/16 14:28:41 dufault Exp $
  */
 #define _POSIX_SOURCE
 #define _POSIX_C_SOURCE 199309L
diff --git a/tools/regression/p1003_1b/prutil.c b/tools/regression/p1003_1b/prutil.c
index e0e3d6f8fa68c..16ae68b3c0972 100644
--- a/tools/regression/p1003_1b/prutil.c
+++ b/tools/regression/p1003_1b/prutil.c
@@ -8,7 +8,7 @@
 #include "prutil.h"
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/prutil.c,v 1.1 2000/02/16 14:28:41 dufault Exp $
  */
 void quit(const char *text)
 {
diff --git a/tools/regression/p1003_1b/prutil.h b/tools/regression/p1003_1b/prutil.h
index 3387b994b1513..e4af986445683 100644
--- a/tools/regression/p1003_1b/prutil.h
+++ b/tools/regression/p1003_1b/prutil.h
@@ -2,7 +2,7 @@
 #define _PRUTIL_H_
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/prutil.h,v 1.1 2000/02/16 14:28:42 dufault Exp $
  */
 
 struct sched_param;
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index bd978f8d49421..8dffc583e548a 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -28,7 +28,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/sched.c,v 1.1 2000/02/16 14:28:42 dufault Exp $
  *
  */
 
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index ac31a99f250ac..c005326a29435 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -28,7 +28,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/p1003_1b/yield.c,v 1.2 2002/04/22 13:44:35 des Exp $
  *
  */
 #include <sys/types.h>
diff --git a/tools/regression/pipe/Makefile b/tools/regression/pipe/Makefile
index cf732538b2559..69791d3c5bc15 100644
--- a/tools/regression/pipe/Makefile
+++ b/tools/regression/pipe/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/pipe/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 #
 # "make" then "make regress".
 #
diff --git a/tools/regression/pipe/bigpipetest.c b/tools/regression/pipe/bigpipetest.c
index c5983fa5559e9..393cd40486df8 100644
--- a/tools/regression/pipe/bigpipetest.c
+++ b/tools/regression/pipe/bigpipetest.c
@@ -12,7 +12,7 @@
  * Test for the non-blocking big pipe bug (write(2) returning
  * EAGAIN while select(2) returns the descriptor as ready for write).
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/bigpipetest.c,v 1.3 2004/11/11 19:47:53 nik Exp $
  */
 
 void write_frame(int fd, char *buf, unsigned long buflen)
diff --git a/tools/regression/pipe/bigpipetest.t b/tools/regression/pipe/bigpipetest.t
index 8bdfd03be81b6..dfdc46dbb5f1a 100644
--- a/tools/regression/pipe/bigpipetest.t
+++ b/tools/regression/pipe/bigpipetest.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/pipe/bigpipetest.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/pipe/pipe-fstatbug.c b/tools/regression/pipe/pipe-fstatbug.c
index ed038c20a69a5..52b6f2d6ead46 100644
--- a/tools/regression/pipe/pipe-fstatbug.c
+++ b/tools/regression/pipe/pipe-fstatbug.c
@@ -28,7 +28,7 @@ SUCH DAMAGE.
 #include <sys/stat.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-fstatbug.c,v 1.1 2004/07/20 07:17:19 silby Exp $
  * The goal of this program is to see if fstat reports the correct
  * data count for a pipe.  Prior to revision 1.172 of sys_pipe.c,
  * 0 would be returned once the pipe entered direct write mode.
diff --git a/tools/regression/pipe/pipe-overcommit1.c b/tools/regression/pipe/pipe-overcommit1.c
index c4686588b6bb1..36aa31513079d 100644
--- a/tools/regression/pipe/pipe-overcommit1.c
+++ b/tools/regression/pipe/pipe-overcommit1.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-overcommit1.c,v 1.1 2005/01/21 06:46:18 silby Exp $
  * This program just allocates as many pipes as it can to ensure
  * that using up all pipe memory doesn't cause a panic.
  */
diff --git a/tools/regression/pipe/pipe-overcommit2.c b/tools/regression/pipe/pipe-overcommit2.c
index 5979585e6e6b2..d1b9f8179c2b1 100644
--- a/tools/regression/pipe/pipe-overcommit2.c
+++ b/tools/regression/pipe/pipe-overcommit2.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-overcommit2.c,v 1.1 2005/01/21 06:46:18 silby Exp $
  * This program tests how sys_pipe.c handles the case where there
  * is ample memory to allocate a pipe, but the file descriptor
  * limit for that user has been exceeded.
diff --git a/tools/regression/pipe/pipe-reverse.c b/tools/regression/pipe/pipe-reverse.c
index f4ae16747d0b2..81c28340a3b7e 100644
--- a/tools/regression/pipe/pipe-reverse.c
+++ b/tools/regression/pipe/pipe-reverse.c
@@ -28,7 +28,7 @@ SUCH DAMAGE.
 #include <sys/stat.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-reverse.c,v 1.1 2004/07/22 02:46:25 silby Exp $
  * This program simply tests writing through the reverse direction of
  * a pipe.  Nothing too fancy, it's only needed because most pipe-using
  * programs never touch the reverse direction (it doesn't exist on
diff --git a/tools/regression/pipe/pipe-wraparound.c b/tools/regression/pipe/pipe-wraparound.c
index ab673e9b180ab..d18a0b537c8c7 100644
--- a/tools/regression/pipe/pipe-wraparound.c
+++ b/tools/regression/pipe/pipe-wraparound.c
@@ -28,7 +28,7 @@ SUCH DAMAGE.
 #include <sys/stat.h>
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pipe/pipe-wraparound.c,v 1.1 2004/07/22 02:46:25 silby Exp $
  * This program tests to make sure that wraparound writes and reads
  * are working, assuming that 16K socket buffers are used.  In order
  * to really stress the pipe code with this test, kernel modifications
diff --git a/tools/regression/priv/Makefile b/tools/regression/priv/Makefile
index 2a63eccfcf541..4b2182ce43395 100644
--- a/tools/regression/priv/Makefile
+++ b/tools/regression/priv/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/priv/Makefile,v 1.2 2007/09/09 23:08:39 rwatson Exp $
 #
 
 PROG=	priv
diff --git a/tools/regression/priv/main.c b/tools/regression/priv/main.c
index a9faa98f81c3f..0f2dd67338e1d 100644
--- a/tools/regression/priv/main.c
+++ b/tools/regression/priv/main.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/main.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/main.h b/tools/regression/priv/main.h
index d863feb7b7d07..8a46accaa1d65 100644
--- a/tools/regression/priv/main.h
+++ b/tools/regression/priv/main.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/main.h,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 #define	UID_ROOT	0
diff --git a/tools/regression/priv/priv_acct.c b/tools/regression/priv/priv_acct.c
index d1324bbeb49c7..20fda8d7ff0d7 100644
--- a/tools/regression/priv/priv_acct.c
+++ b/tools/regression/priv/priv_acct.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_acct.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_adjtime.c b/tools/regression/priv/priv_adjtime.c
index 65fbfac48dbe6..de1a4d799c1fe 100644
--- a/tools/regression/priv/priv_adjtime.c
+++ b/tools/regression/priv/priv_adjtime.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_adjtime.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_audit_control.c b/tools/regression/priv/priv_audit_control.c
index a6618192d95b1..a59cf7b4d17f6 100644
--- a/tools/regression/priv/priv_audit_control.c
+++ b/tools/regression/priv/priv_audit_control.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_audit_control.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_audit_getaudit.c b/tools/regression/priv/priv_audit_getaudit.c
index cccabeda28c66..e8e0209493078 100644
--- a/tools/regression/priv/priv_audit_getaudit.c
+++ b/tools/regression/priv/priv_audit_getaudit.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_audit_getaudit.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_audit_setaudit.c b/tools/regression/priv/priv_audit_setaudit.c
index 0b6d8dbaf173e..94715378e1b8e 100644
--- a/tools/regression/priv/priv_audit_setaudit.c
+++ b/tools/regression/priv/priv_audit_setaudit.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_audit_setaudit.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_audit_submit.c b/tools/regression/priv/priv_audit_submit.c
index 915f6e6cc6f50..c18f97b8e7b1a 100644
--- a/tools/regression/priv/priv_audit_submit.c
+++ b/tools/regression/priv/priv_audit_submit.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_audit_submit.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_clock_settime.c b/tools/regression/priv/priv_clock_settime.c
index 84b8bebfc8a2f..027035955b7e9 100644
--- a/tools/regression/priv/priv_clock_settime.c
+++ b/tools/regression/priv/priv_clock_settime.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_clock_settime.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_cred.c b/tools/regression/priv/priv_cred.c
index 6e060cff40aec..b1534f5eaf373 100644
--- a/tools/regression/priv/priv_cred.c
+++ b/tools/regression/priv/priv_cred.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_cred.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_io.c b/tools/regression/priv/priv_io.c
index 31e60a0c20e53..15e8c0ecd2337 100644
--- a/tools/regression/priv/priv_io.c
+++ b/tools/regression/priv/priv_io.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_io.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_kenv_set.c b/tools/regression/priv/priv_kenv_set.c
index 1e750e03f33ff..a75f60f19013e 100644
--- a/tools/regression/priv/priv_kenv_set.c
+++ b/tools/regression/priv/priv_kenv_set.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_kenv_set.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_kenv_unset.c b/tools/regression/priv/priv_kenv_unset.c
index 02004da782768..1f6935a9fae17 100644
--- a/tools/regression/priv/priv_kenv_unset.c
+++ b/tools/regression/priv/priv_kenv_unset.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_kenv_unset.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_msgbuf.c b/tools/regression/priv/priv_msgbuf.c
index c8db210a4c229..c60846e989485 100644
--- a/tools/regression/priv/priv_msgbuf.c
+++ b/tools/regression/priv/priv_msgbuf.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_msgbuf.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_netinet_raw.c b/tools/regression/priv/priv_netinet_raw.c
index 75f66c07d6b2c..eb8ec033e47bd 100644
--- a/tools/regression/priv/priv_netinet_raw.c
+++ b/tools/regression/priv/priv_netinet_raw.c
@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_netinet_raw.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_proc_setlogin.c b/tools/regression/priv/priv_proc_setlogin.c
index f04b79feaa450..0c866c86fee65 100644
--- a/tools/regression/priv/priv_proc_setlogin.c
+++ b/tools/regression/priv/priv_proc_setlogin.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_proc_setlogin.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_proc_setrlimit.c b/tools/regression/priv/priv_proc_setrlimit.c
index 590f55f0685bf..e12f7db9be9d6 100644
--- a/tools/regression/priv/priv_proc_setrlimit.c
+++ b/tools/regression/priv/priv_proc_setrlimit.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_proc_setrlimit.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*-
diff --git a/tools/regression/priv/priv_sched_rtprio.c b/tools/regression/priv/priv_sched_rtprio.c
index 2498f3faa32a2..dc5c72dfe12b4 100644
--- a/tools/regression/priv/priv_sched_rtprio.c
+++ b/tools/regression/priv/priv_sched_rtprio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_sched_rtprio.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_sched_setpriority.c b/tools/regression/priv/priv_sched_setpriority.c
index 219fd8c68b1cf..ac40867a9be31 100644
--- a/tools/regression/priv/priv_sched_setpriority.c
+++ b/tools/regression/priv/priv_sched_setpriority.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_sched_setpriority.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_settimeofday.c b/tools/regression/priv/priv_settimeofday.c
index df9300ecd8872..69b8d381af758 100644
--- a/tools/regression/priv/priv_settimeofday.c
+++ b/tools/regression/priv/priv_settimeofday.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_settimeofday.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_sysctl_write.c b/tools/regression/priv/priv_sysctl_write.c
index 25e02f91c1892..e4f63c2719ee3 100644
--- a/tools/regression/priv/priv_sysctl_write.c
+++ b/tools/regression/priv/priv_sysctl_write.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_sysctl_write.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_chflags.c b/tools/regression/priv/priv_vfs_chflags.c
index 469b12b125fb7..dab0b0fa9a824 100644
--- a/tools/regression/priv/priv_vfs_chflags.c
+++ b/tools/regression/priv/priv_vfs_chflags.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_chflags.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_chmod.c b/tools/regression/priv/priv_vfs_chmod.c
index 6a64871f59732..ba40ef78ce294 100644
--- a/tools/regression/priv/priv_vfs_chmod.c
+++ b/tools/regression/priv/priv_vfs_chmod.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_chmod.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_chown.c b/tools/regression/priv/priv_vfs_chown.c
index c0c10e640c0dc..64f5fd35749cb 100644
--- a/tools/regression/priv/priv_vfs_chown.c
+++ b/tools/regression/priv/priv_vfs_chown.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_chown.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_chroot.c b/tools/regression/priv/priv_vfs_chroot.c
index 4ba15e5a73f07..2bf32e621103d 100644
--- a/tools/regression/priv/priv_vfs_chroot.c
+++ b/tools/regression/priv/priv_vfs_chroot.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_chroot.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_clearsugid.c b/tools/regression/priv/priv_vfs_clearsugid.c
index b62a9283c7781..a04f8d8d09454 100644
--- a/tools/regression/priv/priv_vfs_clearsugid.c
+++ b/tools/regression/priv/priv_vfs_clearsugid.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_clearsugid.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_extattr_system.c b/tools/regression/priv/priv_vfs_extattr_system.c
index 9f8f88718e1a7..7b576729570d4 100644
--- a/tools/regression/priv/priv_vfs_extattr_system.c
+++ b/tools/regression/priv/priv_vfs_extattr_system.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_extattr_system.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_fhopen.c b/tools/regression/priv/priv_vfs_fhopen.c
index 32b32f98a2327..464cf6f4e3102 100644
--- a/tools/regression/priv/priv_vfs_fhopen.c
+++ b/tools/regression/priv/priv_vfs_fhopen.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_fhopen.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_fhstat.c b/tools/regression/priv/priv_vfs_fhstat.c
index 18506fa190f1e..3e2f84ad3a69c 100644
--- a/tools/regression/priv/priv_vfs_fhstat.c
+++ b/tools/regression/priv/priv_vfs_fhstat.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_fhstat.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_fhstatfs.c b/tools/regression/priv/priv_vfs_fhstatfs.c
index f814989423c18..ed82b974cd7aa 100644
--- a/tools/regression/priv/priv_vfs_fhstatfs.c
+++ b/tools/regression/priv/priv_vfs_fhstatfs.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_fhstatfs.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_generation.c b/tools/regression/priv/priv_vfs_generation.c
index 0ac58c537ce48..d071a89f80b43 100644
--- a/tools/regression/priv/priv_vfs_generation.c
+++ b/tools/regression/priv/priv_vfs_generation.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_generation.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_getfh.c b/tools/regression/priv/priv_vfs_getfh.c
index d2904dfc225ac..f66ef1df9778e 100644
--- a/tools/regression/priv/priv_vfs_getfh.c
+++ b/tools/regression/priv/priv_vfs_getfh.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_getfh.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_read_write.c b/tools/regression/priv/priv_vfs_read_write.c
index 5bf5a0306a20a..682aa9d1c8300 100644
--- a/tools/regression/priv/priv_vfs_read_write.c
+++ b/tools/regression/priv/priv_vfs_read_write.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_read_write.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_setgid.c b/tools/regression/priv/priv_vfs_setgid.c
index 62ebf8c3a7c35..198363df2b3a9 100644
--- a/tools/regression/priv/priv_vfs_setgid.c
+++ b/tools/regression/priv/priv_vfs_setgid.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_setgid.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_stickyfile.c b/tools/regression/priv/priv_vfs_stickyfile.c
index 5dcf350105b0e..6ad3ff9277069 100644
--- a/tools/regression/priv/priv_vfs_stickyfile.c
+++ b/tools/regression/priv/priv_vfs_stickyfile.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_stickyfile.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vfs_utimes.c b/tools/regression/priv/priv_vfs_utimes.c
index 78fe6916c4f46..1752b0bef49e4 100644
--- a/tools/regression/priv/priv_vfs_utimes.c
+++ b/tools/regression/priv/priv_vfs_utimes.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vfs_utimes.c,v 1.1 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vm_madv_protect.c b/tools/regression/priv/priv_vm_madv_protect.c
index 008e531dbe5e6..1ee2566e518ac 100644
--- a/tools/regression/priv/priv_vm_madv_protect.c
+++ b/tools/regression/priv/priv_vm_madv_protect.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vm_madv_protect.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vm_mlock.c b/tools/regression/priv/priv_vm_mlock.c
index 5cdbc706de506..5d2e44c1ea287 100644
--- a/tools/regression/priv/priv_vm_mlock.c
+++ b/tools/regression/priv/priv_vm_mlock.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vm_mlock.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/priv/priv_vm_munlock.c b/tools/regression/priv/priv_vm_munlock.c
index d5a474ad3b8e2..ceebe41d89eb2 100644
--- a/tools/regression/priv/priv_vm_munlock.c
+++ b/tools/regression/priv/priv_vm_munlock.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/priv/priv_vm_munlock.c,v 1.2 2007/09/09 23:08:39 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/pthread/cv_cancel1/Makefile b/tools/regression/pthread/cv_cancel1/Makefile
index 6fe38c76d86c3..27ad649c074ea 100644
--- a/tools/regression/pthread/cv_cancel1/Makefile
+++ b/tools/regression/pthread/cv_cancel1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/pthread/cv_cancel1/Makefile,v 1.1 2006/12/05 05:14:56 davidxu Exp $
 
 PROG=	cv_cancel1
 NO_MAN=
diff --git a/tools/regression/pthread/cv_cancel1/cv_cancel1.c b/tools/regression/pthread/cv_cancel1/cv_cancel1.c
index cacad44c2280f..0f6b42131950a 100644
--- a/tools/regression/pthread/cv_cancel1/cv_cancel1.c
+++ b/tools/regression/pthread/cv_cancel1/cv_cancel1.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/pthread/cv_cancel1/cv_cancel1.c,v 1.3 2006/12/06 00:03:42 davidxu Exp $
  *
  */
 #include <pthread.h>
diff --git a/tools/regression/redzone9/Makefile b/tools/regression/redzone9/Makefile
index 6de15357488f8..130a41b742d7a 100644
--- a/tools/regression/redzone9/Makefile
+++ b/tools/regression/redzone9/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/redzone9/Makefile,v 1.1 2006/01/31 11:20:13 pjd Exp $
 
 KMOD=	redzone
 SRCS=	redzone.c
diff --git a/tools/regression/redzone9/README b/tools/regression/redzone9/README
index 87ca49a08633d..712eaaf803da2 100644
--- a/tools/regression/redzone9/README
+++ b/tools/regression/redzone9/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/redzone9/README,v 1.1 2006/01/31 11:20:13 pjd Exp $
 
 To verify that redzone(9) works properly:
 
diff --git a/tools/regression/redzone9/redzone.c b/tools/regression/redzone9/redzone.c
index 101373892188e..987807460558a 100644
--- a/tools/regression/redzone9/redzone.c
+++ b/tools/regression/redzone9/redzone.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/redzone9/redzone.c,v 1.1 2006/01/31 11:20:13 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/tools/regression/redzone9/test.sh b/tools/regression/redzone9/test.sh
index b38245807e042..3e88215c966e0 100644
--- a/tools/regression/redzone9/test.sh
+++ b/tools/regression/redzone9/test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/redzone9/test.sh,v 1.1 2006/01/31 11:20:13 pjd Exp $
 
 sysctl debug.redzone.malloc_underflow=1
 sysctl debug.redzone.malloc_overflow=1
diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile
index 7ec39999dff6e..b399ebb5cc9dc 100644
--- a/tools/regression/security/access/Makefile
+++ b/tools/regression/security/access/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/security/access/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 
 PROG=	testaccess
 NO_MAN=
diff --git a/tools/regression/security/access/testaccess.c b/tools/regression/security/access/testaccess.c
index 46bb01c4150d1..5634fbfb56f0d 100644
--- a/tools/regression/security/access/testaccess.c
+++ b/tools/regression/security/access/testaccess.c
@@ -29,7 +29,7 @@
  * Work sponsored by Defense Advanced Research Projects Agency under the
  * CHATS research program, CBOSS project.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/access/testaccess.c,v 1.4 2002/05/16 05:03:56 trhodes Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile
index ad09f7a696f33..e4578b29b9db0 100644
--- a/tools/regression/security/proc_to_proc/Makefile
+++ b/tools/regression/security/proc_to_proc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/security/proc_to_proc/Makefile,v 1.4 2004/12/21 08:47:23 ru Exp $
 
 PROG=	testuid
 NO_MAN=
diff --git a/tools/regression/security/proc_to_proc/README b/tools/regression/security/proc_to_proc/README
index 01857b834dcee..474abf4104a1a 100644
--- a/tools/regression/security/proc_to_proc/README
+++ b/tools/regression/security/proc_to_proc/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/security/proc_to_proc/README,v 1.2 2001/04/12 17:46:20 rwatson Exp $
 
   Inter-Process Authorization Test Suite
   Robert Watson, TrustedBSD Project
diff --git a/tools/regression/security/proc_to_proc/scenario.c b/tools/regression/security/proc_to_proc/scenario.c
index 0e3e476df54ba..cf43ab40bbfd5 100644
--- a/tools/regression/security/proc_to_proc/scenario.c
+++ b/tools/regression/security/proc_to_proc/scenario.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/proc_to_proc/scenario.c,v 1.6 2004/07/17 17:01:25 rwatson Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/regression/security/proc_to_proc/scenario.h b/tools/regression/security/proc_to_proc/scenario.h
index da087207c5a73..d94bf07d071b3 100644
--- a/tools/regression/security/proc_to_proc/scenario.h
+++ b/tools/regression/security/proc_to_proc/scenario.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/proc_to_proc/scenario.h,v 1.1 2001/04/11 17:21:14 rwatson Exp $
  */
 #ifndef _SCENARIO_H
 #define _SCENARIO_H
diff --git a/tools/regression/security/proc_to_proc/testuid.c b/tools/regression/security/proc_to_proc/testuid.c
index a9b81a08541c0..ae76b04f0be12 100644
--- a/tools/regression/security/proc_to_proc/testuid.c
+++ b/tools/regression/security/proc_to_proc/testuid.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/security/proc_to_proc/testuid.c,v 1.1 2001/04/11 17:21:14 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sigqueue/Makefile b/tools/regression/sigqueue/Makefile
index 3533723b61cb8..30ed91e53d412 100644
--- a/tools/regression/sigqueue/Makefile
+++ b/tools/regression/sigqueue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sigqueue/Makefile,v 1.2 2005/11/08 09:19:43 davidxu Exp $
 
 SUBDIR=sigqtest1 sigqtest2
 
diff --git a/tools/regression/sigqueue/sigqtest1/Makefile b/tools/regression/sigqueue/sigqtest1/Makefile
index 08a140c5c894d..21978248d7b39 100644
--- a/tools/regression/sigqueue/sigqtest1/Makefile
+++ b/tools/regression/sigqueue/sigqtest1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sigqueue/sigqtest1/Makefile,v 1.1 2005/11/07 14:10:33 davidxu Exp $
 
 PROG=sigqtest1
 LDADD+=
diff --git a/tools/regression/sigqueue/sigqtest1/sigqtest1.c b/tools/regression/sigqueue/sigqtest1/sigqtest1.c
index 0f40021b4ab6a..8f183d4b92914 100644
--- a/tools/regression/sigqueue/sigqtest1/sigqtest1.c
+++ b/tools/regression/sigqueue/sigqtest1/sigqtest1.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/sigqueue/sigqtest1/sigqtest1.c,v 1.1 2005/11/07 14:10:33 davidxu Exp $ */
 #include <signal.h>
 #include <stdio.h>
 #include <err.h>
diff --git a/tools/regression/sigqueue/sigqtest2/Makefile b/tools/regression/sigqueue/sigqtest2/Makefile
index b3899ad833f92..4f7f4181fd85f 100644
--- a/tools/regression/sigqueue/sigqtest2/Makefile
+++ b/tools/regression/sigqueue/sigqtest2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sigqueue/sigqtest2/Makefile,v 1.1 2005/11/08 09:19:44 davidxu Exp $
 
 PROG=sigqtest2
 LDADD+=
diff --git a/tools/regression/sigqueue/sigqtest2/sigqtest2.c b/tools/regression/sigqueue/sigqtest2/sigqtest2.c
index 078ea81f62784..c098a9d5f9dfb 100644
--- a/tools/regression/sigqueue/sigqtest2/sigqtest2.c
+++ b/tools/regression/sigqueue/sigqtest2/sigqtest2.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/sigqueue/sigqtest2/sigqtest2.c,v 1.1 2005/11/08 09:19:44 davidxu Exp $ */
 #include <signal.h>
 #include <stdio.h>
 #include <err.h>
diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
index efcaa16c8e373..5db107c2f46f3 100644
--- a/tools/regression/sockets/accept_fd_leak/Makefile
+++ b/tools/regression/sockets/accept_fd_leak/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accept_fd_leak/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 #
 
 PROG=	accept_fd_leak
diff --git a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
index 32d4edf2192ca..1d2b3c96a0ca5 100644
--- a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
+++ b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c,v 1.6 2007/04/02 16:02:50 jhb Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
index 8bdfd03be81b6..cddef2f436d0f 100644
--- a/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
+++ b/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
index 736c796861fd0..da379c9b9cfae 100644
--- a/tools/regression/sockets/accf_data_attach/Makefile
+++ b/tools/regression/sockets/accf_data_attach/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accf_data_attach/Makefile,v 1.3 2004/12/21 08:47:23 ru Exp $
 #
 
 PROG=	accf_data_attach
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.c b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
index 697d83aa6ef7c..ec8de7719d256 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.c
+++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/accf_data_attach/accf_data_attach.c,v 1.4 2005/06/11 11:59:48 maxim Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.t b/tools/regression/sockets/accf_data_attach/accf_data_attach.t
index 8bdfd03be81b6..a2e4b2f3896d5 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.t
+++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/accf_data_attach/accf_data_attach.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile
index 53d34a91da17d..fd634be02e760 100644
--- a/tools/regression/sockets/kqueue/Makefile
+++ b/tools/regression/sockets/kqueue/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/kqueue/Makefile,v 1.4 2004/12/21 08:47:23 ru Exp $
 #
 
 PROG=	kqueue
diff --git a/tools/regression/sockets/kqueue/kqueue.c b/tools/regression/sockets/kqueue/kqueue.c
index d46db96ad4ee8..e01fd5fc8c091 100644
--- a/tools/regression/sockets/kqueue/kqueue.c
+++ b/tools/regression/sockets/kqueue/kqueue.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/kqueue/kqueue.c,v 1.3 2004/11/11 19:47:53 nik Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/kqueue/kqueue.t b/tools/regression/sockets/kqueue/kqueue.t
index 8bdfd03be81b6..af81f26156006 100644
--- a/tools/regression/sockets/kqueue/kqueue.t
+++ b/tools/regression/sockets/kqueue/kqueue.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/kqueue/kqueue.t,v 1.1 2004/11/11 19:47:53 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile
index aff40e414932c..f9f91346310c9 100644
--- a/tools/regression/sockets/listen_backlog/Makefile
+++ b/tools/regression/sockets/listen_backlog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/listen_backlog/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
 
 PROG=	listen_backlog
 WARNS?=	3
diff --git a/tools/regression/sockets/listen_backlog/listen_backlog.c b/tools/regression/sockets/listen_backlog/listen_backlog.c
index be170ab9f7e45..f5beada6fff79 100644
--- a/tools/regression/sockets/listen_backlog/listen_backlog.c
+++ b/tools/regression/sockets/listen_backlog/listen_backlog.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/listen_backlog/listen_backlog.c,v 1.1 2005/09/18 13:42:19 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile
index 4ca3ddf8273f7..e21a68b513757 100644
--- a/tools/regression/sockets/listenclose/Makefile
+++ b/tools/regression/sockets/listenclose/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/listenclose/Makefile,v 1.4 2006/03/15 10:46:36 ru Exp $
 #
 
 PROG=	listenclose
diff --git a/tools/regression/sockets/listenclose/listenclose.c b/tools/regression/sockets/listenclose/listenclose.c
index 425e39f15820c..28e1d3a967a23 100644
--- a/tools/regression/sockets/listenclose/listenclose.c
+++ b/tools/regression/sockets/listenclose/listenclose.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/listenclose/listenclose.c,v 1.2 2005/05/16 00:53:38 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile
index b825c80fcabe7..bf32363b67bda 100644
--- a/tools/regression/sockets/pr_atomic/Makefile
+++ b/tools/regression/sockets/pr_atomic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/pr_atomic/Makefile,v 1.1 2006/12/23 21:07:07 bms Exp $
 
 PROG=	pr_atomic
 NO_MAN=
diff --git a/tools/regression/sockets/pr_atomic/pr_atomic.c b/tools/regression/sockets/pr_atomic/pr_atomic.c
index 69bbac782a52e..e3e29de7a7d77 100644
--- a/tools/regression/sockets/pr_atomic/pr_atomic.c
+++ b/tools/regression/sockets/pr_atomic/pr_atomic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/pr_atomic/pr_atomic.c,v 1.1 2006/12/23 21:07:07 bms Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
index 21babc6a01247..ace9500143d53 100644
--- a/tools/regression/sockets/reconnect/Makefile
+++ b/tools/regression/sockets/reconnect/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/reconnect/Makefile,v 1.3 2006/03/15 10:46:36 ru Exp $
 #
 
 PROG=	reconnect
diff --git a/tools/regression/sockets/reconnect/reconnect.c b/tools/regression/sockets/reconnect/reconnect.c
index 02922bfb2a8e0..164c4e9f885d7 100644
--- a/tools/regression/sockets/reconnect/reconnect.c
+++ b/tools/regression/sockets/reconnect/reconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/reconnect/reconnect.c,v 1.1 2005/01/12 09:57:18 sobomax Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile
index 51a9452114864..f8e7cc98bc399 100644
--- a/tools/regression/sockets/rtsocket/Makefile
+++ b/tools/regression/sockets/rtsocket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/rtsocket/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
 
 PROG=	rtsocket
 NO_MAN=
diff --git a/tools/regression/sockets/rtsocket/rtsocket.c b/tools/regression/sockets/rtsocket/rtsocket.c
index 6a0738b69c9bc..fffbe2133deb5 100644
--- a/tools/regression/sockets/rtsocket/rtsocket.c
+++ b/tools/regression/sockets/rtsocket/rtsocket.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/rtsocket/rtsocket.c,v 1.1 2006/04/09 14:48:38 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/sblock/Makefile b/tools/regression/sockets/sblock/Makefile
index 97343fc50f451..98ca2585737b1 100644
--- a/tools/regression/sockets/sblock/Makefile
+++ b/tools/regression/sockets/sblock/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/sblock/Makefile,v 1.1 2007/05/06 14:28:49 rwatson Exp $
 #
 
 PROG=	sblock
diff --git a/tools/regression/sockets/sblock/sblock.c b/tools/regression/sockets/sblock/sblock.c
index a5088118873bd..88726568d8688 100644
--- a/tools/regression/sockets/sblock/sblock.c
+++ b/tools/regression/sockets/sblock/sblock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/sblock/sblock.c,v 1.1 2007/05/06 14:28:49 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile
index e1a43cb933f17..6a6f34e21b5e9 100644
--- a/tools/regression/sockets/sendfile/Makefile
+++ b/tools/regression/sockets/sendfile/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/sendfile/Makefile,v 1.4 2007/04/19 07:59:30 des Exp $
 #
 
 PROG=	sendfile
diff --git a/tools/regression/sockets/sendfile/sendfile.c b/tools/regression/sockets/sendfile/sendfile.c
index e91151c6910a0..a7ad0556156cc 100644
--- a/tools/regression/sockets/sendfile/sendfile.c
+++ b/tools/regression/sockets/sendfile/sendfile.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/sendfile/sendfile.c,v 1.5 2007/04/20 19:01:42 pjd Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/shutdown/Makefile b/tools/regression/sockets/shutdown/Makefile
index 775e6e5e10079..90f9a2aad4b1e 100644
--- a/tools/regression/sockets/shutdown/Makefile
+++ b/tools/regression/sockets/shutdown/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/shutdown/Makefile,v 1.2 2006/03/15 10:46:36 ru Exp $
 #
 
 PROG=	shutdown
diff --git a/tools/regression/sockets/shutdown/shutdown.c b/tools/regression/sockets/shutdown/shutdown.c
index c4e884d206583..c586d4976992e 100644
--- a/tools/regression/sockets/shutdown/shutdown.c
+++ b/tools/regression/sockets/shutdown/shutdown.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/shutdown/shutdown.c,v 1.2 2005/09/15 13:20:39 maxim Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/sigpipe/Makefile b/tools/regression/sockets/sigpipe/Makefile
index 2130154edf9da..5389dce51eaf3 100644
--- a/tools/regression/sockets/sigpipe/Makefile
+++ b/tools/regression/sockets/sigpipe/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/sigpipe/Makefile,v 1.2 2006/03/15 10:46:36 ru Exp $
 #
 
 PROG=	sigpipe
diff --git a/tools/regression/sockets/sigpipe/sigpipe.c b/tools/regression/sockets/sigpipe/sigpipe.c
index 0422576ba20bc..8c43e74152da0 100644
--- a/tools/regression/sockets/sigpipe/sigpipe.c
+++ b/tools/regression/sockets/sigpipe/sigpipe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/sigpipe/sigpipe.c,v 1.2 2005/03/11 13:05:18 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile
index 549e219ddfaa3..874f4e92aa51a 100644
--- a/tools/regression/sockets/socketpair/Makefile
+++ b/tools/regression/sockets/socketpair/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/socketpair/Makefile,v 1.5 2006/07/09 11:51:13 maxim Exp $
 #
 
 PROG=	socketpair
diff --git a/tools/regression/sockets/socketpair/socketpair.c b/tools/regression/sockets/socketpair/socketpair.c
index 5f4647614f99e..dd0e52fd2efa6 100644
--- a/tools/regression/sockets/socketpair/socketpair.c
+++ b/tools/regression/sockets/socketpair/socketpair.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/socketpair/socketpair.c,v 1.2 2007/04/02 19:15:47 jhb Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile
index ec1dfd0e2edf5..f471b7a442bab 100644
--- a/tools/regression/sockets/unix_bindconnect/Makefile
+++ b/tools/regression/sockets/unix_bindconnect/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_bindconnect/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
 
 PROG=	unix_bindconnect
 NO_MAN=
diff --git a/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c b/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
index 7db82a0faa440..28b4692df9370 100644
--- a/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
+++ b/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c,v 1.1 2005/02/20 22:21:53 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/unix_cmsg/Makefile b/tools/regression/sockets/unix_cmsg/Makefile
index d09cb79d29730..2a099988d455c 100644
--- a/tools/regression/sockets/unix_cmsg/Makefile
+++ b/tools/regression/sockets/unix_cmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_cmsg/Makefile,v 1.1 2006/05/29 18:40:55 maxim Exp $
 
 PROG=	unix_cmsg
 NO_MAN=
diff --git a/tools/regression/sockets/unix_cmsg/README b/tools/regression/sockets/unix_cmsg/README
index 359da438c360c..d3c83da95155a 100644
--- a/tools/regression/sockets/unix_cmsg/README
+++ b/tools/regression/sockets/unix_cmsg/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sockets/unix_cmsg/README,v 1.1 2006/05/29 18:40:55 maxim Exp $
 
 About unix_cmsg
 ================
diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.c b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
index 6a39ac36ade5a..3f60eb04f1ffc 100644
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.c
+++ b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/regression/sockets/unix_cmsg/unix_cmsg.c,v 1.2 2006/05/31 08:10:34 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/resource.h>
diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.t b/tools/regression/sockets/unix_cmsg/unix_cmsg.t
index c8dea15966971..36b7d8d525616 100644
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.t
+++ b/tools/regression/sockets/unix_cmsg/unix_cmsg.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_cmsg/unix_cmsg.t,v 1.1 2006/05/29 18:40:55 maxim Exp $
 
 cd `dirname $0`
 cmd="./`basename $0 .t`"
diff --git a/tools/regression/sockets/unix_passfd/Makefile b/tools/regression/sockets/unix_passfd/Makefile
index 8d2ddb9c8efbe..6296ced5698a9 100644
--- a/tools/regression/sockets/unix_passfd/Makefile
+++ b/tools/regression/sockets/unix_passfd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_passfd/Makefile,v 1.2 2006/07/09 11:51:13 maxim Exp $
 
 PROG=	unix_passfd
 NO_MAN=
diff --git a/tools/regression/sockets/unix_passfd/unix_passfd.c b/tools/regression/sockets/unix_passfd/unix_passfd.c
index d76b25a6aab89..4c83686b20b3d 100644
--- a/tools/regression/sockets/unix_passfd/unix_passfd.c
+++ b/tools/regression/sockets/unix_passfd/unix_passfd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/unix_passfd/unix_passfd.c,v 1.1 2005/11/09 21:41:20 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile
index 6c92f242f7372..2f837e9b68838 100644
--- a/tools/regression/sockets/unix_sendtorace/Makefile
+++ b/tools/regression/sockets/unix_sendtorace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_sendtorace/Makefile,v 1.1 2006/11/15 12:43:45 rwatson Exp $
 
 PROG=	unix_sendtorace
 NO_MAN=
diff --git a/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c b/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
index 2445b81752e63..f7c10ba27295e 100644
--- a/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
+++ b/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c,v 1.1 2006/11/15 12:43:45 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile
index 8549efc9b3d51..43752cdf2468e 100644
--- a/tools/regression/sockets/unix_socket/Makefile
+++ b/tools/regression/sockets/unix_socket/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/unix_socket/Makefile,v 1.2 2006/07/09 11:51:14 maxim Exp $
 
 PROG=	unix_socket
 NO_MAN=
diff --git a/tools/regression/sockets/unix_socket/unix_socket.c b/tools/regression/sockets/unix_socket/unix_socket.c
index 24b6baf8ee784..02fc4a5b87abc 100644
--- a/tools/regression/sockets/unix_socket/unix_socket.c
+++ b/tools/regression/sockets/unix_socket/unix_socket.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/unix_socket/unix_socket.c,v 1.1 2006/04/09 14:30:11 rwatson Exp $
  */
 
 /*
diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile
index 2bd05014f4888..5c460d5cee1a7 100644
--- a/tools/regression/sockets/zerosend/Makefile
+++ b/tools/regression/sockets/zerosend/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sockets/zerosend/Makefile,v 1.1 2007/01/12 21:49:36 rwatson Exp $
 
 PROG=	zerosend
 NO_MAN=
diff --git a/tools/regression/sockets/zerosend/zerosend.c b/tools/regression/sockets/zerosend/zerosend.c
index b51155d632d6d..f8f7395d04fc8 100644
--- a/tools/regression/sockets/zerosend/zerosend.c
+++ b/tools/regression/sockets/zerosend/zerosend.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sockets/zerosend/zerosend.c,v 1.2 2007/01/12 22:17:31 rwatson Exp $
  */
 
 #include <sys/select.h>
diff --git a/tools/regression/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile
index 6892abb8b24d6..b2f556b807dab 100644
--- a/tools/regression/sysvmsg/Makefile
+++ b/tools/regression/sysvmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvmsg/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 # SysV Message Queue Regression Utility
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:56:59 thorpej Exp $
 
diff --git a/tools/regression/sysvmsg/README b/tools/regression/sysvmsg/README
index f115b9967ed15..40843b8c3fc2a 100644
--- a/tools/regression/sysvmsg/README
+++ b/tools/regression/sysvmsg/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sysvmsg/README,v 1.1 2002/08/15 06:34:37 alfred Exp $
 
 SysV IPC Message Queue Regression Utility.
 
diff --git a/tools/regression/sysvmsg/msgtest.c b/tools/regression/sysvmsg/msgtest.c
index 9aff817f4bef4..1a21bf11344fb 100644
--- a/tools/regression/sysvmsg/msgtest.c
+++ b/tools/regression/sysvmsg/msgtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  * Obtained from: $NetBSD: msgtest.c,v 1.7 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sysvmsg/msgtest.c,v 1.2 2006/11/16 19:51:10 jkim Exp $
  */
 
 /*
diff --git a/tools/regression/sysvsem/Makefile b/tools/regression/sysvsem/Makefile
index 5546b62a471ba..4a68917abcbe8 100644
--- a/tools/regression/sysvsem/Makefile
+++ b/tools/regression/sysvsem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvsem/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 # SysV Semaphores Regression Utility 
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
 
diff --git a/tools/regression/sysvsem/README b/tools/regression/sysvsem/README
index 33b9706817dae..6e15daffe34db 100644
--- a/tools/regression/sysvsem/README
+++ b/tools/regression/sysvsem/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sysvsem/README,v 1.1 2002/08/15 06:34:37 alfred Exp $
 
 SysV IPC Semaphore Regression Utility.
 
diff --git a/tools/regression/sysvsem/semtest.c b/tools/regression/sysvsem/semtest.c
index 83f73e97356f6..87544afe2cbcb 100644
--- a/tools/regression/sysvsem/semtest.c
+++ b/tools/regression/sysvsem/semtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: semtest.c,v 1.4 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sysvsem/semtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
  */
 
 /*
diff --git a/tools/regression/sysvshm/Makefile b/tools/regression/sysvshm/Makefile
index f26b4a7bfa325..41e6b16e512c1 100644
--- a/tools/regression/sysvshm/Makefile
+++ b/tools/regression/sysvshm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/sysvshm/Makefile,v 1.3 2004/12/21 08:47:24 ru Exp $
 # SysV Shared Memory Regression Utility
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
 
diff --git a/tools/regression/sysvshm/README b/tools/regression/sysvshm/README
index 4e0125eec8efe..b788f5bd12728 100644
--- a/tools/regression/sysvshm/README
+++ b/tools/regression/sysvshm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/sysvshm/README,v 1.1 2002/08/15 06:34:37 alfred Exp $
 
 SysV IPC Shared Memory Regression Utility.
 
diff --git a/tools/regression/sysvshm/shmtest.c b/tools/regression/sysvshm/shmtest.c
index 22f626edce498..54ad443e8e837 100644
--- a/tools/regression/sysvshm/shmtest.c
+++ b/tools/regression/sysvshm/shmtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/sysvshm/shmtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
  */
 
 /*
diff --git a/tools/regression/tls/Makefile b/tools/regression/tls/Makefile
index 76def9685e752..64c05eadb1912 100644
--- a/tools/regression/tls/Makefile
+++ b/tools/regression/tls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/Makefile,v 1.2 2005/04/23 23:47:58 davidxu Exp $
 
 SUBDIR=libxx libyy ttls1 ttls2 ttls4
 
diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile
index bc9393b538e04..e76548c1f0184 100644
--- a/tools/regression/tls/libxx/Makefile
+++ b/tools/regression/tls/libxx/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/libxx/Makefile,v 1.4 2006/03/16 15:18:17 ru Exp $
 
 LIB=		xx
 SHLIB_MAJOR=	1
diff --git a/tools/regression/tls/libxx/xx.c b/tools/regression/tls/libxx/xx.c
index 6d1e73f79a05c..0b031c9bea70f 100644
--- a/tools/regression/tls/libxx/xx.c
+++ b/tools/regression/tls/libxx/xx.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/libxx/xx.c,v 1.1 2004/08/03 09:04:00 dfr Exp $ */
 
 extern int __thread yy1;
 int __thread xx1 = 1;
diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile
index 8b45b99a29ca4..d09e23b426233 100644
--- a/tools/regression/tls/libyy/Makefile
+++ b/tools/regression/tls/libyy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/libyy/Makefile,v 1.4 2006/03/16 15:18:17 ru Exp $
 
 LIB=		yy
 SHLIB_MAJOR=	1
diff --git a/tools/regression/tls/libyy/yy.c b/tools/regression/tls/libyy/yy.c
index c00cb8770ec40..bd0d12c65ab23 100644
--- a/tools/regression/tls/libyy/yy.c
+++ b/tools/regression/tls/libyy/yy.c
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/libyy/yy.c,v 1.1 2004/08/03 09:04:00 dfr Exp $ */
 
 int __thread yy1 = 101;
diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile
index d3b6e65214123..135c6a42c6556 100644
--- a/tools/regression/tls/ttls1/Makefile
+++ b/tools/regression/tls/ttls1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls1/Makefile,v 1.4 2004/12/21 08:47:25 ru Exp $
 
 PROG=	ttls1
 LDADD+=	-L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
diff --git a/tools/regression/tls/ttls1/ttls1.c b/tools/regression/tls/ttls1/ttls1.c
index 9c514aeecf7a4..cdd4e91dde64c 100644
--- a/tools/regression/tls/ttls1/ttls1.c
+++ b/tools/regression/tls/ttls1/ttls1.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/ttls1/ttls1.c,v 1.2 2004/08/05 08:07:40 dfr Exp $ */
 
 #include <stdio.h>
 
diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile
index 0a3bc95912e80..cb0fc7e9de8a0 100644
--- a/tools/regression/tls/ttls2/Makefile
+++ b/tools/regression/tls/ttls2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls2/Makefile,v 1.4 2004/12/21 08:47:25 ru Exp $
 
 PROG=	ttls2
 LDADD+= -lpthread
diff --git a/tools/regression/tls/ttls2/ttls2.c b/tools/regression/tls/ttls2/ttls2.c
index f528e3dcc7398..4729aadf8d4c3 100644
--- a/tools/regression/tls/ttls2/ttls2.c
+++ b/tools/regression/tls/ttls2/ttls2.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/regression/tls/ttls2/ttls2.c,v 1.1 2004/08/03 09:04:01 dfr Exp $ */
 
 #include <stdio.h>
 #include <pthread.h>
diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile
index b171181e74fbc..fdec518d01857 100644
--- a/tools/regression/tls/ttls3/Makefile
+++ b/tools/regression/tls/ttls3/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls3/Makefile,v 1.2 2004/08/16 09:35:49 dfr Exp $
 
 all: ttls3
 
diff --git a/tools/regression/tls/ttls3/elftls.S b/tools/regression/tls/ttls3/elftls.S
index 0fad08d90a7c4..b979912e1f6ca 100644
--- a/tools/regression/tls/ttls3/elftls.S
+++ b/tools/regression/tls/ttls3/elftls.S
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/regression/tls/ttls3/elftls.S,v 1.1 2004/08/03 09:04:01 dfr Exp $
  */
 
 .file "elftls.S"
diff --git a/tools/regression/tls/ttls3/tls-test-lib.c b/tools/regression/tls/ttls3/tls-test-lib.c
index bc88ad1383ddb..0935a34c09de5 100644
--- a/tools/regression/tls/ttls3/tls-test-lib.c
+++ b/tools/regression/tls/ttls3/tls-test-lib.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/regression/tls/ttls3/tls-test-lib.c,v 1.1 2004/08/03 09:04:01 dfr Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls3/tls-test.c b/tools/regression/tls/ttls3/tls-test.c
index 539b6ce1ed113..231ebcbaa70b8 100644
--- a/tools/regression/tls/ttls3/tls-test.c
+++ b/tools/regression/tls/ttls3/tls-test.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/regression/tls/ttls3/tls-test.c,v 1.1 2004/08/03 09:04:01 dfr Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile
index 5fb37df580fea..f1ca413fbc0dd 100644
--- a/tools/regression/tls/ttls4/Makefile
+++ b/tools/regression/tls/ttls4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tls/ttls4/Makefile,v 1.1 2005/04/23 23:47:58 davidxu Exp $
 
 PROG=	ttls4
 LDADD+=	-lpthread
diff --git a/tools/regression/tls/ttls4/ttls4.c b/tools/regression/tls/ttls4/ttls4.c
index d55e51bfcd8b9..91dc190a133da 100644
--- a/tools/regression/tls/ttls4/ttls4.c
+++ b/tools/regression/tls/ttls4/ttls4.c
@@ -4,7 +4,7 @@
  *
  * David Xu <davidxu@freebsd.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/tls/ttls4/ttls4.c,v 1.2 2005/04/24 00:17:30 davidxu Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tmpfs/Makefile b/tools/regression/tmpfs/Makefile
index 91e13922e9940..5c27f3be9cf36 100644
--- a/tools/regression/tmpfs/Makefile
+++ b/tools/regression/tmpfs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.4 2006/11/09 15:25:37 jmmv Exp $
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/Makefile,v 1.2 2007/06/25 18:47:09 delphij Exp $
 
 tests=	t_mount
 tests+=	t_statvfs
diff --git a/tools/regression/tmpfs/h_funcs.subr b/tools/regression/tmpfs/h_funcs.subr
index 22c9de32a9c7e..b3ce08d2b5849 100644
--- a/tools/regression/tmpfs/h_funcs.subr
+++ b/tools/regression/tmpfs/h_funcs.subr
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/h_funcs.subr,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/h_tools.c b/tools/regression/tmpfs/h_tools.c
index 1339060bc9a13..0cf8fb22fafde 100644
--- a/tools/regression/tmpfs/h_tools.c
+++ b/tools/regression/tmpfs/h_tools.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/tmpfs/h_tools.c,v 1.2 2007/08/10 10:08:43 delphij Exp $
  */
 
 /*
diff --git a/tools/regression/tmpfs/t_create b/tools/regression/tmpfs/t_create
index 39ea4f4d3ccb0..2c7ab2eacdf01 100644
--- a/tools/regression/tmpfs/t_create
+++ b/tools/regression/tmpfs/t_create
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_create,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_dots b/tools/regression/tmpfs/t_dots
index 80d721aab93ff..fbbed91a73b8d 100644
--- a/tools/regression/tmpfs/t_dots
+++ b/tools/regression/tmpfs/t_dots
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_dots,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_exec b/tools/regression/tmpfs/t_exec
index cb1e23990c0bd..f06d7e2180fae 100644
--- a/tools/regression/tmpfs/t_exec
+++ b/tools/regression/tmpfs/t_exec
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_exec,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_link b/tools/regression/tmpfs/t_link
index bf57ec52508d3..21eba728f00c9 100644
--- a/tools/regression/tmpfs/t_link
+++ b/tools/regression/tmpfs/t_link
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_link,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_mkdir b/tools/regression/tmpfs/t_mkdir
index 7a919614e4be6..efde3e7acc785 100644
--- a/tools/regression/tmpfs/t_mkdir
+++ b/tools/regression/tmpfs/t_mkdir
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_mkdir,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_mount b/tools/regression/tmpfs/t_mount
index c5deaf78d8ff4..3645394b6faa1 100644
--- a/tools/regression/tmpfs/t_mount
+++ b/tools/regression/tmpfs/t_mount
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_mount,v 1.2 2007/08/10 10:08:43 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_pipes b/tools/regression/tmpfs/t_pipes
index 00da567fe0cb3..fc023b8733b7f 100644
--- a/tools/regression/tmpfs/t_pipes
+++ b/tools/regression/tmpfs/t_pipes
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_pipes,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_read_write b/tools/regression/tmpfs/t_read_write
index 42759e0beac54..8b58e6663b3d2 100644
--- a/tools/regression/tmpfs/t_read_write
+++ b/tools/regression/tmpfs/t_read_write
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_read_write,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_readdir b/tools/regression/tmpfs/t_readdir
index 73cb5782f9eea..9c25e9109de7c 100644
--- a/tools/regression/tmpfs/t_readdir
+++ b/tools/regression/tmpfs/t_readdir
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_readdir,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_remove b/tools/regression/tmpfs/t_remove
index 80b8986952f80..bcd35311d630b 100644
--- a/tools/regression/tmpfs/t_remove
+++ b/tools/regression/tmpfs/t_remove
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_remove,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_rename b/tools/regression/tmpfs/t_rename
index 0dbc0b00fc456..0c10f54002022 100644
--- a/tools/regression/tmpfs/t_rename
+++ b/tools/regression/tmpfs/t_rename
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_rename,v 1.2 2007/08/10 10:08:43 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_rmdir b/tools/regression/tmpfs/t_rmdir
index 0cb92d84b1f96..5dc4cbe8d0488 100644
--- a/tools/regression/tmpfs/t_rmdir
+++ b/tools/regression/tmpfs/t_rmdir
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_rmdir,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_setattr b/tools/regression/tmpfs/t_setattr
index b38ad88e85f2d..46cb9acc4f4c6 100644
--- a/tools/regression/tmpfs/t_setattr
+++ b/tools/regression/tmpfs/t_setattr
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_setattr,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_sizes b/tools/regression/tmpfs/t_sizes
index 890ac15992140..f3acca0382b27 100644
--- a/tools/regression/tmpfs/t_sizes
+++ b/tools/regression/tmpfs/t_sizes
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_sizes,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_sockets b/tools/regression/tmpfs/t_sockets
index 6d8e58da95e35..30bad16b29f8a 100644
--- a/tools/regression/tmpfs/t_sockets
+++ b/tools/regression/tmpfs/t_sockets
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_sockets,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_statvfs b/tools/regression/tmpfs/t_statvfs
index 937e72dbe461d..c6e1acf336403 100644
--- a/tools/regression/tmpfs/t_statvfs
+++ b/tools/regression/tmpfs/t_statvfs
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_statvfs,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_symlink b/tools/regression/tmpfs/t_symlink
index 6a5638a1fa17b..7821b00a7d963 100644
--- a/tools/regression/tmpfs/t_symlink
+++ b/tools/regression/tmpfs/t_symlink
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_symlink,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_times b/tools/regression/tmpfs/t_times
index 06055b969874a..73ad6b79b83b7 100644
--- a/tools/regression/tmpfs/t_times
+++ b/tools/regression/tmpfs/t_times
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_times,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_trail_slash b/tools/regression/tmpfs/t_trail_slash
index 028dd216b648d..db9525c7e6d3f 100644
--- a/tools/regression/tmpfs/t_trail_slash
+++ b/tools/regression/tmpfs/t_trail_slash
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_trail_slash,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_truncate b/tools/regression/tmpfs/t_truncate
index c5ff811c66f88..6d2cfb9f06923 100644
--- a/tools/regression/tmpfs/t_truncate
+++ b/tools/regression/tmpfs/t_truncate
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_truncate,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_vnd b/tools/regression/tmpfs/t_vnd
index 54e51baf6dd81..ca732d3f009b6 100644
--- a/tools/regression/tmpfs/t_vnd
+++ b/tools/regression/tmpfs/t_vnd
@@ -36,7 +36,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_vnd,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/tmpfs/t_vnode_leak b/tools/regression/tmpfs/t_vnode_leak
index 7f6b2f93578c4..dc1728a21b5a5 100644
--- a/tools/regression/tmpfs/t_vnode_leak
+++ b/tools/regression/tmpfs/t_vnode_leak
@@ -37,7 +37,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/tmpfs/t_vnode_leak,v 1.1 2007/06/16 02:04:44 delphij Exp $
 #
 
 #
diff --git a/tools/regression/ufs/uprintf/Makefile b/tools/regression/ufs/uprintf/Makefile
index c21ad70933e55..82cb34a963592 100644
--- a/tools/regression/ufs/uprintf/Makefile
+++ b/tools/regression/ufs/uprintf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/ufs/uprintf/Makefile,v 1.2 2006/07/09 11:51:14 maxim Exp $
 
 PROG=	ufs_uprintf
 WARNS?=	3
diff --git a/tools/regression/ufs/uprintf/ufs_uprintf.c b/tools/regression/ufs/uprintf/ufs_uprintf.c
index d9f7125a8c478..4186660b14c5b 100644
--- a/tools/regression/ufs/uprintf/ufs_uprintf.c
+++ b/tools/regression/ufs/uprintf/ufs_uprintf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/ufs/uprintf/ufs_uprintf.c,v 1.1 2005/09/19 16:29:36 rwatson Exp $
  */
 
 #include <err.h>
diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
index d577a04a98e9e..9787b7be6be21 100644
--- a/tools/regression/usr.bin/Makefile
+++ b/tools/regression/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/Makefile,v 1.12 2007/06/03 03:29:31 grog Exp $
 
 SUBDIR=	calendar file2c join jot m4 printf sed uudecode uuencode xargs lastcomm
 
diff --git a/tools/regression/usr.bin/calendar/Makefile b/tools/regression/usr.bin/calendar/Makefile
index b937d41a4e4a8..1903466b6d67f 100644
--- a/tools/regression/usr.bin/calendar/Makefile
+++ b/tools/regression/usr.bin/calendar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/calendar/Makefile,v 1.1 2007/06/03 03:29:32 grog Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/calendar/calendar.calibrate b/tools/regression/usr.bin/calendar/calendar.calibrate
index 28e7e4a42268d..27797a7c20465 100644
--- a/tools/regression/usr.bin/calendar/calendar.calibrate
+++ b/tools/regression/usr.bin/calendar/calendar.calibrate
@@ -1,7 +1,7 @@
 /*
  * Calibration calendar for calendar(1)
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/regression/usr.bin/calendar/calendar.calibrate,v 1.3 2007/06/09 06:01:24 grog Exp $
  */
 
 LANG=C
diff --git a/tools/regression/usr.bin/calendar/regress.sh b/tools/regression/usr.bin/calendar/regress.sh
index 743eb95e7f98a..bb8b8255bb4f6 100644
--- a/tools/regression/usr.bin/calendar/regress.sh
+++ b/tools/regression/usr.bin/calendar/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/calendar/regress.sh,v 1.2 2007/06/09 06:01:24 grog Exp $
 
 CALENDAR_FILE="-f calendar.calibrate"
 CALENDAR_BIN="calendar"
diff --git a/tools/regression/usr.bin/calendar/regress.t b/tools/regression/usr.bin/calendar/regress.t
index a82aacd9886f5..f80988bf4a09a 100644
--- a/tools/regression/usr.bin/calendar/regress.t
+++ b/tools/regression/usr.bin/calendar/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/calendar/regress.t,v 1.1 2007/06/03 03:29:32 grog Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/env/Makefile b/tools/regression/usr.bin/env/Makefile
index c019964c3c3ab..8d2792d69054e 100644
--- a/tools/regression/usr.bin/env/Makefile
+++ b/tools/regression/usr.bin/env/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/env/Makefile,v 1.1 2005/06/20 04:17:12 gad Exp $
 
 TESTPGM?=TestProgramNotSpecifed
 
diff --git a/tools/regression/usr.bin/env/regress-env.rgdata b/tools/regression/usr.bin/env/regress-env.rgdata
index 9f562e9c9e554..eb05da8e9b538 100644
--- a/tools/regression/usr.bin/env/regress-env.rgdata
+++ b/tools/regression/usr.bin/env/regress-env.rgdata
@@ -23,7 +23,7 @@
 #  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #  SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/env/regress-env.rgdata,v 1.3 2005/07/15 02:31:15 gad Exp $
 #
 
 testpgm=/usr/bin/env
diff --git a/tools/regression/usr.bin/env/regress-sb.rb b/tools/regression/usr.bin/env/regress-sb.rb
index b692ef2e87f95..74af7f49b8436 100644
--- a/tools/regression/usr.bin/env/regress-sb.rb
+++ b/tools/regression/usr.bin/env/regress-sb.rb
@@ -24,7 +24,7 @@
 #  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #  SUCH DAMAGE.
 # -------+---------+---------+-------- + --------+---------+---------+---------+
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/env/regress-sb.rb,v 1.1 2005/06/20 04:17:12 gad Exp $
 # -------+---------+---------+-------- + --------+---------+---------+---------+
 #   This script was written to provide a battery of regression-tests for some
 # changes I am making to the `env' command.  I wrote a new script for this
diff --git a/tools/regression/usr.bin/file2c/Makefile b/tools/regression/usr.bin/file2c/Makefile
index b937d41a4e4a8..2c7dae4b20797 100644
--- a/tools/regression/usr.bin/file2c/Makefile
+++ b/tools/regression/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/file2c/Makefile,v 1.2 2002/06/24 14:22:35 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/file2c/regress.sh b/tools/regression/usr.bin/file2c/regress.sh
index 4492e91c05e7c..8ffb73618d986 100644
--- a/tools/regression/usr.bin/file2c/regress.sh
+++ b/tools/regression/usr.bin/file2c/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/file2c/regress.sh,v 1.5 2005/05/15 07:35:34 marcel Exp $
 
 echo 1..9
 
diff --git a/tools/regression/usr.bin/file2c/regress.t b/tools/regression/usr.bin/file2c/regress.t
index a82aacd9886f5..106d0ecd157ef 100644
--- a/tools/regression/usr.bin/file2c/regress.t
+++ b/tools/regression/usr.bin/file2c/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/file2c/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/join/Makefile b/tools/regression/usr.bin/join/Makefile
index b937d41a4e4a8..f227f317e5675 100644
--- a/tools/regression/usr.bin/join/Makefile
+++ b/tools/regression/usr.bin/join/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/join/Makefile,v 1.2 2002/06/24 14:22:37 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/join/regress.sh b/tools/regression/usr.bin/join/regress.sh
index 5807c14fd7e55..c5b614802796c 100644
--- a/tools/regression/usr.bin/join/regress.sh
+++ b/tools/regression/usr.bin/join/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/join/regress.sh,v 1.4 2004/11/11 19:47:54 nik Exp $
 
 echo 1..1
 
diff --git a/tools/regression/usr.bin/join/regress.t b/tools/regression/usr.bin/join/regress.t
index a82aacd9886f5..aa7f37cc1dfbc 100644
--- a/tools/regression/usr.bin/join/regress.t
+++ b/tools/regression/usr.bin/join/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/join/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/jot/Makefile b/tools/regression/usr.bin/jot/Makefile
index b937d41a4e4a8..04b0644bdc533 100644
--- a/tools/regression/usr.bin/jot/Makefile
+++ b/tools/regression/usr.bin/jot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/jot/Makefile,v 1.2 2002/06/24 14:22:40 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/jot/regress.sh b/tools/regression/usr.bin/jot/regress.sh
index c71ade80b9806..b6d4cd2a89d27 100644
--- a/tools/regression/usr.bin/jot/regress.sh
+++ b/tools/regression/usr.bin/jot/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/jot/regress.sh,v 1.7 2006/12/03 19:18:41 dds Exp $
 
 echo 1..56
 
diff --git a/tools/regression/usr.bin/jot/regress.t b/tools/regression/usr.bin/jot/regress.t
index a82aacd9886f5..ef298ff18b2e8 100644
--- a/tools/regression/usr.bin/jot/regress.t
+++ b/tools/regression/usr.bin/jot/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/jot/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/lastcomm/Makefile b/tools/regression/usr.bin/lastcomm/Makefile
index 930f3ff5fd295..868e4b27d9fa0 100644
--- a/tools/regression/usr.bin/lastcomm/Makefile
+++ b/tools/regression/usr.bin/lastcomm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/lastcomm/Makefile,v 1.1 2007/05/22 06:21:20 dds Exp $
 
 all: regress
 
diff --git a/tools/regression/usr.bin/lastcomm/README b/tools/regression/usr.bin/lastcomm/README
index 62e0281dbf884..1f6ec6a822623 100644
--- a/tools/regression/usr.bin/lastcomm/README
+++ b/tools/regression/usr.bin/lastcomm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/usr.bin/lastcomm/README,v 1.2 2007/05/24 06:57:50 dds Exp $
 
 To create the files for regression testing do the following.
 
diff --git a/tools/regression/usr.bin/lastcomm/regress.t b/tools/regression/usr.bin/lastcomm/regress.t
index 6abca0b034847..68338de05574d 100644
--- a/tools/regression/usr.bin/lastcomm/regress.t
+++ b/tools/regression/usr.bin/lastcomm/regress.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/lastcomm/regress.t,v 1.1 2007/05/22 06:21:20 dds Exp $
 #
 
 DIR=`dirname $0`
diff --git a/tools/regression/usr.bin/lastcomm/values.sh b/tools/regression/usr.bin/lastcomm/values.sh
index ef2e015a86f25..21c4e2b9a9a76 100644
--- a/tools/regression/usr.bin/lastcomm/values.sh
+++ b/tools/regression/usr.bin/lastcomm/values.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/lastcomm/values.sh,v 1.1 2007/05/22 06:21:20 dds Exp $
 #
 
 ACCT=acct
diff --git a/tools/regression/usr.bin/m4/Makefile b/tools/regression/usr.bin/m4/Makefile
index 99036706a8180..badbadc498720 100644
--- a/tools/regression/usr.bin/m4/Makefile
+++ b/tools/regression/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/m4/Makefile,v 1.3 2002/06/24 14:29:19 jmallett Exp $
 
 all:
 	@sh ${.CURDIR}/regress.sh ${.CURDIR}
diff --git a/tools/regression/usr.bin/m4/regress.sh b/tools/regression/usr.bin/m4/regress.sh
index 9619d520b00e5..e3e203df8d64e 100644
--- a/tools/regression/usr.bin/m4/regress.sh
+++ b/tools/regression/usr.bin/m4/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/m4/regress.sh,v 1.4 2004/11/11 19:47:54 nik Exp $
 
 # Go into the regression test directory, handed to us by make(1)
 TESTDIR=$1
diff --git a/tools/regression/usr.bin/m4/regress.t b/tools/regression/usr.bin/m4/regress.t
index c36d8342d32a2..9c96275a7d03f 100644
--- a/tools/regression/usr.bin/m4/regress.t
+++ b/tools/regression/usr.bin/m4/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/m4/regress.t,v 1.1 2004/11/11 19:47:54 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/make/README b/tools/regression/usr.bin/make/README
index 6c577ad498820..d780df388c198 100644
--- a/tools/regression/usr.bin/make/README
+++ b/tools/regression/usr.bin/make/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/regression/usr.bin/make/README,v 1.3 2005/06/01 11:25:38 harti Exp $
 
 This directory contains regression tests for make(1).
 
diff --git a/tools/regression/usr.bin/make/all.sh b/tools/regression/usr.bin/make/all.sh
index 42f9e73e6abca..3b5a2ca1eb491 100644
--- a/tools/regression/usr.bin/make/all.sh
+++ b/tools/regression/usr.bin/make/all.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/all.sh,v 1.1 2005/04/28 13:20:45 harti Exp $
 
 # find all test scripts below our current directory
 SCRIPTS=`find . -name test.t`
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile b/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
index 5a8b065d20c9e..3c804387974e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile,v 1.1 2005/05/31 14:12:59 harti Exp $
 # This test checks the code reading archive files. The archive file
 # is a BSD4.4 file with __.SYMTAB and #1/N long file names.
 
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t b/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
index eba6aed9e3851..63d64dedd2c71 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t,v 1.1 2005/05/31 14:12:59 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
index cd999daaad4e3..525d5ead3c34e 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile,v 1.1 2005/05/31 14:12:59 harti Exp $
 # This test checks the code reading archive files. The archive file
 # is a BSD4.4 file with __.SYMTAB and #1/N long file names.
 #
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
index aa65a3e9587be..65566898cf4bc 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
+++ b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t,v 1.1 2005/05/31 14:12:59 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile b/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
index b8f5116195ede..e848c5138eb91 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
+++ b/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile,v 1.1 2005/05/31 14:13:00 harti Exp $
 # This test checks the code reading archive files. The archive file
 # is an old BSD file with __.SYMTAB and no long file names. Filenames
 # are truncated to 16 characters.
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t b/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
index 03f7800a78d94..41d6b9fd9c2ab 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
+++ b/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t,v 1.1 2005/05/31 14:13:00 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t0/test.t b/tools/regression/usr.bin/make/basic/t0/test.t
index d71a39a8a1a3d..62baf6a679892 100644
--- a/tools/regression/usr.bin/make/basic/t0/test.t
+++ b/tools/regression/usr.bin/make/basic/t0/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t0/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t1/Makefile b/tools/regression/usr.bin/make/basic/t1/Makefile
index d120087831ce2..0aaaafd5fb8d5 100644
--- a/tools/regression/usr.bin/make/basic/t1/Makefile
+++ b/tools/regression/usr.bin/make/basic/t1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t1/Makefile,v 1.1 2005/05/31 14:13:02 harti Exp $
 #
 # Just a target and nothing else. No target on command line.
 #
diff --git a/tools/regression/usr.bin/make/basic/t1/test.t b/tools/regression/usr.bin/make/basic/t1/test.t
index 4131f5da859bd..d3669cf73984c 100644
--- a/tools/regression/usr.bin/make/basic/t1/test.t
+++ b/tools/regression/usr.bin/make/basic/t1/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t1/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t2/Makefile b/tools/regression/usr.bin/make/basic/t2/Makefile
index ab8fe4956e459..942118b8f3775 100644
--- a/tools/regression/usr.bin/make/basic/t2/Makefile
+++ b/tools/regression/usr.bin/make/basic/t2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t2/Makefile,v 1.1 2005/05/31 14:13:02 harti Exp $
 #
 # Just a target and a command. No command line targets.
 #
diff --git a/tools/regression/usr.bin/make/basic/t2/test.t b/tools/regression/usr.bin/make/basic/t2/test.t
index f5866bb9c3cef..8e6ad41c180cc 100644
--- a/tools/regression/usr.bin/make/basic/t2/test.t
+++ b/tools/regression/usr.bin/make/basic/t2/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t2/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/basic/t3/test.t b/tools/regression/usr.bin/make/basic/t3/test.t
index 782d27c59fc69..07e029d907e2d 100644
--- a/tools/regression/usr.bin/make/basic/t3/test.t
+++ b/tools/regression/usr.bin/make/basic/t3/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/basic/t3/test.t,v 1.2 2005/05/31 14:13:02 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/common.sh b/tools/regression/usr.bin/make/common.sh
index 34aacf8f22e7c..9bebae9261835 100644
--- a/tools/regression/usr.bin/make/common.sh
+++ b/tools/regression/usr.bin/make/common.sh
@@ -2,7 +2,7 @@
 #
 # Common code used run regression tests for usr.bin/make.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/common.sh,v 1.3 2005/06/01 11:25:38 harti Exp $
 
 #
 # Output a message and exit with an error.
diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/tools/regression/usr.bin/make/shell/builtin/Makefile
index 03764784e1a09..9aa45007a89e0 100644
--- a/tools/regression/usr.bin/make/shell/builtin/Makefile
+++ b/tools/regression/usr.bin/make/shell/builtin/Makefile
@@ -5,7 +5,7 @@
 # will really execute ls, while the line with meta characters will execute
 # our special shell.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/builtin/Makefile,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 .SHELL: path="${.CURDIR}/sh"
 
diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/tools/regression/usr.bin/make/shell/builtin/sh
index 3a507b87f6748..395e45771c900 100644
--- a/tools/regression/usr.bin/make/shell/builtin/sh
+++ b/tools/regression/usr.bin/make/shell/builtin/sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/builtin/sh,v 1.1 2005/05/31 14:13:03 harti Exp $
 echo "$@"
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/tools/regression/usr.bin/make/shell/builtin/test.t
index 1798afcc32077..3ac27f99beb5c 100644
--- a/tools/regression/usr.bin/make/shell/builtin/test.t
+++ b/tools/regression/usr.bin/make/shell/builtin/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/builtin/test.t,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/tools/regression/usr.bin/make/shell/meta/Makefile
index bcf19d052bbc7..f0ef51552f93a 100644
--- a/tools/regression/usr.bin/make/shell/meta/Makefile
+++ b/tools/regression/usr.bin/make/shell/meta/Makefile
@@ -5,7 +5,7 @@
 # will really execute ls, while the line with meta characters will execute
 # our special shell.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/meta/Makefile,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 .SHELL: path="${.OBJDIR}/sh"
 
diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/tools/regression/usr.bin/make/shell/meta/sh
index 3a507b87f6748..a0fc349f33af4 100644
--- a/tools/regression/usr.bin/make/shell/meta/sh
+++ b/tools/regression/usr.bin/make/shell/meta/sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/meta/sh,v 1.1 2005/05/31 14:13:03 harti Exp $
 echo "$@"
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/tools/regression/usr.bin/make/shell/meta/test.t
index 588b73ccc9f65..7af535ab9fcd7 100644
--- a/tools/regression/usr.bin/make/shell/meta/test.t
+++ b/tools/regression/usr.bin/make/shell/meta/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/meta/test.t,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/tools/regression/usr.bin/make/shell/path/Makefile
index fe40b645510ec..16cb25a8b1136 100644
--- a/tools/regression/usr.bin/make/shell/path/Makefile
+++ b/tools/regression/usr.bin/make/shell/path/Makefile
@@ -7,7 +7,7 @@
 # Be sure to include a meta-character into the command line, so that
 # really our shell is executed.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path/Makefile,v 1.2 2005/05/31 14:13:03 harti Exp $
 #
 
 .ifmake sh_test
diff --git a/tools/regression/usr.bin/make/shell/path/sh b/tools/regression/usr.bin/make/shell/path/sh
index 46169eb6efc2b..401a16f7e0b26 100644
--- a/tools/regression/usr.bin/make/shell/path/sh
+++ b/tools/regression/usr.bin/make/shell/path/sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path/sh,v 1.1 2005/05/31 14:13:03 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/tools/regression/usr.bin/make/shell/path/test.t
index 72ff252af70ef..68d6357d2d3ab 100644
--- a/tools/regression/usr.bin/make/shell/path/test.t
+++ b/tools/regression/usr.bin/make/shell/path/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path/test.t,v 1.2 2005/05/31 14:13:03 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/tools/regression/usr.bin/make/shell/path_select/Makefile
index 05cfb27f3fd9a..c89a4b20ef276 100644
--- a/tools/regression/usr.bin/make/shell/path_select/Makefile
+++ b/tools/regression/usr.bin/make/shell/path_select/Makefile
@@ -7,7 +7,7 @@
 # Be sure to include a meta-character into the command line, so that
 # really our shell is executed.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path_select/Makefile,v 1.2 2005/05/31 14:13:04 harti Exp $
 #
 
 .ifmake sh_test
diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/tools/regression/usr.bin/make/shell/path_select/shell
index 46169eb6efc2b..8e5f2781113a5 100644
--- a/tools/regression/usr.bin/make/shell/path_select/shell
+++ b/tools/regression/usr.bin/make/shell/path_select/shell
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path_select/shell,v 1.1 2005/05/31 14:13:04 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/tools/regression/usr.bin/make/shell/path_select/test.t
index 5bac6316722e8..9348b1dc69e55 100644
--- a/tools/regression/usr.bin/make/shell/path_select/test.t
+++ b/tools/regression/usr.bin/make/shell/path_select/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/path_select/test.t,v 1.2 2005/05/31 14:13:04 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/tools/regression/usr.bin/make/shell/replace/Makefile
index 2160dbfb57762..885feec673a09 100644
--- a/tools/regression/usr.bin/make/shell/replace/Makefile
+++ b/tools/regression/usr.bin/make/shell/replace/Makefile
@@ -8,7 +8,7 @@
 # XXX There seems to be a problem here in -j1 mode: for the line without
 # @- make should switch on echoing again, but it doesn't.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/replace/Makefile,v 1.2 2005/05/31 14:13:04 harti Exp $
 
 .SHELL: name="shell" path="${.CURDIR}/shell"			\
 	quiet="be quiet" echo="be verbose" filter="be verbose"	\
diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/tools/regression/usr.bin/make/shell/replace/shell
index 46169eb6efc2b..3310b93e865e5 100644
--- a/tools/regression/usr.bin/make/shell/replace/shell
+++ b/tools/regression/usr.bin/make/shell/replace/shell
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/replace/shell,v 1.1 2005/05/31 14:13:04 harti Exp $
 echo $@
 if ! test -t 0 ; then
 	cat
diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/tools/regression/usr.bin/make/shell/replace/test.t
index 5c91cf9e03e86..ef94c9abb9c6b 100644
--- a/tools/regression/usr.bin/make/shell/replace/test.t
+++ b/tools/regression/usr.bin/make/shell/replace/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/replace/test.t,v 1.2 2005/05/31 14:13:04 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/tools/regression/usr.bin/make/shell/select/Makefile
index e1ff0231c737e..ffe1baedcd8aa 100644
--- a/tools/regression/usr.bin/make/shell/select/Makefile
+++ b/tools/regression/usr.bin/make/shell/select/Makefile
@@ -4,7 +4,7 @@
 # normally don't have a ksh, we make this test conditional. This means
 # one has to recreate the test results once ksh is installed.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/select/Makefile,v 1.2 2005/05/31 14:13:05 harti Exp $
 #
 
 .ifmake sh_test
diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/tools/regression/usr.bin/make/shell/select/test.t
index 7f73f9b24e25f..d5313763e8538 100644
--- a/tools/regression/usr.bin/make/shell/select/test.t
+++ b/tools/regression/usr.bin/make/shell/select/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/shell/select/test.t,v 1.2 2005/05/31 14:13:05 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/suffixes/basic/Makefile b/tools/regression/usr.bin/make/suffixes/basic/Makefile
index 45d9130eed977..20c34aecd7f0c 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/Makefile
+++ b/tools/regression/usr.bin/make/suffixes/basic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/basic/Makefile,v 1.1 2005/05/31 14:13:05 harti Exp $
 #
 # Check that a simple suffix rule is correctly processed.
 
diff --git a/tools/regression/usr.bin/make/suffixes/basic/test.t b/tools/regression/usr.bin/make/suffixes/basic/test.t
index 0b387c8ce9e15..260bfd8a2e5c6 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/test.t
+++ b/tools/regression/usr.bin/make/suffixes/basic/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/basic/test.t,v 1.1 2005/05/31 14:13:05 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile b/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
index d0258ad126c6b..deb35cb83164a 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
+++ b/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile,v 1.1 2005/05/31 14:13:05 harti Exp $
 
 test1:	TEST1.b
 	cat TEST1.a TEST2.a | diff -u - TEST1.b
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t b/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
index 6b3111836453e..192ff47b960de 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
+++ b/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild1/test.t,v 1.1 2005/05/31 14:13:05 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile b/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
index 1dea7ea967ec7..9a77b87474cd3 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
+++ b/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile,v 1.1 2005/05/31 14:13:06 harti Exp $
 #
 # Source expansion with the source in a macro
 #
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t b/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
index 0d40e3d1a07a8..848ab68bf196a 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
+++ b/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/suffixes/src_wild2/test.t,v 1.1 2005/05/31 14:13:06 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/syntax/enl/Makefile b/tools/regression/usr.bin/make/syntax/enl/Makefile
index a7c69555f2446..a6518288a2234 100644
--- a/tools/regression/usr.bin/make/syntax/enl/Makefile
+++ b/tools/regression/usr.bin/make/syntax/enl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/syntax/enl/Makefile,v 1.2 2005/10/18 07:20:14 harti Exp $
 #
 # Test handling of escaped newlines.
 #
diff --git a/tools/regression/usr.bin/make/syntax/enl/test.t b/tools/regression/usr.bin/make/syntax/enl/test.t
index 2e5d12c033574..edcd5d5b6729b 100644
--- a/tools/regression/usr.bin/make/syntax/enl/test.t
+++ b/tools/regression/usr.bin/make/syntax/enl/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/syntax/enl/test.t,v 1.2 2005/10/18 07:20:14 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/syntax/semi/Makefile b/tools/regression/usr.bin/make/syntax/semi/Makefile
index 12f52255ee12e..a9e67b77e55d0 100644
--- a/tools/regression/usr.bin/make/syntax/semi/Makefile
+++ b/tools/regression/usr.bin/make/syntax/semi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/syntax/semi/Makefile,v 1.1 2005/10/18 07:28:09 harti Exp $
 #
 # Test handling of escaped newlines.
 #
diff --git a/tools/regression/usr.bin/make/syntax/semi/test.t b/tools/regression/usr.bin/make/syntax/semi/test.t
index f52c9ab9ead14..8d3e696854219 100644
--- a/tools/regression/usr.bin/make/syntax/semi/test.t
+++ b/tools/regression/usr.bin/make/syntax/semi/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/syntax/semi/test.t,v 1.1 2005/10/18 07:28:09 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/tools/regression/usr.bin/make/variables/modifier_M/Makefile
index f8f6d3f870ce3..fa3fb86f1b1c8 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/Makefile
+++ b/tools/regression/usr.bin/make/variables/modifier_M/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/modifier_M/Makefile,v 1.1 2005/05/31 14:13:07 harti Exp $
 #
 # Test the M modifier.
 #
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/test.t b/tools/regression/usr.bin/make/variables/modifier_M/test.t
index 979778f12e904..d61c6f9b0c1a6 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/test.t
+++ b/tools/regression/usr.bin/make/variables/modifier_M/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/modifier_M/test.t,v 1.1 2005/05/31 14:13:07 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/make/variables/t0/Makefile b/tools/regression/usr.bin/make/variables/t0/Makefile
index 1cc58eefa493a..59df7f69d5ad7 100644
--- a/tools/regression/usr.bin/make/variables/t0/Makefile
+++ b/tools/regression/usr.bin/make/variables/t0/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/t0/Makefile,v 1.1 2005/05/31 14:13:07 harti Exp $
 #
 # A unsorted set of macro expansions. This should be sorted out.
 #
diff --git a/tools/regression/usr.bin/make/variables/t0/test.t b/tools/regression/usr.bin/make/variables/t0/test.t
index 7e4f42729d263..588c787ec9589 100644
--- a/tools/regression/usr.bin/make/variables/t0/test.t
+++ b/tools/regression/usr.bin/make/variables/t0/test.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/make/variables/t0/test.t,v 1.2 2005/05/31 14:13:07 harti Exp $
 
 cd `dirname $0`
 . ../../common.sh
diff --git a/tools/regression/usr.bin/pkill/pgrep-F.t b/tools/regression/usr.bin/pkill/pgrep-F.t
index fd76e6451de3c..84e2e1b99456b 100644
--- a/tools/regression/usr.bin/pkill/pgrep-F.t
+++ b/tools/regression/usr.bin/pkill/pgrep-F.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-F.t,v 1.3 2005/08/25 20:11:39 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-G.t b/tools/regression/usr.bin/pkill/pgrep-G.t
index b07b6089b69ea..7cd744c3cddec 100644
--- a/tools/regression/usr.bin/pkill/pgrep-G.t
+++ b/tools/regression/usr.bin/pkill/pgrep-G.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-G.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-LF.t b/tools/regression/usr.bin/pkill/pgrep-LF.t
index d981175fb9565..08040d7d7821b 100644
--- a/tools/regression/usr.bin/pkill/pgrep-LF.t
+++ b/tools/regression/usr.bin/pkill/pgrep-LF.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-LF.t,v 1.1 2005/08/25 20:13:58 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-P.t b/tools/regression/usr.bin/pkill/pgrep-P.t
index d139edbb078e1..8e108406a774a 100644
--- a/tools/regression/usr.bin/pkill/pgrep-P.t
+++ b/tools/regression/usr.bin/pkill/pgrep-P.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-P.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-S.t b/tools/regression/usr.bin/pkill/pgrep-S.t
index 5ce98e6fa8bc0..9254c8ccb2e11 100644
--- a/tools/regression/usr.bin/pkill/pgrep-S.t
+++ b/tools/regression/usr.bin/pkill/pgrep-S.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-S.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-U.t b/tools/regression/usr.bin/pkill/pgrep-U.t
index 7cc865ab5f382..9f54aa76e2a6c 100644
--- a/tools/regression/usr.bin/pkill/pgrep-U.t
+++ b/tools/regression/usr.bin/pkill/pgrep-U.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-U.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-g.t b/tools/regression/usr.bin/pkill/pgrep-g.t
index 19bd7748b3e31..d65d71301b042 100644
--- a/tools/regression/usr.bin/pkill/pgrep-g.t
+++ b/tools/regression/usr.bin/pkill/pgrep-g.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-g.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-i.t b/tools/regression/usr.bin/pkill/pgrep-i.t
index cbf36ff4dac7e..375574737c924 100644
--- a/tools/regression/usr.bin/pkill/pgrep-i.t
+++ b/tools/regression/usr.bin/pkill/pgrep-i.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-i.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-j.t b/tools/regression/usr.bin/pkill/pgrep-j.t
index 861d5751cc8d7..ae1e7217be8cb 100644
--- a/tools/regression/usr.bin/pkill/pgrep-j.t
+++ b/tools/regression/usr.bin/pkill/pgrep-j.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-j.t,v 1.2 2006/11/23 11:55:17 yar Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-l.t b/tools/regression/usr.bin/pkill/pgrep-l.t
index 3be3402e65cd6..8358d5d6dc97f 100644
--- a/tools/regression/usr.bin/pkill/pgrep-l.t
+++ b/tools/regression/usr.bin/pkill/pgrep-l.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-l.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-n.t b/tools/regression/usr.bin/pkill/pgrep-n.t
index cde95fb5c0571..731b735bf4245 100644
--- a/tools/regression/usr.bin/pkill/pgrep-n.t
+++ b/tools/regression/usr.bin/pkill/pgrep-n.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-n.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-o.t b/tools/regression/usr.bin/pkill/pgrep-o.t
index 2b1cf51672394..f0234f665d1c1 100644
--- a/tools/regression/usr.bin/pkill/pgrep-o.t
+++ b/tools/regression/usr.bin/pkill/pgrep-o.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-o.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-s.t b/tools/regression/usr.bin/pkill/pgrep-s.t
index b9d39698ed51b..abb4283e553d0 100644
--- a/tools/regression/usr.bin/pkill/pgrep-s.t
+++ b/tools/regression/usr.bin/pkill/pgrep-s.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-s.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-t.t b/tools/regression/usr.bin/pkill/pgrep-t.t
index 7e81ada756880..5d24e44da50f0 100644
--- a/tools/regression/usr.bin/pkill/pgrep-t.t
+++ b/tools/regression/usr.bin/pkill/pgrep-t.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-t.t,v 1.2 2005/11/07 16:56:16 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-v.t b/tools/regression/usr.bin/pkill/pgrep-v.t
index 11a2be27c4ba6..4934a0a6327c1 100644
--- a/tools/regression/usr.bin/pkill/pgrep-v.t
+++ b/tools/regression/usr.bin/pkill/pgrep-v.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-v.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pgrep-x.t b/tools/regression/usr.bin/pkill/pgrep-x.t
index 8906664962805..353f86f87a695 100644
--- a/tools/regression/usr.bin/pkill/pgrep-x.t
+++ b/tools/regression/usr.bin/pkill/pgrep-x.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pgrep-x.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-F.t b/tools/regression/usr.bin/pkill/pkill-F.t
index 732d80757bbb6..e3dc558846719 100644
--- a/tools/regression/usr.bin/pkill/pkill-F.t
+++ b/tools/regression/usr.bin/pkill/pkill-F.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-F.t,v 1.3 2005/08/25 20:11:39 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-G.t b/tools/regression/usr.bin/pkill/pkill-G.t
index 0717cea792c36..a1a628fb98a3b 100644
--- a/tools/regression/usr.bin/pkill/pkill-G.t
+++ b/tools/regression/usr.bin/pkill/pkill-G.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-G.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-LF.t b/tools/regression/usr.bin/pkill/pkill-LF.t
index adb6ba9d4f970..11951a9471833 100644
--- a/tools/regression/usr.bin/pkill/pkill-LF.t
+++ b/tools/regression/usr.bin/pkill/pkill-LF.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-LF.t,v 1.1 2005/08/25 20:13:58 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-P.t b/tools/regression/usr.bin/pkill/pkill-P.t
index 4b8ddb559e5b0..8611d60b3b53b 100644
--- a/tools/regression/usr.bin/pkill/pkill-P.t
+++ b/tools/regression/usr.bin/pkill/pkill-P.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-P.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-U.t b/tools/regression/usr.bin/pkill/pkill-U.t
index 16313f82836ad..db2918a9d535a 100644
--- a/tools/regression/usr.bin/pkill/pkill-U.t
+++ b/tools/regression/usr.bin/pkill/pkill-U.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-U.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-g.t b/tools/regression/usr.bin/pkill/pkill-g.t
index d00adacb27fb6..7080afdb329c5 100644
--- a/tools/regression/usr.bin/pkill/pkill-g.t
+++ b/tools/regression/usr.bin/pkill/pkill-g.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-g.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-i.t b/tools/regression/usr.bin/pkill/pkill-i.t
index 6574cbd5d25db..006a10fc288e3 100644
--- a/tools/regression/usr.bin/pkill/pkill-i.t
+++ b/tools/regression/usr.bin/pkill/pkill-i.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-i.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-j.t b/tools/regression/usr.bin/pkill/pkill-j.t
index 5cb0311582bff..a035ee6148348 100644
--- a/tools/regression/usr.bin/pkill/pkill-j.t
+++ b/tools/regression/usr.bin/pkill/pkill-j.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-j.t,v 1.2 2006/11/23 11:55:17 yar Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-s.t b/tools/regression/usr.bin/pkill/pkill-s.t
index 5fc4dc6f2f94d..175d42eafe964 100644
--- a/tools/regression/usr.bin/pkill/pkill-s.t
+++ b/tools/regression/usr.bin/pkill/pkill-s.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-s.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-t.t b/tools/regression/usr.bin/pkill/pkill-t.t
index cbef527cd50b2..78996b7a2fa4e 100644
--- a/tools/regression/usr.bin/pkill/pkill-t.t
+++ b/tools/regression/usr.bin/pkill/pkill-t.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-t.t,v 1.2 2005/11/07 16:56:16 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/pkill/pkill-x.t b/tools/regression/usr.bin/pkill/pkill-x.t
index 61d5d5b5425fc..649d127081c57 100644
--- a/tools/regression/usr.bin/pkill/pkill-x.t
+++ b/tools/regression/usr.bin/pkill/pkill-x.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/pkill/pkill-x.t,v 1.1 2005/03/20 12:38:08 pjd Exp $
 
 base=`basename $0`
 
diff --git a/tools/regression/usr.bin/printf/Makefile b/tools/regression/usr.bin/printf/Makefile
index b937d41a4e4a8..e2def907e10eb 100644
--- a/tools/regression/usr.bin/printf/Makefile
+++ b/tools/regression/usr.bin/printf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/printf/Makefile,v 1.1 2005/04/13 20:08:17 stefanf Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/printf/regress.sh b/tools/regression/usr.bin/printf/regress.sh
index 86c600f574d13..e0cf87b5cea7c 100644
--- a/tools/regression/usr.bin/printf/regress.sh
+++ b/tools/regression/usr.bin/printf/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/printf/regress.sh,v 1.2 2005/04/14 18:33:14 stefanf Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/printf/regress.t b/tools/regression/usr.bin/printf/regress.t
index a82aacd9886f5..a0b9a29801792 100644
--- a/tools/regression/usr.bin/printf/regress.t
+++ b/tools/regression/usr.bin/printf/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/printf/regress.t,v 1.1 2005/04/13 20:08:17 stefanf Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/regress.m4 b/tools/regression/usr.bin/regress.m4
index 35e2ab958f000..f71a76a77999e 100644
--- a/tools/regression/usr.bin/regress.m4
+++ b/tools/regression/usr.bin/regress.m4
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/regress.m4,v 1.5 2004/11/11 19:47:54 nik Exp $
 
 dnl A library of routines for doing regression tests for userland utilities.
 
diff --git a/tools/regression/usr.bin/sed/Makefile b/tools/regression/usr.bin/sed/Makefile
index 050b4ee86dd99..7fc339e3d9751 100644
--- a/tools/regression/usr.bin/sed/Makefile
+++ b/tools/regression/usr.bin/sed/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/Makefile,v 1.4 2007/03/14 18:58:59 dds Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/sed/hanoi.sed b/tools/regression/usr.bin/sed/hanoi.sed
index 6a45deaa94c7b..0fdf1d11a5c2b 100644
--- a/tools/regression/usr.bin/sed/hanoi.sed
+++ b/tools/regression/usr.bin/sed/hanoi.sed
@@ -1,7 +1,7 @@
 # Towers of Hanoi in sed.
 #
 #	@(#)hanoi.sed	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/hanoi.sed,v 1.4 2007/03/14 07:40:44 dds Exp $
 #
 #
 # Ex:
diff --git a/tools/regression/usr.bin/sed/math.sed b/tools/regression/usr.bin/sed/math.sed
index cdd18d6d532b4..e5aa74a53c58e 100644
--- a/tools/regression/usr.bin/sed/math.sed
+++ b/tools/regression/usr.bin/sed/math.sed
@@ -1,6 +1,6 @@
 # This is ksb's infamous sed calculator.		(ksb@sa.fedex.com)
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/math.sed,v 1.3 2007/03/14 07:40:44 dds Exp $
 #
 # $Id: math.sed,v 2.5 1998/08/02 13:23:34 ksb Exp ksb $
 # expr ::= (expr) | expr! |
diff --git a/tools/regression/usr.bin/sed/multitest.t b/tools/regression/usr.bin/sed/multitest.t
index 9c0881f92ac5d..a74601818f534 100644
--- a/tools/regression/usr.bin/sed/multitest.t
+++ b/tools/regression/usr.bin/sed/multitest.t
@@ -30,7 +30,7 @@
 #
 #	@(#)sed.test	8.1 (Berkeley) 6/6/93
 #
-#	$FreeBSD$
+#	$FreeBSD: src/tools/regression/usr.bin/sed/multitest.t,v 1.13 2007/04/02 07:50:09 yar Exp $
 #
 
 # sed Regression Tests
diff --git a/tools/regression/usr.bin/sed/regress.sh b/tools/regression/usr.bin/sed/regress.sh
index febbb0fb17293..17bafee4d975d 100644
--- a/tools/regression/usr.bin/sed/regress.sh
+++ b/tools/regression/usr.bin/sed/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/regress.sh,v 1.18 2007/07/06 16:36:52 delphij Exp $
 
 REGRESSION_START($1)
 
diff --git a/tools/regression/usr.bin/sed/regress.t b/tools/regression/usr.bin/sed/regress.t
index a82aacd9886f5..c05b25510c28a 100644
--- a/tools/regression/usr.bin/sed/regress.t
+++ b/tools/regression/usr.bin/sed/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/sed/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/uudecode/Makefile b/tools/regression/usr.bin/uudecode/Makefile
index b937d41a4e4a8..104026df85f6e 100644
--- a/tools/regression/usr.bin/uudecode/Makefile
+++ b/tools/regression/usr.bin/uudecode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uudecode/Makefile,v 1.2 2002/06/24 14:22:44 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/uudecode/regress.sh b/tools/regression/usr.bin/uudecode/regress.sh
index f131280c4171a..6b190a0b205c1 100644
--- a/tools/regression/usr.bin/uudecode/regress.sh
+++ b/tools/regression/usr.bin/uudecode/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uudecode/regress.sh,v 1.5 2004/11/11 19:47:55 nik Exp $
 
 echo 1..2
 
diff --git a/tools/regression/usr.bin/uudecode/regress.t b/tools/regression/usr.bin/uudecode/regress.t
index a82aacd9886f5..d4c2889d8aab7 100644
--- a/tools/regression/usr.bin/uudecode/regress.t
+++ b/tools/regression/usr.bin/uudecode/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uudecode/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/uuencode/Makefile b/tools/regression/usr.bin/uuencode/Makefile
index b937d41a4e4a8..a9ecaf6341f9b 100644
--- a/tools/regression/usr.bin/uuencode/Makefile
+++ b/tools/regression/usr.bin/uuencode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uuencode/Makefile,v 1.2 2002/06/24 13:52:28 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/uuencode/regress.sh b/tools/regression/usr.bin/uuencode/regress.sh
index e14b2c3049fa0..41c01851705a8 100644
--- a/tools/regression/usr.bin/uuencode/regress.sh
+++ b/tools/regression/usr.bin/uuencode/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uuencode/regress.sh,v 1.7 2004/11/11 19:47:55 nik Exp $
 
 echo 1..2
 
diff --git a/tools/regression/usr.bin/uuencode/regress.t b/tools/regression/usr.bin/uuencode/regress.t
index a82aacd9886f5..b2d893e6de2e4 100644
--- a/tools/regression/usr.bin/uuencode/regress.t
+++ b/tools/regression/usr.bin/uuencode/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/uuencode/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.bin/xargs/Makefile b/tools/regression/usr.bin/xargs/Makefile
index b937d41a4e4a8..59818b1b2181b 100644
--- a/tools/regression/usr.bin/xargs/Makefile
+++ b/tools/regression/usr.bin/xargs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/xargs/Makefile,v 1.2 2002/06/24 13:52:28 jmallett Exp $
 
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/xargs/regress.sh b/tools/regression/usr.bin/xargs/regress.sh
index 7c8db1d2e7d12..220357e894824 100644
--- a/tools/regression/usr.bin/xargs/regress.sh
+++ b/tools/regression/usr.bin/xargs/regress.sh
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/xargs/regress.sh,v 1.6 2004/11/11 19:47:55 nik Exp $
 
 echo 1..5
 
diff --git a/tools/regression/usr.bin/xargs/regress.t b/tools/regression/usr.bin/xargs/regress.t
index a82aacd9886f5..664c8ce49fbc3 100644
--- a/tools/regression/usr.bin/xargs/regress.t
+++ b/tools/regression/usr.bin/xargs/regress.t
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.bin/xargs/regress.t,v 1.1 2004/11/11 19:47:55 nik Exp $
 
 cd `dirname $0`
 
diff --git a/tools/regression/usr.sbin/Makefile b/tools/regression/usr.sbin/Makefile
index d787c4625e1ca..3b0e8f98f9c3b 100644
--- a/tools/regression/usr.sbin/Makefile
+++ b/tools/regression/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.sbin/Makefile,v 1.1 2007/05/22 06:21:20 dds Exp $
 
 SUBDIR=	sa
 
diff --git a/tools/regression/usr.sbin/sa/Makefile b/tools/regression/usr.sbin/sa/Makefile
index 930f3ff5fd295..668d0728b6ba5 100644
--- a/tools/regression/usr.sbin/sa/Makefile
+++ b/tools/regression/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.sbin/sa/Makefile,v 1.1 2007/05/22 06:21:20 dds Exp $
 
 all: regress
 
diff --git a/tools/regression/usr.sbin/sa/prime.sh b/tools/regression/usr.sbin/sa/prime.sh
index c3fec3275a410..64d2b89fe7031 100644
--- a/tools/regression/usr.sbin/sa/prime.sh
+++ b/tools/regression/usr.sbin/sa/prime.sh
@@ -3,7 +3,7 @@
 # Configure and run this script to create the files for regression testing
 # for a new architecture/configuration.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.sbin/sa/prime.sh,v 1.2 2007/05/23 21:35:45 dds Exp $
 #
 
 # Set this to the path of the current sa command
diff --git a/tools/regression/usr.sbin/sa/regress.t b/tools/regression/usr.sbin/sa/regress.t
index 2f64cf9a5f383..a075b293c42ee 100644
--- a/tools/regression/usr.sbin/sa/regress.t
+++ b/tools/regression/usr.sbin/sa/regress.t
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/regression/usr.sbin/sa/regress.t,v 1.1 2007/05/22 06:21:20 dds Exp $
 #
 
 DIR=`dirname $0`
diff --git a/tools/sched/schedgraph.py b/tools/sched/schedgraph.py
index eb5f7308eb65d..e8c3fdf7eb1da 100644
--- a/tools/sched/schedgraph.py
+++ b/tools/sched/schedgraph.py
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/sched/schedgraph.py,v 1.12 2007/04/22 06:20:12 kris Exp $
 
 import sys
 import re
diff --git a/tools/test/README b/tools/test/README
index aacc781436579..b469ee636bdca 100644
--- a/tools/test/README
+++ b/tools/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/test/README,v 1.4 2001/10/08 12:28:31 asmodai Exp $
 
 This directory is for test programs.
 
diff --git a/tools/test/devrandom/hammer.random b/tools/test/devrandom/hammer.random
index ea4cb5f64032b..0aee741e2c8c9 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/hammer.random,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 for (;;) {
diff --git a/tools/test/devrandom/hammer.urandom b/tools/test/devrandom/hammer.urandom
index d0b6aa89da586..e6a49b7841b50 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/hammer.urandom,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 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 32a6a9caf5502..5b1fb5d1079f7 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!
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/stat.16bit,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 for ($i = 0; $i < (1024*64); $i++) {
diff --git a/tools/test/devrandom/stat.8bit b/tools/test/devrandom/stat.8bit
index 03fdbdd5b39d9..de28beb7c117a 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!
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/test/devrandom/stat.8bit,v 1.4 1999/08/28 00:54:24 peter Exp $
 #
 
 for ($i = 0; $i < (1024*32); $i++) {
diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile
index 7d6067087b6b7..d1233f2f11458 100644
--- a/tools/test/malloc/Makefile
+++ b/tools/test/malloc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/malloc/Makefile,v 1.5 2004/12/21 08:47:26 ru Exp $
 PROG=	malloc
 SRCS=	main.c
 .PATH:	${.CURDIR}/../../../lib/libc/stdlib
diff --git a/tools/test/malloc/main.c b/tools/test/malloc/main.c
index 2a0502928c062..dcb200ab9f069 100644
--- a/tools/test/malloc/main.c
+++ b/tools/test/malloc/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/test/malloc/main.c,v 1.2 2002/01/02 06:42:34 kbyanc Exp $ */
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tools/test/posixshm/README b/tools/test/posixshm/README
index 514e18b893a77..767449546f7cd 100644
--- a/tools/test/posixshm/README
+++ b/tools/test/posixshm/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/test/posixshm/README,v 1.1 2000/04/22 15:29:21 wollman Exp $
 
 This is a simple program to test/demonstrate the POSIX Shared Memory
 Objects feature set.  `make shm_test' to build.
diff --git a/tools/test/posixshm/shm_test.c b/tools/test/posixshm/shm_test.c
index 6cee558bb362e..8cdb516372be5 100644
--- a/tools/test/posixshm/shm_test.c
+++ b/tools/test/posixshm/shm_test.c
@@ -1,7 +1,7 @@
 /*
  * Test the POSIX shared-memory API.
  * Dedicated to tyhe public domain by Garrett A. Wollman, 2000.
- * $FreeBSD$
+ * $FreeBSD: src/tools/test/posixshm/shm_test.c,v 1.1 2000/04/22 15:29:21 wollman Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile
index f0110edf12926..92b02fa020413 100644
--- a/tools/test/ppsapi/Makefile
+++ b/tools/test/ppsapi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/ppsapi/Makefile,v 1.4 2004/12/21 08:47:26 ru Exp $
 
 PROG=	ppsapitest
 NO_MAN=
diff --git a/tools/test/ppsapi/README b/tools/test/ppsapi/README
index ad8dacf31b578..95787a375cade 100644
--- a/tools/test/ppsapi/README
+++ b/tools/test/ppsapi/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/test/ppsapi/README,v 1.2 2004/11/19 17:30:48 obrien Exp $
 
 This is a small test program which I have had around since we wrote
 the RFC 2783 API.
diff --git a/tools/test/ppsapi/ppsapitest.c b/tools/test/ppsapi/ppsapitest.c
index 78e73825e16c7..8d255879b77d4 100644
--- a/tools/test/ppsapi/ppsapitest.c
+++ b/tools/test/ppsapi/ppsapitest.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/test/ppsapi/ppsapitest.c,v 1.2 2004/03/10 20:30:19 phk Exp $");
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tools/tools/README b/tools/tools/README
index fe7fd51fa90fd..9342122a0a9dc 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/README,v 1.50 2007/06/29 22:47:16 sam Exp $
 
 This directory is for tools.
 
diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile
index d245d47a6729d..87c46976b7bac 100644
--- a/tools/tools/aac/Makefile
+++ b/tools/tools/aac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/aac/Makefile,v 1.4 2004/12/21 08:47:26 ru Exp $
 
 PROG=	aac_checkq
 NO_MAN=
diff --git a/tools/tools/aac/aac_checkq.c b/tools/tools/aac/aac_checkq.c
index 5893e65374236..8c5d3e31857bb 100644
--- a/tools/tools/aac/aac_checkq.c
+++ b/tools/tools/aac/aac_checkq.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/aac/aac_checkq.c,v 1.3 2005/11/06 15:47:06 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/fcntl.h>
diff --git a/tools/tools/ansify/Makefile b/tools/tools/ansify/Makefile
index 9519a4ce9fb2d..f7e78052275e0 100644
--- a/tools/tools/ansify/Makefile
+++ b/tools/tools/ansify/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ansify/Makefile,v 1.1 2005/12/13 22:09:50 des Exp $
 
 SCRIPTS=	ansify.pl
 BINDIR?=	/usr/local/bin
diff --git a/tools/tools/ansify/ansify.pl b/tools/tools/ansify/ansify.pl
index 801d693f30d7b..732f96a3ea562 100644
--- a/tools/tools/ansify/ansify.pl
+++ b/tools/tools/ansify/ansify.pl
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ansify/ansify.pl,v 1.2 2005/12/13 22:21:46 des Exp $
 #
 
 use v5.6.0;
diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile
index 34c732a593999..91a56e6199bf6 100644
--- a/tools/tools/ath/Makefile
+++ b/tools/tools/ath/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/ath/Makefile,v 1.6 2005/12/11 23:13:52 sam Exp $
 
 SUBDIR=	athstats athdebug
 
diff --git a/tools/tools/ath/athctrl.sh b/tools/tools/ath/athctrl.sh
index 5adee1c3c4a44..e7ae61ff9f411 100644
--- a/tools/tools/ath/athctrl.sh
+++ b/tools/tools/ath/athctrl.sh
@@ -4,7 +4,7 @@
 # point-to-point use at a specific distance.  Based on a
 # program by Gunter Burchardt.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ath/athctrl.sh,v 1.1 2005/08/30 16:03:15 sam Exp $
 #
 DEV=ath0
 d=0
diff --git a/tools/tools/ath/athdebug/Makefile b/tools/tools/ath/athdebug/Makefile
index c1b3bf981678d..a5cd7f2b9e63d 100644
--- a/tools/tools/ath/athdebug/Makefile
+++ b/tools/tools/ath/athdebug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ath/athdebug/Makefile,v 1.2 2006/03/15 10:46:36 ru Exp $
 
 PROG=	athdebug
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/ath/athdebug/athdebug.c b/tools/tools/ath/athdebug/athdebug.c
index 3480224b3a114..14777f5beb603 100644
--- a/tools/tools/ath/athdebug/athdebug.c
+++ b/tools/tools/ath/athdebug/athdebug.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athdebug/athdebug.c,v 1.2 2005/12/13 22:13:41 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile
index 315d7e6cbeccd..d222ccbe3b92e 100644
--- a/tools/tools/ath/athstats/Makefile
+++ b/tools/tools/ath/athstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ath/athstats/Makefile,v 1.4 2007/02/02 02:39:56 sam Exp $
 
 PROG=	athstats
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/ath/athstats/athstats.c b/tools/tools/ath/athstats/athstats.c
index 8d3eb3b12bafb..c4a8811552b22 100644
--- a/tools/tools/ath/athstats/athstats.c
+++ b/tools/tools/ath/athstats/athstats.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athstats/athstats.c,v 1.5 2006/08/10 19:01:16 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/athstats/athstats.h b/tools/tools/ath/athstats/athstats.h
index 03a9b7cde29b9..f3a2a8958cad9 100644
--- a/tools/tools/ath/athstats/athstats.h
+++ b/tools/tools/ath/athstats/athstats.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athstats/athstats.h,v 1.1 2006/08/10 19:01:16 sam Exp $
  */
 
 #ifndef _ATHSTATS_H_
diff --git a/tools/tools/ath/athstats/main.c b/tools/tools/ath/athstats/main.c
index b775b1a3a3260..7fbe1d3c74d13 100644
--- a/tools/tools/ath/athstats/main.c
+++ b/tools/tools/ath/athstats/main.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athstats/main.c,v 1.1 2006/08/10 19:01:16 sam Exp $
  */
 
 /*
diff --git a/tools/tools/ath/athstats/statfoo.c b/tools/tools/ath/athstats/statfoo.c
index 99c616b9c9e67..33a9f7d151096 100644
--- a/tools/tools/ath/athstats/statfoo.c
+++ b/tools/tools/ath/athstats/statfoo.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athstats/statfoo.c,v 1.1 2006/08/10 19:01:16 sam Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/tools/ath/athstats/statfoo.h b/tools/tools/ath/athstats/statfoo.h
index 4575946bceed9..2dee00884dbcd 100644
--- a/tools/tools/ath/athstats/statfoo.h
+++ b/tools/tools/ath/athstats/statfoo.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ath/athstats/statfoo.h,v 1.1 2006/08/10 19:01:16 sam Exp $
  */
 
 #ifndef _STATFOO_H_
diff --git a/tools/tools/backout_commit/backout_commit.rb b/tools/tools/backout_commit/backout_commit.rb
index 264c271b60bf7..9d9b3a579335f 100644
--- a/tools/tools/backout_commit/backout_commit.rb
+++ b/tools/tools/backout_commit/backout_commit.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -w
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/backout_commit/backout_commit.rb,v 1.1 2003/01/31 22:08:14 seanc Exp $
 
 # Please note, that this utility must be kept in sync with
 # CVSROOT/log_accum.pl.  If someone has a different output from their
diff --git a/tools/tools/build_option_survey/listallopts.sh b/tools/tools/build_option_survey/listallopts.sh
index 77c859aaee48f..8c4a6b6c3b88d 100644
--- a/tools/tools/build_option_survey/listallopts.sh
+++ b/tools/tools/build_option_survey/listallopts.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/build_option_survey/listallopts.sh,v 1.1 2006/03/25 10:50:40 phk Exp $
 #
 # This file is in the public domain
 
diff --git a/tools/tools/build_option_survey/mkhtml.sh b/tools/tools/build_option_survey/mkhtml.sh
index a6261f918887c..95882189a7b10 100644
--- a/tools/tools/build_option_survey/mkhtml.sh
+++ b/tools/tools/build_option_survey/mkhtml.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is in the public domain
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/build_option_survey/mkhtml.sh,v 1.5 2006/03/25 21:51:46 phk Exp $
 
 set -e
 
diff --git a/tools/tools/build_option_survey/option_survey.sh b/tools/tools/build_option_survey/option_survey.sh
index 3fee3164de0f8..a4d55b5314805 100644
--- a/tools/tools/build_option_survey/option_survey.sh
+++ b/tools/tools/build_option_survey/option_survey.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is in the public domain
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/build_option_survey/option_survey.sh,v 1.3 2006/03/25 10:50:40 phk Exp $
 
 set -ex
 
diff --git a/tools/tools/build_option_survey/reduce.sh b/tools/tools/build_option_survey/reduce.sh
index 3755749875743..ff4c14082b808 100644
--- a/tools/tools/build_option_survey/reduce.sh
+++ b/tools/tools/build_option_survey/reduce.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is in the public domain
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/build_option_survey/reduce.sh,v 1.2 2006/03/25 10:50:40 phk Exp $
 
 set -e
 
diff --git a/tools/tools/commitsdb/make_commit_db b/tools/tools/commitsdb/make_commit_db
index d33d47806fcf6..24020aa794864 100644
--- a/tools/tools/commitsdb/make_commit_db
+++ b/tools/tools/commitsdb/make_commit_db
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/commitsdb/make_commit_db,v 1.2 2002/10/17 16:29:26 joe Exp $
 
 # This script walks the tree from the current directory
 # and spits out a database generated by md5'ing the cvs log
diff --git a/tools/tools/commitsdb/query_commit_db b/tools/tools/commitsdb/query_commit_db
index e855efb067661..b33f0d0edf8c6 100644
--- a/tools/tools/commitsdb/query_commit_db
+++ b/tools/tools/commitsdb/query_commit_db
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/commitsdb/query_commit_db,v 1.3 2002/04/01 17:51:27 joe Exp $
 
 # This script takes a filename and revision number as arguments
 # and spits out a list of other files and their revisions that share
diff --git a/tools/tools/crypto/Makefile b/tools/tools/crypto/Makefile
index 922b0dcb777e2..aa4ef5785dabe 100644
--- a/tools/tools/crypto/Makefile
+++ b/tools/tools/crypto/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/crypto/Makefile,v 1.8 2004/09/07 18:35:00 sam Exp $
 #
 # Copyright (c) 2002, 2003	Sam Leffler, Errno Consulting
 # All rights reserved.
diff --git a/tools/tools/crypto/README b/tools/tools/crypto/README
index 16b6bdb0d8ca8..cf33e8613b631 100644
--- a/tools/tools/crypto/README
+++ b/tools/tools/crypto/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/crypto/README,v 1.1 2002/12/14 06:23:58 sam Exp $
 
 The cryptotest program repeatedly encrypts and decrypts a buffer
 with the built-in iv and key, using hardware crypto.  At the end,
diff --git a/tools/tools/crypto/cryptokeytest.c b/tools/tools/crypto/cryptokeytest.c
index 4e49152813889..c5bbcc68d3d56 100644
--- a/tools/tools/crypto/cryptokeytest.c
+++ b/tools/tools/crypto/cryptokeytest.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/tools/crypto/cryptokeytest.c,v 1.2 2007/03/21 03:42:51 sam Exp $ */
 /*
  * The big num stuff is a bit broken at the moment and I've not yet fixed it.
  * The symtom is that odd size big nums will fail.  Test code below (it only
diff --git a/tools/tools/crypto/cryptostats.c b/tools/tools/crypto/cryptostats.c
index 83b8a67ac7c2a..3eac0e6e0ae23 100644
--- a/tools/tools/crypto/cryptostats.c
+++ b/tools/tools/crypto/cryptostats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/cryptostats.c,v 1.2 2003/03/19 01:53:55 sam Exp $
  */
 
 /*
diff --git a/tools/tools/crypto/cryptotest.c b/tools/tools/crypto/cryptotest.c
index 9bb93ea56665c..bb66e6359ab58 100644
--- a/tools/tools/crypto/cryptotest.c
+++ b/tools/tools/crypto/cryptotest.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/cryptotest.c,v 1.9 2007/03/21 03:42:51 sam Exp $
  */
 
 /*
diff --git a/tools/tools/crypto/hifnstats.c b/tools/tools/crypto/hifnstats.c
index 1f40cd55ac0bc..e85cb38d281e4 100644
--- a/tools/tools/crypto/hifnstats.c
+++ b/tools/tools/crypto/hifnstats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/hifnstats.c,v 1.1 2003/03/19 01:53:55 sam Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/crypto/ipsecstats.c b/tools/tools/crypto/ipsecstats.c
index 6ecc1f454bcf9..e4944cb898892 100644
--- a/tools/tools/crypto/ipsecstats.c
+++ b/tools/tools/crypto/ipsecstats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/ipsecstats.c,v 1.2 2007/09/19 08:50:55 gnn Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/crypto/safestats.c b/tools/tools/crypto/safestats.c
index ea7601a8e070a..03e9f0551f57f 100644
--- a/tools/tools/crypto/safestats.c
+++ b/tools/tools/crypto/safestats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/safestats.c,v 1.1 2003/07/21 21:58:04 sam Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/crypto/ubsecstats.c b/tools/tools/crypto/ubsecstats.c
index 736f7839458e2..de6af831f3583 100644
--- a/tools/tools/crypto/ubsecstats.c
+++ b/tools/tools/crypto/ubsecstats.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/crypto/ubsecstats.c,v 1.4 2006/05/18 13:22:44 pjd Exp $
  */
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/tools/tools/epfe/epfe.pl b/tools/tools/epfe/epfe.pl
index 0aea2c247a64c..6f21f58fb5f14 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
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/epfe/epfe.pl,v 1.4 1999/08/28 00:54:26 peter Exp $
 
 $in = 0; @a = ();
 sub Print { s/\&amp\;/&/g; push(@a,$_); }
diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile
index 9a55be38d17e2..bd392dc7b829a 100644
--- a/tools/tools/find-sb/Makefile
+++ b/tools/tools/find-sb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/find-sb/Makefile,v 1.3 2006/09/28 12:33:36 ru Exp $
 
 PROG=	find-sb
 NO_MAN=
diff --git a/tools/tools/find-sb/README b/tools/tools/find-sb/README
index fae701c816c3a..bdada71d55da8 100644
--- a/tools/tools/find-sb/README
+++ b/tools/tools/find-sb/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/find-sb/README,v 1.1 2002/10/04 03:06:16 wollman Exp $
 
 find-sb is a program which scans the input file you specify (normally a
 raw disk slice) for filesystems.  It's not very smart, nor particularly
diff --git a/tools/tools/find-sb/find-sb.c b/tools/tools/find-sb/find-sb.c
index fd4de42194b89..d0183209d4833 100644
--- a/tools/tools/find-sb/find-sb.c
+++ b/tools/tools/find-sb/find-sb.c
@@ -2,7 +2,7 @@
  * This program, created 2002-10-03 by Garrett A. Wollman
  * <wollman@FreeBSD.org>, is in the public domain.  Use at your own risk.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/find-sb/find-sb.c,v 1.4 2006/09/28 12:33:36 ru Exp $
  */
 
 #ifdef __FreeBSD__
diff --git a/tools/tools/find-sb/mini_ufs.h b/tools/tools/find-sb/mini_ufs.h
index 82a864dd6a8e2..fadd78b026500 100644
--- a/tools/tools/find-sb/mini_ufs.h
+++ b/tools/tools/find-sb/mini_ufs.h
@@ -2,7 +2,7 @@
  * This program, created 2002-10-03 by Garrett A. Wollman
  * <wollman@FreeBSD.org>, is in the public domain.  Use at your own risk.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/find-sb/mini_ufs.h,v 1.2 2006/10/31 22:18:33 pjd Exp $
  */
 
 /*
diff --git a/tools/tools/gdb_regofs/Makefile b/tools/tools/gdb_regofs/Makefile
index 5f5a7e36b0d91..10e4f9c12c516 100644
--- a/tools/tools/gdb_regofs/Makefile
+++ b/tools/tools/gdb_regofs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/gdb_regofs/Makefile,v 1.3 2004/12/21 08:47:27 ru Exp $
 PROG=gdb_regofs
 SRCS=${MACHINE_ARCH}.c
 NO_MAN=
diff --git a/tools/tools/gdb_regofs/ia64.c b/tools/tools/gdb_regofs/ia64.c
index 59e0055253b60..c42d9ebdb4f35 100644
--- a/tools/tools/gdb_regofs/ia64.c
+++ b/tools/tools/gdb_regofs/ia64.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/gdb_regofs/ia64.c,v 1.1 2004/03/28 18:01:15 marcel Exp $");
 
 #include <stddef.h>
 #include <machine/reg.h>
diff --git a/tools/tools/genericize/Makefile b/tools/tools/genericize/Makefile
index 5df77b99f910c..a42d867f81886 100644
--- a/tools/tools/genericize/Makefile
+++ b/tools/tools/genericize/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/genericize/Makefile,v 1.2 2004/11/07 11:09:44 des Exp $
 
 SCRIPTS=	genericize.pl
 BINDIR?=	/usr/local/bin
diff --git a/tools/tools/genericize/genericize.pl b/tools/tools/genericize/genericize.pl
index 2f8d694d686d9..3bfcc7d838a9b 100755
--- a/tools/tools/genericize/genericize.pl
+++ b/tools/tools/genericize/genericize.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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/genericize/genericize.pl,v 1.6 2006/01/30 10:46:01 des Exp $
 #
 
 use strict;
diff --git a/tools/tools/hcomp/Makefile b/tools/tools/hcomp/Makefile
index 06029b7a90d0c..3db193aee09ca 100644
--- a/tools/tools/hcomp/Makefile
+++ b/tools/tools/hcomp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/hcomp/Makefile,v 1.1 2003/08/04 13:10:01 des Exp $
 
 BINDIR		?= ${HOME}/bin
 BINOWN		?= ${USER}
diff --git a/tools/tools/hcomp/hcomp.pl b/tools/tools/hcomp/hcomp.pl
index 9c48bba123c09..6164026b29806 100644
--- a/tools/tools/hcomp/hcomp.pl
+++ b/tools/tools/hcomp/hcomp.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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/hcomp/hcomp.pl,v 1.1 2003/08/04 13:10:01 des Exp $
 #
 
 use strict;
diff --git a/tools/tools/html-mv/html-mv b/tools/tools/html-mv/html-mv
index 29ea1f2db81dd..fd2ea5fc83d70 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
 # [...]
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/html-mv/html-mv,v 1.2 1999/08/28 00:54:26 peter Exp $
 
 case $# in 0)
 	echo "usage `basename $0` file"
diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile
index 440c39c693f1a..9b1267c6c4533 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ifinfo/Makefile,v 1.5 2004/12/21 08:47:27 ru Exp $
 
 PROG=	ifinfo
 SRCS=	ifinfo.c rfc1650.c
diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c
index 22053c5e049f7..f2f871a0fc5d0 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ifinfo/ifinfo.c,v 1.8 2006/01/04 12:57:09 harti Exp $
  */
 #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 c05a8b82eca58..a00414d4083a4 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/ifinfo/ifinfo.h,v 1.4 1999/08/28 00:54:29 peter Exp $
  */
 #ifndef	ifinfo_h
 #define	ifinfo_h	1
diff --git a/tools/tools/ipw/Makefile b/tools/tools/ipw/Makefile
index a33ab234cfb16..44aed9f5e1046 100644
--- a/tools/tools/ipw/Makefile
+++ b/tools/tools/ipw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ipw/Makefile,v 1.1 2006/06/20 00:26:35 sam Exp $
 
 PROG=	ipwstats
 NO_MAN=
diff --git a/tools/tools/ipw/ipwstats.c b/tools/tools/ipw/ipwstats.c
index 3146d12ad4727..4b7caa421bc69 100644
--- a/tools/tools/ipw/ipwstats.c
+++ b/tools/tools/ipw/ipwstats.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/ipw/ipwstats.c,v 1.2 2006/06/21 09:52:37 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/tools/tools/iwi/Makefile b/tools/tools/iwi/Makefile
index 2bfaac62e44f9..d17777a6581e3 100644
--- a/tools/tools/iwi/Makefile
+++ b/tools/tools/iwi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/iwi/Makefile,v 1.2 2006/03/15 10:46:37 ru Exp $
 
 PROG=	iwistats
 NO_MAN=
diff --git a/tools/tools/iwi/iwistats.c b/tools/tools/iwi/iwistats.c
index 7e6905493a67e..dffc197fe3532 100644
--- a/tools/tools/iwi/iwistats.c
+++ b/tools/tools/iwi/iwistats.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/iwi/iwistats.c,v 1.1 2005/10/07 18:27:21 damien Exp $	*/
 
 /*-
  * Copyright (c) 2005
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/iwi/iwistats.c,v 1.1 2005/10/07 18:27:21 damien Exp $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/tools/tools/kdrv/KernelDriver b/tools/tools/kdrv/KernelDriver
index 60f89d82bf392..d7c7adb346550 100755
--- a/tools/tools/kdrv/KernelDriver
+++ b/tools/tools/kdrv/KernelDriver
@@ -73,7 +73,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kdrv/KernelDriver,v 1.5 2001/02/18 10:43:27 asmodai Exp $
 #
 ################################################################################
 
diff --git a/tools/tools/kdrv/sample.drvinfo b/tools/tools/kdrv/sample.drvinfo
index 4941b07082c4b..9dd50c1a6eea1 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kdrv/sample.drvinfo,v 1.5 2002/08/11 13:05:28 schweikh Exp $
 
 # Device driver name
 #
diff --git a/tools/tools/kernelcruft/kernelcruft.sh b/tools/tools/kernelcruft/kernelcruft.sh
index 87288c54bd218..d9aafb04f27c4 100644
--- a/tools/tools/kernelcruft/kernelcruft.sh
+++ b/tools/tools/kernelcruft/kernelcruft.sh
@@ -4,7 +4,7 @@
 #
 # Try to find *.c files in /sys which are orphaned
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kernelcruft/kernelcruft.sh,v 1.1 2001/11/05 22:06:09 phk Exp $
 
 cd /sys/conf
 cat files* | sed '
diff --git a/tools/tools/kerninclude/kerninclude.sh b/tools/tools/kerninclude/kerninclude.sh
index 1efe4c278fc2c..80e0e7dfba70a 100644
--- a/tools/tools/kerninclude/kerninclude.sh
+++ b/tools/tools/kerninclude/kerninclude.sh
@@ -6,7 +6,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kerninclude/kerninclude.sh,v 1.7 2001/04/23 17:31:16 phk Exp $
 #
 # This script tries to find #include statements which are not needed in
 # the FreeBSD kernel tree.
diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh
index ded6d415715d8..8e76639193df9 100644
--- a/tools/tools/kernxref/kernxref.sh
+++ b/tools/tools/kernxref/kernxref.sh
@@ -9,7 +9,7 @@
 #
 # Sort options by "Matthew Emmerton" <matt@gsicomp.on.ca>
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kernxref/kernxref.sh,v 1.20 2005/02/10 12:47:55 phk Exp $
 #
 # This shell script will make a cross reference of the symbols of a kernel.
 #
diff --git a/tools/tools/kttcp/Makefile b/tools/tools/kttcp/Makefile
index 2f2feb3709bbc..b9cab907dea66 100644
--- a/tools/tools/kttcp/Makefile
+++ b/tools/tools/kttcp/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/kttcp/Makefile,v 1.2 2003/11/13 21:24:09 sam Exp $
 
 SHELL=	/bin/sh
 
diff --git a/tools/tools/kttcp/README b/tools/tools/kttcp/README
index f78c8d66b07a9..1a9f4435d472b 100644
--- a/tools/tools/kttcp/README
+++ b/tools/tools/kttcp/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/kttcp/README,v 1.1 2003/11/13 00:30:27 sam Exp $
 
 This is a port of Jason Thorpe's kttcp tool for testing network
 performance for in-kernel applications (like NFS).  The tool consists
diff --git a/tools/tools/kttcp/kttcp.c b/tools/tools/kttcp/kttcp.c
index 44c6613fa90b7..223b98334c19b 100644
--- a/tools/tools/kttcp/kttcp.c
+++ b/tools/tools/kttcp/kttcp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/kttcp/kttcp.c,v 1.3 2004/12/13 20:40:15 gallatin Exp $	*/
 /*	$NetBSD: kttcp.c,v 1.5 2002/07/11 23:32:35 simonb Exp $	*/
 
 /*
diff --git a/tools/tools/kttcp/sys/Makefile b/tools/tools/kttcp/sys/Makefile
index d7815306b4ab0..5ae9d331d63ee 100644
--- a/tools/tools/kttcp/sys/Makefile
+++ b/tools/tools/kttcp/sys/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/kttcp/sys/Makefile,v 1.1 2003/11/13 00:30:27 sam Exp $
 
 KMOD	= kttcp
 SRCS	= kttcp.c
diff --git a/tools/tools/kttcp/sys/kttcp.c b/tools/tools/kttcp/sys/kttcp.c
index 09739600feaf8..3faa4425e7ec8 100644
--- a/tools/tools/kttcp/sys/kttcp.c
+++ b/tools/tools/kttcp/sys/kttcp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/kttcp/sys/kttcp.c,v 1.4 2004/12/13 20:40:16 gallatin Exp $	*/
 /*	$NetBSD: kttcp.c,v 1.3 2002/07/03 19:36:52 thorpej Exp $	*/
 
 /*
diff --git a/tools/tools/kttcp/sys/kttcpio.h b/tools/tools/kttcp/sys/kttcpio.h
index 1375f6ef6c9db..25fc401d3a22f 100644
--- a/tools/tools/kttcp/sys/kttcpio.h
+++ b/tools/tools/kttcp/sys/kttcpio.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/tools/tools/kttcp/sys/kttcpio.h,v 1.1 2003/11/13 00:30:27 sam Exp $	*/
 /*	$NetBSD$	*/
 
 /*
diff --git a/tools/tools/mfc/Makefile b/tools/tools/mfc/Makefile
index a46dbaaad48f0..398b7c16dec76 100644
--- a/tools/tools/mfc/Makefile
+++ b/tools/tools/mfc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/Makefile,v 1.1 2004/09/24 15:24:12 des Exp $
 
 BINDIR?=	${HOME}/bin
 BINOWN?=	`id -u`
diff --git a/tools/tools/mfc/README b/tools/tools/mfc/README
index 1396ae7479821..a375d58297e3f 100644
--- a/tools/tools/mfc/README
+++ b/tools/tools/mfc/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/mfc/README,v 1.1 2006/01/10 14:33:20 flz Exp $
 
 Summarize scripts abilities and purposes.
 
diff --git a/tools/tools/mfc/mfc.awk b/tools/tools/mfc/mfc.awk
index 0aa98b5fe9e14..0ddd94b59926e 100644
--- a/tools/tools/mfc/mfc.awk
+++ b/tools/tools/mfc/mfc.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/mfc.awk,v 1.2 2006/05/08 06:47:59 jmg Exp $
 #
 
 BEGIN {
diff --git a/tools/tools/mfc/mfc.pl b/tools/tools/mfc/mfc.pl
index c862679882757..a1210f90b29d9 100644
--- a/tools/tools/mfc/mfc.pl
+++ b/tools/tools/mfc/mfc.pl
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/mfc.pl,v 1.12 2007/07/10 15:30:15 flz Exp $
 #
 
 # This perl scripts only uses programs that are part of the base system.
diff --git a/tools/tools/mfc/mfc.sh b/tools/tools/mfc/mfc.sh
index cf7d663e23da3..88cc9dc85c0aa 100644
--- a/tools/tools/mfc/mfc.sh
+++ b/tools/tools/mfc/mfc.sh
@@ -2,7 +2,7 @@
 #
 # Merge an entire directory from HEAD to a given branch
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfc/mfc.sh,v 1.1 2004/09/24 15:24:12 des Exp $
 #
 
 if [ $# -eq 1 -a -f CVS/Tag ] ; then
diff --git a/tools/tools/mfi/Makefile b/tools/tools/mfi/Makefile
index d819a8303bfa8..be4ef2d4117cc 100644
--- a/tools/tools/mfi/Makefile
+++ b/tools/tools/mfi/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfi/Makefile,v 1.1 2007/01/01 23:50:04 scottl Exp $
 
 PROG=	mfi_checkq
 NO_MAN=
diff --git a/tools/tools/mfi/mfi_checkq.c b/tools/tools/mfi/mfi_checkq.c
index 9f860ad92d22b..661c616914e1f 100644
--- a/tools/tools/mfi/mfi_checkq.c
+++ b/tools/tools/mfi/mfi_checkq.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/mfi/mfi_checkq.c,v 1.1 2007/01/01 23:50:04 scottl Exp $");
 
 #include <sys/types.h>
 #include <sys/fcntl.h>
diff --git a/tools/tools/mfi/runmegacli.sh b/tools/tools/mfi/runmegacli.sh
index cf1f938646192..a11997f000948 100644
--- a/tools/tools/mfi/runmegacli.sh
+++ b/tools/tools/mfi/runmegacli.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mfi/runmegacli.sh,v 1.2 2007/01/02 04:51:26 scottl Exp $
 # This is a simple wrapper for running the MegaCLI tool for Linux.  It assumes
 # that the MegaCLI binary has been installed in /compat/linux/usr/sbin/MegaCli.
 # The binary must also have been branded appropriately, and the COMPAT_LINUX,
diff --git a/tools/tools/mid/mid-build b/tools/tools/mid/mid-build
index 0a2d4480a5a8b..9df99f8b7f643 100755
--- a/tools/tools/mid/mid-build
+++ b/tools/tools/mid/mid-build
@@ -4,7 +4,7 @@
 #
 # create a Message-ID, In-Reply-To look(1) index database
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mid/mid-build,v 1.2 2002/12/30 21:18:11 schweikh Exp $
 
 
 TMPDIR=/var/tmp; export TMPDIR
diff --git a/tools/tools/mid/mid-index b/tools/tools/mid/mid-index
index a5ec10b78f3b8..6afa74bbf4c83 100755
--- a/tools/tools/mid/mid-index
+++ b/tools/tools/mid/mid-index
@@ -2,7 +2,7 @@
 #
 # create message-id / in-reply-to database
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mid/mid-index,v 1.2 1999/08/28 00:54:31 peter Exp $
 
 sub usage { die "usage: mid-index name < filelist"; }
 
diff --git a/tools/tools/ministat/Makefile b/tools/tools/ministat/Makefile
index d1a10a3201ee9..6707d33282836 100644
--- a/tools/tools/ministat/Makefile
+++ b/tools/tools/ministat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/Makefile,v 1.6 2005/07/21 08:32:56 phk Exp $
 PROG=	ministat
 NO_MAN=
 DPADD=	${LIBM}
diff --git a/tools/tools/ministat/README b/tools/tools/ministat/README
index cc5fe27df73ea..29b174f5408ed 100644
--- a/tools/tools/ministat/README
+++ b/tools/tools/ministat/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/ministat/README,v 1.1 2003/08/13 07:21:54 phk Exp $
 
 A small tool to do the statistics legwork on benchmarks etc.
 
diff --git a/tools/tools/ministat/chameleon b/tools/tools/ministat/chameleon
index c554c998c1525..294464aa2fbde 100644
--- a/tools/tools/ministat/chameleon
+++ b/tools/tools/ministat/chameleon
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/chameleon,v 1.1 2003/08/13 07:21:54 phk Exp $
 150
 400
 720	
diff --git a/tools/tools/ministat/iguana b/tools/tools/ministat/iguana
index d6996c125802b..967f58323a70e 100644
--- a/tools/tools/ministat/iguana
+++ b/tools/tools/ministat/iguana
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ministat/iguana,v 1.1 2003/08/13 07:21:54 phk Exp $
 50
 200
 150
diff --git a/tools/tools/ministat/ministat.c b/tools/tools/ministat/ministat.c
index 660becf207e15..5fb1161149510 100644
--- a/tools/tools/ministat/ministat.c
+++ b/tools/tools/ministat/ministat.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/ministat/ministat.c,v 1.10 2006/08/28 08:27:02 phk Exp $");
 
 #include <stdio.h>
 #include <math.h>
diff --git a/tools/tools/mtxstat/mtxratio.sh b/tools/tools/mtxstat/mtxratio.sh
index 02a66a94a246b..453d0bc1d0268 100644
--- a/tools/tools/mtxstat/mtxratio.sh
+++ b/tools/tools/mtxstat/mtxratio.sh
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/mtxstat/mtxratio.sh,v 1.1 2004/07/27 00:36:53 jmg Exp $
 sysctl debug.mutex.prof.stats | awk '$1 ~ /[0-9]+/ { if ($3 != 0) { hld_prc = $5 / $3 * 100; lck_prc = $6 / $3 * 100 } else { hld_prc = 0; lck_prc = 0 } print $1 " " $2 " " $3 " " $4 " " $5 " " hld_prc " " $6 " " lck_prc " " substr($0, index($0, $7)); next } { print }'
diff --git a/tools/tools/mtxstat/mtxstat.pl b/tools/tools/mtxstat/mtxstat.pl
index cfa7edd7bf0e5..f33190b838aef 100644
--- a/tools/tools/mtxstat/mtxstat.pl
+++ b/tools/tools/mtxstat/mtxstat.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.
 #
-#      $FreeBSD$
+#      $FreeBSD: src/tools/tools/mtxstat/mtxstat.pl,v 1.2 2003/09/19 21:52:29 sam Exp $
 #
 
 use strict;
diff --git a/tools/tools/nanobsd/Files/root/change_password b/tools/tools/nanobsd/Files/root/change_password
index daf4c8ca0e83c..67a67da0d4a8b 100644
--- a/tools/tools/nanobsd/Files/root/change_password
+++ b/tools/tools/nanobsd/Files/root/change_password
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/change_password,v 1.3 2005/09/21 09:40:45 phk Exp $
 #
 
 set -e
diff --git a/tools/tools/nanobsd/Files/root/save_sshkeys b/tools/tools/nanobsd/Files/root/save_sshkeys
index 03fccf4ac0a2e..68ecfb1a340c9 100644
--- a/tools/tools/nanobsd/Files/root/save_sshkeys
+++ b/tools/tools/nanobsd/Files/root/save_sshkeys
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/save_sshkeys,v 1.4 2005/09/25 21:23:19 phk Exp $
 #
 
 set -e
diff --git a/tools/tools/nanobsd/Files/root/updatep1 b/tools/tools/nanobsd/Files/root/updatep1
index 6e094fa2fbbfb..da6d738ecc53f 100644
--- a/tools/tools/nanobsd/Files/root/updatep1
+++ b/tools/tools/nanobsd/Files/root/updatep1
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/updatep1,v 1.2 2005/09/21 09:40:45 phk Exp $
 #
 # Script to update partition 1 on a NanoBSD system.
 #
diff --git a/tools/tools/nanobsd/Files/root/updatep2 b/tools/tools/nanobsd/Files/root/updatep2
index b9067eb7b7c0e..8aa58d7d3a421 100644
--- a/tools/tools/nanobsd/Files/root/updatep2
+++ b/tools/tools/nanobsd/Files/root/updatep2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/Files/root/updatep2,v 1.2 2005/09/21 09:40:45 phk Exp $
 #
 # Script to update partition 2 on a NanoBSD system.
 #
diff --git a/tools/tools/nanobsd/FlashDevice.sub b/tools/tools/nanobsd/FlashDevice.sub
index 07d3ce698c032..90f8236cd17c9 100644
--- a/tools/tools/nanobsd/FlashDevice.sub
+++ b/tools/tools/nanobsd/FlashDevice.sub
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/FlashDevice.sub,v 1.8 2006/11/16 08:04:29 benno Exp $
 #
 # Convenience function for commonly used Flash devices.
 #
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 1378861c88221..a1d60b177ba94 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.28 2007/08/26 14:57:08 phk Exp $
 #
 
 set -e
diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile
index 1852296ad3e55..b44f62ff36bfc 100644
--- a/tools/tools/ncpus/Makefile
+++ b/tools/tools/ncpus/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/ncpus/Makefile,v 1.3 2006/03/06 21:51:27 sam Exp $
 
 PROG=	ncpus
 NO_MAN=
diff --git a/tools/tools/ncpus/acpi.c b/tools/tools/ncpus/acpi.c
index 88ec6fc2ed45d..527b3091f84f5 100644
--- a/tools/tools/ncpus/acpi.c
+++ b/tools/tools/ncpus/acpi.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/tools/ncpus/acpi.c,v 1.3 2006/03/06 21:51:27 sam Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/tools/ncpus/acpidump.h b/tools/tools/ncpus/acpidump.h
index 9c2b5b6e502d1..03ce0e1e999e3 100644
--- a/tools/tools/ncpus/acpidump.h
+++ b/tools/tools/ncpus/acpidump.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/tools/tools/ncpus/acpidump.h,v 1.1 2006/02/22 21:51:09 sam Exp $
  */
 
 #ifndef _ACPIDUMP_H_
diff --git a/tools/tools/ncpus/biosmptable.c b/tools/tools/ncpus/biosmptable.c
index 398d0e4323853..68bac37576d56 100644
--- a/tools/tools/ncpus/biosmptable.c
+++ b/tools/tools/ncpus/biosmptable.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/ncpus/biosmptable.c,v 1.2 2006/03/06 21:51:27 sam Exp $");
 
 #include <sys/types.h>
 #include <machine/mptable.h>
diff --git a/tools/tools/ncpus/ncpus.c b/tools/tools/ncpus/ncpus.c
index 0f4498f095baa..b0b883afc2d1a 100644
--- a/tools/tools/ncpus/ncpus.c
+++ b/tools/tools/ncpus/ncpus.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/tools/tools/ncpus/ncpus.c,v 1.3 2006/03/06 21:51:27 sam Exp $ */
 
 #include <stdio.h>
 
diff --git a/tools/tools/net80211/Makefile b/tools/tools/net80211/Makefile
index 576dbd011592a..92572b100ac7e 100644
--- a/tools/tools/net80211/Makefile
+++ b/tools/tools/net80211/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/net80211/Makefile,v 1.4 2007/07/28 00:18:23 thompsa Exp $
 
 SUBDIR=	stumbler w00t wesside wlaninject wlanstats wlanwatch
 
diff --git a/tools/tools/net80211/README b/tools/tools/net80211/README
index 2796277b3c583..503105ecf1ef2 100644
--- a/tools/tools/net80211/README
+++ b/tools/tools/net80211/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/net80211/README,v 1.3 2007/07/28 00:18:23 thompsa Exp $
 
 This directory has various tools for use with the net80211 layer.
 Some may not work depending on the capabilities of the underyling
diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile
index 69abea7394bc1..e2954a4feaf95 100644
--- a/tools/tools/net80211/stumbler/Makefile
+++ b/tools/tools/net80211/stumbler/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/stumbler/Makefile,v 1.1 2006/08/05 05:12:03 sam Exp $
 
 PROG=	stumbler
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/stumbler/stumbler.c b/tools/tools/net80211/stumbler/stumbler.c
index ebedd71f62805..e0b1fa92c3cb3 100644
--- a/tools/tools/net80211/stumbler/stumbler.c
+++ b/tools/tools/net80211/stumbler/stumbler.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/stumbler/stumbler.c,v 1.1 2006/08/05 05:12:03 sam Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tools/tools/net80211/w00t/Makefile b/tools/tools/net80211/w00t/Makefile
index 1aecd6937a0e1..37ea9ef9b8769 100644
--- a/tools/tools/net80211/w00t/Makefile
+++ b/tools/tools/net80211/w00t/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/Makefile,v 1.1 2006/08/05 05:18:02 sam Exp $
 
 SUBDIR=	libw00t ap assoc expand prga redir
 
diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc
index 0670300a62e26..ab66f9e940b27 100644
--- a/tools/tools/net80211/w00t/Makefile.inc
+++ b/tools/tools/net80211/w00t/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/Makefile.inc,v 1.1 2006/08/05 05:18:02 sam Exp $
 
 W00T=	../libw00t
 # NB: we get crc32 from -lz
diff --git a/tools/tools/net80211/w00t/README b/tools/tools/net80211/w00t/README
index 7620f8f74bcab..8ceb53d9424db 100644
--- a/tools/tools/net80211/w00t/README
+++ b/tools/tools/net80211/w00t/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/net80211/w00t/README,v 1.1 2006/08/05 05:18:02 sam Exp $
 
 This is a collection of tools that use raw 802.11 packet injection.
 None of the tools configure the interface, so be sure to run something
diff --git a/tools/tools/net80211/w00t/ap/Makefile b/tools/tools/net80211/w00t/ap/Makefile
index 96fe419fb68af..f2f7937f9099e 100644
--- a/tools/tools/net80211/w00t/ap/Makefile
+++ b/tools/tools/net80211/w00t/ap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/ap/Makefile,v 1.1 2006/08/05 05:18:02 sam Exp $
 
 .include <../Makefile.inc>
 
diff --git a/tools/tools/net80211/w00t/ap/ap.c b/tools/tools/net80211/w00t/ap/ap.c
index 2b334ab5434e8..586ccf60297b2 100644
--- a/tools/tools/net80211/w00t/ap/ap.c
+++ b/tools/tools/net80211/w00t/ap/ap.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/ap/ap.c,v 1.1 2006/08/05 05:18:02 sam Exp $
  */
 #include <sys/types.h>
 #include <sys/select.h>
diff --git a/tools/tools/net80211/w00t/assoc/Makefile b/tools/tools/net80211/w00t/assoc/Makefile
index 23271a3a253bd..92183f5d622bd 100644
--- a/tools/tools/net80211/w00t/assoc/Makefile
+++ b/tools/tools/net80211/w00t/assoc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/assoc/Makefile,v 1.1 2006/08/05 05:18:02 sam Exp $
 
 .include <../Makefile.inc>
 
diff --git a/tools/tools/net80211/w00t/assoc/assoc.c b/tools/tools/net80211/w00t/assoc/assoc.c
index 65853afc5f5b7..25490b25f91e6 100644
--- a/tools/tools/net80211/w00t/assoc/assoc.c
+++ b/tools/tools/net80211/w00t/assoc/assoc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/assoc/assoc.c,v 1.1 2006/08/05 05:18:02 sam Exp $
  */
 #include <sys/time.h>
 #include <stdlib.h>
diff --git a/tools/tools/net80211/w00t/expand/Makefile b/tools/tools/net80211/w00t/expand/Makefile
index ffa1334c515a1..9dee4693fa201 100644
--- a/tools/tools/net80211/w00t/expand/Makefile
+++ b/tools/tools/net80211/w00t/expand/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/expand/Makefile,v 1.1 2006/08/05 05:18:02 sam Exp $
 
 .include <../Makefile.inc>
 
diff --git a/tools/tools/net80211/w00t/expand/expand.c b/tools/tools/net80211/w00t/expand/expand.c
index fe3714577af4e..3783657e00e4a 100644
--- a/tools/tools/net80211/w00t/expand/expand.c
+++ b/tools/tools/net80211/w00t/expand/expand.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/expand/expand.c,v 1.1 2006/08/05 05:18:02 sam Exp $
  */
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/tools/tools/net80211/w00t/libw00t/Makefile b/tools/tools/net80211/w00t/libw00t/Makefile
index 64dc51d549cc5..e4ccc97531519 100644
--- a/tools/tools/net80211/w00t/libw00t/Makefile
+++ b/tools/tools/net80211/w00t/libw00t/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/libw00t/Makefile,v 1.1 2006/08/05 05:18:03 sam Exp $
 
 LIB=	w00t
 SRCS=   w00t.c
diff --git a/tools/tools/net80211/w00t/libw00t/w00t.c b/tools/tools/net80211/w00t/libw00t/w00t.c
index ce4a357b4a1dc..9139903c46cea 100644
--- a/tools/tools/net80211/w00t/libw00t/w00t.c
+++ b/tools/tools/net80211/w00t/libw00t/w00t.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/libw00t/w00t.c,v 1.2 2006/08/06 23:50:56 sam Exp $
  */
 #include <stdio.h>
 #include <assert.h>
diff --git a/tools/tools/net80211/w00t/libw00t/w00t.h b/tools/tools/net80211/w00t/libw00t/w00t.h
index 2164119b16e8d..0edcbbde63a3a 100644
--- a/tools/tools/net80211/w00t/libw00t/w00t.h
+++ b/tools/tools/net80211/w00t/libw00t/w00t.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/libw00t/w00t.h,v 1.1 2006/08/05 05:18:03 sam Exp $
  */
 #ifndef __W00T_H__
 #define __W00T_H__
diff --git a/tools/tools/net80211/w00t/prga/Makefile b/tools/tools/net80211/w00t/prga/Makefile
index c4d00b680c1c5..89ce82b69179d 100644
--- a/tools/tools/net80211/w00t/prga/Makefile
+++ b/tools/tools/net80211/w00t/prga/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/prga/Makefile,v 1.1 2006/08/05 05:18:03 sam Exp $
 
 .include <../Makefile.inc>
 
diff --git a/tools/tools/net80211/w00t/prga/prga.c b/tools/tools/net80211/w00t/prga/prga.c
index 5672481788a9a..90d8ca6b93e77 100644
--- a/tools/tools/net80211/w00t/prga/prga.c
+++ b/tools/tools/net80211/w00t/prga/prga.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/prga/prga.c,v 1.1 2006/08/05 05:18:03 sam Exp $
  */
 #include <sys/endian.h>
 #include <sys/time.h>
diff --git a/tools/tools/net80211/w00t/redir/Makefile b/tools/tools/net80211/w00t/redir/Makefile
index 231819640b0c3..88c18c185bb53 100644
--- a/tools/tools/net80211/w00t/redir/Makefile
+++ b/tools/tools/net80211/w00t/redir/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/w00t/redir/Makefile,v 1.1 2006/08/05 05:18:03 sam Exp $
 
 .include <../Makefile.inc>
 
diff --git a/tools/tools/net80211/w00t/redir/buddy.c b/tools/tools/net80211/w00t/redir/buddy.c
index 7d66e042d7532..35d70e66d67a9 100644
--- a/tools/tools/net80211/w00t/redir/buddy.c
+++ b/tools/tools/net80211/w00t/redir/buddy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/redir/buddy.c,v 1.1 2006/08/05 05:18:03 sam Exp $
  */
 #include <sys/uio.h>
 #include <sys/types.h>
diff --git a/tools/tools/net80211/w00t/redir/redir.c b/tools/tools/net80211/w00t/redir/redir.c
index 77dc16dce5da5..a940bed9f7174 100644
--- a/tools/tools/net80211/w00t/redir/redir.c
+++ b/tools/tools/net80211/w00t/redir/redir.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/w00t/redir/redir.c,v 1.1 2006/08/05 05:18:03 sam Exp $
  */
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/tools/tools/net80211/wesside/Makefile b/tools/tools/net80211/wesside/Makefile
index 5b20fa43b0d5d..3630ca4c4872e 100644
--- a/tools/tools/net80211/wesside/Makefile
+++ b/tools/tools/net80211/wesside/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/net80211/wesside/Makefile,v 1.1 2006/08/07 00:05:03 sam Exp $
 
 SUBDIR=	dics udps wesside
 
diff --git a/tools/tools/net80211/wesside/README b/tools/tools/net80211/wesside/README
index 559348de803dc..169e844808a43 100644
--- a/tools/tools/net80211/wesside/README
+++ b/tools/tools/net80211/wesside/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/net80211/wesside/README,v 1.2 2006/08/07 17:08:05 keramida Exp $
 
 This is an implementation of the frag attack described in:
 http://tapir.cs.ucl.ac.uk/bittau-wep.pdf
diff --git a/tools/tools/net80211/wesside/dics/Makefile b/tools/tools/net80211/wesside/dics/Makefile
index 9765243039d9b..1c23c31892758 100644
--- a/tools/tools/net80211/wesside/dics/Makefile
+++ b/tools/tools/net80211/wesside/dics/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/wesside/dics/Makefile,v 1.1 2006/08/07 00:05:03 sam Exp $
 
 PROG=	dics
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/wesside/dics/dics.c b/tools/tools/net80211/wesside/dics/dics.c
index 54bc981ebef38..c81a93df16b69 100644
--- a/tools/tools/net80211/wesside/dics/dics.c
+++ b/tools/tools/net80211/wesside/dics/dics.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wesside/dics/dics.c,v 1.1 2006/08/07 00:05:03 sam Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tools/tools/net80211/wesside/udps/Makefile b/tools/tools/net80211/wesside/udps/Makefile
index 257a181001fc6..bd1a91487aba1 100644
--- a/tools/tools/net80211/wesside/udps/Makefile
+++ b/tools/tools/net80211/wesside/udps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/wesside/udps/Makefile,v 1.1 2006/08/07 00:05:03 sam Exp $
 
 PROG=	udps
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/wesside/udps/udps.c b/tools/tools/net80211/wesside/udps/udps.c
index 8ffd1f02609cf..7043b03e3ccaf 100644
--- a/tools/tools/net80211/wesside/udps/udps.c
+++ b/tools/tools/net80211/wesside/udps/udps.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wesside/udps/udps.c,v 1.1 2006/08/07 00:05:03 sam Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tools/tools/net80211/wesside/wesside/Makefile b/tools/tools/net80211/wesside/wesside/Makefile
index 58f1855255c5a..fad095dff9d9a 100644
--- a/tools/tools/net80211/wesside/wesside/Makefile
+++ b/tools/tools/net80211/wesside/wesside/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/wesside/wesside/Makefile,v 1.2 2007/04/08 21:18:15 sam Exp $
 
 PROG=	wesside
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c b/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c
index fde09fd5f17bf..7cb2ce219ba29 100644
--- a/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c
+++ b/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c,v 1.2 2007/04/09 15:43:43 sam Exp $
  */
 #include <string.h>
 #include <stdio.h>
diff --git a/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h b/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h
index 3769a94ae2d0a..77d185d5ecde2 100644
--- a/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h
+++ b/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h,v 1.2 2007/04/09 15:43:43 sam Exp $
  */
 #include <stdint.h>
 
diff --git a/tools/tools/net80211/wesside/wesside/wesside.c b/tools/tools/net80211/wesside/wesside/wesside.c
index 8106b64c7939d..4e7c9c1eda747 100644
--- a/tools/tools/net80211/wesside/wesside/wesside.c
+++ b/tools/tools/net80211/wesside/wesside/wesside.c
@@ -5,7 +5,7 @@
  * XXX GENERAL: I DON'T CHECK FOR PACKET LENGTHS AND STUFF LIKE THAT and buffer
  * overflows.  this whole thing is experimental n e way.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wesside/wesside/wesside.c,v 1.3 2007/04/23 05:51:18 sam Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/net80211/wlaninject/Makefile b/tools/tools/net80211/wlaninject/Makefile
index 6d692a6b485a7..ef53bc65a5658 100644
--- a/tools/tools/net80211/wlaninject/Makefile
+++ b/tools/tools/net80211/wlaninject/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/wlaninject/Makefile,v 1.1 2006/08/05 05:13:31 sam Exp $
 
 PROG=	wlaninject
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/wlaninject/README b/tools/tools/net80211/wlaninject/README
index 706e3ae9ddb5b..52085cb8bff9a 100644
--- a/tools/tools/net80211/wlaninject/README
+++ b/tools/tools/net80211/wlaninject/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/tools/tools/net80211/wlaninject/README,v 1.1 2006/08/05 05:13:31 sam Exp $
 
 This tool generates raw 802.11 frames.  The resulting frame will
 depend on the capabilities of the hardware.  Some hardware mangles
diff --git a/tools/tools/net80211/wlaninject/wlaninject.c b/tools/tools/net80211/wlaninject/wlaninject.c
index b491da80475ff..eeb16694282e9 100644
--- a/tools/tools/net80211/wlaninject/wlaninject.c
+++ b/tools/tools/net80211/wlaninject/wlaninject.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlaninject/wlaninject.c,v 1.2 2006/08/05 18:21:04 sam Exp $
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile
index da364952b1382..1946d3a4a1a89 100644
--- a/tools/tools/net80211/wlanstats/Makefile
+++ b/tools/tools/net80211/wlanstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/wlanstats/Makefile,v 1.3 2006/08/10 18:59:49 sam Exp $
 
 PROG=	wlanstats
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/wlanstats/main.c b/tools/tools/net80211/wlanstats/main.c
index 55cdeaed7699c..58d2fcc50b4fd 100644
--- a/tools/tools/net80211/wlanstats/main.c
+++ b/tools/tools/net80211/wlanstats/main.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlanstats/main.c,v 1.1.4.1 2007/11/11 17:48:17 sam Exp $
  */
 
 /*
diff --git a/tools/tools/net80211/wlanstats/statfoo.c b/tools/tools/net80211/wlanstats/statfoo.c
index 77190361af9aa..8e3fda3557dee 100644
--- a/tools/tools/net80211/wlanstats/statfoo.c
+++ b/tools/tools/net80211/wlanstats/statfoo.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlanstats/statfoo.c,v 1.1.4.1 2007/11/11 17:48:48 sam Exp $
  */
 
 #include <stdio.h>
diff --git a/tools/tools/net80211/wlanstats/statfoo.h b/tools/tools/net80211/wlanstats/statfoo.h
index 4575946bceed9..3a52a17f2afc5 100644
--- a/tools/tools/net80211/wlanstats/statfoo.h
+++ b/tools/tools/net80211/wlanstats/statfoo.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlanstats/statfoo.h,v 1.1 2006/08/10 18:59:49 sam Exp $
  */
 
 #ifndef _STATFOO_H_
diff --git a/tools/tools/net80211/wlanstats/wlanstats.c b/tools/tools/net80211/wlanstats/wlanstats.c
index 16d566fcc308f..1fca9c6513eea 100644
--- a/tools/tools/net80211/wlanstats/wlanstats.c
+++ b/tools/tools/net80211/wlanstats/wlanstats.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlanstats/wlanstats.c,v 1.4.2.1 2007/11/11 17:49:50 sam Exp $
  */
 
 /*
diff --git a/tools/tools/net80211/wlanstats/wlanstats.h b/tools/tools/net80211/wlanstats/wlanstats.h
index 9f38098a08625..c3640ed917ff5 100644
--- a/tools/tools/net80211/wlanstats/wlanstats.h
+++ b/tools/tools/net80211/wlanstats/wlanstats.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlanstats/wlanstats.h,v 1.1 2006/08/10 18:59:49 sam Exp $
  */
 
 #ifndef _WLANSTATS_H_
diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile
index 97742a16539ec..3737fd317ccd5 100644
--- a/tools/tools/net80211/wlanwatch/Makefile
+++ b/tools/tools/net80211/wlanwatch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/net80211/wlanwatch/Makefile,v 1.3 2006/07/28 10:59:27 yar Exp $
 
 PROG=	wlanwatch
 BINDIR=	/usr/local/bin
diff --git a/tools/tools/net80211/wlanwatch/wlanwatch.c b/tools/tools/net80211/wlanwatch/wlanwatch.c
index 1501d211df4b4..49e5e729afe51 100644
--- a/tools/tools/net80211/wlanwatch/wlanwatch.c
+++ b/tools/tools/net80211/wlanwatch/wlanwatch.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/net80211/wlanwatch/wlanwatch.c,v 1.2 2006/06/30 19:06:18 sam Exp $
  */
 
 /*
diff --git a/tools/tools/netrate/Makefile b/tools/tools/netrate/Makefile
index 8fbd75e21976e..ea3ecd30a5b14 100644
--- a/tools/tools/netrate/Makefile
+++ b/tools/tools/netrate/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/Makefile,v 1.3 2005/02/12 20:04:23 rwatson Exp $
 #
 
 SUBDIR=	netreceive netsend netblast
diff --git a/tools/tools/netrate/Makefile.inc b/tools/tools/netrate/Makefile.inc
index 3b1228c2879a0..2332953c56aea 100644
--- a/tools/tools/netrate/Makefile.inc
+++ b/tools/tools/netrate/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/Makefile.inc,v 1.1 2004/12/21 12:14:33 keramida Exp $
 
 WARNS?= 5
 WFORMAT?= 2
diff --git a/tools/tools/netrate/README b/tools/tools/netrate/README
index ff249621c5d0e..bd7ce6b1a3847 100644
--- a/tools/tools/netrate/README
+++ b/tools/tools/netrate/README
@@ -54,4 +54,4 @@ license:
  * SUCH DAMAGE.
  */
 
-$FreeBSD$
+$FreeBSD: src/tools/tools/netrate/README,v 1.1 2004/09/10 19:09:50 rwatson Exp $
diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile
index 789e7d0528a0b..db3672c92430e 100644
--- a/tools/tools/netrate/http/Makefile
+++ b/tools/tools/netrate/http/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/http/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $
 
 PROG=	http
 WARNS=	3
diff --git a/tools/tools/netrate/http/http.c b/tools/tools/netrate/http/http.c
index 5010703b18316..dfc5294441232 100644
--- a/tools/tools/netrate/http/http.c
+++ b/tools/tools/netrate/http/http.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/http/http.c,v 1.5 2006/09/02 08:25:40 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile
index 74067f2368996..1a29f1851ab1d 100644
--- a/tools/tools/netrate/httpd/Makefile
+++ b/tools/tools/netrate/httpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/httpd/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $
 
 PROG=	httpd
 WARNS=	3
diff --git a/tools/tools/netrate/httpd/httpd.c b/tools/tools/netrate/httpd/httpd.c
index 73422b1b3ba6d..3448e2c736c4a 100644
--- a/tools/tools/netrate/httpd/httpd.c
+++ b/tools/tools/netrate/httpd/httpd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/httpd/httpd.c,v 1.5 2006/02/22 02:54:04 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile
index 67d6263c89f10..b80e6fc3bb74c 100644
--- a/tools/tools/netrate/juggle/Makefile
+++ b/tools/tools/netrate/juggle/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/juggle/Makefile,v 1.2 2006/03/15 10:46:38 ru Exp $
 
 PROG=	juggle
 NO_MAN=
diff --git a/tools/tools/netrate/juggle/juggle.c b/tools/tools/netrate/juggle/juggle.c
index d0bb4968c4f37..f56a05100bbb6 100644
--- a/tools/tools/netrate/juggle/juggle.c
+++ b/tools/tools/netrate/juggle/juggle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/juggle/juggle.c,v 1.2 2006/01/28 21:03:16 rwatson Exp $
  */
 
 #include <sys/types.h>
@@ -497,7 +497,7 @@ main(int argc, char *argv[])
 	int fd1, fd2, i, j, p;
 	struct utsname uts;
 
-	printf("version, juggle.c %s\n", "$FreeBSD$");
+	printf("version, juggle.c %s\n", "$FreeBSD: src/tools/tools/netrate/juggle/juggle.c,v 1.2 2006/01/28 21:03:16 rwatson Exp $");
 
 	if (uname(&uts) < 0)
 		err(-1, "utsname");
diff --git a/tools/tools/netrate/netblast/Makefile b/tools/tools/netrate/netblast/Makefile
index 7e51860e5c514..ec13be64aea22 100644
--- a/tools/tools/netrate/netblast/Makefile
+++ b/tools/tools/netrate/netblast/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/netblast/Makefile,v 1.3 2004/12/21 08:47:27 ru Exp $
 #
 
 PROG=	netblast
diff --git a/tools/tools/netrate/netblast/netblast.c b/tools/tools/netrate/netblast/netblast.c
index 3e901266f0e5e..87e55a4c56ffa 100644
--- a/tools/tools/netrate/netblast/netblast.c
+++ b/tools/tools/netrate/netblast/netblast.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/netblast/netblast.c,v 1.3 2005/12/16 06:02:44 scottl Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/netreceive/Makefile b/tools/tools/netrate/netreceive/Makefile
index ef2b09bf8ff52..5eeaed658160a 100644
--- a/tools/tools/netrate/netreceive/Makefile
+++ b/tools/tools/netrate/netreceive/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/netreceive/Makefile,v 1.3 2004/12/21 08:47:28 ru Exp $
 #
 
 PROG=	netreceive
diff --git a/tools/tools/netrate/netreceive/netreceive.c b/tools/tools/netrate/netreceive/netreceive.c
index 4a3a6f6c3ae8e..6a5b9d75f7cc1 100644
--- a/tools/tools/netrate/netreceive/netreceive.c
+++ b/tools/tools/netrate/netreceive/netreceive.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/netreceive/netreceive.c,v 1.2 2004/09/21 03:10:28 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/netsend/Makefile b/tools/tools/netrate/netsend/Makefile
index 2b11958898a1f..125d81545f8af 100644
--- a/tools/tools/netrate/netsend/Makefile
+++ b/tools/tools/netrate/netsend/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/netsend/Makefile,v 1.4 2004/12/21 08:47:28 ru Exp $
 #
 
 CFLAGS+=	-Wall
diff --git a/tools/tools/netrate/netsend/netsend.c b/tools/tools/netrate/netsend/netsend.c
index 8a335b648d823..a3b264dfd4241 100644
--- a/tools/tools/netrate/netsend/netsend.c
+++ b/tools/tools/netrate/netsend/netsend.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/netsend/netsend.c,v 1.9 2007/02/08 15:37:13 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/tcpconnect/Makefile b/tools/tools/netrate/tcpconnect/Makefile
index 4a3f5ad57e19f..4a6450c58cf54 100644
--- a/tools/tools/netrate/tcpconnect/Makefile
+++ b/tools/tools/netrate/tcpconnect/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/tcpconnect/Makefile,v 1.1 2005/10/05 12:10:35 rwatson Exp $
 
 PROG=	tcpconnect
 WARNS=	3
diff --git a/tools/tools/netrate/tcpconnect/tcpconnect.c b/tools/tools/netrate/tcpconnect/tcpconnect.c
index efcde7681244c..0dc7a49393050 100644
--- a/tools/tools/netrate/tcpconnect/tcpconnect.c
+++ b/tools/tools/netrate/tcpconnect/tcpconnect.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/tcpconnect/tcpconnect.c,v 1.1 2005/10/05 12:10:35 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/netrate/tcpreceive/Makefile b/tools/tools/netrate/tcpreceive/Makefile
index 06d58ce8e2452..4f1779995d427 100644
--- a/tools/tools/netrate/tcpreceive/Makefile
+++ b/tools/tools/netrate/tcpreceive/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/netrate/tcpreceive/Makefile,v 1.1 2005/10/05 12:10:35 rwatson Exp $
 
 PROG=	tcpreceive
 WARNS=	3
diff --git a/tools/tools/netrate/tcpreceive/tcpreceive.c b/tools/tools/netrate/tcpreceive/tcpreceive.c
index 09e60a306de20..669a42a807a50 100644
--- a/tools/tools/netrate/tcpreceive/tcpreceive.c
+++ b/tools/tools/netrate/tcpreceive/tcpreceive.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/netrate/tcpreceive/tcpreceive.c,v 1.1 2005/10/05 12:10:35 rwatson Exp $
  */
 
 /*
diff --git a/tools/tools/nxge/Makefile b/tools/tools/nxge/Makefile
index e311920fa5769..9c89d9913f851 100644
--- a/tools/tools/nxge/Makefile
+++ b/tools/tools/nxge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/nxge/Makefile,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
 
 PROG=   xgeinfo
 SRCS= xge_info.c xge_log.c
diff --git a/tools/tools/nxge/xge_cmn.h b/tools/tools/nxge/xge_cmn.h
index f4eb9aa5005ab..f5655c4fe5236 100644
--- a/tools/tools/nxge/xge_cmn.h
+++ b/tools/tools/nxge/xge_cmn.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/nxge/xge_cmn.h,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
  */
 
 #ifndef XGE_CMN_H
diff --git a/tools/tools/nxge/xge_info.c b/tools/tools/nxge/xge_info.c
index f392c5c05c1b4..169fda2feee96 100644
--- a/tools/tools/nxge/xge_info.c
+++ b/tools/tools/nxge/xge_info.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/nxge/xge_info.c,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
  */
 
 #include "xge_info.h"
diff --git a/tools/tools/nxge/xge_info.h b/tools/tools/nxge/xge_info.h
index 344865154eba3..b6d97c171f2c8 100644
--- a/tools/tools/nxge/xge_info.h
+++ b/tools/tools/nxge/xge_info.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/nxge/xge_info.h,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
  */
 
 #ifndef XGE_CMN_H
diff --git a/tools/tools/nxge/xge_log.c b/tools/tools/nxge/xge_log.c
index e08ad1425e9da..8c23e264bd43f 100644
--- a/tools/tools/nxge/xge_log.c
+++ b/tools/tools/nxge/xge_log.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/nxge/xge_log.c,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
  */
 
 #include "xge_log.h"
diff --git a/tools/tools/nxge/xge_log.h b/tools/tools/nxge/xge_log.h
index b8bfdecec6998..6472429e6a707 100644
--- a/tools/tools/nxge/xge_log.h
+++ b/tools/tools/nxge/xge_log.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/nxge/xge_log.h,v 1.1.2.1 2007/11/02 00:52:34 rwatson Exp $
  */
 
 #ifndef XGE_CMN_H
diff --git a/tools/tools/pciid/mk_pci_vendors.pl b/tools/tools/pciid/mk_pci_vendors.pl
index aa1974caa74bd..bdf1702b83d6e 100644
--- a/tools/tools/pciid/mk_pci_vendors.pl
+++ b/tools/tools/pciid/mk_pci_vendors.pl
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/pciid/mk_pci_vendors.pl,v 1.5 2004/06/28 11:46:48 mux Exp $
 #
 # usage: mk_pci_vendors [-lq] [-p pcidevs.txt] [-v vendors.txt]
 #
diff --git a/tools/tools/pciroms/Makefile b/tools/tools/pciroms/Makefile
index 94e7f5fd4a7be..fce41f8f6c8fc 100644
--- a/tools/tools/pciroms/Makefile
+++ b/tools/tools/pciroms/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/pciroms/Makefile,v 1.1 2007/03/02 13:53:23 bms Exp $
 #
 
 PROG=	pciroms
diff --git a/tools/tools/pciroms/pciroms.c b/tools/tools/pciroms/pciroms.c
index 460c7ef1f2b2c..9282dbbb5de6c 100644
--- a/tools/tools/pciroms/pciroms.c
+++ b/tools/tools/pciroms/pciroms.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/pciroms/pciroms.c,v 1.2 2007/09/30 11:05:18 marius Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile
index 18e6bb84ef4a4..99971a322fd22 100644
--- a/tools/tools/pirtool/Makefile
+++ b/tools/tools/pirtool/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/tools/tools/pirtool/Makefile,v 1.5 2005/01/21 18:12:46 bms Exp $
 
 PROG=   pirtool
 SRCS=   pirtool.c
diff --git a/tools/tools/pirtool/pirtable.h b/tools/tools/pirtool/pirtable.h
index 86bed66652beb..80481334568f3 100644
--- a/tools/tools/pirtool/pirtable.h
+++ b/tools/tools/pirtool/pirtable.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/pirtool/pirtable.h,v 1.6 2007/01/11 05:00:30 imp Exp $
  */
 
 /*
diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c
index 2b854ccbdca08..3cd0aa60e212a 100644
--- a/tools/tools/pirtool/pirtool.c
+++ b/tools/tools/pirtool/pirtool.c
@@ -28,7 +28,7 @@
  *
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/tools/tools/pirtool/pirtool.c,v 1.7 2007/01/11 05:00:30 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/tools/tools/portsinfo/portsinfo.sh b/tools/tools/portsinfo/portsinfo.sh
index f3dcf5039b922..08d36617f4468 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.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/portsinfo/portsinfo.sh,v 1.5 1999/08/28 00:54:32 peter Exp $
 
 PATH=/bin:/usr/bin:/usr/local/bin:$PATH; export PATH
 
diff --git a/tools/tools/prstats/prstats.pl b/tools/tools/prstats/prstats.pl
index bb437a6bbc0b5..edc42aced9aab 100644
--- a/tools/tools/prstats/prstats.pl
+++ b/tools/tools/prstats/prstats.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.
 #
-#      $FreeBSD$
+#      $FreeBSD: src/tools/tools/prstats/prstats.pl,v 1.4 2002/04/15 06:36:22 des Exp $
 #
 
 use strict;
diff --git a/tools/tools/release/chk_dokern.sh_and_drivers.conf b/tools/tools/release/chk_dokern.sh_and_drivers.conf
index a47c700e152b2..47a8a4a36eaf7 100644
--- a/tools/tools/release/chk_dokern.sh_and_drivers.conf
+++ b/tools/tools/release/chk_dokern.sh_and_drivers.conf
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/release/chk_dokern.sh_and_drivers.conf,v 1.2 2003/11/28 08:58:44 ru Exp $
 
 echo Checking */drivers.conf ...
 for f in */drivers.conf; do
diff --git a/tools/tools/scsi-defects/scsi-defects.pl b/tools/tools/scsi-defects/scsi-defects.pl
index 0827182d6e5f9..88ba13d360c32 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.
 # 
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/scsi-defects/scsi-defects.pl,v 1.3 1999/08/28 00:54:32 peter Exp $
 #
 
 #
diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile
index 684477bd3d796..22f29f453b14e 100644
--- a/tools/tools/syscall_timing/Makefile
+++ b/tools/tools/syscall_timing/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/syscall_timing/Makefile,v 1.3 2004/12/21 08:47:29 ru Exp $
 #
 
 PROG=	syscall_timing
diff --git a/tools/tools/syscall_timing/syscall_timing.c b/tools/tools/syscall_timing/syscall_timing.c
index 7263906ea1844..a5999c1dc1b63 100644
--- a/tools/tools/syscall_timing/syscall_timing.c
+++ b/tools/tools/syscall_timing/syscall_timing.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/syscall_timing/syscall_timing.c,v 1.3 2005/08/03 17:33:46 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/sysdoc/Makefile b/tools/tools/sysdoc/Makefile
index f3704dab9eb76..156ffb7c42251 100644
--- a/tools/tools/sysdoc/Makefile
+++ b/tools/tools/sysdoc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/Makefile,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 
 MAINTAINER=	trhodes@FreeBSD.org
 
diff --git a/tools/tools/sysdoc/sysctl.sh b/tools/tools/sysdoc/sysctl.sh
index 8dcaf62f35768..aa1abf07584ed 100644
--- a/tools/tools/sysdoc/sysctl.sh
+++ b/tools/tools/sysdoc/sysctl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/sysctl.sh,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 #
 # For each sysctl, repeat:
 #	if it has a short description
diff --git a/tools/tools/sysdoc/sysdoc.sh b/tools/tools/sysdoc/sysdoc.sh
index c428174c8c365..66873c7841879 100644
--- a/tools/tools/sysdoc/sysdoc.sh
+++ b/tools/tools/sysdoc/sysdoc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/sysdoc.sh,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 #
 #################################################################
 # Missing Features:
diff --git a/tools/tools/sysdoc/tunables.mdoc b/tools/tools/sysdoc/tunables.mdoc
index 429e9dc78884d..f8cb3bc3a679d 100644
--- a/tools/tools/sysdoc/tunables.mdoc
+++ b/tools/tools/sysdoc/tunables.mdoc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/sysdoc/tunables.mdoc,v 1.1 2005/03/01 05:48:37 trhodes Exp $
 ---
 debug.disablecwd
 bool
diff --git a/tools/tools/tinybsd/CHANGES b/tools/tools/tinybsd/CHANGES
index b409fd67fbd22..f566827edbec9 100644
--- a/tools/tools/tinybsd/CHANGES
+++ b/tools/tools/tinybsd/CHANGES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/CHANGES,v 1.1 2006/09/20 22:24:17 julian Exp $
 
 0.9:
 - Added function personal_directories, you can create on conf dir your custom 
diff --git a/tools/tools/tinybsd/README b/tools/tools/tinybsd/README
index eec7944663ff2..ee87c1626e8f8 100644
--- a/tools/tools/tinybsd/README
+++ b/tools/tools/tinybsd/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/README,v 1.3 2006/11/01 01:25:49 julian Exp $
 
 - TinyBSD
 
diff --git a/tools/tools/tinybsd/conf/bridge/TINYBSD b/tools/tools/tinybsd/conf/bridge/TINYBSD
index 6faf082dd92e0..2b1a12ae41c27 100644
--- a/tools/tools/tinybsd/conf/bridge/TINYBSD
+++ b/tools/tools/tinybsd/conf/bridge/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/bridge/TINYBSD,v 1.3 2007/08/22 18:44:59 remko Exp $
 
 machine		i386
 cpu		I486_CPU
diff --git a/tools/tools/tinybsd/conf/bridge/etc/fstab b/tools/tools/tinybsd/conf/bridge/etc/fstab
index 16ada11d77906..10462cdc134df 100644
--- a/tools/tools/tinybsd/conf/bridge/etc/fstab
+++ b/tools/tools/tinybsd/conf/bridge/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/bridge/etc/fstab,v 1.1 2006/09/20 22:24:17 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/bridge/etc/rc.conf b/tools/tools/tinybsd/conf/bridge/etc/rc.conf
index a3e638e5efd5a..8c0ad6665cb23 100644
--- a/tools/tools/tinybsd/conf/bridge/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/bridge/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/bridge/etc/rc.conf,v 1.2 2006/09/21 22:17:02 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf b/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf
index cb7084679fae3..a6c9226077e21 100644
--- a/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf
+++ b/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf,v 1.2 2006/09/21 22:17:02 julian Exp $
 
 # BRIDGE Options
 net.link.bridge.ipfw=1
diff --git a/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles b/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles
index 63a860e5b8f75..20cee3b00b2e3 100644
--- a/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles,v 1.4 2007/07/01 10:25:06 thompsa Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/bridge/tinybsd.ports b/tools/tools/tinybsd/conf/bridge/tinybsd.ports
index 49bb52175241f..b2f6a0f8ef31f 100644
--- a/tools/tools/tinybsd/conf/bridge/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/bridge/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/bridge/tinybsd.ports,v 1.1 2006/11/01 01:25:50 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/conf/default/TINYBSD b/tools/tools/tinybsd/conf/default/TINYBSD
index d3af637c988ec..beeb1c270aeb7 100644
--- a/tools/tools/tinybsd/conf/default/TINYBSD
+++ b/tools/tools/tinybsd/conf/default/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/default/TINYBSD,v 1.3 2007/08/22 18:44:59 remko Exp $
 
 machine		i386
 cpu		I486_CPU
diff --git a/tools/tools/tinybsd/conf/default/etc/fstab b/tools/tools/tinybsd/conf/default/etc/fstab
index 16ada11d77906..007b1478b1916 100644
--- a/tools/tools/tinybsd/conf/default/etc/fstab
+++ b/tools/tools/tinybsd/conf/default/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/default/etc/fstab,v 1.1 2006/09/20 22:24:18 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/default/etc/rc.conf b/tools/tools/tinybsd/conf/default/etc/rc.conf
index a21476241081c..4324b1176a9b6 100644
--- a/tools/tools/tinybsd/conf/default/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/default/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/default/etc/rc.conf,v 1.2 2006/09/21 22:17:03 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/default/tinybsd.basefiles b/tools/tools/tinybsd/conf/default/tinybsd.basefiles
index 4db705f95557a..4802bf513fbc8 100644
--- a/tools/tools/tinybsd/conf/default/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/default/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/default/tinybsd.basefiles,v 1.4 2007/07/01 10:25:06 thompsa Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/default/tinybsd.ports b/tools/tools/tinybsd/conf/default/tinybsd.ports
index 49bb52175241f..319af151005c5 100644
--- a/tools/tools/tinybsd/conf/default/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/default/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/default/tinybsd.ports,v 1.1 2006/11/01 01:25:50 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/conf/firewall/TINYBSD b/tools/tools/tinybsd/conf/firewall/TINYBSD
index f4c5d3ce546c0..792b1c646c6d6 100644
--- a/tools/tools/tinybsd/conf/firewall/TINYBSD
+++ b/tools/tools/tinybsd/conf/firewall/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/TINYBSD,v 1.3 2007/08/22 18:44:59 remko Exp $
 machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
diff --git a/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules b/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules
index e8c0da7a1d7eb..2f6e251fb4f7d 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules
+++ b/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules,v 1.1 2006/09/20 22:24:18 julian Exp $
diff --git a/tools/tools/tinybsd/conf/firewall/etc/fstab b/tools/tools/tinybsd/conf/firewall/etc/fstab
index 16ada11d77906..d97ed2eb0b69d 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/fstab
+++ b/tools/tools/tinybsd/conf/firewall/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/fstab,v 1.1 2006/09/20 22:24:18 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/firewall/etc/natd.conf b/tools/tools/tinybsd/conf/firewall/etc/natd.conf
index e8c0da7a1d7eb..c89e823868667 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/natd.conf
+++ b/tools/tools/tinybsd/conf/firewall/etc/natd.conf
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/natd.conf,v 1.1 2006/09/20 22:24:18 julian Exp $
diff --git a/tools/tools/tinybsd/conf/firewall/etc/pf.conf b/tools/tools/tinybsd/conf/firewall/etc/pf.conf
index 9acf363030a2f..3847605815037 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/pf.conf
+++ b/tools/tools/tinybsd/conf/firewall/etc/pf.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/pf.conf,v 1.1 2006/09/20 22:24:18 julian Exp $
 #
 # See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
 # Required order: options, normalization, queueing, translation, filtering.
diff --git a/tools/tools/tinybsd/conf/firewall/etc/pf.os b/tools/tools/tinybsd/conf/firewall/etc/pf.os
index 2a64809bcfa94..423b880841825 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/pf.os
+++ b/tools/tools/tinybsd/conf/firewall/etc/pf.os
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/pf.os,v 1.1 2006/09/20 22:24:18 julian Exp $
 # passive OS fingerprinting
 # -------------------------
 #
diff --git a/tools/tools/tinybsd/conf/firewall/etc/rc.conf b/tools/tools/tinybsd/conf/firewall/etc/rc.conf
index d00fe837797f4..f4cf2c2d43c09 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/firewall/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/rc.conf,v 1.2 2006/09/21 22:17:03 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/firewall/etc/rc.firewall b/tools/tools/tinybsd/conf/firewall/etc/rc.firewall
index 05a1a6aaec95d..4abb58ecd07ae 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/rc.firewall
+++ b/tools/tools/tinybsd/conf/firewall/etc/rc.firewall
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/rc.firewall,v 1.1 2006/09/20 22:24:18 julian Exp $
 #
 
 #
diff --git a/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf b/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf
index f9e09ff620d07..d576dce2a5c53 100644
--- a/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf
+++ b/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf,v 1.1 2006/09/20 22:24:18 julian Exp $
 # CARP Options
 #net.inet.carp.preempt=1
 #net.inet.carp.arpbalance=1
diff --git a/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles b/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles
index ad76d0b758a32..ca671177ac756 100644
--- a/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles,v 1.3 2007/06/25 05:06:57 rafan Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/firewall/tinybsd.ports b/tools/tools/tinybsd/conf/firewall/tinybsd.ports
index 49bb52175241f..811b3e2638094 100644
--- a/tools/tools/tinybsd/conf/firewall/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/firewall/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/firewall/tinybsd.ports,v 1.1 2006/11/01 01:25:50 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/conf/minimal/TINYBSD b/tools/tools/tinybsd/conf/minimal/TINYBSD
index 2cd1f9af9ae66..06fee1a0a7de3 100644
--- a/tools/tools/tinybsd/conf/minimal/TINYBSD
+++ b/tools/tools/tinybsd/conf/minimal/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/minimal/TINYBSD,v 1.3 2007/08/22 18:45:00 remko Exp $
 machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
diff --git a/tools/tools/tinybsd/conf/minimal/etc/fstab b/tools/tools/tinybsd/conf/minimal/etc/fstab
index 16ada11d77906..752efb5339aa8 100644
--- a/tools/tools/tinybsd/conf/minimal/etc/fstab
+++ b/tools/tools/tinybsd/conf/minimal/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/minimal/etc/fstab,v 1.1 2006/09/20 22:24:19 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/minimal/etc/rc.conf b/tools/tools/tinybsd/conf/minimal/etc/rc.conf
index a21476241081c..132d9e3eb40d0 100644
--- a/tools/tools/tinybsd/conf/minimal/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/minimal/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/minimal/etc/rc.conf,v 1.2 2006/09/21 22:17:03 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles b/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles
index 446ef1f2afeac..a0ac9a5f98d33 100644
--- a/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles,v 1.3 2007/06/25 05:06:57 rafan Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/minimal/tinybsd.ports b/tools/tools/tinybsd/conf/minimal/tinybsd.ports
index 49bb52175241f..5c71b39e7cdd8 100644
--- a/tools/tools/tinybsd/conf/minimal/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/minimal/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/minimal/tinybsd.ports,v 1.1 2006/11/01 01:25:50 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/conf/vpn/TINYBSD b/tools/tools/tinybsd/conf/vpn/TINYBSD
index 76a6fa2bf7a06..3d702791e9cbf 100644
--- a/tools/tools/tinybsd/conf/vpn/TINYBSD
+++ b/tools/tools/tinybsd/conf/vpn/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/vpn/TINYBSD,v 1.3 2007/08/22 18:45:00 remko Exp $
 machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
diff --git a/tools/tools/tinybsd/conf/vpn/etc/fstab b/tools/tools/tinybsd/conf/vpn/etc/fstab
index 16ada11d77906..4425e9214c2e3 100644
--- a/tools/tools/tinybsd/conf/vpn/etc/fstab
+++ b/tools/tools/tinybsd/conf/vpn/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/vpn/etc/fstab,v 1.1 2006/09/20 22:24:19 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/vpn/etc/rc.conf b/tools/tools/tinybsd/conf/vpn/etc/rc.conf
index cb0af9ffa6c8b..c05eb25488616 100644
--- a/tools/tools/tinybsd/conf/vpn/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/vpn/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/vpn/etc/rc.conf,v 1.2 2006/09/21 22:17:04 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/vpn/etc/setkey.conf b/tools/tools/tinybsd/conf/vpn/etc/setkey.conf
index e8c0da7a1d7eb..a7dcedf786ed9 100644
--- a/tools/tools/tinybsd/conf/vpn/etc/setkey.conf
+++ b/tools/tools/tinybsd/conf/vpn/etc/setkey.conf
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/vpn/etc/setkey.conf,v 1.1 2006/09/20 22:24:19 julian Exp $
diff --git a/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles b/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles
index eba1a11493faf..872029da35e70 100644
--- a/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles,v 1.4 2007/06/25 05:06:57 rafan Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/vpn/tinybsd.ports b/tools/tools/tinybsd/conf/vpn/tinybsd.ports
index 49bb52175241f..80678058e3dad 100644
--- a/tools/tools/tinybsd/conf/vpn/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/vpn/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/vpn/tinybsd.ports,v 1.1 2006/11/01 01:25:50 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/conf/wireless/TINYBSD b/tools/tools/tinybsd/conf/wireless/TINYBSD
index 8b3f843941e0d..8117abb96cd2f 100644
--- a/tools/tools/tinybsd/conf/wireless/TINYBSD
+++ b/tools/tools/tinybsd/conf/wireless/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/TINYBSD,v 1.3 2007/08/22 18:45:00 remko Exp $
 machine		i386
 cpu		I486_CPU
 cpu		I586_CPU
diff --git a/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules b/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules
index e8c0da7a1d7eb..720600c89bfb2 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules
+++ b/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules,v 1.1 2006/09/20 22:24:19 julian Exp $
diff --git a/tools/tools/tinybsd/conf/wireless/etc/fstab b/tools/tools/tinybsd/conf/wireless/etc/fstab
index 16ada11d77906..87eba72e251a4 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/fstab
+++ b/tools/tools/tinybsd/conf/wireless/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/fstab,v 1.1 2006/09/20 22:24:19 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/wireless/etc/natd.conf b/tools/tools/tinybsd/conf/wireless/etc/natd.conf
index e8c0da7a1d7eb..5e4f985ce55ba 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/natd.conf
+++ b/tools/tools/tinybsd/conf/wireless/etc/natd.conf
@@ -1 +1 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/natd.conf,v 1.1 2006/09/20 22:24:19 julian Exp $
diff --git a/tools/tools/tinybsd/conf/wireless/etc/pf.conf b/tools/tools/tinybsd/conf/wireless/etc/pf.conf
index 9acf363030a2f..0469ba42bff79 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/pf.conf
+++ b/tools/tools/tinybsd/conf/wireless/etc/pf.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/pf.conf,v 1.1 2006/09/20 22:24:19 julian Exp $
 #
 # See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
 # Required order: options, normalization, queueing, translation, filtering.
diff --git a/tools/tools/tinybsd/conf/wireless/etc/pf.os b/tools/tools/tinybsd/conf/wireless/etc/pf.os
index 2a64809bcfa94..7cb186290c3ad 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/pf.os
+++ b/tools/tools/tinybsd/conf/wireless/etc/pf.os
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/pf.os,v 1.1 2006/09/20 22:24:19 julian Exp $
 # passive OS fingerprinting
 # -------------------------
 #
diff --git a/tools/tools/tinybsd/conf/wireless/etc/rc.conf b/tools/tools/tinybsd/conf/wireless/etc/rc.conf
index 18c3586b38acb..f16368d7e2b49 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/wireless/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/rc.conf,v 1.2 2006/09/21 22:17:04 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/wireless/etc/rc.firewall b/tools/tools/tinybsd/conf/wireless/etc/rc.firewall
index 05a1a6aaec95d..02c6e861b8257 100644
--- a/tools/tools/tinybsd/conf/wireless/etc/rc.firewall
+++ b/tools/tools/tinybsd/conf/wireless/etc/rc.firewall
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/etc/rc.firewall,v 1.1 2006/09/20 22:24:19 julian Exp $
 #
 
 #
diff --git a/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles b/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles
index e37dade3acd32..cf4b58e7d34f6 100644
--- a/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles,v 1.4 2007/07/01 10:25:06 thompsa Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/wireless/tinybsd.ports b/tools/tools/tinybsd/conf/wireless/tinybsd.ports
index 49bb52175241f..61f1a0c6538de 100644
--- a/tools/tools/tinybsd/conf/wireless/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/wireless/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wireless/tinybsd.ports,v 1.1 2006/11/01 01:25:50 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/conf/wrap/TINYBSD b/tools/tools/tinybsd/conf/wrap/TINYBSD
index aff67ea95efa8..8e02d100ed34e 100644
--- a/tools/tools/tinybsd/conf/wrap/TINYBSD
+++ b/tools/tools/tinybsd/conf/wrap/TINYBSD
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wrap/TINYBSD,v 1.3 2007/08/22 18:45:00 remko Exp $
 machine		i386
 cpu		I586_CPU
 ident		TINYBSD
diff --git a/tools/tools/tinybsd/conf/wrap/etc/fstab b/tools/tools/tinybsd/conf/wrap/etc/fstab
index 16ada11d77906..6ee2e6777afba 100644
--- a/tools/tools/tinybsd/conf/wrap/etc/fstab
+++ b/tools/tools/tinybsd/conf/wrap/etc/fstab
@@ -1,2 +1,2 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wrap/etc/fstab,v 1.1 2006/09/20 22:24:20 julian Exp $
 /dev/ad0a / ufs ro 1 1
diff --git a/tools/tools/tinybsd/conf/wrap/etc/rc.conf b/tools/tools/tinybsd/conf/wrap/etc/rc.conf
index a21476241081c..b16b87458698c 100644
--- a/tools/tools/tinybsd/conf/wrap/etc/rc.conf
+++ b/tools/tools/tinybsd/conf/wrap/etc/rc.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wrap/etc/rc.conf,v 1.2 2006/09/21 22:17:04 julian Exp $
 hostname="tinybsd.freebsd.org"
 sendmail_enable="NONE"
 sshd_enable="YES"
diff --git a/tools/tools/tinybsd/conf/wrap/etc/ttys b/tools/tools/tinybsd/conf/wrap/etc/ttys
index d20b7ebbd30c1..8e555b964bf33 100644
--- a/tools/tools/tinybsd/conf/wrap/etc/ttys
+++ b/tools/tools/tinybsd/conf/wrap/etc/ttys
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wrap/etc/ttys,v 1.1 2006/09/20 22:24:20 julian Exp $
 #
 # This file specifies various information about terminals on the system.
 # It is used by several different programs.  Common entries for the
diff --git a/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles b/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles
index e37dade3acd32..6e9cee89934f2 100644
--- a/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles
+++ b/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles,v 1.4 2007/07/01 10:25:07 thompsa Exp $
 # contents of ${WORKDIR}/boot
 boot/boot0
 boot/boot1
diff --git a/tools/tools/tinybsd/conf/wrap/tinybsd.ports b/tools/tools/tinybsd/conf/wrap/tinybsd.ports
index 49bb52175241f..2ee2d414cae71 100644
--- a/tools/tools/tinybsd/conf/wrap/tinybsd.ports
+++ b/tools/tools/tinybsd/conf/wrap/tinybsd.ports
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/conf/wrap/tinybsd.ports,v 1.1 2006/11/01 01:25:51 julian Exp $
 # Here you can add the applications from the FreeBSD Ports Collection which you 
 # want TinyBSD ports system to install in your embedded system. You whould list 
 # one application per line, mentioning its category and name, like the examples:
diff --git a/tools/tools/tinybsd/tinybsd b/tools/tools/tinybsd/tinybsd
index f8de882cda36f..49a7edea4fdb0 100755
--- a/tools/tools/tinybsd/tinybsd
+++ b/tools/tools/tinybsd/tinybsd
@@ -3,7 +3,7 @@
 #				       <jmelo@FreeBSD.org>
 #		     Patrick Tracanelli <eksffa@freebsdbrasil.com.br>
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/tinybsd/tinybsd,v 1.7 2007/08/22 18:44:59 remko Exp $
 #set -xv
 CURRENTDIR=/usr/src/tools/tools/tinybsd
 if [ ! -d $CURRENTDIR ]
diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile
index 9461173507549..3b2507eb8dcfb 100644
--- a/tools/tools/umastat/Makefile
+++ b/tools/tools/umastat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/umastat/Makefile,v 1.2 2006/03/15 10:46:38 ru Exp $
 
 PROG=	umastat
 NO_MAN=
diff --git a/tools/tools/umastat/umastat.c b/tools/tools/umastat/umastat.c
index 8e3bfdc71d1a3..3c9fe0e081e08 100644
--- a/tools/tools/umastat/umastat.c
+++ b/tools/tools/umastat/umastat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/tools/tools/umastat/umastat.c,v 1.5 2007/02/06 17:57:20 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/tools/tools/usb/print-usb-if-vids.sh b/tools/tools/usb/print-usb-if-vids.sh
index ffe86934bdc01..b9116ec384a2f 100644
--- a/tools/tools/usb/print-usb-if-vids.sh
+++ b/tools/tools/usb/print-usb-if-vids.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/usb/print-usb-if-vids.sh,v 1.1 2004/04/18 05:37:34 obrien Exp $
 
 
 fetch -o /tmp/usb.if http://www.usb.org/app/pub/dump/comp_dump/
diff --git a/tools/tools/vop_table/vop_table.pl b/tools/tools/vop_table/vop_table.pl
index 5ac979d7e1eda..6c1cfdaf30b13 100644
--- a/tools/tools/vop_table/vop_table.pl
+++ b/tools/tools/vop_table/vop_table.pl
@@ -7,7 +7,7 @@
 # (c) 2004 Andrew R. Reiter <arr@watson.org>
 # All Rights Reserved.
 #
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/vop_table/vop_table.pl,v 1.1 2005/01/05 06:53:03 arr Exp $
 
 # XXX todo: Make $src_dir modificationable
 
diff --git a/tools/tools/vop_table/vop_table.tcl b/tools/tools/vop_table/vop_table.tcl
index 1b76d18bae0d1..ebc3eeb394e55 100644
--- a/tools/tools/vop_table/vop_table.tcl
+++ b/tools/tools/vop_table/vop_table.tcl
@@ -1,5 +1,5 @@
 #!/usr/local/bin/tclsh8.3
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/vop_table/vop_table.tcl,v 1.5 2003/01/15 19:19:28 phk Exp $
 
 set fo [open _.html w]
 
diff --git a/tools/tools/whereintheworld/Makefile b/tools/tools/whereintheworld/Makefile
index 876a318c3f44a..0ff712faf8c47 100644
--- a/tools/tools/whereintheworld/Makefile
+++ b/tools/tools/whereintheworld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/whereintheworld/Makefile,v 1.1 2003/01/09 12:23:29 des Exp $
 
 SCRIPTS=	whereintheworld.pl
 
diff --git a/tools/tools/whereintheworld/whereintheworld.pl b/tools/tools/whereintheworld/whereintheworld.pl
index 6a8e21e0c4a97..9860156b259a9 100644
--- a/tools/tools/whereintheworld/whereintheworld.pl
+++ b/tools/tools/whereintheworld/whereintheworld.pl
@@ -7,7 +7,7 @@
 # Dag-Erling Smørgrav <des@freebsd.org> 09 January 2003
 #
 # $Id: whereintheworld,v 1.3 2000/01/28 00:42:32 fenner Exp $
-# $FreeBSD$
+# $FreeBSD: src/tools/tools/whereintheworld/whereintheworld.pl,v 1.5 2003/02/15 14:30:51 des Exp $
 #
 
 use strict;
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index c2eefc8a33ba2..b197d05867a59 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/Makefile,v 1.303 2007/10/09 23:31:11 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc
index 2ee98c34aab58..f5da842c7f624 100644
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/Makefile.inc,v 1.3 2002/02/06 18:13:12 markm Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/usr.bin/alias/Makefile b/usr.bin/alias/Makefile
index 53df717f66cf1..5d82678321aac 100644
--- a/usr.bin/alias/Makefile
+++ b/usr.bin/alias/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/alias/Makefile,v 1.4 2004/12/21 08:46:55 ru Exp $
 
 SCRIPTS=generic.sh
 SCRIPTSNAME=alias
diff --git a/usr.bin/alias/generic.sh b/usr.bin/alias/generic.sh
index d9c3127e43d62..b47956d099863 100644
--- a/usr.bin/alias/generic.sh
+++ b/usr.bin/alias/generic.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/alias/generic.sh,v 1.2 2005/10/24 22:32:19 cperciva Exp $
 # This file is in the public domain.
 builtin ${0##*/} ${1+"$@"}
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index 0355588b3c394..5fd09ea2024ae 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/apply/Makefile,v 1.8 2002/07/14 18:22:12 alfred Exp $
 
 PROG=	apply
 WARNS?=	4
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 60ba84f7270a2..f38d7bbdb1ac6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/apply/apply.1,v 1.17 2006/12/13 08:13:14 ru Exp $
 .\"
 .Dd December 13, 2006
 .Dt APPLY 1
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 25ba374d97e93..97f3db97b021f 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/apply/apply.c,v 1.24 2003/06/09 19:21:35 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.bin/asa/Makefile b/usr.bin/asa/Makefile
index c2a221ae027be..6bc0ccca3ee83 100644
--- a/usr.bin/asa/Makefile
+++ b/usr.bin/asa/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/03/25 18:04:51 glass Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/asa/Makefile,v 1.1 2002/05/15 02:40:57 tjr Exp $
 
 PROG=	asa
 
diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index 5f5c236a67e8a..1e8d6916e38e0 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/asa/asa.1,v 1.4 2005/01/17 07:44:11 ru Exp $
 .\"
 .Dd May 9, 2002
 .Dt ASA 1
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 692b83757d4f3..65fa675ff174b 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -36,7 +36,7 @@
 __RCSID("$NetBSD: asa.c,v 1.11 1997/09/20 14:55:00 lukem Exp $");
 #endif
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/asa/asa.c,v 1.6 2005/05/21 09:55:04 ru Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 47d2574e7f5c5..ddf7026a06122 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/at/Makefile,v 1.15 2002/02/08 22:31:35 markm Exp $
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 71d8e607f9c92..46c0bdb8c08fa 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/at.c,v 1.30 2007/09/21 01:55:11 kevlo Exp $");
 
 #define _USE_BSD 1
 
diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index 3d72bbbdbbd44..ff8008d58dca1 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/at/at.h,v 1.5 2001/07/24 14:15:51 obrien Exp $
  */
 
 extern int fcreated;
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index bca1051793f5b..e166d377b2b98 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/at/at.man,v 1.35 2005/01/18 13:43:46 ru Exp $
 .Dd January 13, 2002
 .Dt "AT" 1
 .Os
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index ef5265b4c1d25..76831a8a8ebbd 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/panic.c,v 1.17 2002/05/16 00:47:14 tjr Exp $");
 
 /* System Headers */
 
diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h
index 832de83a7d986..d656d6185b9d2 100644
--- a/usr.bin/at/panic.h
+++ b/usr.bin/at/panic.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/at/panic.h,v 1.6 2002/01/13 20:21:08 mike Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 195a38d21df69..682ae6d15f0ab 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/parsetime.c,v 1.27 2005/08/18 08:18:02 stefanf Exp $");
 
 /* System Headers */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 91176b471249d..872ce44dbae7b 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/at/perm.c,v 1.13 2001/12/10 21:13:01 dwmalone Exp $");
 
 /* System Headers */
 
diff --git a/usr.bin/at/perm.h b/usr.bin/at/perm.h
index b55b5fb786a71..92d0e31f10d7c 100644
--- a/usr.bin/at/perm.h
+++ b/usr.bin/at/perm.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/at/perm.h,v 1.4 2001/12/02 12:26:18 markm Exp $
  */
 
 int check_permission(void);
diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h
index 50dd6b108af47..cb5adf6705754 100644
--- a/usr.bin/at/privs.h
+++ b/usr.bin/at/privs.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/at/privs.h,v 1.8 2001/09/04 16:15:51 ru Exp $
  */
 
 #ifndef _PRIVS_H
diff --git a/usr.bin/atm/Makefile b/usr.bin/atm/Makefile
index 9ed46ef7a16d2..5f7daefc539af 100644
--- a/usr.bin/atm/Makefile
+++ b/usr.bin/atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/atm/Makefile,v 1.1 2003/10/29 10:30:53 harti Exp $
 
 SUBDIR=	sscop
 
diff --git a/usr.bin/atm/Makefile.inc b/usr.bin/atm/Makefile.inc
index 265f86d1ed55a..e971f6f5e318b 100644
--- a/usr.bin/atm/Makefile.inc
+++ b/usr.bin/atm/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/atm/Makefile.inc,v 1.1 2003/10/29 10:30:53 harti Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile
index 16703bb35bd66..d8786f61804d7 100644
--- a/usr.bin/atm/sscop/Makefile
+++ b/usr.bin/atm/sscop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/atm/sscop/Makefile,v 1.3 2004/09/24 22:10:34 trhodes Exp $
 
 CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
 
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 3cd4aa8cc3d93..24a0b76c9e41d 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/awk/Makefile,v 1.14 2006/10/25 21:23:20 ru Exp $
 
 AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
 .PATH: ${AWKSRC}
diff --git a/usr.bin/awk/b.c.diff b/usr.bin/awk/b.c.diff
index 525fcbc37dc5d..de86b234b5314 100644
--- a/usr.bin/awk/b.c.diff
+++ b/usr.bin/awk/b.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/b.c.diff,v 1.2 2007/06/05 15:35:05 rafan Exp $
 
 Index: b.c
 ===================================================================
diff --git a/usr.bin/awk/lib.c.diff b/usr.bin/awk/lib.c.diff
index 5b654be4d2687..362612c0851b1 100644
--- a/usr.bin/awk/lib.c.diff
+++ b/usr.bin/awk/lib.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/lib.c.diff,v 1.2 2007/06/08 05:44:12 delphij Exp $
 
 Index: lib.c
 ===================================================================
diff --git a/usr.bin/awk/main.c.diff b/usr.bin/awk/main.c.diff
index 252cd5ac24217..98e56196f14ba 100644
--- a/usr.bin/awk/main.c.diff
+++ b/usr.bin/awk/main.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/main.c.diff,v 1.3 2007/06/05 15:35:05 rafan Exp $
 
 Index: main.c
 ===================================================================
diff --git a/usr.bin/awk/run.c.diff b/usr.bin/awk/run.c.diff
index d4912507ee5cd..722c71c544cbd 100644
--- a/usr.bin/awk/run.c.diff
+++ b/usr.bin/awk/run.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/run.c.diff,v 1.1 2005/05/17 14:54:33 ru Exp $
 
 Index: run.c
 ===================================================================
diff --git a/usr.bin/awk/tran.c.diff b/usr.bin/awk/tran.c.diff
index 18f0f588b7e23..6c8c2d58bd373 100644
--- a/usr.bin/awk/tran.c.diff
+++ b/usr.bin/awk/tran.c.diff
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/awk/tran.c.diff,v 1.1 2006/10/25 21:23:20 ru Exp $
 
 Index: tran.c
 ===================================================================
diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile
index 67d4ba7fecd1d..d5bb0e2b1f058 100644
--- a/usr.bin/banner/Makefile
+++ b/usr.bin/banner/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/banner/Makefile,v 1.8 2002/02/08 22:31:35 markm Exp $
 
 PROG=	banner
 MAN=	banner.6
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index febfa3d326528..b5e8cf57c512e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/banner/banner.6,v 1.9 2005/01/25 22:24:04 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Dt BANNER 6
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index eb96a152f95c6..d97069e5faee9 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/banner/banner.c,v 1.16 2006/11/22 21:05:17 maxim Exp $");
 
 /*
  * banner - prints large signs
diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile
index d647395c83d90..78bae81fcdb64 100644
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/basename/Makefile,v 1.4 2002/02/08 22:31:35 markm Exp $
 
 PROG=	basename
 MLINKS=	basename.1 dirname.1
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index b2ad95d8bdfb8..bb733fe40019c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/basename/basename.1,v 1.17 2006/03/16 17:21:52 jkoshy Exp $
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index d94ee67a3a1dc..3078949096e0a 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/basename/basename.c,v 1.15 2004/07/15 06:15:10 tjr Exp $");
 
 #include <err.h>
 #include <libgen.h>
diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile
index 15109434e5afd..8592fbf8ebb57 100644
--- a/usr.bin/biff/Makefile
+++ b/usr.bin/biff/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/biff/Makefile,v 1.4 2002/02/08 22:31:35 markm Exp $
 
 PROG=	biff
 
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 8484faab7c65f..a64267f512815 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/biff/biff.1,v 1.21 2006/12/28 04:58:38 ru Exp $
 .\"
 .Dd July 9, 2002
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index c04c8d39f9fa8..b12d1597ae452 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)biff.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/biff/biff.c,v 1.18 2002/07/24 18:54:59 robert Exp $");
 
 #include <sys/stat.h>
 
diff --git a/usr.bin/bluetooth/Makefile b/usr.bin/bluetooth/Makefile
index 9ef16cc8aae6c..3cd0778944ca4 100644
--- a/usr.bin/bluetooth/Makefile
+++ b/usr.bin/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/Makefile,v 1.3 2003/10/12 22:04:21 emax Exp $
 
 SUBDIR=	\
 	bthost \
diff --git a/usr.bin/bluetooth/Makefile.inc b/usr.bin/bluetooth/Makefile.inc
index c0e05cfa1da6b..eb32d7b65ad80 100644
--- a/usr.bin/bluetooth/Makefile.inc
+++ b/usr.bin/bluetooth/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/Makefile.inc,v 1.1 2003/10/12 22:04:21 emax Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 
diff --git a/usr.bin/bluetooth/bthost/Makefile b/usr.bin/bluetooth/bthost/Makefile
index fe2c47959353e..b618fc7e3bdf9 100644
--- a/usr.bin/bluetooth/bthost/Makefile
+++ b/usr.bin/bluetooth/bthost/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.4 2003/08/14 20:07:13 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/bthost/Makefile,v 1.2 2005/01/28 16:08:06 ru Exp $
 
 PROG=		bthost
 WARNS?=		2
diff --git a/usr.bin/bluetooth/bthost/bthost.1 b/usr.bin/bluetooth/bthost/bthost.1
index e4a4abc45ecb5..b7476a0698724 100644
--- a/usr.bin/bluetooth/bthost/bthost.1
+++ b/usr.bin/bluetooth/bthost/bthost.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bthost.1,v 1.7 2003/05/21 22:19:00 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bluetooth/bthost/bthost.1,v 1.3 2005/01/17 07:44:12 ru Exp $
 .\"
 .Dd May 8, 2003
 .Dt BTHOST 1
diff --git a/usr.bin/bluetooth/bthost/bthost.c b/usr.bin/bluetooth/bthost/bthost.c
index 2dd56359fbaf7..74738dab43d69 100644
--- a/usr.bin/bluetooth/bthost/bthost.c
+++ b/usr.bin/bluetooth/bthost/bthost.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthost.c,v 1.5 2003/05/21 20:30:01 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/bthost/bthost.c,v 1.1 2003/10/12 22:04:21 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.bin/bluetooth/btsockstat/Makefile b/usr.bin/bluetooth/btsockstat/Makefile
index cdec9f7013c6a..258ea8500c8f1 100644
--- a/usr.bin/bluetooth/btsockstat/Makefile
+++ b/usr.bin/bluetooth/btsockstat/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:07:14 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/btsockstat/Makefile,v 1.4 2005/01/28 16:08:07 ru Exp $
 
 PROG=		btsockstat
 WARNS?=		2
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index ad5063da32c7f..8dc91a8bef67b 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.1
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: btsockstat.1,v 1.6 2003/05/21 00:09:45 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bluetooth/btsockstat/btsockstat.1,v 1.8 2005/01/18 13:43:47 ru Exp $
 .\"
 .Dd October 12, 2003
 .Dt BTSOCKSTAT 1
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c
index c7f333c60eb6a..5c1e261a809b7 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.c
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: btsockstat.c,v 1.8 2003/05/21 22:40:25 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/btsockstat/btsockstat.c,v 1.5 2004/04/09 23:01:41 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/Makefile b/usr.bin/bluetooth/rfcomm_sppd/Makefile
index 9018f6e88de60..7904cc2a10081 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/Makefile
+++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/09/07 18:15:55 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/Makefile,v 1.3 2005/01/28 16:08:07 ru Exp $
 
 PROG=		rfcomm_sppd
 SRCS=		rfcomm_sppd.c rfcomm_sdp.c
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 5873071533338..51a4f60df70a5 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_sdp.c,v 1.1 2003/09/07 18:15:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c,v 1.2 2004/04/09 23:26:16 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
index 4af70943f6dfc..d6e0f209574bb 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: rfcomm_sppd.1,v 1.3 2003/09/07 18:15:55 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1,v 1.10 2007/01/25 20:54:59 emax Exp $
 .\"
 .Dd January 24, 2007
 .Dt RFCOMM_SPPD 1
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
index deffb2ea2978c..103ae53585ffe 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_sppd.c,v 1.4 2003/09/07 18:15:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c,v 1.10 2007/09/11 01:59:00 kevlo Exp $
  */
 
 #include <sys/stat.h>
diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile
index 2c4859fcd959d..6fc3996d8fc5b 100644
--- a/usr.bin/brandelf/Makefile
+++ b/usr.bin/brandelf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/brandelf/Makefile,v 1.7 2003/06/14 19:32:51 obrien Exp $
 
 PROG=	brandelf
 
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 9c7439e1e3b27..7762fa3fd112d 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/brandelf/brandelf.1,v 1.17 2007/03/09 14:36:18 ru Exp $
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 9cd391eb5ee2b..25c1344239dba 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/brandelf/brandelf.c,v 1.25 2005/05/21 09:55:04 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/elf_common.h>
diff --git a/usr.bin/bsdiff/Makefile b/usr.bin/bsdiff/Makefile
index 8a8bc3120b58f..e79c03c1e293e 100644
--- a/usr.bin/bsdiff/Makefile
+++ b/usr.bin/bsdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/Makefile,v 1.1 2005/08/06 01:59:05 cperciva Exp $
 
 SUBDIR=	bsdiff bspatch
 
diff --git a/usr.bin/bsdiff/Makefile.inc b/usr.bin/bsdiff/Makefile.inc
index 198d906713fde..2ec0a080a3e50 100644
--- a/usr.bin/bsdiff/Makefile.inc
+++ b/usr.bin/bsdiff/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/Makefile.inc,v 1.2 2005/08/06 02:37:21 cperciva Exp $
 
 WARNS?=	6
 
diff --git a/usr.bin/bsdiff/bsdiff/Makefile b/usr.bin/bsdiff/bsdiff/Makefile
index 0e8498f2be73a..f8d2fed345b04 100644
--- a/usr.bin/bsdiff/bsdiff/Makefile
+++ b/usr.bin/bsdiff/bsdiff/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/bsdiff/Makefile,v 1.1 2005/08/06 01:59:05 cperciva Exp $
 
 PROG=	bsdiff
 
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.1 b/usr.bin/bsdiff/bsdiff/bsdiff.1
index 5c608b44c426c..e2464dac44edd 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.1
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.1
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.1,v 1.2 2005/11/18 12:08:31 ru Exp $
 .\"
 .Dd May 18, 2003
 .Dt BSDIFF 1
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 005ad4d16610a..5e1a1f1c7bcc7 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c,v 1.2 2006/12/05 20:22:14 cperciva Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/bsdiff/bspatch/Makefile b/usr.bin/bsdiff/bspatch/Makefile
index c0ed5219167f9..ac95543d16721 100644
--- a/usr.bin/bsdiff/bspatch/Makefile
+++ b/usr.bin/bsdiff/bspatch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bsdiff/bspatch/Makefile,v 1.1 2005/08/06 01:59:06 cperciva Exp $
 
 PROG=	bspatch
 
diff --git a/usr.bin/bsdiff/bspatch/bspatch.1 b/usr.bin/bsdiff/bspatch/bspatch.1
index 894bc50752250..1cc7ec71dfb88 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.1
+++ b/usr.bin/bsdiff/bspatch/bspatch.1
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.1,v 1.2 2005/11/18 12:08:31 ru Exp $
 .\"
 .Dd May 18, 2003
 .Dt BSPATCH 1
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index d2af3ca869a26..e05dcb585cfe3 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.2 2006/12/05 20:22:14 cperciva Exp $");
 
 #include <bzlib.h>
 #include <stdlib.h>
diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile
index 0460fff191420..33ad0077f3738 100644
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2/Makefile,v 1.9 2007/03/28 07:48:03 delphij Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile
index 7f61946c8db1b..c284138497a28 100644
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/bzip2recover/Makefile,v 1.3 2004/12/21 08:47:29 ru Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile
index 1d9551cc38b64..a71aebdf04c57 100644
--- a/usr.bin/c89/Makefile
+++ b/usr.bin/c89/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/c89/Makefile,v 1.7 2005/01/28 16:08:07 ru Exp $
 
 PROG=	c89
 
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 302aa321dad7b..486c12d35730e 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/c89/c89.1,v 1.11 2007/03/10 07:10:01 ru Exp $
 .\"
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index a1dc9b2a62382..00a99890e40df 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/c89/c89.c,v 1.5 2005/05/21 09:55:04 ru Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile
index 580065ff15c69..99921ef4ab789 100644
--- a/usr.bin/c99/Makefile
+++ b/usr.bin/c99/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/c99/Makefile,v 1.1 2002/10/07 09:37:55 tjr Exp $
 
 PROG=	c99
 
diff --git a/usr.bin/c99/c99.1 b/usr.bin/c99/c99.1
index c56e5856e3543..c61df87e175bb 100644
--- a/usr.bin/c99/c99.1
+++ b/usr.bin/c99/c99.1
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" From FreeBSD: src/usr.bin/c89/c89.1,v 1.11 2007/03/10 07:10:01 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/c99/c99.1,v 1.5 2007/03/10 07:11:20 ru Exp $
 .\"
 .Dd October 7, 2002
 .Os
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index 553099f65cc16..80203c6ae0c87 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/c99/c99.c,v 1.4 2005/05/21 09:55:05 ru Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 481713ac9931e..0c55f0d660bc3 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/calendar/Makefile,v 1.31 2005/10/28 21:25:27 ru Exp $
 
 PROG=	calendar
 SRCS=   calendar.c io.c day.c ostern.c paskha.c
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 404f44c4adec3..1d82f715edcca 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/calendar/calendar.1,v 1.38 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd June 13, 2002
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 5a0eefc4e97ed..ecb659131266b 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/calendar.c,v 1.19 2007/05/07 11:18:30 dwmalone Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index 4f4297b489a58..57e84a14b2da1 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendar.h,v 1.12 2007/06/09 05:54:13 grog Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index b46dcb46f0e43..c7593f6cec409 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.all,v 1.10 2007/06/09 05:51:24 grog Exp $
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.australia b/usr.bin/calendar/calendars/calendar.australia
index 323e7eeffee14..32a3900bd0437 100644
--- a/usr.bin/calendar/calendars/calendar.australia
+++ b/usr.bin/calendar/calendars/calendar.australia
@@ -1,7 +1,7 @@
 /*
  * Australian holidays
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.australia,v 1.7 2006/10/06 23:20:01 flz Exp $
  */
 
 #ifndef _calendar_australia_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 96da40cfc563e..4e6972e33c66d 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.birthday,v 1.34 2006/12/29 06:39:35 ru Exp $
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index d446fb1f8bbc3..b04b4113b488e 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.christian,v 1.10 2006/12/29 06:36:32 ru Exp $
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index e8b22b482a198..6a4e9f0b4bb91 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.computer,v 1.11 2007/09/07 03:23:06 edwin Exp $
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index 443122744d3f7..61d74937863e7 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.croatian,v 1.5 2001/06/11 04:24:43 ache Exp $
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.dutch b/usr.bin/calendar/calendars/calendar.dutch
index 502a126e3afde..05c0501b317ca 100644
--- a/usr.bin/calendar/calendars/calendar.dutch
+++ b/usr.bin/calendar/calendars/calendar.dutch
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.dutch,v 1.3 2007/09/20 21:46:04 edwin Exp $
  *
  * Originally submitted by Edwin Groothuis <edwin@FreeBSD.org>
  */
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd
index 49dc1344e801f..7bdf03f4893d2 100644
--- a/usr.bin/calendar/calendars/calendar.freebsd
+++ b/usr.bin/calendar/calendars/calendar.freebsd
@@ -1,7 +1,7 @@
 /*
  * FreeBSD
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.219 2007/09/21 12:12:13 tabthorpe Exp $
  */
 
 #ifndef _calendar_freebsd_
diff --git a/usr.bin/calendar/calendars/calendar.french b/usr.bin/calendar/calendars/calendar.french
index 18b4d8ae8a949..a9af6f16607f9 100644
--- a/usr.bin/calendar/calendars/calendar.french
+++ b/usr.bin/calendar/calendars/calendar.french
@@ -1,7 +1,7 @@
 /*
  * French calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.french,v 1.2 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _calendar_french_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index 635aef1d5735a..d84e2604fd5ef 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.german,v 1.6 2001/06/11 04:24:43 ache Exp $
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index 80b517351432e..e8abdb71b21c6 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.history,v 1.35 2006/12/29 06:39:35 ru Exp $
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 6ed8be1d164fb..f3093dd2e714f 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.holiday,v 1.36 2007/09/07 03:23:06 edwin Exp $
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.hungarian b/usr.bin/calendar/calendars/calendar.hungarian
index 1b29dfaf2f46a..0fd3dd41e7d33 100644
--- a/usr.bin/calendar/calendars/calendar.hungarian
+++ b/usr.bin/calendar/calendars/calendar.hungarian
@@ -1,7 +1,7 @@
 /*
  * Hungarian calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.hungarian,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _calendar_hungarian_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index 33e8033aa72e2..8247093dcc347 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic Calendar. Maintained by Josef Grosch <jgrosch@mooseriver.com>.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.judaic,v 1.13 2007/01/14 09:58:39 dwmalone Exp $
  *
  */
 
diff --git a/usr.bin/calendar/calendars/calendar.lotr b/usr.bin/calendar/calendars/calendar.lotr
index 2450e363400bc..e4d3e26d91c72 100644
--- a/usr.bin/calendar/calendars/calendar.lotr
+++ b/usr.bin/calendar/calendars/calendar.lotr
@@ -1,7 +1,7 @@
 /*
  * Lord Of The Rings
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.lotr,v 1.2 2003/10/09 00:31:48 grog Exp $
  */
 
 #ifndef _calendar_lotr_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index c7384923eaac2..a2e4292f190e5 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.music,v 1.19 2007/01/24 21:21:38 dougb Exp $
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.newzealand b/usr.bin/calendar/calendars/calendar.newzealand
index be069df8dfeaa..3437c8300a253 100644
--- a/usr.bin/calendar/calendars/calendar.newzealand
+++ b/usr.bin/calendar/calendars/calendar.newzealand
@@ -1,7 +1,7 @@
 /*
  * New Zealand holidays
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.newzealand,v 1.2 2005/01/01 18:58:28 ceri Exp $
  */
 
 #ifndef _calendar_newzealand_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index 07018766a8325..489d21fa444f7 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.russian,v 1.5 2000/05/04 11:35:27 phantom Exp $
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.southafrica b/usr.bin/calendar/calendars/calendar.southafrica
index ae683b0bd358e..5ff50136a322a 100644
--- a/usr.bin/calendar/calendars/calendar.southafrica
+++ b/usr.bin/calendar/calendars/calendar.southafrica
@@ -5,7 +5,7 @@
  * be an unnamed public holiday in addition to the named holiday the day
  * before. This file format is not complex enough to reflect this, but
  * if it ever is, the change should be made.
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.southafrica,v 1.1 2002/11/19 00:29:36 grog Exp $
  */
 
 #ifndef _calendar_southafrica_
diff --git a/usr.bin/calendar/calendars/calendar.ukrainian b/usr.bin/calendar/calendars/calendar.ukrainian
index 3cff8c5a60724..0a25db15346a1 100644
--- a/usr.bin/calendar/calendars/calendar.ukrainian
+++ b/usr.bin/calendar/calendars/calendar.ukrainian
@@ -1,7 +1,7 @@
 /*
  * Ukrainian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.ukrainian,v 1.1 2005/10/28 21:25:28 ru Exp $
  */
 
 #ifndef _calendar_ukrainian_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index 8ae0bc019dff5..f64c10be40381 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.usholiday,v 1.9 2007/04/29 20:03:06 dwmalone Exp $
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 2b65f1af748f6..7f6b8734d6822 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.world,v 1.5 2003/02/15 10:57:20 seanc Exp $
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag b/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag
index 751c001982caf..ddac0f6e1b65a 100644
--- a/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag,v 1.1 2004/05/23 13:22:01 josef Exp $
  */
 
 #ifndef _de_AT_ISO8859_15_feiertag_
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 f2a33cc563b26..1274934a85ddc 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all,v 1.6 2001/06/11 03:06:13 ache Exp $
  */
 
 #ifndef _de_DE_ISO8859_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 f966c0d085bea..48cfd31ab0d1c 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag,v 1.14 2006/10/01 09:22:05 maxim Exp $
  */
 
 #ifndef _de_DE_ISO8859_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 4ca78bb6abd81..64ccc31b062c3 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
  * 
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte,v 1.13 2005/09/23 11:58:16 krion Exp $
  */
 
 #ifndef _de_DE_ISO8859_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 02640b115bfba..eba0fe33838c0 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche,v 1.7 2001/06/11 03:06:13 ache Exp $
  */
 
 #ifndef _de_DE_ISO8859_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 bfa33e66168e8..db1f6bd78002e 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur,v 1.8 2003/10/06 01:17:42 grog Exp $
  */
 
 #ifndef _de_DE_ISO8859_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 318969cfe87c6..7dd5175ebb0a8 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik,v 1.13 2006/10/24 23:18:07 grog Exp $
  */
 
 #ifndef _de_DE_ISO8859_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 2c7639217df5e..444d05ba19355 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft,v 1.9 2003/10/15 08:18:59 tg Exp $
  */
 
 #ifndef _de_DE_ISO8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
index 785512e543d31..9a706c022b00f 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * Calendrier français
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_all_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
index 7ee3b92b8d0f7..7eb01835a1584 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
@@ -1,7 +1,7 @@
 /*
  * Fêtes à souhaiter
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes,v 1.2 2006/04/13 12:14:44 flz Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_fetes_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
index 18b4d8ae8a949..823aef4c34819 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
@@ -1,7 +1,7 @@
 /*
  * French calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _calendar_french_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
index 48867ac42dc1c..21d1f0cb3451a 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
@@ -1,7 +1,7 @@
 /*
  * Jours fériés
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies,v 1.2 2006/04/13 12:14:44 flz Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_jferies_
diff --git a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
index 5a9f0eaf13aa1..40c6414198a71 100644
--- a/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
+++ b/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
@@ -1,7 +1,7 @@
 /*
  * Proverbes liés au calendrier
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes,v 1.1 2002/04/29 20:57:36 dwmalone Exp $
  */
 
 #ifndef _fr_FR_ISO8859_1_proverbes_
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 326571a2ae370..835ed470d3d52 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all,v 1.5 2001/06/11 03:08:46 ache Exp $
  */
 
 #ifndef _hr_HR_ISO8859_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 a1e93fbf059da..8b9a56cb97535 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
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici,v 1.8 2007/09/21 23:43:03 edwin Exp $
  */
 
 #ifndef _hr_HR_ISO8859_2_praznici
diff --git a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all
index 5084dc7295b6e..5165ab309ce17 100644
--- a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  * Magyar kalendárium
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.all,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _hu_HU_ISO8859_2_all_
diff --git a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok
index f85c0840d910a..14f7c57d2fb1f 100644
--- a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok
+++ b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok
@@ -1,7 +1,7 @@
 /*
  * Névnapok
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.nevnapok,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _hu_HU_ISO8859_2_nevnapok_
diff --git a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek
index dab8ead76abf3..41e619f314cdf 100644
--- a/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek
+++ b/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek
@@ -1,7 +1,7 @@
 /*
  * Ünnepnapok
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hu_HU.ISO8859-2/calendar.unnepek,v 1.1 2004/08/16 09:31:09 dwmalone Exp $
  */
 
 #ifndef _hu_HU_ISO8859_2_unnepek_
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 b2de01ee8e589..fe1ad0bdc6ed7 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 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all,v 1.6 2003/12/15 11:51:26 maxim Exp $
  */
 
 #ifndef _ru_RU_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 66b81e64ebe62..b5ea8ed19a94b 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 @@
 /*
  * òÏÓÓÉÊÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common,v 1.13 2003/12/26 13:04:13 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday
index c062b5764c4fd..bf2d6bad11e9c 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * òÏÓÓÉÊÓËÉÅ ÐÒÁÚÄÎÉËÉ (ÎÅÒÁÂÏÞÉÅ "ËÒÁÓÎÙÅ" ÄÎÉ)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday,v 1.3 2005/11/02 09:22:28 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_holiday_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military
index 1b4e9c8880f8c..f3a6f33ffb5d6 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military
@@ -1,7 +1,7 @@
 /*
  * äÎÉ ×ÏÉÎÓËÏÊ ÓÌÁ×Ù òÏÓÓÉÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military,v 1.2 2003/12/26 13:04:13 maxim Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_military_
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 5e279859b7ffd..c173b65970767 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 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk,v 1.7 2006/12/29 06:44:24 ru Exp $
  */
 
 #ifndef _ru_RU_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 ac38458d4a680..da2d0a700b485 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 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox,v 1.5 2000/05/04 11:31:16 phantom Exp $
  */
 
 #ifndef _ru_RU_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 2fb6bc0726924..7ac2bac5802b3 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 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan,v 1.7 2003/12/31 18:01:31 ache Exp $
  */
 
 #ifndef _ru_RU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.all b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.all
index 1dfa26220475e..dc862bdc7fc1e 100644
--- a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.all
+++ b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.all
@@ -1,7 +1,7 @@
 /*
  * õËÒÁ§ÎÓØËÉÊ ËÁÌÅÎÄÁÒ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.all,v 1.1 2005/10/28 21:25:28 ru Exp $
  */
 
 #ifndef _uk_UA_KOI8_U_all_
diff --git a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.holiday b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.holiday
index 08559d89bc2dd..d127ed91c3112 100644
--- a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.holiday
+++ b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * õËÒÁ§ÎÓØ˦ ÄÅÒÖÁ×Φ Ó×ÑÔÁ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.holiday,v 1.1 2005/10/28 21:25:28 ru Exp $
  */
 
 #ifndef _uk_UA_KOI8_U_holiday_
diff --git a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.misc b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.misc
index b49769d104ace..ec9126411bc9d 100644
--- a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.misc
+++ b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.misc
@@ -1,7 +1,7 @@
 /*
  * ¶ÎÛ¦ æËÁצ ÄÁÔÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.misc,v 1.1 2005/10/28 21:25:28 ru Exp $
  */
 
 #ifndef _uk_UA_KOI8_U_misc_
diff --git a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.orthodox b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.orthodox
index 797c8c184f109..31f6df38ed4ce 100644
--- a/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.orthodox
+++ b/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×Φ Ó×ÑÔÁ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/uk_UA.KOI8-U/calendar.orthodox,v 1.1 2005/10/28 21:25:28 ru Exp $
  */
 
 #ifndef _uk_UA_KOI8_U_orthodox_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 8e3317b29b43c..4cfd079f9ad04 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/day.c,v 1.27 2007/06/09 05:54:13 grog Exp $");
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index e5a0a086e393c..e5fb3baca85e5 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/io.c,v 1.21 2007/06/09 05:54:13 grog Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 833d6233f81d9..0f9d17ee23cdd 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/ostern.c,v 1.12 2007/05/07 11:18:30 dwmalone Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index 769d09152d999..8193fb3481e7f 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/calendar/paskha.c,v 1.8 2007/05/07 11:18:30 dwmalone Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index cacbd2587acd8..85913f5841008 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/pathnames.h,v 1.4 2001/01/13 01:33:59 ache Exp $
  */
 
 #include <paths.h>
diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile
index 408790c6c0257..4c3a59b626fb2 100644
--- a/usr.bin/cap_mkdb/Makefile
+++ b/usr.bin/cap_mkdb/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cap_mkdb/Makefile,v 1.4 2002/02/08 22:31:36 markm Exp $
 
 PROG=	cap_mkdb
 
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 2ac09e35bc84d..404fc8b7cede5 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.1,v 1.15 2005/02/22 23:29:53 ru Exp $
 .\"
 .Dd February 22, 2005
 .Dt CAP_MKDB 1
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 32413c88b4b64..60f9b37c9a1c3 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)cap_mkdb.c	8.2 (Berkeley) 4/27/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.c,v 1.14 2005/02/22 23:29:53 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/catman/Makefile b/usr.bin/catman/Makefile
index d80a5fd8ae496..fc63007e92197 100644
--- a/usr.bin/catman/Makefile
+++ b/usr.bin/catman/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/catman/Makefile,v 1.2 2004/12/22 15:25:51 ru Exp $
 
 PROG=	catman
 WARNS?=	6
diff --git a/usr.bin/catman/catman.1 b/usr.bin/catman/catman.1
index fe855872fd548..43d3240d036f6 100644
--- a/usr.bin/catman/catman.1
+++ b/usr.bin/catman/catman.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/catman/catman.1,v 1.6 2005/12/05 14:22:12 ru Exp $
 .\"
 .Dd December 3, 2005
 .Dt CATMAN 1
diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c
index ced6ae6bbc55b..98ab1aee54e74 100644
--- a/usr.bin/catman/catman.c
+++ b/usr.bin/catman/catman.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/catman/catman.c,v 1.14 2005/12/05 14:22:12 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 8aa23eb0daf29..fe7c36af98ee8 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chat/Makefile,v 1.13 2003/10/31 06:22:03 kientzle Exp $
 
 # I once used this extensively, but no longer have a modem.  Feel free
 # to ask me questions about it, but I disclaim ownership now.  -Peter
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index ecc733d1ce7b9..42f466c0234b9 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.20 2002/12/30 21:18:11 schweikh Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index c0afeaf53689d..d74b00850f743 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chat/chat.c,v 1.21 2003/10/31 06:22:03 kientzle Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/checknr/Makefile b/usr.bin/checknr/Makefile
index 8a47b5956bef0..5d349f5b8b9f3 100644
--- a/usr.bin/checknr/Makefile
+++ b/usr.bin/checknr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/checknr/Makefile,v 1.3 2002/02/27 15:49:07 dwmalone Exp $
 
 PROG=	checknr
 
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 713c88cd26ee7..51a9414de08f9 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/checknr/checknr.1,v 1.12 2005/01/25 22:27:00 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Dt CHECKNR 1
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 742c74e5de600..ae1f847cf67ad 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)checknr.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/checknr/checknr.c,v 1.9 2004/07/15 04:42:47 tjr Exp $");
 
 /*
  * checknr: check an nroff/troff input file for matching macro calls.
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index 847e5c960106b..9067c141a9c00 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chkey/Makefile,v 1.11 2006/03/17 18:54:38 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index a4467c89449ce..6ef107742e315 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.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chkey/chkey.1,v 1.7 2002/04/19 23:24:07 charnier Exp $
 .\"
 .Dd July 5, 1989
 .Dt CHKEY 1
diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c
index db0b743fd583d..44eb825ed9557 100644
--- a/usr.bin/chkey/chkey.c
+++ b/usr.bin/chkey/chkey.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chkey/chkey.c,v 1.5 2002/08/27 19:06:44 charnier Exp $");
 
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 2bbdc0875b69f..9647794ad382e 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chpass/Makefile,v 1.31 2006/03/17 18:54:38 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 24b17597bad66..797f590ba9a7e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.39 2005/08/02 21:38:02 seanc Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 2504e68ec17d9..59b1832cefdc3 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/chpass.c,v 1.28 2006/09/25 15:06:24 marck Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index ed1a58649d592..1d852d4bff877 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)chpass.h	8.4 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/chpass/chpass.h,v 1.7 2004/01/18 21:46:39 charnier Exp $
  */
 
 struct passwd;
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index ce82f8ee46447..42fcdcf1a73fe 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)edit.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/edit.c,v 1.23 2003/04/09 18:18:42 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index eac5561a8dc2e..c6e140e2bc4d2 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)field.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/field.c,v 1.9 2004/01/18 21:46:39 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 19f1a99062d89..81511ee2c5f07 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)table.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/table.c,v 1.10 2003/05/03 19:44:45 obrien Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 07d96e227a961..c97f0b4cd7a98 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/chpass/util.c,v 1.13 2004/01/18 21:46:39 charnier Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile
index 828900ac02735..01440d0bc695c 100644
--- a/usr.bin/cksum/Makefile
+++ b/usr.bin/cksum/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/28/95
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cksum/Makefile,v 1.5 2002/02/08 22:31:36 markm Exp $
 
 PROG=	cksum
 SRCS=	cksum.c crc.c print.c sum1.c sum2.c crc32.c
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index d4a0ee7d3ed28..b4161fee89d03 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cksum/cksum.1,v 1.19 2005/01/17 07:44:13 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index b6462d49fafbc..b698cdc49bb37 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/cksum.c,v 1.17 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index d1f42f2f628cf..92693e8014d68 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/crc.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
index cadbc17b69bb7..fa8f900ece612 100644
--- a/usr.bin/cksum/crc32.c
+++ b/usr.bin/cksum/crc32.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/crc32.c,v 1.9 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index f2d75def1eabc..e9b594adf2629 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/cksum/extern.h,v 1.6 2003/03/13 23:32:28 robert Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 1cc27646f21cd..4d732d9acee79 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/print.c,v 1.7 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 406b40e2832fa..f3c05ce02ef99 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sum1.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/sum1.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index c179c6289a2fc..83ca362d3ae0f 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)sum2.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cksum/sum2.c,v 1.8 2003/03/13 23:32:28 robert Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile
index d93f54bc0fd5a..6e1606515b3f5 100644
--- a/usr.bin/cmp/Makefile
+++ b/usr.bin/cmp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cmp/Makefile,v 1.7 2005/08/23 13:13:13 brian Exp $
 
 PROG=	cmp
 SRCS=	cmp.c link.c misc.c regular.c special.c
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 29088aae1128e..e030d0dbd2735 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cmp/cmp.1,v 1.15 2006/12/19 10:34:14 ru Exp $
 .\"
 .Dd December 19, 2006
 .Dt CMP 1
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 304aa7de4613a..ed85502ce76ff 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)cmp.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/cmp.c,v 1.17 2005/08/23 13:13:13 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 1dd1c820e2fba..4f02e32e6c7d7 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/cmp/extern.h,v 1.5 2005/08/23 13:13:13 brian Exp $
  *
  */
 
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index fe45def9fb573..9c8b3ca5e9c7b 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/link.c,v 1.1 2005/08/23 13:13:13 brian Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 53c6a9bf6dd35..7fc0470b5258a 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/misc.c,v 1.7 2002/07/28 15:13:17 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 7a27f5e470c42..963cc9b9e7f26 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/regular.c,v 1.18 2003/02/26 06:44:46 das Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index bbe3cb10fa819..ab21146505bd0 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cmp/special.c,v 1.10 2003/06/19 07:24:26 murray Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile
index 8e3a95948f3f6..e1a26f1e2aaaf 100644
--- a/usr.bin/col/Makefile
+++ b/usr.bin/col/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/col/Makefile,v 1.4 2002/02/08 22:31:36 markm Exp $
 
 PROG=	col
 
diff --git a/usr.bin/col/README b/usr.bin/col/README
index 116a044a38f4c..89e4ce4c72362 100644
--- a/usr.bin/col/README
+++ b/usr.bin/col/README
@@ -1,6 +1,6 @@
 #	@(#)README	8.1 (Berkeley) 6/6/93
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/col/README,v 1.2 2001/06/17 04:24:16 mikeh Exp $
 
 col - filter out reverse line feeds.
 
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 3197c02d5a430..2bac8b8cddc1d 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/col/col.1,v 1.19 2005/02/13 22:25:20 ru Exp $
 .\"
 .Dd August 4, 2004
 .Dt COL 1
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 8b45ba697202f..32ad925a0de22 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/col/col.c,v 1.21 2006/07/18 07:16:25 stefanf Exp $");
 
 #include <err.h>
 #include <locale.h>
diff --git a/usr.bin/colcrt/Makefile b/usr.bin/colcrt/Makefile
index 87d96cabffa18..7d2b7be0af403 100644
--- a/usr.bin/colcrt/Makefile
+++ b/usr.bin/colcrt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colcrt/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	colcrt
 
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index a4a727e8940b4..d5bbbf459106a 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colcrt/colcrt.1,v 1.16 2005/02/13 22:25:21 ru Exp $
 .\"
 .Dd July 31, 2004
 .Dt COLCRT 1
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 2ba4f39bbdae7..2e5570b216e2f 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colcrt/colcrt.c,v 1.18 2004/07/31 06:22:57 tjr Exp $");
 
 #include <err.h>
 #include <locale.h>
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index 6cb213f488982..b3af0663795f8 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/Makefile,v 1.21 2002/02/08 23:07:34 markm Exp $
 
 PROG=	colldef
 SRCS=	parse.y scan.l y.tab.h
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index fafa74db460d0..000fb2f605660 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colldef/colldef.1,v 1.23 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd January 27, 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/common.h b/usr.bin/colldef/common.h
index 316490d4eb8de..46ec066685441 100644
--- a/usr.bin/colldef/common.h
+++ b/usr.bin/colldef/common.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/colldef/common.h,v 1.2 2001/11/28 09:50:24 ache Exp $
  */
 
 #define CHARMAP_SYMBOL_LEN 64
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 375aed8ac3e09..3bedd7394a935 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colldef/parse.y,v 1.34 2005/05/21 09:55:05 ru Exp $");
 
 #include <arpa/inet.h>
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index aeeff1406832a..96a7ef3726367 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colldef/scan.l,v 1.19 2002/08/23 04:18:26 ache Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile
index 12585762f6263..d616bd3a20bbe 100644
--- a/usr.bin/colrm/Makefile
+++ b/usr.bin/colrm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colrm/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	colrm
 
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index ceb04558e6dc6..f97a8c4bb9e14 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colrm/colrm.1,v 1.11 2005/01/17 07:44:14 ru Exp $
 .\"
 .Dd August 4, 2004
 .Dt COLRM 1
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 52dda90086dda..34440736f52f0 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/colrm/colrm.c,v 1.12 2004/07/29 09:09:22 tjr Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile
index 771723ef31f58..ed0fa5e7304df 100644
--- a/usr.bin/column/Makefile
+++ b/usr.bin/column/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/column/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	column
 
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 5c5a100fe3b13..717c593a3702e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/column/column.1,v 1.14 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd July 29, 2004
 .Os
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 329cfa932ee52..61a9aea27bb60 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/column/column.c,v 1.17 2006/12/15 17:47:25 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 13da76fa2ef66..1c9b5a399de20 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/comm/Makefile,v 1.4 2002/02/08 22:31:37 markm Exp $
 
 PROG=	comm
 
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 2402ab5a1ceb4..45a726d80ba2d 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/comm/comm.1,v 1.14 2005/01/25 22:28:34 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 0e7e029ce7825..06cf4a4e430ee 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -47,7 +47,7 @@ static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/comm/comm.c,v 1.21 2004/07/02 22:48:29 tjr Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index 3d4ab15dfcceb..f4bb71ce20381 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/compile_et/Makefile,v 1.12 2005/10/14 15:50:22 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/com_err
 
diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile
index 45c0814add3f1..ec45aa5f933af 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/17/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/compress/Makefile,v 1.8 2004/09/10 21:34:46 trhodes Exp $
 
 PROG=	compress
 SRCS=	compress.c zopen.c
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index c37562fb0402c..561995beb3d90 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/compress/compress.1,v 1.22 2005/11/18 10:36:28 ru Exp $
 .\"
 .Dd May 17, 2002
 .Dt COMPRESS 1
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 584f283ffb88b..3931ee57c92ef 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/compress/compress.c,v 1.21 2003/06/14 13:41:31 trhodes Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/compress/doc/NOTES b/usr.bin/compress/doc/NOTES
index d400c9b485caa..aec6b750e5945 100644
--- a/usr.bin/compress/doc/NOTES
+++ b/usr.bin/compress/doc/NOTES
@@ -1,5 +1,5 @@
 
-  $FreeBSD$
+  $FreeBSD: src/usr.bin/compress/doc/NOTES,v 1.2 2002/10/16 12:42:15 charnier Exp $
 
 From: James A. Woods <jaw@eos.arc.nasa.gov>
 
diff --git a/usr.bin/compress/doc/README b/usr.bin/compress/doc/README
index 2b5f6ba98b231..0828cdfb3a91d 100644
--- a/usr.bin/compress/doc/README
+++ b/usr.bin/compress/doc/README
@@ -1,6 +1,6 @@
 
 	@(#)README	8.1 (Berkeley) 6/9/93
-  $FreeBSD$
+  $FreeBSD: src/usr.bin/compress/doc/README,v 1.3 2002/12/30 21:18:11 schweikh Exp $
 
 Compress version 4.0 improvements over 3.0:
 	o compress() speedup (10-50%) by changing division hash to xor
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index 57e0337eef7dc..76e82ad9ecee0 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.4 2001/08/13 14:06:30 ru Exp $ */
 
 /*
  * $Header: compress.c,v 4.0 85/07/30 12:50:00 joe Release $
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index a1ffbf75d20d7..730a1200df7a6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/compress/zopen.3,v 1.8 2001/10/01 15:01:57 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt ZOPEN 3
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index f0ec8871cd817..12d6da903a2a2 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/compress/zopen.c,v 1.12 2005/05/18 05:24:08 kan Exp $");
 
 /*-
  * fcompress.c - File compression ala IEEE Computer, June 1984.
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index a27a4f9b98aa2..8ad5691ff6080 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/compress/zopen.h,v 1.5 2002/03/22 01:19:31 imp Exp $
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/csplit/Makefile b/usr.bin/csplit/Makefile
index 3f370c7c4ad31..671233575011a 100644
--- a/usr.bin/csplit/Makefile
+++ b/usr.bin/csplit/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/csplit/Makefile,v 1.1 2002/05/02 07:54:04 tjr Exp $
 
 PROG=	csplit
 
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index 8582887113fd4..98b834f9772c1 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/csplit/csplit.1,v 1.11 2005/01/25 22:29:51 tjr Exp $
 .\"
 .Dd January 26, 2005
 .Dt CSPLIT 1
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 2dff81fa8a45f..9d2b4e5bc84c9 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.9 2004/03/22 11:15:03 tjr Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/csup/Makefile b/usr.bin/csup/Makefile
index b37e26153a945..b90775cadea41 100644
--- a/usr.bin/csup/Makefile
+++ b/usr.bin/csup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/csup/Makefile,v 1.3 2006/03/14 03:53:50 mux Exp $
 
 .PATH: ${.CURDIR}/../../contrib/csup
 
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index a55895f769ef2..2475421465803 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/C.c,v 1.12 2007/02/04 20:07:07 rse Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile
index dc639af6e2e86..7c5b1147e5552 100644
--- a/usr.bin/ctags/Makefile
+++ b/usr.bin/ctags/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ctags/Makefile,v 1.5 2002/02/08 22:31:37 markm Exp $
 
 PROG=	ctags
 SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index d1f0d5a616324..eaf038c703321 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ctags/ctags.1,v 1.17 2005/01/17 07:44:16 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt CTAGS 1
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index eda4145291f92..2c0dc09fd5cac 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/ctags.c,v 1.20 2006/07/18 07:29:42 stefanf Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index ce4484f2f6bc6..6ae0cdd0a029e 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ctags.h	8.3 (Berkeley) 4/2/94
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ctags/ctags.h,v 1.7 2002/03/22 01:19:31 imp Exp $
  *
  */
 
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 3761615f10ebd..ab27203f669e9 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/fortran.c,v 1.13 2007/02/04 20:06:10 rse Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 3ac47df76ee56..1416e7596570a 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/lisp.c,v 1.7 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index a31ff931f7f2e..ae44d2c14ae04 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/print.c,v 1.9 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index bd65c5a88f3cd..0fa94a68ae15b 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/tree.c,v 1.12 2007/02/04 20:04:29 rse Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index e0e0daba6687f..eb40786ebbf5c 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ctags/yacc.c,v 1.9 2002/07/28 15:50:38 dwmalone Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile
index 5be029a3d9d15..b0ea0f6e28f25 100644
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/cut/Makefile,v 1.5 2002/02/08 22:31:38 markm Exp $
 
 PROG=	cut
 
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index a6ebdddb3340c..04e941f45dfb5 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cut/cut.1,v 1.32 2007/02/28 10:13:32 ru Exp $
 .\"
 .Dd December 21, 2006
 .Dt CUT 1
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index a370e600ef0a2..fd64dabc4bbeb 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)cut.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/cut/cut.c,v 1.30 2004/11/05 10:45:23 tjr Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 4ac3e64b246f0..36c13cafb4276 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dig/Makefile,v 1.13 2007/06/02 23:19:57 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 770389799411f..f06791277318c 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dirname/Makefile,v 1.6 2004/12/21 08:47:29 ru Exp $
 
 PROG=	dirname
 NO_MAN=
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 3018f2f6f00c7..55ae5d2f97abb 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dirname.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/dirname/dirname.c,v 1.12 2005/05/21 09:55:05 ru Exp $");
 
 #include <err.h>
 #include <libgen.h>
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index 12e80b9da3d15..98c73ca7077df 100644
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/du/Makefile,v 1.9 2004/05/24 22:22:29 pjd Exp $
 
 PROG=	du
 WARNS?=	6
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 8594ba7269d3a..6596cee446c5c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/du/du.1,v 1.32 2006/09/29 15:20:44 ru Exp $
 .\"
 .Dd May 6, 2006
 .Dt DU 1
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 73583e320b947..a04bb22fff3a4 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)du.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/du/du.c,v 1.42 2007/07/04 00:00:39 scf Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/ee/FREEBSD-upgrade b/usr.bin/ee/FREEBSD-upgrade
index 3bca6abb4b8c9..bebbc60cf753f 100644
--- a/usr.bin/ee/FREEBSD-upgrade
+++ b/usr.bin/ee/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/ee/FREEBSD-upgrade,v 1.2 2001/06/11 03:45:25 ache Exp $
 
 Hugh F. Mahon's EasyEditor
 	originals can be found at: 	http://mahon.cwx.net/
diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile
index 8fdc4996fa824..02f6ff5490ba4 100644
--- a/usr.bin/ee/Makefile
+++ b/usr.bin/ee/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ee/Makefile,v 1.24 2002/07/02 12:37:09 ru Exp $
 
 CFLAGS+= -DCAP -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
 	 -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 4da47bc528127..8e29729db42c7 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.19 2005/07/14 20:29:06 brueffer Exp $
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index 17ecc310a7490..4e31a66ed59ab 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ee/ee.c,v 1.33 2006/01/11 08:01:32 cperciva Exp $");
 
 char *ee_copyright_message = 
 "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996 Hugh Mahon ";
diff --git a/usr.bin/ee/new_curse.c b/usr.bin/ee/new_curse.c
index 22e1a847f6e01..5693628dd41ee 100644
--- a/usr.bin/ee/new_curse.c
+++ b/usr.bin/ee/new_curse.c
@@ -45,7 +45,7 @@ char *copyright_message[] = { "Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993,
 				"All rights are reserved."};
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ee/new_curse.c,v 1.9 2002/06/30 05:21:17 obrien Exp $");
 
 #include "new_curse.h"
 #include <signal.h>
diff --git a/usr.bin/ee/new_curse.h b/usr.bin/ee/new_curse.h
index bbef58572a7bd..a55ba80e68e4e 100644
--- a/usr.bin/ee/new_curse.h
+++ b/usr.bin/ee/new_curse.h
@@ -37,7 +37,7 @@
  |	Copyright (c) 1986, 1987, 1988, 1991, 1995 Hugh Mahon
  |	All are rights reserved.
  |
- | $FreeBSD$
+ | $FreeBSD: src/usr.bin/ee/new_curse.h,v 1.3 2001/03/27 13:51:17 sobomax Exp $
  |
  */
 
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 80a99616df6ef..083beab3cf45c 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
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg,v 1.9 2001/03/28 21:33:30 joerg Exp $
 $ 
 $ 
 $set 1
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 ccefcc4b3e62c..eee79bab9bb0e 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
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/en_US.US-ASCII/ee.msg,v 1.7 2001/03/27 13:51:18 sobomax Exp $
 $ 
 $ 
 $set 1
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 e93ff22dfa59b..b3082d4777518 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
 $
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg,v 1.10 2001/03/27 13:53:08 sobomax Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
index 3176f7995993b..0e09299f7c244 100644
--- a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
+++ b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg,v 1.6 2005/02/27 19:42:48 phantom Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
index 99aa34392ac8e..2d5d46fcccec8 100644
--- a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
+++ b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg
@@ -5,7 +5,7 @@ $ Based on uk_UA.KOI8-U translation by Olexander Kunytsa <kunia@istc.kiev.ua>
 $
 $ For ee patchlevel 3
 $
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg,v 1.1 2001/04/19 10:32:25 ache Exp $
 $
 $
 $set 1
diff --git a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
index 1556d916742ea..761e07de7cff1 100644
--- a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
+++ b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg,v 1.1 2001/03/28 16:51:02 sobomax Exp $
 $ 
 $ 
 $set 1
diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile
index 92bb65980d064..4a65b55138d1c 100644
--- a/usr.bin/elf2aout/Makefile
+++ b/usr.bin/elf2aout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/elf2aout/Makefile,v 1.9 2004/12/21 08:47:29 ru Exp $
 
 PROG=	elf2aout
 NO_MAN=
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 4168f4e60560e..1d1405629e95d 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/elf2aout/elf2aout.c,v 1.11 2006/04/21 09:39:51 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/elf64.h>
diff --git a/usr.bin/elfdump/Makefile b/usr.bin/elfdump/Makefile
index 95ce514b3ace0..dd2e9e38303f0 100644
--- a/usr.bin/elfdump/Makefile
+++ b/usr.bin/elfdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/elfdump/Makefile,v 1.4 2003/02/03 01:59:27 obrien Exp $
 
 PROG=	elfdump
 WARNS?=	5
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index 1902e41820c8b..d2fc5574c600d 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/elfdump/elfdump.1,v 1.6 2005/01/18 13:43:48 ru Exp $
 .\"
 .Dd January 15, 2003
 .Dt ELFDUMP 1
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index 2ddfc857c46fc..fa02c54cb4981 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/elfdump/elfdump.c,v 1.14 2006/01/28 17:58:22 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/elf32.h>
diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile
index 32a670b07eca8..6e5ad7b3a6df7 100644
--- a/usr.bin/enigma/Makefile
+++ b/usr.bin/enigma/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/enigma/Makefile,v 1.9 2004/02/05 22:44:24 ru Exp $
 
 PROG=	enigma
 
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index 4fc0b206fe9b5..2741bb27741ae 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/enigma/enigma.1,v 1.13 2006/12/24 19:55:38 ru Exp $
 .\" "
 .Dd May 14, 2004
 .Os
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 68fd29ddfbc09..26cfc4aec2d06 100644
--- a/usr.bin/enigma/enigma.c
+++ b/usr.bin/enigma/enigma.c
@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/enigma/enigma.c,v 1.9 2006/07/25 22:20:05 jkim Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
index bc1eea49153a7..867cf948c0caa 100644
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/env/Makefile,v 1.6 2005/06/20 03:43:25 gad Exp $
 
 PROG=	env
 SRCS=	env.c envopts.c
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index a1696d3c2cf74..667c20058115c 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -33,7 +33,7 @@
 .\"
 .\" From @(#)printenv.1	8.1 (Berkeley) 6/6/93
 .\" From FreeBSD: src/usr.bin/printenv/printenv.1,v 1.17 2002/11/26 17:33:35 ru Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/env/env.1,v 1.9 2005/06/22 19:04:07 ru Exp $
 .\"
 .Dd June 20, 2005
 .Dt ENV 1
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index b11a0b772e917..87a1bd8c8d9cf 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)env.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/env/env.c,v 1.19 2007/07/04 00:00:40 scf Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index f8214305cc60a..1f2e95b00ecbd 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/env/envopts.c,v 1.4 2005/07/18 22:18:16 gad Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/usr.bin/env/envopts.h b/usr.bin/env/envopts.h
index 1f15c6917a809..5e30ac1e2cd42 100644
--- a/usr.bin/env/envopts.h
+++ b/usr.bin/env/envopts.h
@@ -27,7 +27,7 @@
  * are those of the authors and should not be interpreted as representing
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/env/envopts.h,v 1.1 2005/06/20 03:43:25 gad Exp $
  */
 
 void		 search_paths(char *path, char **argv);
diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile
index c6b339c69fc20..6093c6b5b6cc6 100644
--- a/usr.bin/expand/Makefile
+++ b/usr.bin/expand/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/expand/Makefile,v 1.4 2002/02/08 22:31:38 markm Exp $
 
 PROG=	expand
 MLINKS=	expand.1 unexpand.1
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 0ca6dcb38d75f..4fb5b07ceb3cc 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/expand/expand.1,v 1.15 2006/10/13 16:22:24 ru Exp $
 .\"
 .Dd October 13, 2006
 .Dt EXPAND 1
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 6c99db8068563..3ba16b833283d 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/expand/expand.c,v 1.15 2004/06/24 13:42:26 tjr Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile
index ffae97dc061fc..3dd55e90c0cf9 100644
--- a/usr.bin/false/Makefile
+++ b/usr.bin/false/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/false/Makefile,v 1.3 2002/02/08 22:31:38 markm Exp $
 
 PROG=	false
 
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 415ec580a3759..24a8ab2812bf2 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/false/false.1,v 1.11 2001/11/22 11:05:31 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt FALSE 1
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 27b2c258cfff5..7a5155755ebd8 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)false.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/false/false.c,v 1.5 2003/02/19 00:10:28 peter Exp $");
 
 int
 main(void)
diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile
index c422af8afb210..df8cf5a8ac9f8 100644
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fetch/Makefile,v 1.18 2006/03/17 18:54:38 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 5d87839cf27f3..803ea9dc868ed 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.67 2006/04/22 03:04:24 jkoshy Exp $
 .\"
 .Dd March 11, 2003
 .Dt FETCH 1
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index d19a25703f272..79955ac5ee81c 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fetch/fetch.c,v 1.78 2006/11/10 22:05:41 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 0aec031c98cc1..f2f1c8c3a26d6 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Makefile,v 1.30 2004/11/19 04:04:14 obrien Exp $
 # Makefile for file(1) cmd.
 # Copyright (c) David E. O'Brien, 2000-2004
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
diff --git a/usr.bin/file/config.h b/usr.bin/file/config.h
index 65e4a6a59ad9a..5e7908038e46f 100644
--- a/usr.bin/file/config.h
+++ b/usr.bin/file/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/file/config.h,v 1.13.4.1 2008/02/06 18:26:38 obrien Exp $ */
 
 #include <osreldate.h>
 
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index c945f48dd63dd..ebfc170cbdf85 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file/file.1,v 1.38 2007/05/25 09:25:05 ru Exp $
 .\" $Id: file.man,v 1.57 2005/08/18 15:18:22 christos Exp $
 .Dd August 18, 2005
 .Dt FILE 1 "Copyright but distributable"
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index ea60544201d16..56ab195d99e65 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file/magic.5,v 1.28 2007/05/25 09:25:05 ru Exp $
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index c3c6ddc7612d5..602ce7461c028 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file2c/Makefile,v 1.8 2005/05/15 06:26:59 marcel Exp $
 
 PROG=	file2c
 WARNS?=	6
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 40482c27e0e87..345d8690d8e9a 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
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file2c/file2c.1,v 1.13.2.1 2007/11/14 19:24:10 ru Exp $
 .\"
 .Dd March 22, 2007
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index e50bd1f8a46d6..14dae0ad3ab83 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/file2c/file2c.c,v 1.10.2.1 2007/11/14 19:24:10 ru Exp $");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index b20dc0346f559..33038fe23f664 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/find/Makefile,v 1.18 2005/01/25 14:07:25 ssouhlal Exp $
 
 PROG=	find
 SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c \
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index a6f09f47db758..945b5575dc86f 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/16/94
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/find/extern.h,v 1.23 2006/05/14 20:23:00 krion Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index d8376d81d8707..b38cabb2b5697 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/find/find.1,v 1.82 2007/02/28 10:19:25 ru Exp $
 .\"
 .Dd December 13, 2006
 .Dt FIND 1
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index cc2d797a541db..7f83ab1d71c28 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)find.c	8.5 (Berkeley) 8/5/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/find.c,v 1.18 2006/05/14 20:23:00 krion Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index c7366fa5246dc..6a8bc437f129d 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)find.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/find/find.h,v 1.19 2006/05/14 20:23:01 krion Exp $
  */
 
 #include <regex.h>
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 5de9db073d791..e9dce9a7cb182 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -41,7 +41,7 @@ static const char sccsid[] = "@(#)function.c	8.10 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.58 2006/05/27 18:27:41 krion Exp $");
 
 #include <sys/param.h>
 #include <sys/ucred.h>
diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
index de7750c88ff54..c68de33c79d55 100644
--- a/usr.bin/find/getdate.y
+++ b/usr.bin/find/getdate.y
@@ -13,7 +13,7 @@
 /* SUPPRESS 288 on yyerrlab *//* Label unused */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/getdate.y,v 1.4 2005/08/25 13:44:02 roberto Exp $");
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 88e45938cc6d3..b5ca8ae56c072 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ls.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/ls.c,v 1.17 2004/01/20 09:27:03 des Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 643f1f8cbf3a0..b1f22332658ad 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/main.c,v 1.15 2003/06/14 13:00:21 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 15329064cf444..a8274130c29f3 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)misc.c	8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/misc.c,v 1.8 2005/04/02 07:44:12 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index c774efa0dc890..f04d12adaffd3 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)operator.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/operator.c,v 1.14 2003/06/14 13:00:21 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index c1c59ea090a84..0028f348d8f60 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/find/option.c,v 1.25 2006/04/05 23:06:11 ceri Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/finger/Makefile b/usr.bin/finger/Makefile
index 983392b7a1e05..aea815eef0435 100644
--- a/usr.bin/finger/Makefile
+++ b/usr.bin/finger/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/finger/Makefile,v 1.5 2002/02/08 22:31:39 markm Exp $
 
 PROG=	finger
 SRCS=	finger.c lprint.c net.c sprint.c util.c
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 498c296d09378..ff4b9b03dac18 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/extern.h,v 1.11 2007/04/11 19:11:54 des Exp $
  */
 
 #ifndef	_EXTERN_H_
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 590a3822adf16..4aac59824e47c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.35 2007/04/12 08:22:49 ru Exp $
 .\"
 .Dd April 11, 2007
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index b2787520c4867..edf9a2ec1b67d 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/finger.c,v 1.38 2007/04/11 20:32:09 des Exp $");
 
 /*
  * Finger prints out information about users.  It is not portable since
diff --git a/usr.bin/finger/finger.conf.5 b/usr.bin/finger/finger.conf.5
index 54f5eecd7c54b..83ebc5be8e0bc 100644
--- a/usr.bin/finger/finger.conf.5
+++ b/usr.bin/finger/finger.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/finger/finger.conf.5,v 1.6 2005/02/09 18:04:22 ru Exp $
 .\"
 .Dd August 16, 2000
 .Dt FINGER.CONF 5
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 6b18146d4b50d..bf56cd66ba132 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
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/finger.h,v 1.5 2004/03/14 06:43:34 jmallett Exp $
  */
 
 #ifndef	_FINGER_H_
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 848bbeeeb3243..695701763bce8 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/lprint.c,v 1.25 2004/03/14 06:43:34 jmallett Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 5260a2d6ca294..79cac0425d2a4 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/net.c,v 1.24 2007/04/11 19:11:54 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/pathnames.h b/usr.bin/finger/pathnames.h
index 7c9ad19abcb61..160252d411832 100644
--- a/usr.bin/finger/pathnames.h
+++ b/usr.bin/finger/pathnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/pathnames.h,v 1.5 2001/07/30 16:50:47 yar Exp $
  */
 
 #ifndef PATHNAMES_H
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index e4f768b300003..157b51d7db444 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/sprint.c,v 1.23 2006/03/04 16:13:16 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index a84c711745c7a..0a6c53c0612d0 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/finger/util.c,v 1.22 2005/09/19 10:11:47 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile
index b15d254d39368..b8b70b3237f4e 100644
--- a/usr.bin/fmt/Makefile
+++ b/usr.bin/fmt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fmt/Makefile,v 1.8 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	fmt
 
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 162bcab0f9d2a..6480c82efe976 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fmt/fmt.1,v 1.14 2004/08/02 11:12:13 tjr Exp $
 .\"
 .\" Modified by Gareth McCaughan to describe the new version of `fmt'
 .\" rather than the old one.
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 33f92b1b82d55..853695fca4e9c 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -173,7 +173,7 @@ static const char copyright[] =
   "Copyright (c) 1997 Gareth McCaughan. All rights reserved.\n";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fmt/fmt.c,v 1.22 2004/08/02 11:10:20 tjr Exp $");
 
 #include <err.h>
 #include <locale.h>
diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile
index d73d0a7cee437..df19735226747 100644
--- a/usr.bin/fold/Makefile
+++ b/usr.bin/fold/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fold/Makefile,v 1.3 2002/02/08 22:31:39 markm Exp $
 
 PROG=	fold
 
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 7cc01298add73..bb8d04a2385ba 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fold/fold.1,v 1.13 2006/12/15 11:23:59 ru Exp $
 .\"
 .Dd December 15, 2006
 .Dt FOLD 1
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 59d8fc59adfdd..c0a92b9ce5a60 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fold/fold.c,v 1.13 2004/06/24 15:12:29 tjr Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile
index 57b966353fdc1..63315d51cee05 100644
--- a/usr.bin/from/Makefile
+++ b/usr.bin/from/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/from/Makefile,v 1.3 2002/02/08 22:31:39 markm Exp $
 
 PROG=	from
 
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 071298561d74f..429203daa3336 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/from/from.1,v 1.16 2006/12/18 15:36:31 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 84d0c52b23a3a..51f3222f2532d 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/from/from.c,v 1.14 2002/09/04 23:29:00 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 8ca57b992bc82..eee3ce513b23d 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fstat/Makefile,v 1.9 2004/10/21 12:09:45 phk Exp $
 
 PROG=	fstat
 SRCS=	cd9660.c fstat.c msdosfs.c
diff --git a/usr.bin/fstat/cd9660.c b/usr.bin/fstat/cd9660.c
index 1c26e8d854a89..a86964eec4546 100644
--- a/usr.bin/fstat/cd9660.c
+++ b/usr.bin/fstat/cd9660.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fstat/cd9660.c,v 1.6 2005/03/16 10:24:16 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 91bf4d27530df..5b025af511c0c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fstat/fstat.1,v 1.26 2005/02/13 22:25:22 ru Exp $
 .\"
 .Dd March 27, 2002
 .Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 26c9ad4984c90..c5e49a260ed04 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fstat/fstat.c,v 1.64 2007/03/09 16:21:40 emaste Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index dda8bbf7906b9..66f47260f74a2 100644
--- a/usr.bin/fstat/fstat.h
+++ b/usr.bin/fstat/fstat.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fstat/fstat.h,v 1.6 2004/06/29 21:28:09 dwmalone Exp $
  */
 
 #ifndef	__FSTAT_H__
diff --git a/usr.bin/fstat/msdosfs.c b/usr.bin/fstat/msdosfs.c
index 5bae63e4b5eb0..720a6ebf71a1a 100644
--- a/usr.bin/fstat/msdosfs.c
+++ b/usr.bin/fstat/msdosfs.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fstat/msdosfs.c,v 1.9 2004/06/29 21:28:09 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile
index 42aa6ddec6658..f71790f4f8b89 100644
--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fsync/Makefile,v 1.5 2005/01/25 14:12:01 ssouhlal Exp $
 
 PROG=	fsync
 
diff --git a/usr.bin/fsync/fsync.1 b/usr.bin/fsync/fsync.1
index 0cc41d3ceb05a..ee77227d356a6 100644
--- a/usr.bin/fsync/fsync.1
+++ b/usr.bin/fsync/fsync.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fsync/fsync.1,v 1.7 2005/01/26 06:42:45 ssouhlal Exp $
 .\"
 .Dd January 25, 2005
 .Dt FSYNC 1
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 78aeb21baa215..82ccf71d1c600 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -27,7 +27,7 @@
 #ifndef lint
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/fsync/fsync.c,v 1.7 2005/01/26 15:17:25 delphij Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index c2fe59cd4b1fe..65e6274ae1912 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ftp/Makefile,v 1.18 2006/07/27 14:20:13 yar Exp $
 #	$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/config.h b/usr.bin/ftp/config.h
index 77dff70747ce1..26dbd6c21712b 100644
--- a/usr.bin/ftp/config.h
+++ b/usr.bin/ftp/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/ftp/config.h,v 1.3 2002/06/15 09:42:17 mikeh Exp $ */
 
 
 /* config.h.  Generated automatically by configure.  */
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index 5ab51cf5c7eb6..472a7d052d503 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gcore/Makefile,v 1.9 2004/11/27 06:46:48 das Exp $
 
 PROG=	gcore
 SRCS=	elfcore.c gcore.c
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 2c27a64aba1d4..afe8950cf889c 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gcore/elfcore.c,v 1.19 2007/04/10 17:37:53 emaste Exp $");
 
 #include <sys/param.h>
 #include <sys/procfs.h>
diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index 1bd70954794fb..64b2ebe3b9369 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gcore/extern.h,v 1.4 2002/09/13 16:33:35 peter Exp $
  */
 
 struct dumpers {
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index 981e0be3b346a..dfe6d821c9f7a 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gcore/gcore.1,v 1.15 2004/07/03 00:24:40 ru Exp $
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 7005e834ff913..b7846d291535c 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gcore/gcore.c,v 1.31 2004/02/15 22:48:25 dwmalone Exp $");
 
 /*
  * Originally written by Eric Cooper in Fall 1981.
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index a6c9991bb5b90..d59655138438c 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gencat/Makefile,v 1.9 2005/06/30 11:56:31 johan Exp $
 
 PROG=	gencat
 WARNS?=	6
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index eed6764284877..b4d5f03bab240 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gencat/gencat.1,v 1.12 2005/01/17 07:44:17 ru Exp $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 306f48d3d7bd7..c419f2d92c627 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -72,7 +72,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gencat/gencat.c,v 1.12 2005/02/27 19:37:51 ru Exp $");
 
 #define _NLS_PRIVATE
 
diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile
index eaaf628aad374..8b035ab4392b9 100644
--- a/usr.bin/getconf/Makefile
+++ b/usr.bin/getconf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getconf/Makefile,v 1.4 2002/11/25 09:00:05 ru Exp $
 
 PROG=	getconf
 
diff --git a/usr.bin/getconf/confstr.gperf b/usr.bin/getconf/confstr.gperf
index c629987e5caf8..929a8fd1350af 100644
--- a/usr.bin/getconf/confstr.gperf
+++ b/usr.bin/getconf/confstr.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/confstr.gperf,v 1.5 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/fake-gperf.awk b/usr.bin/getconf/fake-gperf.awk
index 96fcd3c9977c2..b3107fe40e02a 100644
--- a/usr.bin/getconf/fake-gperf.awk
+++ b/usr.bin/getconf/fake-gperf.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getconf/fake-gperf.awk,v 1.3 2003/08/22 17:32:07 markm Exp $
 BEGIN {
   state = 0;
   struct_seen = "";
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index c3baed94b1fa0..35e4d7e680c2a 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getconf/getconf.1,v 1.14 2005/01/18 13:43:49 ru Exp $
 .\"
 .Dd September 18, 2002
 .Dt GETCONF 1
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 5f88db6cbe186..5ee262d8ef295 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/getconf/getconf.c,v 1.10 2006/12/06 12:00:26 maxim Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/getconf/getconf.h b/usr.bin/getconf/getconf.h
index 266a0ff3b0512..3f7e412f9dc75 100644
--- a/usr.bin/getconf/getconf.h
+++ b/usr.bin/getconf/getconf.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/getconf.h,v 1.4 2002/10/27 04:14:08 wollman Exp $
  */
 
 #ifdef STABLE
diff --git a/usr.bin/getconf/limits.gperf b/usr.bin/getconf/limits.gperf
index 68e0d65e78ff5..ceb93db334715 100644
--- a/usr.bin/getconf/limits.gperf
+++ b/usr.bin/getconf/limits.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/limits.gperf,v 1.2 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/pathconf.gperf b/usr.bin/getconf/pathconf.gperf
index e8b83659d80f4..00a934592a170 100644
--- a/usr.bin/getconf/pathconf.gperf
+++ b/usr.bin/getconf/pathconf.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/pathconf.gperf,v 1.4 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf
index 40ce16a160690..13656e33aa790 100644
--- a/usr.bin/getconf/progenv.gperf
+++ b/usr.bin/getconf/progenv.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/progenv.gperf,v 1.3 2005/02/18 21:53:05 wollman Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getconf/sysconf.gperf b/usr.bin/getconf/sysconf.gperf
index ae88464a0b742..945f7ab47284e 100644
--- a/usr.bin/getconf/sysconf.gperf
+++ b/usr.bin/getconf/sysconf.gperf
@@ -2,7 +2,7 @@
 /*
  * Copyright is disclaimed as to the contents of this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/getconf/sysconf.gperf,v 1.5 2003/08/22 17:32:07 markm Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getent/Makefile b/usr.bin/getent/Makefile
index 6cc3d56cfd1e7..f6350effabb1d 100644
--- a/usr.bin/getent/Makefile
+++ b/usr.bin/getent/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getent/Makefile,v 1.2 2006/05/04 09:01:54 maxim Exp $
 
 PROG=	getent
 WARNS?=	3
diff --git a/usr.bin/getent/getent.1 b/usr.bin/getent/getent.1
index a18d3411d67da..f253084e2cf86 100644
--- a/usr.bin/getent/getent.1
+++ b/usr.bin/getent/getent.1
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getent/getent.1,v 1.2 2006/09/30 17:27:50 ru Exp $
 .\"
 .Dd August 24, 2005
 .Dt GETENT 1
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index d7558135b6f23..6ac5b141c497a 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/getent/getent.c,v 1.3 2007/02/04 20:52:57 rse Exp $");
 
 #include <sys/socket.h>
 #include <sys/param.h>
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index 01dfa87e2935f..7a633ee477eb1 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getopt/Makefile,v 1.5 2002/02/08 22:31:40 markm Exp $
 #
 
 PROG = getopt
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 771a2e73645f0..53bc1ea46fc79 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getopt/getopt.1,v 1.23 2005/02/13 22:25:22 ru Exp $
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index 33637604f26f2..a897b4105e7d8 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/getopt/getopt.c,v 1.10 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile
index a24d9cda6c81f..9fa5a90f7449a 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/29/93
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/gprof/Makefile,v 1.8 2004/06/20 11:05:25 stefanf Exp $
 
 PROG=	gprof
 SRCS=	gprof.c aout.c arcs.c dfn.c elf.c lookup.c hertz.c \
diff --git a/usr.bin/gprof/amd64.h b/usr.bin/gprof/amd64.h
index 823d6562d105b..c869875864a82 100644
--- a/usr.bin/gprof/amd64.h
+++ b/usr.bin/gprof/amd64.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/amd64.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/aout.c b/usr.bin/gprof/aout.c
index 2ccf818f42e01..6afa3c48f7ebc 100644
--- a/usr.bin/gprof/aout.c
+++ b/usr.bin/gprof/aout.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/aout.c,v 1.7 2004/06/20 11:05:25 stefanf Exp $");
 
 #include <netinet/in.h>
 
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 3be00dffbc6aa..10d87a7e706ac 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/arcs.c,v 1.12 2004/06/20 11:05:25 stefanf Exp $");
 
 #include <err.h>
 #include "gprof.h"
diff --git a/usr.bin/gprof/arm.h b/usr.bin/gprof/arm.h
index 823d6562d105b..c7d626d0a22f4 100644
--- a/usr.bin/gprof/arm.h
+++ b/usr.bin/gprof/arm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/arm.h,v 1.1 2004/05/14 13:44:04 cognet Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index 0e23a87a22bfe..6658432ceb669 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)dfn.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/dfn.c,v 1.5 2002/10/16 13:50:09 charnier Exp $");
 
 #include <err.h>
 #include "gprof.h"
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index b0af431dc5a16..26d5428e80308 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/elf.c,v 1.5 2002/10/16 13:50:09 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index b340ed9d67c11..d0c7e890649e3 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gprof/gprof.1,v 1.29 2005/10/07 11:58:46 bde Exp $
 .\"
 .Dd October 7, 2005
 .Dt GPROF 1
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index cfb9fab2cc9bd..9b7dab1f572eb 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/gprof.c,v 1.24 2004/07/11 17:37:33 stefanf Exp $");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index d5b4ee1124cf5..c5837d6d34ae6 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gprof.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/gprof.h,v 1.25 2006/08/23 12:11:18 ru Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index cf8a3ae68523d..2ef289b487a97 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hertz.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/hertz.c,v 1.3 2004/10/03 18:22:35 stefanf Exp $");
 
 #include <sys/time.h>
 
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index 823d6562d105b..a6e9bb73aff11 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/i386.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/ia64.h b/usr.bin/gprof/ia64.h
index 823d6562d105b..4fe478b8965ff 100644
--- a/usr.bin/gprof/ia64.h
+++ b/usr.bin/gprof/ia64.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/ia64.h,v 1.2 2002/02/21 07:12:57 bde Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/kernel.c b/usr.bin/gprof/kernel.c
index dc456f5f97a96..cfc0870c3b946 100644
--- a/usr.bin/gprof/kernel.c
+++ b/usr.bin/gprof/kernel.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/kernel.c,v 1.5 2004/10/05 23:50:10 green Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index f51da9829f743..4716453f1b54b 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/lookup.c,v 1.5 2002/10/16 13:50:09 charnier Exp $");
 
 #include "gprof.h"
 
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index 0dcd78c6af47f..7a9d8ff9211c6 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- *  $FreeBSD$
+ *  $FreeBSD: src/usr.bin/gprof/pathnames.h,v 1.2 2002/10/16 13:50:09 charnier Exp $
  */
 
 #define	_PATH_FLAT_BLURB	"/usr/share/misc/gprof.flat"
diff --git a/usr.bin/gprof/powerpc.h b/usr.bin/gprof/powerpc.h
index 823d6562d105b..b82e988049636 100644
--- a/usr.bin/gprof/powerpc.h
+++ b/usr.bin/gprof/powerpc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/powerpc.h,v 1.1 2005/12/29 04:23:54 grehan Exp $
  */
 
     /*
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 41c1c1f5c2557..6f7984a5088a5 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/printgprof.c,v 1.13 2005/10/07 10:59:41 bde Exp $");
 
 #include <err.h>
 #include <string.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index ed68bcc0d3136..1ec8cdb748758 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/gprof/printlist.c,v 1.6 2004/05/24 12:44:00 stefanf Exp $");
 
 #include <err.h>
 #include <string.h>
diff --git a/usr.bin/gprof/sparc64.h b/usr.bin/gprof/sparc64.h
index 823d6562d105b..a4b64254fe135 100644
--- a/usr.bin/gprof/sparc64.h
+++ b/usr.bin/gprof/sparc64.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gprof/sparc64.h,v 1.1 2002/03/10 01:25:47 jake Exp $
  */
 
     /*
diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile
index dae5f842a32e1..b1b66e58f9114 100644
--- a/usr.bin/gzip/Makefile
+++ b/usr.bin/gzip/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.10 2006/05/12 02:01:15 mrg Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gzip/Makefile,v 1.2 2007/02/10 13:49:39 simon Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/gzip/gzexe b/usr.bin/gzip/gzexe
index 5f5424e71039e..5809133ddf23d 100644
--- a/usr.bin/gzip/gzexe
+++ b/usr.bin/gzip/gzexe
@@ -18,7 +18,7 @@
 #  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 #  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gzip/gzexe,v 1.1 2007/01/26 10:19:07 delphij Exp $
 
 # The number of lines plus one in the on-the-fly decompression script
 lines=19
diff --git a/usr.bin/gzip/gzexe.1 b/usr.bin/gzip/gzexe.1
index 019503747ba6c..0c514c4f8b747 100644
--- a/usr.bin/gzip/gzexe.1
+++ b/usr.bin/gzip/gzexe.1
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gzip/gzexe.1,v 1.1 2007/01/26 10:19:07 delphij Exp $
 .Dd January 26, 2007
 .Dt GZEXE 1
 .Os
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1
index a50df2b8746e7..ebcbf38e6541c 100644
--- a/usr.bin/gzip/gzip.1
+++ b/usr.bin/gzip/gzip.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gzip/gzip.1,v 1.4 2007/06/06 02:51:54 delphij Exp $
 .Dd June 6, 2007
 .Dt GZIP 1
 .Os
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 8711a20c23540..23721fd03a139 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green\n\
      All rights reserved.\n");
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/gzip/gzip.c,v 1.4 2007/07/12 01:17:14 delphij Exp $");
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gzip/unbzip2.c b/usr.bin/gzip/unbzip2.c
index 1f708c9a42fca..e84437a507623 100644
--- a/usr.bin/gzip/unbzip2.c
+++ b/usr.bin/gzip/unbzip2.c
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gzip/unbzip2.c,v 1.1 2007/01/26 10:19:07 delphij Exp $
  */
 
 /* This file is #included by gzip.c */
diff --git a/usr.bin/gzip/zdiff b/usr.bin/gzip/zdiff
index 34caf2bdfb839..5ecc1b0e98cc2 100644
--- a/usr.bin/gzip/zdiff
+++ b/usr.bin/gzip/zdiff
@@ -22,7 +22,7 @@
 # Agency (DARPA) and Air Force Research Laboratory, Air Force
 # Materiel Command, USAF, under agreement number F39502-99-1-0512.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gzip/zdiff,v 1.1 2007/01/26 10:19:07 delphij Exp $
 
 # Set $prog based on $0
 case $0 in
diff --git a/usr.bin/gzip/zdiff.1 b/usr.bin/gzip/zdiff.1
index 2a6a4c8c74a80..f37ad29e54646 100644
--- a/usr.bin/gzip/zdiff.1
+++ b/usr.bin/gzip/zdiff.1
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gzip/zdiff.1,v 1.1 2007/01/26 10:19:07 delphij Exp $
 .Dd January 26, 2007
 .Dt ZDIFF 1
 .Os
diff --git a/usr.bin/gzip/zforce b/usr.bin/gzip/zforce
index 3b7324c6ef5a4..243cbdf51e655 100644
--- a/usr.bin/gzip/zforce
+++ b/usr.bin/gzip/zforce
@@ -18,7 +18,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gzip/zforce,v 1.1 2007/01/26 10:19:07 delphij Exp $
 prog=`basename $0`
 USAGE="usage: $prog file ..."
 if test $# -eq 0; then
diff --git a/usr.bin/gzip/zforce.1 b/usr.bin/gzip/zforce.1
index efcc4215e2b9d..933d68104c2db 100644
--- a/usr.bin/gzip/zforce.1
+++ b/usr.bin/gzip/zforce.1
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gzip/zforce.1,v 1.1 2007/01/26 10:19:07 delphij Exp $
 .Dd January 26, 2007
 .Dt ZFORCE 1
 .Os
diff --git a/usr.bin/gzip/zmore b/usr.bin/gzip/zmore
index 46a4eb482bda6..6d7d22e6f1817 100644
--- a/usr.bin/gzip/zmore
+++ b/usr.bin/gzip/zmore
@@ -22,7 +22,7 @@
 # Agency (DARPA) and Air Force Research Laboratory, Air Force
 # Materiel Command, USAF, under agreement number F39502-99-1-0512.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gzip/zmore,v 1.1 2007/01/26 10:19:07 delphij Exp $
 
 # Pull out any command line flags so we can pass them to more/less
 flags=
diff --git a/usr.bin/gzip/zmore.1 b/usr.bin/gzip/zmore.1
index 1bd349d209be2..74ae8bde5c73e 100644
--- a/usr.bin/gzip/zmore.1
+++ b/usr.bin/gzip/zmore.1
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gzip/zmore.1,v 1.1 2007/01/26 10:19:07 delphij Exp $
 .Dd January 26, 2007
 .Dt ZMORE 1
 .Os
diff --git a/usr.bin/gzip/znew b/usr.bin/gzip/znew
index e3e4cce29c3ac..565b24b22541c 100644
--- a/usr.bin/gzip/znew
+++ b/usr.bin/gzip/znew
@@ -18,7 +18,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gzip/znew,v 1.1 2007/01/26 10:19:07 delphij Exp $
 
 # Return 0 if the first arg file size is smaller than the second, 1 otherwise.
 smaller () {
diff --git a/usr.bin/gzip/znew.1 b/usr.bin/gzip/znew.1
index 0da5a6281f6ce..61060ca0feff2 100644
--- a/usr.bin/gzip/znew.1
+++ b/usr.bin/gzip/znew.1
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gzip/znew.1,v 1.1 2007/01/26 10:19:07 delphij Exp $
 .Dd January 26, 2007
 .Dt ZNEW 1
 .Os
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
index 82b7a475be88f..d49caca61d583 100644
--- a/usr.bin/gzip/zuncompress.c
+++ b/usr.bin/gzip/zuncompress.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  * from: NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gzip/zuncompress.c,v 1.1 2007/01/26 10:19:07 delphij Exp $
  */
 
 /* This file is #included by gzip.c */
diff --git a/usr.bin/head/Makefile b/usr.bin/head/Makefile
index 002b3f385b3ea..98fb9ff7929be 100644
--- a/usr.bin/head/Makefile
+++ b/usr.bin/head/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/head/Makefile,v 1.2 2007/01/11 17:03:51 brooks Exp $
 
 PROG=	head
 WARNS=	6
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 81346182e650d..f0021c9e7275d 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/head/head.1,v 1.13 2005/01/17 07:44:18 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index 5de0cba13168b..a831685e284ad 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/head/head.c,v 1.20 2007/01/11 20:23:01 brooks Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hesinfo/Makefile b/usr.bin/hesinfo/Makefile
index 870db2887d7b6..c4c46764ffc06 100644
--- a/usr.bin/hesinfo/Makefile
+++ b/usr.bin/hesinfo/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/hesinfo/Makefile,v 1.3 2002/02/08 22:31:40 markm Exp $
 
 PROG=	hesinfo
 
diff --git a/usr.bin/hesinfo/hesinfo.1 b/usr.bin/hesinfo/hesinfo.1
index 7ab2d35d4a301..004b4070290a4 100644
--- a/usr.bin/hesinfo/hesinfo.1
+++ b/usr.bin/hesinfo/hesinfo.1
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hesinfo/hesinfo.1,v 1.6 2005/02/09 18:04:22 ru Exp $
 .\"
 .Dd October 27, 1996
 .Dt HESINFO 1
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index fa81864a5d008..503d46c46f868 100644
--- a/usr.bin/hesinfo/hesinfo.c
+++ b/usr.bin/hesinfo/hesinfo.c
@@ -19,7 +19,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hesinfo/hesinfo.c,v 1.7 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
index 3252fc9af1479..22e1b59f64ce3 100644
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/hexdump/Makefile,v 1.9 2004/07/22 13:14:42 johan Exp $
 
 PROG=	hexdump
 SRCS=	conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 96dc2d64c43bf..9360c714fce0b 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -35,7 +35,7 @@
 static const char sccsid[] = "@(#)conv.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.9 2006/07/31 14:17:04 jkoshy Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index db04c49aade5a..6cf3aa80d8e81 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/display.c,v 1.22 2004/08/04 02:47:32 tjr Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 4d8c2daefecc9..cbf17d6033d42 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hexdump/hexdump.1,v 1.22 2005/01/17 07:44:18 ru Exp $
 .\"
 .Dd July 10, 2004
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 2ed7c4b9df490..78df723fa4361 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/hexdump.c,v 1.7 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <locale.h>
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 9a1198f45cf5d..a984287869865 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hexdump.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/hexdump/hexdump.h,v 1.9 2004/07/11 01:11:12 tjr Exp $
  */
 
 #include <wchar.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 4d21611f6a3fa..a510db35e9ae7 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/hexsyntax.c,v 1.12 2002/09/04 23:29:01 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 9bf796762107a..18414f6871531 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.21 2006/12/24 14:23:35 ru Exp $
 .\"
 .Dd December 24, 2006
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index e0f9283bbc220..c144d2fe55280 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.17 2004/07/22 13:14:42 johan Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index ef19278b486ad..8199ddd91c82f 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.14 2006/08/09 19:12:10 maxim Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 986191466a9be..21e069f1745ee 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/host/Makefile,v 1.13 2007/06/02 23:19:57 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 96c162f7565a8..2420f94fc6074 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/id/Makefile,v 1.12 2006/09/23 12:30:31 rwatson Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index 771b0d0c0c3b2..00c030ba8d2c2 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/groups.1,v 1.10 2006/12/23 17:14:01 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index b14e4e56cbfa1..c92c29a9c3661 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/id.1,v 1.18 2006/09/26 22:28:12 ceri Exp $
 .\"
 .Dd September 26, 2006
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index d18e8b0ea788e..f54c11063f0ef 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/id/id.c,v 1.33.2.1 2007/10/30 13:17:02 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/mac.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 958570df5fccf..568fbaf147c17 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/whoami.1,v 1.9 2005/01/17 07:44:19 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
diff --git a/usr.bin/indent/README b/usr.bin/indent/README
index 03d5d3d8d39e8..a796b4614647b 100644
--- a/usr.bin/indent/README
+++ b/usr.bin/indent/README
@@ -1,5 +1,5 @@
 
-  $FreeBSD$
+  $FreeBSD: src/usr.bin/indent/README,v 1.2 2002/10/16 13:58:39 charnier Exp $
 
 This is the C indenter, it originally came from the University of Illinois
 via some distribution tape for PDP-11 Unix.  It has subsequently been
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index f139de5884041..cc6deea06a10e 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/args.c,v 1.15 2004/09/19 20:34:30 das Exp $");
 
 /*
  * Argument scanning and profile reading code.  Default parameters are set
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index f04e13d5f4263..b71e37b650f68 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/indent/indent.1,v 1.27 2005/07/31 03:30:45 keramida Exp $
 .\"
 .Dd June 29, 2004
 .Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 9917960446a88..47962f1e42aa2 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/indent.c,v 1.25 2006/09/13 05:06:12 charnier Exp $");
 
 #include <sys/param.h>
 #include <err.h>
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index 4c52bf8370e42..ac40f01b04841 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -25,7 +25,7 @@
  */
 
 #if 0
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/indent.h,v 1.2 2002/03/30 17:10:20 dwmalone Exp $");
 #endif
 
 void	addkey(char *, int);
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index e1ff294e25765..008bf2b41a9f7 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_codes.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/indent/indent_codes.h,v 1.2 2000/12/09 09:52:51 obrien Exp $
  */
 
 #define newline		1
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index 11ea239571b02..c5ab2a072e81e 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_globs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/indent/indent_globs.h,v 1.11 2005/11/13 20:37:25 dwmalone Exp $
  */
 
 #define BACKSLASH '\\'
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 1e36582d5bf84..3560d5d112cc9 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/io.c,v 1.15 2005/11/13 20:37:25 dwmalone Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 60fc1aee9eea3..39f9b49a1a998 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/lexi.c,v 1.19 2005/11/20 13:48:15 dds Exp $");
 
 /*
  * Here we have the token scanner for indent.  It scans off one token and puts
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 65d9a6bb8c475..7720ff147acf5 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/parse.c,v 1.10 2003/06/15 09:28:17 charnier Exp $");
 
 #include <stdio.h>
 #include "indent_globs.h"
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 9524bf404f190..ad7fe2e7f6077 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)pr_comment.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/indent/pr_comment.c,v 1.8 2003/06/15 09:28:17 charnier Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 9c0e45c0702cc..c369399219c5d 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcrm/Makefile,v 1.6 2002/02/08 22:31:40 markm Exp $
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 9e2a4700dc21d..7fa3c79ac563e 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.14 2007/03/09 12:45:00 ru Exp $
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 8c039aefd01e1..8f93b483bccd2 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ipcrm/ipcrm.c,v 1.11 2002/09/04 23:29:02 dwmalone Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index af767776af9ab..9024c6ac35e39 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcs/Makefile,v 1.7 2004/02/05 22:44:24 ru Exp $
 
 PROG=	ipcs
 DPADD=	${LIBKVM}
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 7d231342d68be..0e94097bc4c81 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.21 2005/01/18 13:43:49 ru Exp $
 .\"
 .Dd March 24, 2004
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 9424e67dc4579..efc8f69e04f86 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ipcs/ipcs.c,v 1.29 2006/05/15 08:20:38 maxim Exp $");
 
 #include <assert.h>
 #include <err.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index ed828a7deed31..d5e1bbb3c2574 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/join/join.1,v 1.21 2006/12/21 10:59:48 ru Exp $
 .\"
 .Dd July 5, 2004
 .Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 097ecbe743f9b..52ffac2bfdbca 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/join/join.c,v 1.20 2004/08/26 06:28:05 maxim Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 662600eef0a8f..7804b92f282a6 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/jot/Makefile,v 1.4 2002/02/08 22:31:40 markm Exp $
 
 PROG=	jot
 
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 77cebb403a5ad..3e6488d9f795f 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/jot/jot.1,v 1.23 2006/11/06 15:11:50 dds Exp $
 .\"
 .Dd November 6, 2006
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 2e58968865866..dfed0fc6ac94c 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/jot/jot.c,v 1.37 2006/12/09 15:23:20 delphij Exp $");
 
 /*
  * jot - print sequential or random data
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 2ca8561c4eb90..e6700f0b7b0a5 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kdump/Makefile,v 1.12 2006/05/20 14:27:22 netchild Exp $
 
 .PATH: ${.CURDIR}/../ktrace
 
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index fc4037456274b..8b19405c1aa01 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/kdump/kdump.1,v 1.15 2005/11/18 10:36:28 ru Exp $
 .\"
 .Dd November 12, 2005
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index c3778b0f47f62..1bab941217518 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.37.2.1.2.1 2008/01/12 00:07:50 jhb Exp $");
 
 #define _KERNEL
 extern int errno;
diff --git a/usr.bin/kdump/kdump_subr.h b/usr.bin/kdump/kdump_subr.h
index 21d85a97eb249..96473a57383df 100644
--- a/usr.bin/kdump/kdump_subr.h
+++ b/usr.bin/kdump/kdump_subr.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/kdump/kdump_subr.h,v 1.3 2007/04/09 22:04:27 emaste Exp $ */
 
 void signame (int);
 void semctlname (int);
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index fbbd2b1010a80..d67af2ee8b4f0 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,6 +1,6 @@
 set -e
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kdump/mkioctls,v 1.39 2007/07/14 21:49:24 rwatson Exp $
 
 if [ "x$1" = "x-s" ]; then
 	use_switch=1
diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr
index 22db125306253..b108b0fde2a72 100644
--- a/usr.bin/kdump/mksubr
+++ b/usr.bin/kdump/mksubr
@@ -16,7 +16,7 @@ set -e
 # that the auto_*_type() functions are inappropriate for.
 # MANUAL: Manually entered and must therefore be manually updated.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kdump/mksubr,v 1.9 2007/04/09 19:16:24 emaste Exp $
 
 LC_ALL=C; export LC_ALL
 
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index bf279eb25b22b..776568cb44ab1 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogin/Makefile,v 1.3 1999/08/28 01:02:27 peter Exp $
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index 8a3927dfb65a5..5d55b2443c0a9 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.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.8 2004/07/03 00:24:41 ru Exp $
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
diff --git a/usr.bin/keylogin/keylogin.c b/usr.bin/keylogin/keylogin.c
index 8e10d957b3ef7..484efb40f8f48 100644
--- a/usr.bin/keylogin/keylogin.c
+++ b/usr.bin/keylogin/keylogin.c
@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)keylogin.c 1.4 91/03/11 Copyr 1986 Sun Micro";
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/keylogin/keylogin.c,v 1.4 2002/06/30 05:25:01 obrien Exp $");
 
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index 1f5feec6e9d0d..07a67120a520b 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogout/Makefile,v 1.4 2004/02/04 11:59:07 ru Exp $
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.1 b/usr.bin/keylogout/keylogout.1
index 6d643c90d1ad0..485e120790240 100644
--- a/usr.bin/keylogout/keylogout.1
+++ b/usr.bin/keylogout/keylogout.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keylogout/keylogout.1,v 1.5 2002/04/20 12:14:57 charnier Exp $
 .\" @(#)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 e4fcf21adbeb1..a7169ce48261b 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/keylogout/keylogout.c,v 1.5 2002/06/30 05:25:01 obrien Exp $");
 
 /*
  * unset the secret key on local machine
diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile
index ff772a800aecf..584e6d82b29e2 100644
--- a/usr.bin/killall/Makefile
+++ b/usr.bin/killall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/killall/Makefile,v 1.4 2000/08/28 22:09:38 peter Exp $
 
 PROG=	killall
 
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 816ea812194ad..9af4e874da7b5 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/killall/killall.1,v 1.34.10.1 2007/11/14 19:22:42 ru Exp $
 .\"
 .Dd November 9, 2007
 .Os
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index b991b15ad9378..9cb529f6c69e8 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/killall/killall.c,v 1.31.18.1 2007/11/14 19:18:40 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/jail.h>
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index c00bb7510459b..542046efc5a07 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ktrace/Makefile,v 1.6 1999/08/28 01:02:32 peter Exp $
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 0260b1ea2af1e..e4ccd8473c5ec 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ktrace/ktrace.1,v 1.18 2006/11/06 15:17:50 trhodes Exp $
 .\"
 .Dd November 6, 2006
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 727e52ffb6c29..973b78b7ec24a 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ktrace.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ktrace/ktrace.c,v 1.22 2007/02/13 00:22:29 mpp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 058fbd7e01ba6..c699fffa3f26a 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ktrace/ktrace.h,v 1.4 2002/04/28 13:00:16 markm Exp $
  */
 
 #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 01d7b43a3fcb1..950962a5f3df5 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ktrace/subr.c,v 1.13 2004/11/27 06:51:38 das Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile
index 6b5ff127165f0..caacccb32294d 100644
--- a/usr.bin/ktrdump/Makefile
+++ b/usr.bin/ktrdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ktrdump/Makefile,v 1.3 2002/06/06 11:27:03 ru Exp $
 
 PROG=	ktrdump
 DPADD=	${LIBKVM}
diff --git a/usr.bin/ktrdump/ktrdump.8 b/usr.bin/ktrdump/ktrdump.8
index 1e0e8c94208eb..41fbb2182735d 100644
--- a/usr.bin/ktrdump/ktrdump.8
+++ b/usr.bin/ktrdump/ktrdump.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ktrdump/ktrdump.8,v 1.8 2005/06/14 11:50:52 ru Exp $
 .\"
 .Dd March 8, 2005
 .Dt KTRDUMP 8
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index 69a1bf18784f6..7e199d97b9cf5 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ktrdump/ktrdump.c,v 1.14 2006/01/12 22:32:07 glebius Exp $");
 
 #include <sys/types.h>
 #include <sys/ktr.h>
diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile
index 08b73286dfc48..062e4817e5b8b 100644
--- a/usr.bin/lam/Makefile
+++ b/usr.bin/lam/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lam/Makefile,v 1.3 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lam
 
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 67dee0799738c..663fe017c1f7c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lam/lam.1,v 1.14 2006/10/20 04:31:01 cperciva Exp $
 .\"
 .Dd August 12, 2004
 .Dt LAM 1
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 333549fe17a12..b837bea72ca80 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lam/lam.c,v 1.14 2005/08/05 01:04:36 jmallett Exp $");
 
 /*
  *	lam - laminate files
diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile
index f7e88115e9b1f..0cfb97b6f8ef1 100644
--- a/usr.bin/last/Makefile
+++ b/usr.bin/last/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/last/Makefile,v 1.3 2002/02/08 22:31:41 markm Exp $
 
 PROG=	last
 
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index f838c4aab8a27..5ad73f9e68637 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/last/last.1,v 1.18 2005/02/13 22:25:23 ru Exp $
 .\"
 .Dd July 27, 2003
 .Dt LAST 1
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index d9877b423bb86..2de02d64a046d 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)last.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/last/last.c,v 1.34 2004/08/08 18:59:19 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index c79cd7442a4cd..a2a2089e85d1b 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lastcomm/Makefile,v 1.5 2007/05/22 06:51:37 dds Exp $
 
 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 1d714c5514f6c..66ee72578eb65 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lastcomm/lastcomm.1,v 1.17 2007/05/14 09:05:22 dds Exp $
 .\"
 .Dd May 14, 2007
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 8c551231a4fca..ca93c82a287f1 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lastcomm/lastcomm.c,v 1.27 2007/05/22 06:51:37 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 4883b2a4ef884..0e595acc07349 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lastcomm/readrec.c,v 1.1 2007/05/22 06:51:37 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index bb04f4550e322..5e3200690d93a 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13 2004/06/29 21:13:15 dwmalone Exp $
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/extern.h b/usr.bin/ldd/extern.h
index 4df6759b971db..936f52b2be23f 100644
--- a/usr.bin/ldd/extern.h
+++ b/usr.bin/ldd/extern.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ldd/extern.h,v 1.1 2002/04/28 12:55:35 markm Exp $
  */
 
 extern void	dump_file(const char *);
diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index 9dd7902fae030..e37b903d0cde4 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.24 2007/05/12 12:23:40 pav Exp $
 .\"
 .Dd October 22, 1993
 .Dt LDD 1
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 8e5e5d2f2bcfc..6880f36904061 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ldd/ldd.c,v 1.33 2002/10/19 10:18:29 sobomax Exp $");
 
 #include <sys/wait.h>
 
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index e6de90fcae384..c1288f99a6646 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ldd/sods.c,v 1.17 2004/06/29 21:13:15 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index 859c11cbf8453..801501f3e1351 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/leave/Makefile,v 1.5 2002/02/08 22:31:41 markm Exp $
 
 PROG=	leave
 
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 6c33367b85ab7..ada7c3f5f5335 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/leave/leave.1,v 1.10 2002/12/23 16:04:51 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt LEAVE 1
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 89c3f52857164..c1db13606cb09 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/leave/leave.c,v 1.12 2002/09/04 23:29:03 dwmalone Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index 663ee26a6cca3..311cb2f501523 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/Makefile,v 1.10 2005/05/17 11:41:01 ru Exp $
 
 PROG=	less
 SRCS=	main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c \
diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common
index fcc6ccfa1ce3c..8aea191fded1c 100644
--- a/usr.bin/less/Makefile.common
+++ b/usr.bin/less/Makefile.common
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/Makefile.common,v 1.4 2003/06/06 13:46:55 kuriyama Exp $
 
 LSDIR=	${.CURDIR}/../../contrib/less
 .PATH:	${LSDIR}
diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h
index bc1b7173f0c16..16d624ea925cf 100644
--- a/usr.bin/less/defines.h
+++ b/usr.bin/less/defines.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/less/defines.h,v 1.7.2.1 2007/12/04 22:37:27 delphij Exp $ */
 /* defines.h.  Generated from defines.h.in by configure.  */
 /* defines.h.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/usr.bin/less/lesspipe.sh b/usr.bin/less/lesspipe.sh
index f8202ff386db1..d9c18e5fae1a3 100644
--- a/usr.bin/less/lesspipe.sh
+++ b/usr.bin/less/lesspipe.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # ex:ts=8
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/lesspipe.sh,v 1.4 2007/05/24 18:28:08 le Exp $
 
 case "$1" in
 	*.Z)
diff --git a/usr.bin/less/zless.sh b/usr.bin/less/zless.sh
index b947b819f2c04..08ae728979426 100644
--- a/usr.bin/less/zless.sh
+++ b/usr.bin/less/zless.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/less/zless.sh,v 1.1 2005/05/17 11:14:11 des Exp $
 #
 
 export LESSOPEN="|/usr/bin/lesspipe.sh %s"
diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile
index bb8d1a68c5dcd..69ca336f0b9a3 100644
--- a/usr.bin/lessecho/Makefile
+++ b/usr.bin/lessecho/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lessecho/Makefile,v 1.4 2006/08/20 15:52:17 delphij Exp $
 
 PROG=	lessecho
 SRCS=	lessecho.c version.c
diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile
index b10bf6d5fa2bf..5d7878ce16af4 100644
--- a/usr.bin/lesskey/Makefile
+++ b/usr.bin/lesskey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lesskey/Makefile,v 1.3 2001/03/27 10:51:48 ru Exp $
 
 PROG=	lesskey
 SRCS=	lesskey.c version.c
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index 12e8ec32f61ff..1b076c98eda82 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,5 +1,5 @@
 // $Header: /home/daffy/u0/vern/flex/RCS/FlexLexer.h,v 1.19 96/05/25 20:43:02 vern Exp $
-// $FreeBSD$
+// $FreeBSD: src/usr.bin/lex/FlexLexer.h,v 1.4 2004/03/11 10:43:35 josef Exp $
 
 // FlexLexer.h -- define interfaces for lexical analyzer classes generated
 //		  by flex
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 6d0ea5b44ec23..20c68474f7dba 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/Makefile,v 1.20 2004/07/30 00:08:15 kan Exp $
 #
 # 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/ccl.c b/usr.bin/lex/ccl.c
index 025a914407ec9..da07f39ecccbd 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/ccl.c,v 2.9 93/09/16 20:32:14 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/ccl.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index 2e0b5b43747bb..f321b12333d7e 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,5 +1,5 @@
 /* config.h.  Generated automatically by configure.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/config.h,v 1.3 1999/08/28 05:08:16 peter Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 0853466f9ac2a..1f056284d949f 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/dfa.c,v 2.26 95/04/20 13:53:14 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/dfa.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index d647142f4054f..60ef676f0fa5f 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/ecs.c,v 2.9 93/12/07 10:18:20 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/ecs.c,v 1.6 2002/06/30 05:25:03 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 602095095fb27..066f9ab13e34c 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -2,7 +2,7 @@
 
 /* Scanner skeleton version:
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.8 2004/01/06 19:03:44 nectar Exp $
  */
 
 #if defined(__FreeBSD__)
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index 03651ea965b8e..a1e4f0dceb4bc 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -27,7 +27,7 @@
  */
 
 /* @(#) $Header: /home/daffy/u0/vern/flex/RCS/flexdef.h,v 2.53 95/04/20 11:17:36 vern Exp $ (LBL) */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/flexdef.h,v 1.6 2003/01/01 18:49:00 schweikh Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index 7ccf4da84a802..cb02ea4e95623 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/gen.c,v 2.56 96/05/25 20:43:38 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/gen.c,v 1.7 2004/01/06 18:54:55 nectar Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index a7316ba920371..35398d5860aa2 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -5,7 +5,7 @@
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/initscan.c,v 1.9 2002/08/25 13:22:44 charnier Exp $");
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
@@ -1276,7 +1276,7 @@ char *yytext;
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lex/initscan.c,v 1.9 2002/08/25 13:22:44 charnier Exp $";
 #endif /* not lint */
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/lex.1 b/usr.bin/lex/lex.1
index b41de37986a20..fecf68ce6d947 100644
--- a/usr.bin/lex/lex.1
+++ b/usr.bin/lex/lex.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lex/lex.1,v 1.18 2004/07/07 21:27:44 keramida Exp $
 .\"
 .TH FLEX 1 "April 1995" "Version 2.5"
 .SH NAME
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index dcc75185c0449..8a3cf5be9be0d 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/lib/Makefile,v 1.10.2.1 2007/10/23 15:41:34 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c
index 426eb98985d4e..2927e16ccf759 100644
--- a/usr.bin/lex/lib/libmain.c
+++ b/usr.bin/lex/lib/libmain.c
@@ -1,7 +1,7 @@
 /* libmain - flex run-time support library "main" function */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/libmain.c,v 1.4 95/09/27 12:47:55 vern Exp $
- * $FreeBSD$ */
+ * $FreeBSD: src/usr.bin/lex/lib/libmain.c,v 1.3 1999/10/27 07:56:49 obrien Exp $ */
 
 extern int yylex();
 
diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c
index 75c669c6ae947..f249e9d540062 100644
--- a/usr.bin/lex/lib/libyywrap.c
+++ b/usr.bin/lex/lib/libyywrap.c
@@ -1,7 +1,7 @@
 /* libyywrap - flex run-time support library "yywrap" function */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/libyywrap.c,v 1.1 93/10/02 15:23:09 vern Exp $
- * $FreeBSD$ */
+ * $FreeBSD: src/usr.bin/lex/lib/libyywrap.c,v 1.4 1999/10/27 07:56:49 obrien Exp $ */
 
 int yywrap()
 	{
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index f6adaa7c41c19..f1f68774da106 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -34,7 +34,7 @@ char copyright[] =
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/main.c,v 2.64 96/05/25 20:42:42 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/main.c,v 1.8 2002/06/30 05:25:04 obrien Exp $");
 
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 3eda5793650c6..a9dec4caf83a2 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/misc.c,v 2.47 95/04/28 11:39:39 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/misc.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 4b81284ff2ec1..1be59e5c01568 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/nfa.c,v 2.17 95/03/04 16:11:42 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/nfa.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index dc71379b3ee24..71c54154cdac2 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -34,7 +34,7 @@
  */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/parse.y,v 2.28 95/04/21 11:51:51 vern Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/parse.y,v 1.3 1999/10/27 07:56:46 obrien Exp $ */
 
 
 /* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index cee8a16d2deff..6ad8669775428 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -28,7 +28,7 @@
  */
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/scan.l,v 2.56 95/04/24 12:17:19 vern Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/scan.l,v 1.5 1999/10/27 07:56:46 obrien Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index 077015b78578e..8cecdedfc712e 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/sym.c,v 2.19 95/03/04 16:11:04 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/sym.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index 89973f08ba87b..32a3cfa9e608e 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/tblcmp.c,v 2.11 94/11/05 17:08:28 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/tblcmp.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/version.h b/usr.bin/lex/version.h
index 5dbdf94b67656..a9f3056abef77 100644
--- a/usr.bin/lex/version.h
+++ b/usr.bin/lex/version.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/version.h,v 1.3 1999/10/27 07:47:42 obrien Exp $ */
 
 #define FLEX_VERSION "2.5.4"
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index e90c5d4fee0ac..99e06f9b88f2d 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -28,7 +28,7 @@
 
 /* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.13 95/03/04 16:10:41 vern Exp $ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lex/yylex.c,v 1.6 2002/06/30 05:25:04 obrien Exp $");
 
 #include <ctype.h>
 #include "flexdef.h"
diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile
index 5999cdbe060c1..7caaac36f07ce 100644
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/limits/Makefile,v 1.5 2004/11/08 18:08:16 des Exp $
 
 PROG=	limits
 DPADD=	${LIBUTIL}
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 62efb85fe57ac..95bcb6dcf2403 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/limits/limits.1,v 1.29 2005/01/17 07:44:20 ru Exp $
 .\"
 .Dd September 18, 2002
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 0383ac2a11991..82d18e58ab903 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/limits/limits.c,v 1.17 2007/07/04 00:00:40 scf Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile
index d7f67e1aca814..aead6830b40fe 100644
--- a/usr.bin/locale/Makefile
+++ b/usr.bin/locale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locale/Makefile,v 1.4 2003/06/25 23:05:11 phantom Exp $
 
 PROG = locale
 CFLAGS += -I${.CURDIR}/../../lib/libc/locale
diff --git a/usr.bin/locale/locale.1 b/usr.bin/locale/locale.1
index e6b6451807878..0ec20e986387f 100644
--- a/usr.bin/locale/locale.1
+++ b/usr.bin/locale/locale.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locale/locale.1,v 1.8 2005/11/01 19:36:17 trhodes Exp $
 .\"
 .Dd November 1, 2005
 .Dt LOCALE 1
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index a4b6b40018399..d0e826dc9fbe4 100644
--- a/usr.bin/locale/locale.c
+++ b/usr.bin/locale/locale.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locale/locale.c,v 1.15 2004/08/02 12:50:12 tjr Exp $
  */
 
 /*
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 05b13580bf7d5..bc5d179c9bd6c 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile,v 1.7 2005/07/17 21:19:28 wosch Exp $
 
 
 SUBDIR=	bigram code locate
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 48174083d848b..5b2166eae5bfa 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile.inc,v 1.4 1999/08/28 01:02:52 peter Exp $
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index eb39dd16b51d4..ac544d449d5dd 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/bigram/Makefile,v 1.6 2004/12/21 08:47:30 ru Exp $
 
 PROG=	locate.bigram
 NO_MAN=
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 208824f22d2c0..a4ad2b1e86504 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/bigram/locate.bigram.c,v 1.12 2005/02/09 09:13:36 stefanf Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 20eef8c492128..4de4b8ab6d29f 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/code/Makefile,v 1.6 2004/12/21 08:47:30 ru Exp $
 
 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 6290c67201ef9..9f7850e16028c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/code/locate.code.c,v 1.13 2002/03/22 01:22:47 imp Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 9a618da4e8fa7..96320a1d34223 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/Makefile,v 1.15 2002/07/29 09:40:15 ru Exp $
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 156f21a725d22..a236332a8d0d1 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
 #
 # Sequence of databases is important.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/concatdb.sh,v 1.10 2000/01/12 08:01:00 kris Exp $
 
 # 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 e132dbd53e59b..9383f0735219f 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/fastfind.c,v 1.14 2005/12/07 12:22:46 des Exp $
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index c436cd44c6860..05c036ec52670 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.34 2006/09/29 15:20:45 ru Exp $
 .\"
 .Dd August 17, 2006
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 64ce7f95d472e..1333e3e8388f0 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/locate/locate/locate.c,v 1.17 2006/06/11 17:40:25 maxim Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 24df8d4002bed..100139de8fdc7 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
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/locate.h,v 1.7 1999/08/28 01:02:59 peter Exp $
  */
 
 /* 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 2d0f033a636b8..5246edcd67647 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)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/locate.rc,v 1.10 2007/07/19 21:00:08 jhb Exp $
 
 #
 # 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 2e2248f535f1b..12db435d434a8 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.12 2005/01/18 13:43:50 ru Exp $
 .\"
 .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 39d15d7c13cfa..7231ebae97ace 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/mklocatedb.sh,v 1.13 2002/07/22 05:35:59 tjr Exp $
 
 # 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 3f35ef2f9a63c..58508e8721877 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
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.20.2.1 2007/11/15 15:14:16 se Exp $
 
 if [ "$(id -u)" = "0" ]; then
 	echo ">>> WARNING" 1>&2
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 944ca88e70383..0a94c9c28702c 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/locate/locate/util.c,v 1.10 2002/06/24 12:40:11 naddy Exp $
  */
 
 
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index dc09a87b1b9cb..6c3c968e51be6 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lock/Makefile,v 1.9 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lock
 BINOWN=	root
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 7c9c65025cf2e..ccd0dee77c2ab 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lock/lock.1,v 1.12 2005/02/13 22:25:23 ru Exp $
 .\"
 .Dd July 10, 2002
 .Dt LOCK 1
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 3b19e35bbe1cb..23c5717ce8e5c 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lock/lock.c,v 1.18 2004/01/22 04:24:15 cperciva Exp $");
 
 /*
  * Lock a terminal up until the given key is entered or the given
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 7baff7cd7738e..5c90e1f02ddef 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lockf/Makefile,v 1.6 2002/02/08 22:31:41 markm Exp $
 
 PROG=	lockf
 
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index e8ce3ff02f590..4f7d3ba55d764 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lockf/lockf.1,v 1.18.2.2 2007/11/14 19:25:04 ru Exp $
 .\"
 .Dd July 7, 1998
 .Os
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 843f06115682b..22d4857ae13fe 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lockf/lockf.c,v 1.16.2.1 2007/10/20 15:07:56 csjp Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index 6ff722452793f..8a0a77af417e0 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/logger/Makefile,v 1.5 2007/05/07 11:28:01 dwmalone Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index d7e28b1e6b7cf..fb90137a8ae8c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.19 2006/09/29 15:20:45 ru Exp $
 .\"
 .Dd August 2, 2006
 .Dt LOGGER 1
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index ff3c3925cec65..aeb17be8efe6a 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logger/logger.c,v 1.16 2007/05/07 11:28:01 dwmalone Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 22c73b9993d9e..237005bc525a5 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # 	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/login/Makefile,v 1.53 2006/12/13 06:13:32 csjp Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/login/README b/usr.bin/login/README
index 192534da4a3fe..5e492064e2d08 100644
--- a/usr.bin/login/README
+++ b/usr.bin/login/README
@@ -9,4 +9,4 @@ The following defines can be used:
 
 -Guido
 
-$FreeBSD$
+$FreeBSD: src/usr.bin/login/README,v 1.5 2006/03/06 12:56:35 yar Exp $
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 68bf8408f683e..cae0b7c8eae9f 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/login/login.1,v 1.32.2.1 2007/12/06 10:48:31 philip Exp $
 .\"
 .Dd September 13, 2006
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 549e015c160a5..208aaa7c76dd2 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/login/login.c,v 1.106 2007/07/04 00:00:40 scf Exp $");
 
 /*
  * login [ name ]
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 48ef31bb59207..1d0e72e258ada 100644
--- a/usr.bin/login/login.h
+++ b/usr.bin/login/login.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/login/login.h,v 1.7 2007/05/07 11:01:36 dwmalone Exp $
  */
 
 void	login_fbtab(char *, uid_t, gid_t);
diff --git a/usr.bin/login/login_audit.c b/usr.bin/login/login_audit.c
index a50a15893cf95..4f6bb9d913111 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/login/login_audit.c,v 1.2 2007/05/07 11:01:36 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index f6111a1cd352f..94ab74c6264ed 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/login/login_fbtab.c,v 1.18 2007/09/21 01:55:11 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 60fecc2411496..96da87e7b107d 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/9/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/login/pathnames.h,v 1.6 2006/03/06 12:38:42 yar Exp $
  */
 
 #include <paths.h>
diff --git a/usr.bin/logins/Makefile b/usr.bin/logins/Makefile
index 42840fb28b9ce..2065dd242b0b8 100644
--- a/usr.bin/logins/Makefile
+++ b/usr.bin/logins/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/logins/Makefile,v 1.1 2004/03/06 21:57:29 des Exp $
 
 PROG=	logins
 WARNS?=	6
diff --git a/usr.bin/logins/logins.1 b/usr.bin/logins/logins.1
index fcd12b309b0d5..c62d5e144f8b3 100644
--- a/usr.bin/logins/logins.1
+++ b/usr.bin/logins/logins.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logins/logins.1,v 1.2 2004/03/06 23:36:41 des Exp $
 .\"
 .Dd March 6, 2004
 .Dt LOGINS 1
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index abf342e632199..bde8beb2c1d9d 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -25,11 +25,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/logins/logins.c,v 1.1 2004/03/06 21:57:29 des Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logins/logins.c,v 1.1 2004/03/06 21:57:29 des Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile
index 4e910ce73297c..bfe5682e54f13 100644
--- a/usr.bin/logname/Makefile
+++ b/usr.bin/logname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/logname/Makefile,v 1.5 2005/01/25 14:22:20 ssouhlal Exp $
 
 PROG=	logname
 WARNS?= 6
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index e247471806324..7ca2fbb14a1bb 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logname/logname.1,v 1.10 2006/12/26 10:37:37 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 8f98b8a6dd5e9..24b704747a10b 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)logname.c	8.2 (Berkeley) 4/3/94";
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/logname/logname.c,v 1.8 2005/01/25 14:22:20 ssouhlal Exp $");
 
 #include <err.h>
 #include <unistd.h>
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index ecc19a62cd249..fb8bc8515b432 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/look/look.1,v 1.17 2005/01/17 07:44:22 ru Exp $
 .\"
 .Dd July 17, 2004
 .Dt LOOK 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index e6fd1b8b9e269..70f756eec82a9 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/look/look.c,v 1.18 2006/07/18 10:19:46 stefanf Exp $");
 
 /*
  * look -- find lines in a sorted list.
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index 61996824ef93b..a9651c0c5d02e 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lorder/Makefile,v 1.10 2005/09/28 07:54:18 ru Exp $
 
 SCRIPTS=lorder.sh
 MAN=	lorder.1
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index f3222c4d6f730..fb6d3702e9aa6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lorder/lorder.1,v 1.10 2006/10/25 09:40:07 ru Exp $
 .\"
 .Dd October 25, 2006
 .Dt LORDER 1
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index 958e95da31e5b..9a056bb6bc73c 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -33,7 +33,7 @@
 #
 #	@(#)lorder.sh	8.1 (Berkeley) 6/6/93
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lorder/lorder.sh,v 1.7 2005/07/15 15:21:12 ru Exp $
 #
 
 # only one argument is a special case, just output the name twice
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 0c33583257cf4..9e7f1916c8c64 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lsvfs/Makefile,v 1.8 2002/08/10 20:19:03 mux Exp $
 
 PROG=	lsvfs
 WARNS?=	6
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index ed4b44eb2b89d..c4b259d763323 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.13 2005/01/24 20:06:16 charnier Exp $
 .\" 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 a091282fb5079..ae82000b7a376 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.18.2.1 2007/11/15 15:18:44 se Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 702b3f3d24442..44b68d5778f97 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.10 2002/04/26 13:13:41 espie Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/m4/Makefile,v 1.7 2005/01/28 16:08:07 ru Exp $
 
 # -DEXTENDED 
 # 	if you want the paste & spaste macros.
diff --git a/usr.bin/m4/TEST/math.m4 b/usr.bin/m4/TEST/math.m4
index 0262af66e2534..b51f6ed9c5e03 100644
--- a/usr.bin/m4/TEST/math.m4
+++ b/usr.bin/m4/TEST/math.m4
@@ -1,4 +1,4 @@
-dnl $FreeBSD$
+dnl $FreeBSD: src/usr.bin/m4/TEST/math.m4,v 1.1 2004/05/01 03:27:05 smkelly Exp $
 dnl A regression test for m4 C operators		(ksb,petef)
 dnl If you think you have a short-circuiting m4, run us m4 -DSHORCIRCUIT=yes
 dnl
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 060ce03661d54..7988957c35e3c 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: eval.c,v 1.44 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/eval.c,v 1.22 2004/08/16 14:18:21 tjr Exp $");
 
 /*
  * eval.c
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 2c0284b1a784d..969f99d7a4ea4 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/expr.c,v 1.14 2004/05/01 03:59:43 smkelly Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index e96870b585558..cefa6ecac8925 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/extern.h,v 1.12 2004/08/16 14:18:22 tjr Exp $
  */
 
 /* eval.c */
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index f4cfa77860174..ca78a014739e7 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/gnum4.c,v 1.10 2007/09/21 01:55:11 kevlo Exp $");
 
 /*
  * functions needed to support gnu-m4 extensions, including a fake freezing
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index bafaa2ad5a43a..805b51f8504fd 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)look.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/look.c,v 1.7 2002/07/15 02:15:12 jmallett Exp $");
 
 /*
  * look.c
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 0c492a98ca3cb..fc233cc16d35d 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"	@(#) $OpenBSD: m4.1,v 1.24 2002/04/18 18:57:23 espie Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/m4/m4.1,v 1.27 2005/01/17 07:44:22 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 847a37288e0c6..bf4b95af20ecd 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.53 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/main.c,v 1.26 2004/08/16 14:18:22 tjr Exp $");
 
 /*
  * main.c
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index e3e48e2720011..47ab5fbf96107 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mdef.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/mdef.h,v 1.10 2002/07/15 02:15:12 jmallett Exp $
  */
 
 #define MACRTYPE        1
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index b5632e820fef6..7718796b116b2 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.27 2002/04/26 16:15:16 espie Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/misc.c,v 1.15 2002/07/15 02:15:12 jmallett Exp $");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 94e8164f07ab7..a8a30e0ce650a 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/pathnames.h,v 1.4 2002/05/02 05:25:23 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 34939854b97f9..5cd8db0fe302b 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdd.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/m4/stdd.h,v 1.4 2002/07/15 02:15:12 jmallett Exp $
  */
 
 /*
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index a42aea0442712..26140bf7269af 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/m4/trace.c,v 1.7 2002/07/15 02:15:12 jmallett Exp $");
 
 #include <sys/types.h>
 #include <stddef.h>
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 491d06f97c50b..69090591de824 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/25/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mail/Makefile,v 1.11 2002/07/29 09:40:16 ru Exp $
 
 PROG=	mail
 SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
diff --git a/usr.bin/mail/USD.doc/mail0.nr b/usr.bin/mail/USD.doc/mail0.nr
index e569a5fbe72fd..d09653e60ed70 100644
--- a/usr.bin/mail/USD.doc/mail0.nr
+++ b/usr.bin/mail/USD.doc/mail0.nr
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mail0.nr	8.1 (Berkeley) 6/8/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/USD.doc/mail0.nr,v 1.2 2005/08/17 15:56:04 cperciva Exp $
 .\"
 .eh 'USD:7-%''Mail Reference Manual'
 .oh 'Mail Reference Manual''USD:7-%'
diff --git a/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 10e707cc3c0c7..011630308e7fe 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail5.nr	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/USD.doc/mail5.nr,v 1.4 2000/11/29 10:56:59 ru Exp $
 .\"
 .bp
 .sh 1 "Additional features"
diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c
index fa820b4a94bd6..d0c6a83bd569f 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/aux.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)aux.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/aux.c,v 1.13 2002/08/25 13:22:47 charnier Exp $");
 
 #include <sys/time.h>
 
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 5ec6d7a69e7a2..5eb8f097a2c71 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmd1.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmd1.c,v 1.7 2002/06/30 05:25:05 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 15cf04a47b82d..507c29a8964e4 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmd2.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <sys/wait.h>
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index c9b7c6ae57aa6..2a0a4d8fc5333 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmd3.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmd3.c,v 1.10 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index b350ccef746e8..adf21f0b39488 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/cmdtab.c,v 1.6 2002/06/30 05:25:06 obrien Exp $");
 
 #include "def.h"
 #include "extern.h"
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 6a0926336c148..3badff9f2539d 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/collect.c,v 1.12 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index 3ef4ed0866d16..8b7f8270588be 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -32,7 +32,7 @@
  *
  *	@(#)def.h	8.4 (Berkeley) 4/20/95
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/def.h,v 1.8 2001/12/18 20:52:09 mikeh Exp $
  */
 
 /*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index d50c43a73b5f7..0acda60bc2edd 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)edit.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/edit.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <fcntl.h>
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 7f02a88c2f7f1..74bb78f92cf5e 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/extern.h,v 1.9 2004/02/29 20:44:44 mikeh Exp $
  */
 
 struct name *cat(struct name *, struct name *);
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index b00f48593ede3..a5fe4c1c0523b 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fio.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/fio.c,v 1.12 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <sys/file.h>
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 58519852aa936..6f65772e63042 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)getname.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/getname.c,v 1.4 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <pwd.h>
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index 5f1812a5af620..796231d647685 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -32,7 +32,7 @@
  *
  *	@(#)glob.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/glob.h,v 1.2 2001/03/25 04:57:04 mikeh Exp $
  */
 
 /*
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index 90db9621075bd..40e8eda6d9440 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/head.c,v 1.8 2003/01/09 05:08:37 mikeh Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 7eb11231334ed..e204e45649f92 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/lex.c,v 1.16 2004/03/06 13:27:59 mikeh Exp $");
 
 #include "rcv.h"
 #include <errno.h>
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index abff92a928c9c..c55849beeee81 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)list.c	8.4 (Berkeley) 5/1/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/list.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <ctype.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 8f8ce40973358..286c4e3341eb5 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.8 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.48 2007/03/25 18:37:59 maxim Exp $
 .\"
 .Dd January 5, 2006
 .Dt MAIL 1
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 3338b1dee93cd..20783f666f134 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/20/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/main.c,v 1.15 2005/10/07 10:18:44 yar Exp $");
 
 #include "rcv.h"
 #include <fcntl.h>
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index fc0acdc851ea7..a03fe58417deb 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/names.c,v 1.9 2004/02/29 20:44:44 mikeh Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index 57a2a0c005951..f34827589a469 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/pathnames.h,v 1.4 2001/05/27 20:26:22 mikeh Exp $
  */
 
 #define	_PATH_EX	"/usr/bin/ex"
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index b6dc30a39ac5f..42aaa5ce77077 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/popen.c,v 1.7 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <sys/wait.h>
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 4507c59e23b6b..e7d7ece4611dc 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)quit.c	8.2 (Berkeley) 4/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/quit.c,v 1.7 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include <fcntl.h>
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 44bb25ef36943..37303b8287b8f 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -32,7 +32,7 @@
  *
  *	@(#)rcv.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mail/rcv.h,v 1.2 2001/03/25 04:57:04 mikeh Exp $
  */
 
 /*
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 35b4c729522ac..a71d28e37193e 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)send.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/send.c,v 1.14 2004/02/29 20:44:44 mikeh Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index d3a816fb081d0..766311e5f0bd7 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)strings.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/strings.c,v 1.5 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 0d7424e94dafa..38d44126970e2 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/temp.c,v 1.9 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index 6948d042488d9..4bafd7511062b 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)tty.c	8.2 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/tty.c,v 1.6 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 34f9d800aad7c..a6bad0bb16323 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/v7.local.c,v 1.5 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Mail -- a mail program
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index ab171c159e1e8..5bc00497bf8fc 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/vars.c,v 1.4 2002/06/30 05:25:06 obrien Exp $");
 
 #include "rcv.h"
 #include "extern.h"
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index e41c25c08681e..3aa98d28e0f5e 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)version.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mail/version.c,v 1.4 2002/06/30 05:25:06 obrien Exp $");
 
 /*
  * Just keep track of the date/sid of this version of Mail.
diff --git a/usr.bin/make/GNode.h b/usr.bin/make/GNode.h
index 71d2afd93418f..70a78bf9bf9f6 100644
--- a/usr.bin/make/GNode.h
+++ b/usr.bin/make/GNode.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/GNode.h,v 1.5 2007/04/20 06:33:25 fjoe Exp $
  */
 
 #ifndef GNode_h_39503bf2
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index c054ae0e2d6dc..0e9f6a3a0423a 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 #	$Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/Makefile,v 1.65 2006/05/11 18:08:44 ru Exp $
 
 PROG=	make
 CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/make/Makefile.dist b/usr.bin/make/Makefile.dist
index 0a485e1db01f5..5b85088e9c79c 100644
--- a/usr.bin/make/Makefile.dist
+++ b/usr.bin/make/Makefile.dist
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/Makefile.dist,v 1.4 2005/05/24 13:19:40 harti Exp $
 # a very simple makefile...
 pmake:
 	@echo 'make started.'
diff --git a/usr.bin/make/PSD.doc/stubs b/usr.bin/make/PSD.doc/stubs
index 39d8defe2e143..156d34e0e3bb6 100644
--- a/usr.bin/make/PSD.doc/stubs
+++ b/usr.bin/make/PSD.doc/stubs
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/stubs,v 1.1 2000/11/24 10:05:30 ru Exp $
 .\"
 .de Ix
 ..
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 320d5dfc3c4b9..0701bde181276 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.13 2002/10/29 14:56:09 ru Exp $
 .\"
 .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 2b81c7f5993fc..2287f2d0bedd6 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/arch.c,v 1.66 2005/05/24 15:58:34 harti Exp $");
 
 /*-
  * arch.c --
diff --git a/usr.bin/make/arch.h b/usr.bin/make/arch.h
index 3c28b2fcdb985..61f67baa34234 100644
--- a/usr.bin/make/arch.h
+++ b/usr.bin/make/arch.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/arch.h,v 1.5 2005/05/18 06:50:38 harti Exp $
  */
 
 #ifndef arch_h_488adf7a
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 6453abf5f8fa0..f8a356f78ddfd 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/buf.c,v 1.36 2005/05/13 08:53:00 harti Exp $");
 
 /*
  * buf.c
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 106f348848975..81d7fd82fff14 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/buf.h,v 1.27 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef buf_h_a61a6812
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 6e7a094517784..ede5656e506fb 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/cond.c,v 1.54 2005/05/25 16:06:14 harti Exp $");
 
 /*
  * Functions to handle conditionals in a makefile.
diff --git a/usr.bin/make/cond.h b/usr.bin/make/cond.h
index 9a8dbdcc0cbe8..c4510c1a0ddcc 100644
--- a/usr.bin/make/cond.h
+++ b/usr.bin/make/cond.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/cond.h,v 1.3 2005/04/11 07:20:09 harti Exp $
  */
 
 #ifndef cond_h_6e96ad7c
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 06b0f8e91a026..32d0baa992f47 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/config.h,v 1.16 2005/02/01 10:50:35 harti Exp $
  */
 
 #ifndef config_h_efe0765e
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index c66b2bf4bc97c..2aabd93ab5950 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/dir.c,v 1.52 2005/03/23 12:56:15 harti Exp $");
 
 /*-
  * dir.c --
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 03481b869790a..a5ed061790f3e 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/dir.h,v 1.21 2005/03/23 12:56:15 harti Exp $
  */
 
 #ifndef dir_h_6002e3b8
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 15372b648e95c..387c3ef1df8a0 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/for.c,v 1.43 2005/05/10 12:02:15 harti Exp $");
 
 /*-
  * for.c --
diff --git a/usr.bin/make/for.h b/usr.bin/make/for.h
index 0e43c4a4194c0..674c307fcfe50 100644
--- a/usr.bin/make/for.h
+++ b/usr.bin/make/for.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/for.h,v 1.3 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef for_h_9d770f33
diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h
index 465c4f3d60982..4343a5db35350 100644
--- a/usr.bin/make/globals.h
+++ b/usr.bin/make/globals.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/globals.h,v 1.11 2007/03/08 09:16:10 fjoe Exp $
  */
 
 #ifndef globals_h_1c1edb96
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index b5ea6bcb8aebf..b5a75a108c9bc 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/hash.c,v 1.25 2005/05/13 08:53:00 harti Exp $");
 
 /* hash.c --
  *
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 80dd74ddb19e2..30d548a937cd1 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hash.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash.h,v 1.20 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef hash_h_f6312f46
diff --git a/usr.bin/make/hash_tables.c b/usr.bin/make/hash_tables.c
index 27fdf2dd7678f..9f0f92c2b18ce 100644
--- a/usr.bin/make/hash_tables.c
+++ b/usr.bin/make/hash_tables.c
@@ -1,6 +1,6 @@
 /*
  * DO NOT EDIT
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash_tables.c,v 1.3 2005/09/26 20:31:00 phk Exp $
  * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.108 2005/05/24 15:30:03 harti Exp 
  * DO NOT EDIT
  */
diff --git a/usr.bin/make/hash_tables.h b/usr.bin/make/hash_tables.h
index 8fa43a5808da0..7d50d1915a098 100644
--- a/usr.bin/make/hash_tables.h
+++ b/usr.bin/make/hash_tables.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash_tables.h,v 1.1 2005/04/29 15:15:28 harti Exp $
  */
 #ifndef hash_tables_h_
 #define hash_tables_h_
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 6136c6f27927a..c00244812af88 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/job.c,v 1.126 2007/03/08 09:16:10 fjoe Exp $");
 
 #ifndef OLD_JOKE
 #define	OLD_JOKE 0
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index a4c66201b7dc5..35f200cc5b479 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)job.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/job.h,v 1.46 2007/03/08 09:16:10 fjoe Exp $
  */
 
 #ifndef job_h_4678dfd1
diff --git a/usr.bin/make/lst.c b/usr.bin/make/lst.c
index a5b7f06c5254e..f35f160b8ab5f 100644
--- a/usr.bin/make/lst.c
+++ b/usr.bin/make/lst.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.c,v 1.7 2005/05/18 06:50:39 harti Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 497d59c597802..0a7083fa41963 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lst.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.h,v 1.37 2005/05/18 06:50:39 harti Exp $
  */
 
 #ifndef lst_h_38f3ead1
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index b683f8547cf69..07d14865aceae 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -46,7 +46,7 @@ static char copyright[] =
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/main.c,v 1.163.2.1 2007/11/29 04:20:19 fjoe Exp $");
 
 /*
  * main.c
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index b226f83e7e264..86fbd580ecd2b 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)make.1	8.8 (Berkeley) 6/13/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/make.1,v 1.103 2007/03/08 14:05:45 fjoe Exp $
 .\"
 .Dd April 8, 2006
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 4ac5bb625cabc..d1a56e2ec95b1 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/make.c,v 1.39 2007/04/20 06:33:25 fjoe Exp $");
 
 /*
  * make.c
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 2386cd72a5aeb..b1b912fa60b6a 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)make.h	8.3 (Berkeley) 6/13/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/make.h,v 1.35 2007/03/08 09:16:10 fjoe Exp $
  */
 
 #ifndef make_h_a91074b9
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 14ffe180cad4d..f0852ba6573ad 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.113 2007/04/12 18:14:00 ru Exp $");
 
 /*-
  * parse.c --
diff --git a/usr.bin/make/parse.h b/usr.bin/make/parse.h
index 6ee15f963def7..c957979e1aedb 100644
--- a/usr.bin/make/parse.h
+++ b/usr.bin/make/parse.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/parse.h,v 1.6 2005/05/13 08:53:00 harti Exp $
  */
 
 #ifndef parse_h_470eeb9a
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 5fb4ceb8400b4..51ac851db38bd 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.14 2005/03/11 13:02:38 harti Exp $
  */
 
 #ifndef pathnames_h_235b888a
diff --git a/usr.bin/make/proc.c b/usr.bin/make/proc.c
index 711f605a48462..986a088037151 100644
--- a/usr.bin/make/proc.c
+++ b/usr.bin/make/proc.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/proc.c,v 1.1 2005/05/24 15:41:34 harti Exp $");
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/usr.bin/make/proc.h b/usr.bin/make/proc.h
index a4ce6d31f37a1..2919debcff55f 100644
--- a/usr.bin/make/proc.h
+++ b/usr.bin/make/proc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/proc.h,v 1.1 2005/05/24 15:41:34 harti Exp $
  */
 
 #ifndef proc_h_458845848
diff --git a/usr.bin/make/shell.c b/usr.bin/make/shell.c
index c1f82d1cb05f3..07a1ca635a5ee 100644
--- a/usr.bin/make/shell.c
+++ b/usr.bin/make/shell.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/shell.c,v 1.1 2005/05/24 15:30:03 harti Exp $");
 
 #include <sys/queue.h>
 #include <stdio.h>
diff --git a/usr.bin/make/shell.h b/usr.bin/make/shell.h
index a3170583bdc26..c61c69347aa84 100644
--- a/usr.bin/make/shell.h
+++ b/usr.bin/make/shell.h
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/shell.h,v 1.1 2005/05/24 15:30:03 harti Exp $
  */
 
 #ifndef shell_h_6002e3b8
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 81bb7a3756174..50b656ebd5956 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/str.c,v 1.46 2006/10/09 19:37:26 ru Exp $");
 
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/usr.bin/make/str.h b/usr.bin/make/str.h
index e8cf10cc648d6..f4d63f3bf2500 100644
--- a/usr.bin/make/str.h
+++ b/usr.bin/make/str.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/str.h,v 1.6 2005/05/23 13:27:52 harti Exp $
  */
 
 #ifndef str_h_44db59e6
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 7aa96f62a1c4f..bfe8b3727d027 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/suff.c,v 1.64 2005/05/24 15:58:35 harti Exp $");
 
 /*-
  * suff.c --
diff --git a/usr.bin/make/suff.h b/usr.bin/make/suff.h
index 9982ab46321ce..145b92160f6f8 100644
--- a/usr.bin/make/suff.h
+++ b/usr.bin/make/suff.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/suff.h,v 1.3 2005/03/23 12:56:15 harti Exp $
  */
 
 #ifndef suff_h_2d5a821c
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index eac121e23ca8e..6a9a5cab4266b 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/targ.c,v 1.42 2007/04/20 06:33:25 fjoe Exp $");
 
 /*
  * Functions for maintaining the Lst allTargets. Target nodes are
diff --git a/usr.bin/make/targ.h b/usr.bin/make/targ.h
index 38828334e92a1..a5ad59b1b1254 100644
--- a/usr.bin/make/targ.h
+++ b/usr.bin/make/targ.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/targ.h,v 1.2 2005/02/04 07:51:00 harti Exp $
  */
 
 #ifndef targ_h_6ded1830
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 3a27b0a4110aa..2ca65911d29d9 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/util.c,v 1.19 2005/05/13 13:47:41 harti Exp $");
 
 /*-
  * util.c --
diff --git a/usr.bin/make/util.h b/usr.bin/make/util.h
index 9a1dedf6c7d56..4e0c215689508 100644
--- a/usr.bin/make/util.h
+++ b/usr.bin/make/util.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/util.h,v 1.10 2005/05/18 06:50:39 harti Exp $
  */
 
 #ifndef util_h_b7020fdb
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 259a672828179..b7d741782dd60 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/make/var.c,v 1.163 2006/07/17 21:05:27 obrien Exp $");
 
 /**
  * var.c --
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 618cf7af84624..159bb11ec6369 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/var.h,v 1.29 2005/05/24 16:05:51 harti Exp $
  */
 
 #ifndef var_h_9cccafce
diff --git a/usr.bin/makewhatis/Makefile b/usr.bin/makewhatis/Makefile
index 4da90ef0f73f9..e28374f2aeec6 100644
--- a/usr.bin/makewhatis/Makefile
+++ b/usr.bin/makewhatis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/makewhatis/Makefile,v 1.3 2002/11/18 10:11:22 ru Exp $
 
 PROG=		makewhatis
 DPADD=		${LIBZ}
diff --git a/usr.bin/makewhatis/makewhatis.1 b/usr.bin/makewhatis/makewhatis.1
index 1928c84701133..d840203c16558 100644
--- a/usr.bin/makewhatis/makewhatis.1
+++ b/usr.bin/makewhatis/makewhatis.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/makewhatis/makewhatis.1,v 1.5 2005/12/05 14:22:12 ru Exp $
 .\"
 .Dd December 3, 2005
 .Dt MAKEWHATIS 1
diff --git a/usr.bin/makewhatis/makewhatis.c b/usr.bin/makewhatis/makewhatis.c
index c9404f6bae21b..7249b297fc78a 100644
--- a/usr.bin/makewhatis/makewhatis.c
+++ b/usr.bin/makewhatis/makewhatis.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/makewhatis/makewhatis.c,v 1.10.2.1 2007/10/18 12:55:27 edwin Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/makewhatis/makewhatis.local.8 b/usr.bin/makewhatis/makewhatis.local.8
index dfe252fdd9617..65d4e8e2bf91d 100644
--- a/usr.bin/makewhatis/makewhatis.local.8
+++ b/usr.bin/makewhatis/makewhatis.local.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/makewhatis/makewhatis.local.8,v 1.15 2004/07/02 22:22:28 ru Exp $
 .Dd April 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os
diff --git a/usr.bin/makewhatis/makewhatis.local.sh b/usr.bin/makewhatis/makewhatis.local.sh
index 8be25300b75dd..b0bb2081468b1 100644
--- a/usr.bin/makewhatis/makewhatis.local.sh
+++ b/usr.bin/makewhatis/makewhatis.local.sh
@@ -33,7 +33,7 @@
 #
 # PS: this wrapper works also for catman(1)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/makewhatis/makewhatis.local.sh,v 1.7 1999/08/27 23:36:10 peter Exp $
 
 PATH=/bin:/usr/bin:$PATH; export PATH
 opt= dirs= localdirs=
diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile
index 47f5a85fccfe7..52da7f0075cd6 100644
--- a/usr.bin/mesg/Makefile
+++ b/usr.bin/mesg/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mesg/Makefile,v 1.3 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mesg
 
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index b596f75cf7d2b..2132892e48bc7 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mesg/mesg.1,v 1.13 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd May 5, 2002
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 270c1c546b5c8..8ac81a76e25bb 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mesg/mesg.c,v 1.9 2005/05/21 09:55:06 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 226ba76179850..3df33e1e49358 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/minigzip/Makefile,v 1.4 2004/02/05 22:44:25 ru Exp $
 
 PROG=	minigzip
 LDADD=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index ddd2b957a6b11..04cd7dd2e7e2c 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/minigzip/minigzip.1,v 1.10 2004/07/02 22:22:28 ru Exp $
 .\"
 .Dd October 3, 2002
 .Dt MINIGZIP 1
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index 463466ca840a5..f57a148d6b8f3 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkdep/Makefile,v 1.9 2001/04/07 11:21:23 ru Exp $
 
 SCRIPTS=	mkdep.gcc.sh
 MAN=		mkdep.1
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 5d86209a03af3..436889a95267f 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkdep/mkdep.1,v 1.16 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ec00dcfbdf926..9d983ac4128f3 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
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkdep/mkdep.gcc.sh,v 1.18 1999/08/28 01:04:04 peter Exp $
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile
index bab308b133f6a..b2b673f162ee5 100644
--- a/usr.bin/mkfifo/Makefile
+++ b/usr.bin/mkfifo/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkfifo/Makefile,v 1.4 2005/01/17 13:47:05 delphij Exp $
 
 PROG=	mkfifo
 WARNS?=	6
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index b29c48aae037a..8b97d257d7ac8 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.15 2006/12/15 14:14:17 ru Exp $
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 7e147b6b14979..ec4c47e14acbb 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mkfifo/mkfifo.c,v 1.10 2005/01/17 13:47:05 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 9873d4e32fc3d..11a71fa1bc7a8 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mklocale/Makefile,v 1.29 2005/05/16 09:32:41 ru Exp $
 
 PROG=	mklocale
 WARNS?=	6
diff --git a/usr.bin/mklocale/extern.h b/usr.bin/mklocale/extern.h
index a52c6b5b90154..f2037dd2c6eb8 100644
--- a/usr.bin/mklocale/extern.h
+++ b/usr.bin/mklocale/extern.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mklocale/extern.h,v 1.1 2002/04/28 12:34:54 markm Exp $
  */
 
 int yylex(void);
diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index f35506b3483bd..d1aaaa2a41c26 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ldef.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/mklocale/ldef.h,v 1.4 2005/02/26 21:47:54 ru Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index eeed535db2c60..157004109f711 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.9 2005/02/26 21:47:54 ru Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 249249c485a2f..7b74ecd10ae92 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.27 2005/01/21 10:36:11 ru Exp $
 .\"
 .Dd October 17, 2004
 .Dt MKLOCALE 1
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 899b186d93c4b..7194878315977 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)yacc.y	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.27 2007/09/21 01:55:11 kevlo Exp $");
 
 #include <arpa/inet.h>
 
diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index 805c013d4a972..b0c432f5a3155 100644
--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkstr/Makefile,v 1.4 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mkstr
 
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 7435a25c741df..c2cf8dff32c27 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.14 2007/03/04 08:24:13 ru Exp $
 .\"
 .Dd November 1, 2002
 .Dt MKSTR 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index ce61c9d7ff9b7..e7957ce8fa8ef 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mkstr/mkstr.c,v 1.11 2004/03/14 05:51:20 bde Exp $");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile
index 76ebee6f360b5..bdb07a32ac842 100644
--- a/usr.bin/mktemp/Makefile
+++ b/usr.bin/mktemp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mktemp/Makefile,v 1.3 2002/02/08 22:31:42 markm Exp $
 
 PROG=	mktemp
 
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 6e35759771752..e9822d3458472 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.21 2006/09/29 15:20:46 ru Exp $
 .\"
 .Dd December 30, 2005
 .Dt MKTEMP 1
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index b58ac4b9d055d..132e27b57dcf1 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$FreeBSD: src/usr.bin/mktemp/mktemp.c,v 1.5 2002/03/22 01:33:17 imp Exp $";
 #endif /* not lint */
 
 static void usage(void);
diff --git a/usr.bin/mkuzip/Makefile b/usr.bin/mkuzip/Makefile
index 11ed0831f14cb..1350711d19aa4 100644
--- a/usr.bin/mkuzip/Makefile
+++ b/usr.bin/mkuzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mkuzip/Makefile,v 1.4 2005/05/02 17:38:49 sobomax Exp $
 
 PROG=	mkuzip
 MAN=	mkuzip.8
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index 37d86bab6a671..487b67bb4c53e 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.       Maxim Sobolev
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkuzip/mkuzip.8,v 1.7 2006/09/29 15:20:46 ru Exp $
 .\"
 .Dd March 17, 2006
 .Dt MKUZIP 8
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index 02ebefa8094f6..afe113b4993f3 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.       Maxim Sobolev
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mkuzip/mkuzip.c,v 1.6 2007/03/06 17:04:15 fjoe Exp $
  *
  */
 
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 9f59c6a598cc4..f2ecf4c4ac50c 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/msgs/Makefile,v 1.9 2005/01/17 17:45:38 delphij Exp $
 
 PROG=	msgs
 WARNS?=	6
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 147f8c9e42329..65b7aa72b84b5 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/msgs/msgs.1,v 1.19 2004/07/03 00:24:42 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 23f224047b1f3..a5b7ec5ff954d 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/msgs/msgs.c,v 1.27 2005/01/17 17:45:38 delphij Exp $");
 
 /*
  * msgs - a user bulletin board program
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index 25b4af5b897f5..e9fb2b6196334 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mt/Makefile,v 1.4 2001/05/18 13:41:31 ru Exp $
 
 PROG=	mt
 
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 2328e4f197a88..a07f9320775b6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.44 2005/11/18 10:36:28 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 902128e3cd961..d26a25e9bfb92 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/mt/mt.c,v 1.37 2005/11/13 20:50:17 dwmalone Exp $");
 
 /*
  * mt --
diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile
index a4400bcddc906..e7715dfae4986 100644
--- a/usr.bin/nc/Makefile
+++ b/usr.bin/nc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nc/Makefile,v 1.3 2005/02/07 08:44:34 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/netcat
 
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 4ec897371b2be..5a90348b9e5c2 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncal/Makefile,v 1.8 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	ncal
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 6bcddd2e2157c..bfa760119d1ed 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncal/ncal.1,v 1.19 2005/10/23 01:37:25 tjr Exp $
 .\"
 .Dd October 23, 2005
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 7e0d5eed09cca..ba865e7b740ab 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ncal/ncal.c,v 1.19 2004/11/23 22:57:17 wollman Exp $";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/ncplist/Makefile b/usr.bin/ncplist/Makefile
index 8e6d18991a4fe..b7ae2f59b27f1 100644
--- a/usr.bin/ncplist/Makefile
+++ b/usr.bin/ncplist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncplist/Makefile,v 1.2 1999/10/31 08:58:29 bp Exp $
 
 PROG=	ncplist
 
diff --git a/usr.bin/ncplist/ncplist.1 b/usr.bin/ncplist/ncplist.1
index 753be8fc61970..6574f7fdb4bf8 100644
--- a/usr.bin/ncplist/ncplist.1
+++ b/usr.bin/ncplist/ncplist.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.11 2006/12/15 13:40:53 ru Exp $
 .Dd June 24, 1999
 .Dt NCPLIST 1
 .Os
diff --git a/usr.bin/ncplist/ncplist.c b/usr.bin/ncplist/ncplist.c
index e2c2ce4133c08..eeb093a0f559f 100644
--- a/usr.bin/ncplist/ncplist.c
+++ b/usr.bin/ncplist/ncplist.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ncplist/ncplist.c,v 1.3 2007/02/05 07:35:23 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/ncplogin/Makefile b/usr.bin/ncplogin/Makefile
index 8795f29f3ad18..6e08d251e1cdc 100644
--- a/usr.bin/ncplogin/Makefile
+++ b/usr.bin/ncplogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncplogin/Makefile,v 1.5 2002/02/08 22:31:42 markm Exp $
 
 PROG=	ncplogin
 MAN=	ncplogin.1 ncplogout.1
diff --git a/usr.bin/ncplogin/ncplogin.1 b/usr.bin/ncplogin/ncplogin.1
index 24b806af68344..f2d5605811075 100644
--- a/usr.bin/ncplogin/ncplogin.1
+++ b/usr.bin/ncplogin/ncplogin.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.13 2007/01/15 15:25:15 ru Exp $
 .Dd September 15, 1999
 .Dt NCPLOGIN 1
 .Os
diff --git a/usr.bin/ncplogin/ncplogin.c b/usr.bin/ncplogin/ncplogin.c
index 16e5268495fed..3c1b1f5ae123d 100644
--- a/usr.bin/ncplogin/ncplogin.c
+++ b/usr.bin/ncplogin/ncplogin.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.5 2007/02/05 07:35:23 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/usr.bin/ncplogin/ncplogout.1 b/usr.bin/ncplogin/ncplogout.1
index bc220a7cf333f..973bcda5acaa2 100644
--- a/usr.bin/ncplogin/ncplogout.1
+++ b/usr.bin/ncplogin/ncplogout.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.11 2007/01/15 15:25:15 ru Exp $
 .Dd September 15, 1999
 .Dt NCPLOGOUT 1
 .Os
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index d8794d9d0ffaa..738bffd97cf1e 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/netstat/Makefile,v 1.39 2007/07/01 12:08:07 gnn Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 7c19c561d5f4d..67cf9f1629181 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/atalk.c,v 1.26 2007/07/16 17:15:54 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index 73cc018b816fa..cfd4cc08f4a7c 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/netstat/bpf.c,v 1.9 2007/07/16 17:15:54 jhb Exp $
  */
 #include <sys/types.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 9acd37ca2db1a..cd57b39181864 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/if.c,v 1.69 2007/07/16 17:15:54 jhb Exp $");
 
 #include <sys/types.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index eee2fefec066f..21e0b9a948082 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/inet.c,v 1.78 2007/07/16 17:15:54 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 945075ce6d27d..f9e6624d07d83 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)inet6.c	8.4 (Berkeley) 4/20/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/inet6.c,v 1.29 2007/07/16 17:15:54 jhb Exp $");
 
 #ifdef INET6
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index ef3e78f49d94a..7953ebd7a2685 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.bin/netstat/ipsec.c,v 1.17 2007/07/16 17:15:54 jhb Exp $	*/
 /*	$KAME: ipsec.c,v 1.33 2003/07/25 09:54:32 itojun Exp $	*/
 
 /*
@@ -96,7 +96,7 @@ static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/ipsec.c,v 1.17 2007/07/16 17:15:54 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 893dc75b1cdf5..1acc35a69cebf 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/ipx.c,v 1.27 2007/07/30 11:06:42 des Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 75edcb0cb67bb..582e5457d0edf 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/main.c,v 1.87 2007/07/16 18:13:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 7e09a1e5bc768..cdcaadf074fb4 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mbuf.c,v 1.53 2007/07/16 17:15:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/usr.bin/netstat/mcast.c b/usr.bin/netstat/mcast.c
index 734893427c883..e41fef8343692 100644
--- a/usr.bin/netstat/mcast.c
+++ b/usr.bin/netstat/mcast.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mcast.c,v 1.9 2007/07/16 17:15:55 jhb Exp $");
 
 /*
  * Print the running system's current multicast group memberships.
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index d3cf740ad6e76..e20d5dc7d08d7 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mroute.c,v 1.30 2007/07/16 17:15:55 jhb Exp $");
 
 /*
  * Print multicast routing structures and statistics.
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 6b4230d7765cd..fac504c13474a 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/mroute6.c,v 1.21 2007/07/16 17:15:55 jhb Exp $");
 
 #ifdef INET6
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 8ca9e5cd7e315..0aa6b54056055 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/netgraph.c,v 1.13 2007/07/16 17:15:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index c1e140fbcfe4b..bfc9f77d43baf 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.58 2007/06/10 06:11:03 ceri Exp $
 .\"
 .Dd June 10, 2007
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 0c6f7339c31bf..a945d7195c17e 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netstat.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/netstat/netstat.h,v 1.51 2007/07/16 17:15:55 jhb Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 47fccb7826cb3..f78a71ea19f19 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.bin/netstat/pfkey.c,v 1.5 2007/07/16 17:15:55 jhb Exp $	*/
 /*	$NetBSD: inet.c,v 1.35.2.1 1999/04/29 14:57:08 perry Exp $	*/
 /*	$KAME: ipsec.c,v 1.25 2001/03/12 09:04:39 itojun Exp $	*/
 
@@ -70,7 +70,7 @@
 static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/pfkey.c,v 1.5 2007/07/16 17:15:55 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index a0a8990a17bdf..540f480a1e970 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -38,7 +38,7 @@ static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/route.c,v 1.82 2007/07/16 17:15:55 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 70f54d26cd89b..4143415f1f7b4 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)sctp.c	0.1 (Berkeley) 4/18/2007";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/sctp.c,v 1.7.2.1 2007/10/29 12:50:28 rrs Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 03bef85b7f7a7..e4f11b4a070af 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/netstat/unix.c,v 1.20 2007/07/16 17:15:55 jhb Exp $");
 
 /*
  * Display protocol blocks in the unix domain.
diff --git a/usr.bin/newgrp/Makefile b/usr.bin/newgrp/Makefile
index 8195348bf3f8a..30d8fa4f4d6ce 100644
--- a/usr.bin/newgrp/Makefile
+++ b/usr.bin/newgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newgrp/Makefile,v 1.3 2004/11/03 18:01:20 ru Exp $
 
 PROG=	newgrp
 DPADD=	${LIBCRYPT} ${LIBUTIL}
diff --git a/usr.bin/newgrp/newgrp.1 b/usr.bin/newgrp/newgrp.1
index 44ab9fd565839..af36e190ad858 100644
--- a/usr.bin/newgrp/newgrp.1
+++ b/usr.bin/newgrp/newgrp.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/newgrp/newgrp.1,v 1.3 2005/01/17 07:44:25 ru Exp $
 .\"
 .Dd May 23, 2002
 .Dt NEWGRP 1
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index 62d552fa05d3a..aa2ff9147312e 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newgrp/newgrp.c,v 1.2 2003/10/30 15:14:34 harti Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index b3b5b51d8c9fe..ca2e76d3fc126 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newkey/Makefile,v 1.14 2006/03/17 18:54:39 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/newkey/extern.h b/usr.bin/newkey/extern.h
index 7a5fb422d4f08..333b613b58eb1 100644
--- a/usr.bin/newkey/extern.h
+++ b/usr.bin/newkey/extern.h
@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/newkey/extern.h,v 1.4 2005/02/07 21:40:24 stefanf Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 3572df92f7275..9d0b993a71e37 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newkey/generic.c,v 1.7 2002/04/28 12:09:33 markm Exp $");
 
 #include <sys/file.h>
 
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index 09b00e9f47d37..2ae1e90ef57cd 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;
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/newkey/newkey.8,v 1.7 2002/07/14 15:09:10 charnier Exp $
 .Dd October 12, 1987
 .Dt NEWKEY 8
 .Os
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index 22d34e7a5e599..7925f8a8024fb 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
  * Administrative tool to add a new user to the publickey database
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newkey/newkey.c,v 1.8 2005/05/21 09:55:06 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 533568fe836d5..451e2847833e4 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -42,7 +42,7 @@ static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
  * Administrative tool to add a new user to the publickey database
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/newkey/update.c,v 1.10 2005/02/07 21:42:16 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile
index ce4c7c6136fbe..b6aa7473a57fc 100644
--- a/usr.bin/nfsstat/Makefile
+++ b/usr.bin/nfsstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nfsstat/Makefile,v 1.3 2001/12/10 21:13:06 dwmalone Exp $
 
 PROG=	nfsstat
 CFLAGS+=-DNFS
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index a7c2a13cd21f1..b6060a136d7d0 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nfsstat/nfsstat.1,v 1.14.2.1 2007/10/26 21:46:31 jhb Exp $
 .\"
 .Dd October 18, 2007
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 5a1495a1f5280..d263a37f1b349 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nfsstat/nfsstat.c,v 1.21.18.1 2007/10/26 21:46:32 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile
index 0d2733a6d10e6..be49265a996b1 100644
--- a/usr.bin/nice/Makefile
+++ b/usr.bin/nice/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nice/Makefile,v 1.4 2002/02/08 22:31:43 markm Exp $
 
 PROG=	nice
 
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index eb804bd7d3c78..b8e2dc2b13201 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nice/nice.1,v 1.26 2005/01/18 13:43:51 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 1aed481f71cb7..551b6930aa1ce 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)nice.c	8.2 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/nice/nice.c,v 1.12 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nl/Makefile b/usr.bin/nl/Makefile
index 9b1f292dfbee4..f83d4af1ab860 100644
--- a/usr.bin/nl/Makefile
+++ b/usr.bin/nl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nl/Makefile,v 1.1 2001/05/04 17:25:23 brian Exp $
 
 PROG=	nl
 
diff --git a/usr.bin/nl/nl.1 b/usr.bin/nl/nl.1
index f21ce93a3be96..202f52a1f4f0a 100644
--- a/usr.bin/nl/nl.1
+++ b/usr.bin/nl/nl.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nl/nl.1,v 1.17 2007/03/25 18:37:59 maxim Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index afc3c8608a2b4..c03e701969ebc 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -39,7 +39,7 @@
 __COPYRIGHT(
 "@(#) Copyright (c) 1999\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/nl/nl.c,v 1.11 2006/12/22 05:54:19 imp Exp $");
 #endif    
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile
index cd635cefa526e..8e6290f0e9676 100644
--- a/usr.bin/nohup/Makefile
+++ b/usr.bin/nohup/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nohup/Makefile,v 1.5 2002/07/14 18:19:26 alfred Exp $
 
 PROG=	nohup
 WARNS?=	4
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index bf74dd65bf39f..34f19e6c76f2f 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/nohup/nohup.1,v 1.13 2005/01/17 07:44:27 ru Exp $
 .\"
 .Dd July 19, 2001
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 06f22445771d9..c1f4d17b22149 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/nohup/nohup.c,v 1.10 2003/05/03 19:44:46 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/nslookup/Makefile b/usr.bin/nslookup/Makefile
index 004efa2def2ad..c32ffd4a0b74a 100644
--- a/usr.bin/nslookup/Makefile
+++ b/usr.bin/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nslookup/Makefile,v 1.7 2007/06/02 23:19:57 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/nsupdate/Makefile b/usr.bin/nsupdate/Makefile
index e77ea397521dd..4ae42397232c9 100644
--- a/usr.bin/nsupdate/Makefile
+++ b/usr.bin/nsupdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/nsupdate/Makefile,v 1.7 2007/06/02 23:19:57 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index 9550ff0263456..6e224f9e2d047 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/objformat/Makefile,v 1.20 2007/01/25 23:12:19 peter Exp $
 
 SCRIPTS=objformat.sh
 NO_MAN=
diff --git a/usr.bin/objformat/objformat.sh b/usr.bin/objformat/objformat.sh
index edd96073f603e..a555feec8fbdc 100644
--- a/usr.bin/objformat/objformat.sh
+++ b/usr.bin/objformat/objformat.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/objformat/objformat.sh,v 1.1 2007/01/25 23:12:19 peter Exp $
 # /usr/bin/objformat has been obsolete and deprecated for years.
 # Please remove any build/configure script references.  New software
 # should only have to only support elf on FreeBSD.
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 0375111dbfba0..7925fa9e60ed3 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opieinfo/Makefile,v 1.11 2004/11/03 18:01:20 ru Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index 215c86b4511e6..00fbb7c6d10a5 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiekey/Makefile,v 1.11 2002/01/03 21:20:29 ache Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index 0d75a2113dc1f..782af6dcf775d 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiepasswd/Makefile,v 1.10 2004/11/03 18:01:20 ru Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 6ca205d32252e..31978c82c8c2c 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/3/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pagesize/Makefile,v 1.7 2001/04/07 11:21:23 ru Exp $
 
 SCRIPTS=pagesize.sh
 MAN=	pagesize.1
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index e4287e18cb0e2..bf987d03be978 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pagesize/pagesize.1,v 1.7 2002/04/20 12:16:17 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt PAGESIZE 1
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index fd5477b3222ba..8c46ee0f6f990 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
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pagesize/pagesize.sh,v 1.5 1999/08/28 01:04:48 peter Exp $
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index a1ce76b48117d..fcf9503a2d43b 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.47 2006/03/17 18:54:39 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 6015952ad619e..d9613899e0736 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.32.2.1 2007/11/14 19:25:04 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index d35458c956a1e..487309e79901e 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/passwd/passwd.c,v 1.23 2003/04/18 21:27:09 nectar Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 6b8ed0de12bd8..f5a4aa6c409d8 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/paste/paste.1,v 1.19 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd June 25, 2004
 .Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 6e3e5539d0c0a..c090456b63d45 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/paste/paste.c,v 1.15 2006/09/12 05:08:36 charnier Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/pathchk/Makefile b/usr.bin/pathchk/Makefile
index b5bea85270aa1..73ab3e915e3b7 100644
--- a/usr.bin/pathchk/Makefile
+++ b/usr.bin/pathchk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pathchk/Makefile,v 1.1 2002/05/22 10:30:16 tjr Exp $
 
 PROG=	pathchk
 
diff --git a/usr.bin/pathchk/pathchk.1 b/usr.bin/pathchk/pathchk.1
index e8639559cf47d..c03522ef31ee6 100644
--- a/usr.bin/pathchk/pathchk.1
+++ b/usr.bin/pathchk/pathchk.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pathchk/pathchk.1,v 1.5 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd May 21, 2002
 .Dt PATHCHK 1
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index dd9768a497e0e..2d5dcdc21de24 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pathchk/pathchk.c,v 1.5 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/pkill/Makefile b/usr.bin/pkill/Makefile
index 51ddc8d499cdd..587b2c685bc93 100644
--- a/usr.bin/pkill/Makefile
+++ b/usr.bin/pkill/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/pkill/Makefile,v 1.7 2006/08/20 04:25:20 yar Exp $
 
 BINDIR=	/bin
 
diff --git a/usr.bin/pkill/pkill.1 b/usr.bin/pkill/pkill.1
index 725f27eff8494..f56493d2016aa 100644
--- a/usr.bin/pkill/pkill.1
+++ b/usr.bin/pkill/pkill.1
@@ -1,6 +1,6 @@
 .\"	$NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pkill/pkill.1,v 1.22 2006/12/20 11:57:22 ru Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c
index 2547744a5489d..d2697203ea8ed 100644
--- a/usr.bin/pkill/pkill.c
+++ b/usr.bin/pkill/pkill.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pkill/pkill.c,v 1.31 2006/11/23 11:55:17 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 277459ee47a79..46257f47932c6 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)egetopt.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pr/egetopt.c,v 1.3 2002/06/23 20:42:30 charnier Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index da552c03e8e88..d3a999bfb14ad 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/extern.h,v 1.3 2002/09/04 23:29:05 dwmalone Exp $
  */
 
 extern int eoptind;
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 035958e26bf58..629512861d086 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/pr/pr.1,v 1.22 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index fed27f253add6..ff68e88fc596c 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)pr.c	8.2 (Berkeley) 4/16/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/pr/pr.c,v 1.19 2005/10/26 17:37:54 jhb Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index a4346c788dccb..d93fe8c422f87 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)pr.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/pr.h,v 1.4 2001/03/21 14:32:02 ache Exp $
  */
 
 /*
diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile
index bcb5952eb9eed..f6e4b181e4a96 100644
--- a/usr.bin/printenv/Makefile
+++ b/usr.bin/printenv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/printenv/Makefile,v 1.5 2003/06/01 06:29:47 tjr Exp $
 
 PROG=	printenv
 
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index 776e2653e0ae9..4b4181f39b3f7 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/printenv/printenv.1,v 1.20 2006/12/26 12:43:12 ru Exp $
 .\"
 .Dd May 12, 2003
 .Dt PRINTENV 1
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 8ad23c7454da5..fbda2718a8812 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/printenv/printenv.c,v 1.6 2002/09/04 23:29:05 dwmalone Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index 78cdd0d130191..7809e8beead2b 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/printf/Makefile,v 1.5 2005/04/14 08:43:36 stefanf Exp $
 
 PROG=	printf
 WARNS?=	6
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 4a30851de01e4..2754fb7f6c72f 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/printf/printf.1,v 1.34 2005/06/14 11:50:52 ru Exp $
 .\"
 .Dd April 14, 2005
 .Dt PRINTF 1
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index e86394dad52f9..5c82411c08d9b 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -44,7 +44,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)printf.c	8.1 (Berkeley) 7/20/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/printf/printf.c,v 1.37 2005/08/05 08:18:00 stefanf Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile
index a479402878feb..0e9c5d29a9f9c 100644
--- a/usr.bin/quota/Makefile
+++ b/usr.bin/quota/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/quota/Makefile,v 1.6 2006/10/21 23:57:38 ru Exp $
 
 PROG=	quota
 BINOWN=	root
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index fb06d44fa2841..24e5789a0f30c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/quota/quota.1,v 1.19 2007/02/11 18:13:00 mpp Exp $
 .\"
 .Dd February 3, 2007
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index c007e529dbf4e..f41d551057a11 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -48,7 +48,7 @@ static const char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
  * Disk quota reporting program.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/quota/quota.c,v 1.31 2007/05/07 12:10:06 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile
index d5471379fe1ed..b32dcebacc166 100644
--- a/usr.bin/renice/Makefile
+++ b/usr.bin/renice/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/renice/Makefile,v 1.5 2002/02/08 22:31:43 markm Exp $
 
 PROG=	renice
 MAN=	renice.8
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 4420d8efa7582..d42123879b3ce 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/renice/renice.8,v 1.16 2003/02/26 20:27:24 charnier Exp $
 .\"
 .Dd June 9, 1993
 .Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 21bb4c2c9805f..528176a2d1ad3 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/renice/renice.c,v 1.18 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile
index 27137ffb4d156..6275448f3e0ea 100644
--- a/usr.bin/rev/Makefile
+++ b/usr.bin/rev/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rev/Makefile,v 1.4 2002/02/08 22:31:43 markm Exp $
 
 PROG=	rev
 
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index 68b00bf89c53f..a1e9eb53eff73 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rev/rev.1,v 1.6 2001/02/13 09:55:09 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt REV 1
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index eed36a81c09b3..d14f31d1bc15e 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rev/rev.c,v 1.9 2006/07/30 07:41:28 maxim Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 195bffbb0b152..857d41013b05c 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rlogin/Makefile,v 1.28 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	rlogin
 
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 9a29f66147083..3a6ae5593f572 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rlogin/rlogin.1,v 1.27 2005/01/21 11:09:40 ru Exp $
 .\"
 .Dd September 26, 2003
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index c279535b64974..ecde5666a6fd1 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rlogin/rlogin.c,v 1.40 2005/11/13 21:03:56 dwmalone Exp $");
 
 /*
  * rlogin - remote login
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index c298820e343a1..b48935e253621 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rpcgen/Makefile,v 1.8 2005/08/31 19:44:40 stefanf Exp $
 
 PROG=	rpcgen
 SRCS=	rpc_main.c  rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 713cba11d55ad..290256342c901 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_clntout.c,v 1.12 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index c72edc6fe94dd..bb6b69eb0bd34 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_cout.c,v 1.16 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_cout.c, XDR routine outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 70683638360e6..1b749b3e22e00 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_hout.c,v 1.15 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_hout.c, Header file outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index fb3813f42bd70..0fa6dd1585a6b 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_main.c,v 1.33 2007/08/23 09:38:26 delphij Exp $");
 
 /*
  * rpc_main.c, Top level of the RPC protocol compiler.
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index f7f857a0c9a5e..870f613c766d8 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_parse.c,v 1.12 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_parse.c, Parser for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index 3ca874e449456..f454dd9e89f48 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/rpcgen/rpc_parse.h,v 1.7 2005/11/13 21:17:24 dwmalone Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index 3a4e392d1ce8b..692662a762158 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -30,7 +30,7 @@
 /* #pragma ident	"@(#)rpc_sample.c	1.9	94/04/25 SMI" */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_sample.c,v 1.9 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 421b0552aa05e..3aeb6c8e1bdb5 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_scan.c,v 1.10 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_scan.c, Scanner for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index a57eb3bb1948a..3caf9fa091e01 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/rpcgen/rpc_scan.h,v 1.7 2005/11/13 21:17:24 dwmalone Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 6fd7cad2ce641..1b37055f7a60e 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_svcout.c,v 1.25 2007/08/23 09:39:40 delphij Exp $");
 
 /*
  * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index f96bdfcbc187e..7665f804e7811 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_tblout.c,v 1.12 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 9d1c85be5f1cf..3d5b491d22a55 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcgen/rpc_util.c,v 1.10 2005/11/13 21:17:24 dwmalone Exp $");
 
 /*
  * rpc_util.c, Utility routines for the RPC protocol compiler
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 644cbeaa9347a..7195730100ae5 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/rpcgen/rpc_util.h,v 1.12 2005/11/13 21:17:24 dwmalone Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 2a4a25ecc51be..d9209244c481e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.24 2005/09/02 18:37:34 stefanf Exp $
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .\"
 .Dd September 2, 2005
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index c89b5b3cbe563..e576cadbd57c8 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rpcinfo/Makefile,v 1.8 2006/07/27 13:47:02 yar Exp $
 
 PROG=	rpcinfo
 SRCS=	rpcinfo.c
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index f4c7fc79868c1..940da8c0e97c9 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -2,7 +2,7 @@
 .\" Copyright 1989 AT&T
 .\" Copyright 1991 Sun Microsystems, Inc.
 .\" $NetBSD: rpcinfo.8,v 1.6 2000/06/02 23:19:38 fvdl Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcinfo/rpcinfo.8,v 1.9 2002/10/16 15:38:28 charnier Exp $
 .Dd August 18, 1992
 .Dt RPCINFO 8
 .Os
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index a2e662961adac..d7c8025722f61 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rpcinfo.c 1.16 89/04/05 Copyr 1986 Sun Micro";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rpcinfo/rpcinfo.c,v 1.17 2004/03/11 10:22:25 bde Exp $");
 
 /*
  * rpcinfo: ping a particular rpc program
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index 4aa338202f020..680a319f44400 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rs/rs.1,v 1.12 2006/10/20 04:31:01 cperciva Exp $
 .\"
 .Dd July 30, 2004
 .Dt RS 1
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index df01c57d1b63b..60be8c4324ef0 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -48,7 +48,7 @@ static const char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rs/rs.c,v 1.13 2005/04/28 12:37:15 robert Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index cf052f71efa71..35a1e1f393f7f 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rsh/Makefile,v 1.24 2005/01/27 14:52:45 delphij Exp $
 
 PROG=	rsh
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index ee5d0dd193ffc..a0810d8ad2728 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rsh/rsh.1,v 1.21 2005/07/14 20:29:07 brueffer Exp $
 .\"
 .Dd October 16, 2002
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index a3668300f3873..465b264a31b4f 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -51,7 +51,7 @@ static const char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rsh/rsh.c,v 1.35 2005/05/21 09:55:07 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 6d329774b7111..9059f0e5e99aa 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rup/Makefile,v 1.5 2001/03/27 10:52:09 ru Exp $
 
 PROG=	rup
 
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index fca4cdb6d9562..5e9ab3d3f31c5 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rup/rup.1,v 1.20 2007/02/28 10:22:19 ru Exp $
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 239b313ce8112..073b6c4738610 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rup/rup.c,v 1.19 2005/12/04 18:25:26 philip Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 3d0938140daf2..6b50cfcc53f93 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.17 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd March 1, 2003
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index f0778ea3f4c28..fd98d8446034b 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -42,7 +42,7 @@ static const char sccsid[] = "@(#)ruptime.c	8.2 (Berkeley) 4/5/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ruptime/ruptime.c,v 1.18 2005/09/02 14:58:26 ssouhlal Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 21d0ce24a7068..b37c8d0b33052 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rusers/Makefile,v 1.6 2004/05/19 21:34:52 dwmalone Exp $
 
 PROG = rusers
 WARNS?=	6
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index f528bb87e4e44..d08b73686bae0 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rusers/rusers.1,v 1.18 2004/07/04 20:55:50 ru Exp $
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 705c887e8d7d2..91fe63bdd86a7 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rusers/rusers.c,v 1.17 2005/05/21 09:55:08 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 4e448dbd2ca76..0ca9e4fc40b09 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rwall/Makefile,v 1.6 2004/02/04 11:59:07 ru Exp $
 
 PROG = rwall
 
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 2de83d4c27110..e08884699791c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rwall/rwall.1,v 1.15 2004/07/04 20:55:50 ru Exp $
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 042b72f713556..5aac7f537766e 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rwall/rwall.c,v 1.14 2005/05/21 09:55:08 ru Exp $");
 
 /*
  * This program is not related to David Wall, whose Stanford Ph.D. thesis
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index 684e508146d00..d0ac8376dc885 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rwho/rwho.1,v 1.11 2005/08/07 11:48:44 ssouhlal Exp $
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index be82ad36d4dcc..50a17d21d6230 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/rwho/rwho.c,v 1.18 2002/07/01 16:40:33 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/file.h>
diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile
index 50ba12e696af6..1d53d1aa789ba 100644
--- a/usr.bin/script/Makefile
+++ b/usr.bin/script/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/script/Makefile,v 1.4 2001/12/12 23:23:52 markm Exp $
 
 PROG=	script
 LDADD=	-lutil
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 1c93b3e48a15e..8c0dae9250694 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/script/script.1,v 1.21 2004/07/03 00:24:43 ru Exp $
 .\"
 .Dd January 22, 2004
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index ad706dcdd350a..1c2a383316ed8 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/script/script.c,v 1.24 2004/02/15 17:30:13 cperciva Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index 9d9886f3688cd..a411bd79f0e5c 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sed/Makefile,v 1.5 2002/06/17 08:21:53 sobomax Exp $
 
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c
diff --git a/usr.bin/sed/POSIX b/usr.bin/sed/POSIX
index 239acf8e48d14..bd600a66a4fb1 100644
--- a/usr.bin/sed/POSIX
+++ b/usr.bin/sed/POSIX
@@ -1,5 +1,5 @@
 #	@(#)POSIX	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sed/POSIX,v 1.4 2007/04/06 08:43:30 yar Exp $
 
 Comments on the IEEE P1003.2 Draft 12
      Part 2: Shell and Utilities
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 635e058eac67b..e420c930a71b5 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/compile.c,v 1.30 2007/07/06 16:34:56 delphij Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index cbc0790afa10e..b313f54e7f4ac 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/sed/defs.h,v 1.6 2007/07/04 16:42:41 ssouhlal Exp $
  */
 
 /*
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index f2bd71bacfa4b..488468f582d51 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/sed/extern.h,v 1.15 2007/06/12 12:05:23 yar Exp $
  */
 
 extern struct s_command *prog;
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index e17741f6257d8..17594ea5cafeb 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/main.c,v 1.39 2007/06/12 12:05:23 yar Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index f3b513784a6ea..2a3789221df37 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/misc.c,v 1.10 2004/08/09 15:29:41 dds Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index fb3f9004f9e0e..a0ba85516edc9 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sed/process.c,v 1.48 2007/06/12 12:17:25 yar Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 71f3a9d688b17..615e79796ddb8 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/sed/sed.1,v 1.46 2007/07/04 16:42:41 ssouhlal Exp $
 .\"
 .Dd April 21, 2007
 .Dt SED 1
diff --git a/usr.bin/setchannel/Makefile b/usr.bin/setchannel/Makefile
index 0ffb33078592c..f3e66755a607c 100644
--- a/usr.bin/setchannel/Makefile
+++ b/usr.bin/setchannel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/setchannel/Makefile,v 1.1 2006/12/09 02:27:45 grog Exp $
 
 PROG=   setchannel
 
diff --git a/usr.bin/setchannel/setchannel.1 b/usr.bin/setchannel/setchannel.1
index c51ec3c00d728..f20b3b9c4f5fd 100644
--- a/usr.bin/setchannel/setchannel.1
+++ b/usr.bin/setchannel/setchannel.1
@@ -23,7 +23,7 @@
 .\ SUCH DAMAGE.
 .\
 .\" $Id: cxm.4,v 1.1 2004/10/16 00:12:35 mavetju Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/setchannel/setchannel.1,v 1.3 2007/02/25 01:28:37 grog Exp $
 .\"
 .Dd November 30, 2006
 .Dt pvr250-setchannel 1
diff --git a/usr.bin/setchannel/setchannel.c b/usr.bin/setchannel/setchannel.c
index f6f3e2040ac67..7800a7eaa7d16 100644
--- a/usr.bin/setchannel/setchannel.c
+++ b/usr.bin/setchannel/setchannel.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *  $FreeBSD$
+ *  $FreeBSD: src/usr.bin/setchannel/setchannel.c,v 1.5 2007/02/25 01:28:37 grog Exp $
  */
 
 /* Set the channel of the tuner card. */
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 9970eb5c3cef5..fcd79990d17e1 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/shar/Makefile,v 1.7 2001/04/07 11:21:24 ru Exp $
 
 SCRIPTS=shar.sh
 MAN=	shar.1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 1143f9cd3b7b8..88dd16f2fe0b1 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/shar/shar.1,v 1.11 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index 59199098dda60..444408ca3de3e 100644
--- a/usr.bin/showmount/Makefile
+++ b/usr.bin/showmount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/showmount/Makefile,v 1.4 2001/03/27 10:52:12 ru Exp $
 
 PROG=	showmount
 MAN=	showmount.8
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index fe53d88dc822b..8c7ad4d6fd064 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/showmount/showmount.8,v 1.18 2005/01/18 13:43:52 ru Exp $
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index b9ea200692f4b..c4814a2f70018 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/showmount/showmount.c,v 1.16 2005/05/21 09:55:08 ru Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile
index 13b5078e0411b..8e8721d3debd9 100644
--- a/usr.bin/smbutil/Makefile
+++ b/usr.bin/smbutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/smbutil/Makefile,v 1.2 2005/05/04 15:05:46 takawata Exp $
 
 PROG=	smbutil
 SRCS=	smbutil.c dumptree.c login.c lookup.c view.c print.c
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index 55e702577e6c8..37419d59f4a29 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sockstat/Makefile,v 1.7 2005/01/28 16:08:08 ru Exp $
 
 PROG=		sockstat
 WARNS?=		4
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 0fa6bada48120..2a3ea444bcb52 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.21 2006/11/11 22:11:54 keramida Exp $
 .\"
 .Dd November 11, 2006
 .Dt SOCKSTAT 1
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index 8c29843670a86..521018196bdc8 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.17 2007/06/16 20:24:55 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile
index d176fdd7d4570..0fbeb420e207c 100644
--- a/usr.bin/split/Makefile
+++ b/usr.bin/split/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/split/Makefile,v 1.4 2001/12/12 23:09:07 markm Exp $
 
 PROG=	split
 
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 5e8e198cba9ec..caabb66eb051b 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/split/split.1,v 1.21 2006/09/29 15:20:47 ru Exp $
 .\"
 .Dd August 10, 2006
 .Dt SPLIT 1
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index d7936b0b88ddf..c52df066ed8d7 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/split/split.c,v 1.19 2006/08/10 10:41:47 keramida Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile
index 808c41e9b0cb5..428cea6676af1 100644
--- a/usr.bin/stat/Makefile
+++ b/usr.bin/stat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/stat/Makefile,v 1.4 2005/01/28 16:08:08 ru Exp $
 
 PROG=	stat
 WARNS?=	2
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index 8c260e25c124f..a1d63b0997c22 100644
--- a/usr.bin/stat/stat.1
+++ b/usr.bin/stat/stat.1
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.9 2007/04/27 18:23:32 brian Exp $
 .\"
 .Dd April 27, 2007
 .Dt STAT 1
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index b67627e947160..b9eaf9f8ff4b8 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -41,7 +41,7 @@ __RCSID("$NetBSD: stat.c,v 1.13 2003/07/25 03:21:17 atatat Exp $");
 #endif
 #endif
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/stat/stat.c,v 1.6 2003/10/06 01:55:17 dougb Exp $");
 
 #if HAVE_CONFIG_H
 #include "config.h" 
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 25216cf44f1d8..cbe2aa1de2bad 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/su/Makefile,v 1.41 2006/09/01 13:39:02 csjp Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 56d3f9832635c..49d54688e6364 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/su/su.1,v 1.40 2007/07/24 06:41:07 delphij Exp $
 .\"
 .Dd September 13, 2006
 .Dt SU 1
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 9f5ac44dade8c..57ab87f414ce2 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -74,7 +74,7 @@ static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/su/su.c,v 1.86.2.1 2007/10/24 01:04:10 davidxu Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 4f5f229725b61..1e36f73674312 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/systat/Makefile,v 1.18 2006/11/27 21:30:38 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index b15286b580c53..50575dd19538b 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/cmds.c,v 1.5 2003/01/04 21:58:25 phk Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index a8daa1311ee51..c652a213801f0 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/cmdtab.c,v 1.10 2006/04/30 04:26:46 bde Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/convtbl.c b/usr.bin/systat/convtbl.c
index ba4d795dfc331..cd1dfb7782628 100644
--- a/usr.bin/systat/convtbl.c
+++ b/usr.bin/systat/convtbl.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/convtbl.c,v 1.12 2007/01/18 09:24:08 ru Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/systat/convtbl.h b/usr.bin/systat/convtbl.h
index 051e1cd4f08a6..ab891f9b630e5 100644
--- a/usr.bin/systat/convtbl.h
+++ b/usr.bin/systat/convtbl.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/convtbl.h,v 1.8 2006/11/27 16:33:44 yar Exp $
  */
 
 #ifndef _CONVTBL_H_
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index d37cf2d5ad984..a9ba440fdf570 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/devs.c,v 1.9 2003/10/20 20:13:50 phk Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)disks.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index 921700846b231..314ffe3a80108 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/devs.h,v 1.4 2001/12/12 00:13:37 markm Exp $
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 84af89ca55f08..2cf4afbafd107 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/extern.h,v 1.14 2004/03/09 11:57:27 dwmalone Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 1a22bbeb171f3..94752bd73b8ff 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/fetch.c,v 1.5 2001/12/12 00:13:37 markm Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)fetch.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index e09ced5ad888f..3d9d4cdf58e0a 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/icmp.c,v 1.5 2006/04/30 04:47:23 bde Exp $");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 28a9af7a10abe..62c198227d480 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/icmp6.c,v 1.3 2006/04/30 04:47:23 bde Exp $");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ifcmds.c b/usr.bin/systat/ifcmds.c
index 495ac46ac637c..dc03fc83cff26 100644
--- a/usr.bin/systat/ifcmds.c
+++ b/usr.bin/systat/ifcmds.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/ifcmds.c,v 1.6 2006/11/27 16:14:32 yar Exp $
  */
 
 #include "systat.h"
diff --git a/usr.bin/systat/ifstat.c b/usr.bin/systat/ifstat.c
index 62773e9fd09c6..ed3e8476d52f7 100644
--- a/usr.bin/systat/ifstat.c
+++ b/usr.bin/systat/ifstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/ifstat.c,v 1.6.4.1 2008/01/26 22:13:30 delphij Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 1ac8d5b667adf..88c1188535f2c 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -60,7 +60,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/iostat.c,v 1.24 2006/11/27 20:19:05 yar Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index f811f2ff65804..e81f45980564e 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/ip.c,v 1.7 2006/04/30 04:47:23 bde Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index 6c7a1b9c7e0f5..7cda4e77a8e4d 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/ip6.c,v 1.3 2006/04/30 04:47:23 bde Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index b563266be97f3..96bc702cd27e5 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/keyboard.c,v 1.2 2001/12/12 00:13:37 markm Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)keyboard.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 980e06480fde1..25f90817e4561 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/main.c,v 1.20 2006/04/30 04:47:23 bde Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 5469de856cce7..2bf800a3368a6 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/mbufs.c,v 1.20 2006/07/24 01:49:24 rwatson Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 5f64e3ec237ff..53bbb4cd01193 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -58,7 +58,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/mode.c,v 1.3 2001/12/12 00:13:37 markm Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index 9fc0feae96d50..cb6d40cc8474e 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/mode.h,v 1.3 2001/12/12 00:13:37 markm Exp $
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index c78f6feac7d76..e7d7e9aae2d22 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/netcmds.c,v 1.12 2002/03/22 01:42:31 imp Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 22ef864c4e707..5083dfdfe927b 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/netstat.c,v 1.28 2006/11/27 17:34:40 yar Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 6d911d6f12258..59abbe34cdf17 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.24 2007/09/17 05:27:19 jeff Exp $");
 
 /*
  * Pigs display from Bill Reeves at Lucasfilm
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index e4a5dda50a948..a18a3f9f11e66 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/swap.c,v 1.35 2006/12/23 22:39:38 yar Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 0c5c4b5691ef0..70d67c4a54ad6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.53 2006/10/12 10:54:34 ru Exp $
 .\"
 .Dd October 12, 2006
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 501d3d7b1bb8a..278ce98bb963b 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
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/systat.h,v 1.8 2006/04/30 04:47:23 bde Exp $
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 0086b9c5f21ee..d086c81307055 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -41,7 +41,7 @@ static const char rcsid[] =
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/tcp.c,v 1.14 2007/06/15 18:12:58 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 5aa28c15b7cde..28026623e1644 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/systat/vmstat.c,v 1.83 2006/11/28 12:46:02 ru Exp $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile
index 4b5d40e0d3024..f35ca4d0057af 100644
--- a/usr.bin/tabs/Makefile
+++ b/usr.bin/tabs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tabs/Makefile,v 1.1 2002/05/21 02:33:25 tjr Exp $
 
 PROG=	tabs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/tabs/tabs.1 b/usr.bin/tabs/tabs.1
index 9075de5fa7ff7..b2f8523371897 100644
--- a/usr.bin/tabs/tabs.1
+++ b/usr.bin/tabs/tabs.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tabs/tabs.1,v 1.7 2005/01/17 07:44:29 ru Exp $
 .\"
 .Dd May 20, 2002
 .Dt TABS 1
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index d03a7413d175f..48a610516d4d9 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tabs/tabs.c,v 1.3 2002/06/08 11:33:22 tjr Exp $");
 
 #include <sys/types.h>
 #include <sys/tty.h>
diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile
index c8166936983d5..c11dc8cae8fd0 100644
--- a/usr.bin/tail/Makefile
+++ b/usr.bin/tail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tail/Makefile,v 1.4 2005/01/10 20:22:37 dwmalone Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	tail
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index d9566807a529b..6f47a98f2ace0 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tail/extern.h,v 1.10 2006/06/29 22:07:49 flz Exp $
  */
 
 #define	WR(p, size) do { \
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index c79c4382de045..f44d1f1d0bdeb 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/forward.c,v 1.41 2006/10/21 18:05:06 marcel Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)forward.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index 584e3d103eab3..0bb8ecabf9464 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/misc.c,v 1.9 2005/01/10 20:19:46 dwmalone Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 85d4d6ec51a74..3a75310aedb03 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/read.c,v 1.11.10.2 2007/11/29 03:50:54 avatar Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index f0a52aa8bcc51..981dec692a934 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/reverse.c,v 1.19 2005/03/20 22:08:52 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 251511a86eb8f..f94e5b7523cb7 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tail/tail.1,v 1.15 2006/12/24 19:18:52 ru Exp $
 .\"
 .Dd June 29, 2006
 .Dt TAIL 1
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 2292c5fb8f21c..0b140b91c57ed 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tail/tail.c,v 1.23 2006/06/30 08:19:26 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 94795d775bb37..1011a82966f4f 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/talk/Makefile,v 1.10 2002/02/08 23:07:35 markm Exp $
 
 PROG=	talk
 SRCS=	ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 717ffb36a5402..b1de3d2da546b 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/ctl.c,v 1.10 2005/02/09 09:13:36 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 0871febe7361b..06c32b0c0dfa7 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/ctl_transact.c,v 1.7 2002/02/18 20:35:26 mike Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 24851e45fab1b..a495aa4709e25 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/display.c,v 1.11 2003/07/04 20:44:25 luigi Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index f212a209a0157..b54ed3ba769e6 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/get_addrs.c,v 1.5 2001/12/11 23:51:14 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index d7cca18ec0dc1..7e646ff23a293 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/get_iface.c,v 1.10 2005/03/11 14:17:12 stefanf Exp $");
 
 /*
  * From:
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index ad6b8235eec19..0f23d35e90b71 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/get_names.c,v 1.9 2004/06/14 22:34:13 bms Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index f391b76a5e0bc..ce24553aef84b 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/init_disp.c,v 1.14 2004/04/19 21:37:28 cognet Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index a6e98e8900db8..4d73e78a5ff04 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/invite.c,v 1.9 2003/01/01 18:49:00 schweikh Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index bcbf53580d06f..f9b306d921c96 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/io.c,v 1.16 2004/05/10 15:52:16 cognet Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 1ff1477b22ffc..f251661e8b1bc 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/look_up.c,v 1.8 2005/02/09 09:13:36 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index e4a0977396710..6936efaa285f3 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/msgs.c,v 1.6 2001/12/11 23:51:14 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 775b6d1437cea..4a41c4b368ac3 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/talk/talk.1,v 1.20 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd July 3, 2004
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 8e3f540055bb2..b58839c30a924 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/talk/talk.c,v 1.11 2002/08/19 03:07:56 jmallett Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 2a81a53bca9b6..7f3bcf4c9ec9e 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)talk.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/talk/talk.h,v 1.5 2004/04/19 21:37:29 cognet Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tar/COPYING b/usr.bin/tar/COPYING
index 6d66cdab3c72d..e0cc5d0435259 100644
--- a/usr.bin/tar/COPYING
+++ b/usr.bin/tar/COPYING
@@ -24,4 +24,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.bin/tar/COPYING,v 1.2 2007/01/09 08:12:17 kientzle Exp $
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 153cd0ec9af27..b20867a13261b 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/Makefile,v 1.32 2007/07/20 01:24:49 kientzle Exp $
 
 PROG=	bsdtar
 VERSION=	2.2.5
diff --git a/usr.bin/tar/bsdtar.1 b/usr.bin/tar/bsdtar.1
index e6350dccc1c8b..44b7909fc7adf 100644
--- a/usr.bin/tar/bsdtar.1
+++ b/usr.bin/tar/bsdtar.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tar/bsdtar.1,v 1.35 2007/05/29 05:39:10 kientzle Exp $
 .\"
 .Dd April 13, 2004
 .Dt BSDTAR 1
diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c
index d20a5cf5b7094..478a70a493c45 100644
--- a/usr.bin/tar/bsdtar.c
+++ b/usr.bin/tar/bsdtar.c
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.77 2007/09/09 00:07:18 kientzle Exp $");
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/usr.bin/tar/bsdtar.h b/usr.bin/tar/bsdtar.h
index 8a56ddfea984f..3117d6664f17c 100644
--- a/usr.bin/tar/bsdtar.h
+++ b/usr.bin/tar/bsdtar.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.28 2007/05/29 05:39:10 kientzle Exp $
  */
 
 #include "bsdtar_platform.h"
diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h
index a91797868be66..707abcbda2051 100644
--- a/usr.bin/tar/bsdtar_platform.h
+++ b/usr.bin/tar/bsdtar_platform.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tar/bsdtar_platform.h,v 1.24 2007/04/12 04:45:32 kientzle Exp $
  */
 
 /*
diff --git a/usr.bin/tar/config_freebsd.h b/usr.bin/tar/config_freebsd.h
index 164ce528c4e28..c7b6878f98155 100644
--- a/usr.bin/tar/config_freebsd.h
+++ b/usr.bin/tar/config_freebsd.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tar/config_freebsd.h,v 1.1 2007/03/11 10:36:42 kientzle Exp $
  */
 
 /* A default configuration for FreeBSD, used if there is no config.h. */
diff --git a/usr.bin/tar/getdate.y b/usr.bin/tar/getdate.y
index 16162c35424bd..3253f6d68acfe 100644
--- a/usr.bin/tar/getdate.y
+++ b/usr.bin/tar/getdate.y
@@ -26,7 +26,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/getdate.y,v 1.9 2007/07/20 01:27:50 kientzle Exp $");
 #endif
 
 #include <ctype.h>
diff --git a/usr.bin/tar/matching.c b/usr.bin/tar/matching.c
index c3ff802b9a95e..f0ca0c9abbc2e 100644
--- a/usr.bin/tar/matching.c
+++ b/usr.bin/tar/matching.c
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/matching.c,v 1.11 2007/03/11 10:36:42 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c
index b0c5d2c8edea8..b52c1ee0d5479 100644
--- a/usr.bin/tar/read.c
+++ b/usr.bin/tar/read.c
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.34 2007/07/20 01:24:49 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/usr.bin/tar/test/config.sh b/usr.bin/tar/test/config.sh
index 49b6972cf10dd..c983d83e57117 100755
--- a/usr.bin/tar/test/config.sh
+++ b/usr.bin/tar/test/config.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/config.sh,v 1.2 2007/03/11 19:33:45 kientzle Exp $
 
 THISDIR=`cd \`dirname $0\`;/bin/pwd`
 
diff --git a/usr.bin/tar/test/test-acl.sh b/usr.bin/tar/test/test-acl.sh
index 0d0bbebbfbf78..818607dcd13c6 100755
--- a/usr.bin/tar/test/test-acl.sh
+++ b/usr.bin/tar/test/test-acl.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-acl.sh,v 1.1 2007/03/11 10:36:42 kientzle Exp $
 
 # Exercise copying of ACLs
 echo "ACL handling"
diff --git a/usr.bin/tar/test/test-basic.sh b/usr.bin/tar/test/test-basic.sh
index 42c6749b39375..65ac7f5215107 100755
--- a/usr.bin/tar/test/test-basic.sh
+++ b/usr.bin/tar/test/test-basic.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-basic.sh,v 1.5 2007/04/18 04:35:17 kientzle Exp $
 
 # Generate a dir tree with various data and copy it using
 # a variety of tools and flags.  This mostly checks that
diff --git a/usr.bin/tar/test/test-deep-dir.sh b/usr.bin/tar/test/test-deep-dir.sh
index f16e7c4aa3851..22cf1c8f826f9 100755
--- a/usr.bin/tar/test/test-deep-dir.sh
+++ b/usr.bin/tar/test/test-deep-dir.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-deep-dir.sh,v 1.1 2007/03/11 10:36:42 kientzle Exp $
 
 # Stress the deep directory logic; the actual depth here seems to
 # be limited by the shell.  This should be restructured to get around
diff --git a/usr.bin/tar/test/test-flags.sh b/usr.bin/tar/test/test-flags.sh
index 3d8c322c6ceee..bfbf542163caa 100755
--- a/usr.bin/tar/test/test-flags.sh
+++ b/usr.bin/tar/test/test-flags.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-flags.sh,v 1.1 2007/03/11 10:36:42 kientzle Exp $
 
 # Exercise copying of file flags
 echo "File Flag handling"
diff --git a/usr.bin/tar/test/test-nodump.sh b/usr.bin/tar/test/test-nodump.sh
index 131fc08796873..1d21b49032d10 100755
--- a/usr.bin/tar/test/test-nodump.sh
+++ b/usr.bin/tar/test/test-nodump.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-nodump.sh,v 1.1 2007/03/11 10:36:42 kientzle Exp $
 
 # Test that archiving obeys the 'nodump' flag
 echo "Verify 'nodump'"
diff --git a/usr.bin/tar/test/test-overwrite.sh b/usr.bin/tar/test/test-overwrite.sh
index 03bfc96e7dedf..b9208905b57a6 100755
--- a/usr.bin/tar/test/test-overwrite.sh
+++ b/usr.bin/tar/test/test-overwrite.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-overwrite.sh,v 1.1 2007/03/11 10:36:42 kientzle Exp $
 
 echo "Test overwrite avoidance"
 . `dirname $0`/config.sh
diff --git a/usr.bin/tar/test/test-utf8.sh b/usr.bin/tar/test/test-utf8.sh
index 16438eadb90c2..c1b18a690489e 100755
--- a/usr.bin/tar/test/test-utf8.sh
+++ b/usr.bin/tar/test/test-utf8.sh
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tar/test/test-utf8.sh,v 1.1 2007/03/11 10:36:42 kientzle Exp $
 
 echo "Test UTF8 filenames"
 . `dirname $0`/config.sh
diff --git a/usr.bin/tar/tree.c b/usr.bin/tar/tree.c
index 4c9a4bd1b25e5..23e64e3da0644 100644
--- a/usr.bin/tar/tree.c
+++ b/usr.bin/tar/tree.c
@@ -43,7 +43,7 @@
  * regular dir or via fchdir(2) for a symlink).
  */
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/tree.c,v 1.8 2007/03/11 10:36:42 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/usr.bin/tar/tree.h b/usr.bin/tar/tree.h
index ff38f5346c1ce..a32a15f8f3257 100644
--- a/usr.bin/tar/tree.h
+++ b/usr.bin/tar/tree.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tar/tree.h,v 1.3 2007/01/09 08:12:17 kientzle Exp $
  */
 
 /*-
diff --git a/usr.bin/tar/util.c b/usr.bin/tar/util.c
index 080252c39d1bb..d4a92c9befe99 100644
--- a/usr.bin/tar/util.c
+++ b/usr.bin/tar/util.c
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.17 2007/04/18 04:36:11 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c
index 0efddd0977465..f25b6857d4f3b 100644
--- a/usr.bin/tar/write.c
+++ b/usr.bin/tar/write.c
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.63 2007/05/29 05:39:10 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile
index 1bae0b2294209..2cc2841ef5eef 100644
--- a/usr.bin/tcopy/Makefile
+++ b/usr.bin/tcopy/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tcopy/Makefile,v 1.3 2002/02/08 23:07:35 markm Exp $
 
 PROG=	tcopy
 
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 5d926b8f56ded..880bf6349a91a 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tcopy/tcopy.1,v 1.18 2006/12/20 15:34:01 ru Exp $
 .\"
 .Dd December 20, 2006
 .Dt TCOPY 1
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 540ac06af7380..7b0b77cba5dcd 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tcopy/tcopy.c,v 1.13 2002/03/25 05:23:45 mike Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile
index 920dd66059170..c546408ed5746 100644
--- a/usr.bin/tee/Makefile
+++ b/usr.bin/tee/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tee/Makefile,v 1.4 2001/12/12 00:06:51 markm Exp $
 
 PROG=	tee
 
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index fec2cd2f70998..65bfc2c37a747 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tee/tee.1,v 1.7.10.1 2007/11/14 19:25:05 ru Exp $
 .\"
 .Dd November 13, 2007
 .Dt TEE 1
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 123a2de69ab55..a9741998a3d26 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tee/tee.c,v 1.10 2002/09/04 23:29:07 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index c5525b3c20d18..15ba95525c1c0 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/telnet/Makefile,v 1.33 2007/07/05 08:56:45 bz Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index a51afed997450..6a05f0f5b1b16 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tftp/Makefile,v 1.5 2002/02/08 23:07:35 markm Exp $
 
 PROG=	tftp
 SRCS=	main.c tftp.c tftpsubs.c
diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h
index 3956aca95ecc8..fdf3d312e3d4e 100644
--- a/usr.bin/tftp/extern.h
+++ b/usr.bin/tftp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tftp/extern.h,v 1.3 2002/03/22 01:42:33 imp Exp $
  */
 
 void	recvfile(int, char *, char *);
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 591914cdff5bd..a525e200e0f93 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tftp/main.c,v 1.22 2005/10/19 15:37:42 stefanf Exp $");
 
 /* 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 8924eb5e56108..d32d024ec80ad 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tftp/tftp.1,v 1.19.10.1 2007/11/14 19:25:04 ru Exp $
 .\"
 .Dd October 1, 2003
 .Dt TFTP 1
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index c7c2c7e0fdf9a..1093dc6b5b54d 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tftp/tftp.c,v 1.13 2006/09/28 21:22:21 matteo Exp $");
 
 /* 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 a7911cf70a89b..7e0655bc58859 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tftp/tftpsubs.c,v 1.6 2005/02/14 17:42:58 stefanf Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h
index 0c3b42ea991a3..d3eafd9ade8d7 100644
--- a/usr.bin/tftp/tftpsubs.h
+++ b/usr.bin/tftp/tftpsubs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tftpsubs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tftp/tftpsubs.h,v 1.2 2002/03/22 01:42:34 imp Exp $
  */
 
 /*
diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile
index 5a580d2c4ead0..ef26618055404 100644
--- a/usr.bin/time/Makefile
+++ b/usr.bin/time/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/time/Makefile,v 1.2 2007/05/07 12:23:23 dwmalone Exp $
 
 PROG=	time
 WARNS?=6
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 79419bfa309c8..8960540442e61 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/time/time.1,v 1.26 2006/09/29 15:20:47 ru Exp $
 .\"
 .Dd May 14, 2006
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index a97ffecce2095..7c653b1858656 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/time/time.c,v 1.30 2007/05/07 12:23:23 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index 532431d13cae4..ee82e8bf7fcb0 100644
--- a/usr.bin/tip/Makefile
+++ b/usr.bin/tip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/Makefile,v 1.6 2001/12/20 14:25:46 markm Exp $
 
 SUBDIR=tip
 
diff --git a/usr.bin/tip/Makefile.inc b/usr.bin/tip/Makefile.inc
index 265f86d1ed55a..651f84c309c45 100644
--- a/usr.bin/tip/Makefile.inc
+++ b/usr.bin/tip/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/Makefile.inc,v 1.4 2001/12/20 14:25:46 markm Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.bin/tip/README b/usr.bin/tip/README
index fb9af15741198..ca3a3caa972c8 100644
--- a/usr.bin/tip/README
+++ b/usr.bin/tip/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/README,v 1.3 2001/12/20 14:25:46 markm Exp $
 
 Tip can be configured in a number of ways:
 
diff --git a/usr.bin/tip/TODO b/usr.bin/tip/TODO
index 6aace387e541d..559aefee8d033 100644
--- a/usr.bin/tip/TODO
+++ b/usr.bin/tip/TODO
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/TODO,v 1.3 2001/12/20 14:25:46 markm Exp $
 
 1. Rethink protection glitches on REMOTE & PHONES
    files (setuid/setgid??).
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 99b6fb08afeb1..d309773aa48dd 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/biz22.c,v 1.3 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index 5bc00ae517ed1..0fb5d4d3c0eb2 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/biz31.c,v 1.3 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index b23c28ccabb75..8fb6cff84b39b 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/courier.c,v 1.7 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index 03374e11678f7..7e826691c4f01 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/df.c,v 1.4 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index a0b18ba18afc7..71b94c0be468d 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/dn11.c,v 1.4 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index fe52274901d78..67648729f139b 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/hayes.c,v 1.6 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index a640ff3a2a139..3001cec7e56eb 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/t3000.c,v 1.6 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 0de679e3a382c..2c14181f5cc3f 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/v3451.c,v 1.3 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 7adc3c67b15c8..92a62b6179026 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/v831.c,v 1.5 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index 399b5d8cc54e7..05406ee05dce3 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/ventel.c,v 1.5 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile
index 8928621d61fed..b75e64ef56b79 100644
--- a/usr.bin/tip/tip/Makefile
+++ b/usr.bin/tip/tip/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.11 2006/05/25 08:41:52 jmc Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tip/tip/Makefile,v 1.20 2006/09/01 17:09:09 ru Exp $
 #
 # Files are:
 #	/etc/remote		remote host description file
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 5d2cda624c027..ceab4a3539fb8 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/acu.c,v 1.10 2007/05/12 23:29:33 pav Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 5f64968636778..bfe86ad0a6431 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/acutab.c,v 1.6 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index f6badcb876252..1ed497ab584dd 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.18 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index 3666c12af6716..997163912c769 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmdtab.c,v 1.7 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/cu.1 b/usr.bin/tip/tip/cu.1
index b67b19de4d08d..b2e0f85e27e62 100644
--- a/usr.bin/tip/tip/cu.1
+++ b/usr.bin/tip/tip/cu.1
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tip/tip/cu.1,v 1.2 2006/08/31 20:44:59 ru Exp $
 .\"
 .Dd September 1, 2006
 .Dt CU 1
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index d8d104d482e47..ad50fad67a7f3 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.7 2006/09/07 19:48:52 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 0c104f1d53268..ad530c9e5b2db 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/hunt.c,v 1.7 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index 8123795111a31..1ebf5f1ed545d 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/log.c,v 1.6 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index 05bb3294a7de9..71f9828892db3 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/partab.c,v 1.5 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index 66a453ddd65fc..92e92a1063d6f 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:18 millert Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.bin/tip/tip/pathnames.h,v 1.6 2006/08/31 14:14:29 ru Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index d9993ae7d9280..d406747b05f6d 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/remote.c,v 1.6 2006/08/31 14:14:29 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index ee085da811abc..37e03200bc220 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.27 2006/08/31 16:40:30 ru Exp $
 .\"
 .Dd August 31, 2006
 .Dt TIP 1
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 22b362c53389d..b151fbcacae5f 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.18 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index 5e9a37e7fce96..c078162f54632 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -1,6 +1,6 @@
 /*	$OpenBSD: tip.h,v 1.27 2006/08/18 03:06:18 jason Exp $	*/
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.bin/tip/tip/tip.h,v 1.11 2006/08/31 14:14:30 ru Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 42fc4a214e4fb..01c11b0e79deb 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/tipout.c,v 1.12 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index 81e463eb4ef6b..12980d89620d3 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/uucplock.c,v 1.8 2006/08/31 19:19:44 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index b6cf5c2a44115..4a6c40cf1b276 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/value.c,v 1.12 2007/02/23 18:41:12 jls Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index a991bcc5b51a5..4947cd01ec6ac 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tip/tip/vars.c,v 1.7 2006/08/31 14:14:30 ru Exp $");
 
 #ifndef lint
 #if 0
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile
index 182714aa7021a..b8c6257bd1067 100644
--- a/usr.bin/top/Makefile
+++ b/usr.bin/top/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/top/Makefile,v 1.11 2006/12/01 07:01:19 keramida Exp $
 
 TOPDIR=	${.CURDIR}/../../contrib/top
 .PATH: ${TOPDIR}
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index dadb03d4f60e6..c0eef2d348f6e 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -20,7 +20,7 @@
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *          Thomas Moestl <tmoestl@gmx.net>
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/top/machine.c,v 1.82 2007/09/17 05:27:19 jeff Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/top/top.local.1 b/usr.bin/top/top.local.1
index a3f3540a820d1..c21e149841ef2 100644
--- a/usr.bin/top/top.local.1
+++ b/usr.bin/top/top.local.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$ 
+.\" $FreeBSD: src/usr.bin/top/top.local.1,v 1.5 2007/09/02 10:29:16 ru Exp $ 
 .SH "FreeBSD NOTES"
 
 .SH DISPLAY OF THREADS
diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile
index e44f4f2cfdcc3..6ff2e02413964 100644
--- a/usr.bin/touch/Makefile
+++ b/usr.bin/touch/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/touch/Makefile,v 1.3 2001/12/11 23:38:24 markm Exp $
 
 PROG=	touch
 
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 8eb7f40262005..6e6678b6d5074 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/touch/touch.1,v 1.16 2007/04/10 07:24:47 grog Exp $
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 624ce05065e6d..524a9ce813bbe 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/touch/touch.c,v 1.23 2007/04/10 07:22:30 grog Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 143dc651e1353..fe8a25990b83c 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tput/Makefile,v 1.4 2001/04/07 11:21:25 ru Exp $
 
 PROG=	tput
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 33950a766bf58..4003c7f455f03 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tput/tput.1,v 1.17 2005/02/13 22:25:24 ru Exp $
 .\"
 .Dd June 15, 2002
 .Dt TPUT 1
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index a478d5dcf49ac..13a09e2a82fb3 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tput/tput.c,v 1.16 2006/10/12 21:10:55 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
index 00bdd8d5bb7aa..f240ad15c6ac6 100644
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tr/Makefile,v 1.2 2004/07/09 02:08:07 tjr Exp $
 
 PROG=	tr
 SRCS=	cmap.c cset.c str.c tr.c
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index 811040c25e761..1edd9d257b8c0 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/cmap.c,v 1.2 2004/07/14 08:36:09 tjr Exp $");
 
 #include <assert.h>
 #include <limits.h>
diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h
index 9a81e134678fd..38e3d0e275e8b 100644
--- a/usr.bin/tr/cmap.h
+++ b/usr.bin/tr/cmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tr/cmap.h,v 1.1 2004/07/09 02:08:07 tjr Exp $
  */
 
 #ifndef CMAP_H
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index 1b4212949b6cf..6e7c21734b18d 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/cset.c,v 1.3 2004/07/14 08:33:14 tjr Exp $");
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h
index ab3eabd3e4390..ae62d1dfa898d 100644
--- a/usr.bin/tr/cset.h
+++ b/usr.bin/tr/cset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tr/cset.h,v 1.2 2004/07/14 08:35:11 tjr Exp $
  */
 
 #ifndef CSET_H
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 2fdbdf33438cf..adc9ec3c0c20d 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/tr/extern.h,v 1.9 2004/07/09 02:08:07 tjr Exp $
  */
 
 #include <limits.h>
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 86ae1731ac42f..8a5e97f1515fd 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/str.c,v 1.25 2007/01/20 08:24:01 maxim Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index e30c877399cf3..1d8ba3623382c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tr/tr.1,v 1.34 2006/10/13 16:13:45 ru Exp $
 .\"
 .Dd October 13, 2006
 .Dt TR 1
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 61195ff4dbb0b..fbfb8320f9d01 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tr/tr.c,v 1.24 2005/04/09 14:31:41 stefanf Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index 028a6ca75c9fb..eb1ce72f39c8a 100644
--- a/usr.bin/true/Makefile
+++ b/usr.bin/true/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/true/Makefile,v 1.4 2001/12/12 00:06:51 markm Exp $
 
 PROG=	true
 
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index 58d3a0236878c..251d6235dc02a 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/true/true.1,v 1.12 2002/04/20 12:17:23 charnier Exp $
 .\"
 .Dd June 9, 1993
 .Dt TRUE 1
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index 8e2f2554396a2..5d7a1fb45ecab 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/true/true.c,v 1.6 2003/02/19 00:18:13 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile
index 4752c5cb64e25..1325fe2b62aa5 100644
--- a/usr.bin/truncate/Makefile
+++ b/usr.bin/truncate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truncate/Makefile,v 1.3 2001/12/12 00:06:52 markm Exp $
 
 PROG=		truncate
 
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index 827097ce6c6ff..5d2669edee696 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/truncate/truncate.1,v 1.15 2006/12/19 11:20:34 ru Exp $
 .\"
 .Dd December 19, 2006
 .Dt TRUNCATE 1
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index 98f72898c0484..87ac054c8c099 100644
--- a/usr.bin/truncate/truncate.c
+++ b/usr.bin/truncate/truncate.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$FreeBSD$";
+    "$FreeBSD: src/usr.bin/truncate/truncate.c,v 1.12 2006/09/18 16:39:23 maxim Exp $";
 #endif
 
 #include <sys/stat.h>
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 18c2b932c6774..f6a138f6bcba0 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truss/Makefile,v 1.22 2007/04/10 04:03:34 delphij Exp $
 
 WARNS?= 6	
 NO_WERROR=
diff --git a/usr.bin/truss/amd64-fbsd.c b/usr.bin/truss/amd64-fbsd.c
index 3a632d637c5eb..4aca6750128f5 100644
--- a/usr.bin/truss/amd64-fbsd.c
+++ b/usr.bin/truss/amd64-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/amd64-fbsd.c,v 1.8 2007/06/26 22:42:37 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index 3882f1053cda4..2bb2c5857ed0c 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/extern.h,v 1.12 2007/04/10 04:03:34 delphij Exp $
  */
 
 extern int setup_and_wait(char **);
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 4f0eabb206224..804d511f136f5 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-fbsd.c,v 1.29 2007/07/28 23:15:04 marcel Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 1264439fcef54..019bcbcce919d 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-linux.c,v 1.27 2007/06/26 22:42:37 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386.conf b/usr.bin/truss/i386.conf
index cfe2f46989bed..f6330e6aad771 100644
--- a/usr.bin/truss/i386.conf
+++ b/usr.bin/truss/i386.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truss/i386.conf,v 1.3 2007/05/22 10:36:12 ru Exp $
 
 sysnames="syscalls.h"
 sysproto="/dev/null"
diff --git a/usr.bin/truss/i386linux.conf b/usr.bin/truss/i386linux.conf
index 7669bceaf1a9e..27a674d1d9d2d 100644
--- a/usr.bin/truss/i386linux.conf
+++ b/usr.bin/truss/i386linux.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/truss/i386linux.conf,v 1.3 2007/05/22 10:36:12 ru Exp $
 
 sysnames="linux_syscalls.h"
 sysproto="/dev/null"
diff --git a/usr.bin/truss/ia64-fbsd.c b/usr.bin/truss/ia64-fbsd.c
index 70140b6b84de3..05a8142264a3c 100644
--- a/usr.bin/truss/ia64-fbsd.c
+++ b/usr.bin/truss/ia64-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/ia64-fbsd.c,v 1.11 2007/06/26 22:42:37 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 8924d8cbc70e7..0a0611619fcff 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/truss/main.c,v 1.46 2007/07/28 23:00:42 marcel Exp $");
 
 /*
  * The main module for truss.  Suprisingly simple, but, then, the other
diff --git a/usr.bin/truss/powerpc-fbsd.c b/usr.bin/truss/powerpc-fbsd.c
index 7b4cfb5ba63f4..c3b1612c67491 100644
--- a/usr.bin/truss/powerpc-fbsd.c
+++ b/usr.bin/truss/powerpc-fbsd.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/powerpc-fbsd.c,v 1.4 2007/07/28 23:15:04 marcel Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index aa1c7701c5a57..edf09cfbf8959 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/truss/setup.c,v 1.24 2007/06/26 22:42:37 delphij Exp $");
 
 /*
  * Various setup functions for truss.  Not the cleanest-written code,
diff --git a/usr.bin/truss/sparc64-fbsd.c b/usr.bin/truss/sparc64-fbsd.c
index 896bac749395b..50344e286a6dc 100644
--- a/usr.bin/truss/sparc64-fbsd.c
+++ b/usr.bin/truss/sparc64-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/sparc64-fbsd.c,v 1.11 2007/06/26 22:42:37 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index ccd83bb512c7a..16238cd940954 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -32,7 +32,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/syscall.h,v 1.18 2007/04/10 04:03:34 delphij Exp $
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, Name, Ptr, Stat, Ioctl, Quad,
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 642c29f14ea5b..41a90b4a20d2a 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/syscalls.c,v 1.55 2007/07/28 23:18:39 marcel Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index ddff08b41ae4d..508dd8b0cf3ca 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/truss/truss.1,v 1.24 2007/05/21 20:33:51 keramida Exp $
 .\"
 .Dd January 2, 2004
 .Dt TRUSS 1
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index 8533fae36ea9e..8c6198f808a41 100644
--- a/usr.bin/truss/truss.h
+++ b/usr.bin/truss/truss.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/truss.h,v 1.8 2007/04/10 04:03:34 delphij Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index f02d0c50bd56c..bbbcfbf5f2ae0 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/9/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.bin/tset/extern.h,v 1.9 2002/03/22 01:42:37 imp Exp $
  */
 
 #include <termcap.h>
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index d3db6b67e707f..b6d1d3d7b01e2 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/map.c,v 1.11 2005/05/29 15:44:55 charnier Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 52358e75a14cb..212e4f9dab2d9 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/misc.c,v 1.5 2001/12/11 23:29:45 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 85965b38b9911..d090e1a445c0e 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/set.c,v 1.10 2002/03/22 01:42:37 imp Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index 54a349e05f2b0..008328cf86148 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/term.c,v 1.6 2002/03/22 01:42:37 imp Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index fd62aabdd1ee5..7722fcdffb752 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tset/tset.1,v 1.16 2005/02/13 22:25:25 ru Exp $
 .\"
 .Dd June 9, 1993
 .Dt TSET 1
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index dc4c333e2f90e..8091c8d414e1c 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/tset.c,v 1.19 2002/09/04 23:29:07 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 9d149183e2f22..b0703f8928017 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tset/wrterm.c,v 1.4 2001/12/11 23:29:45 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile
index b0d353e4d8f7e..98dce616d753b 100644
--- a/usr.bin/tsort/Makefile
+++ b/usr.bin/tsort/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tsort/Makefile,v 1.4 2001/12/12 00:06:52 markm Exp $
 
 PROG=	tsort
 
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 71f7372c4bd78..d94bb7abc6506 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tsort/tsort.1,v 1.13 2006/12/27 14:56:18 ru Exp $
 .\"
 .Dd December 27, 2006
 .Dt TSORT 1
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index a01a86c3700c0..aa79e59e099d1 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -45,7 +45,7 @@ static const char sccsid[] = "@(#)tsort.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tsort/tsort.c,v 1.17 2005/05/29 15:47:31 charnier Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile
index 4dcab3343e44a..635e7426f0cbb 100644
--- a/usr.bin/tty/Makefile
+++ b/usr.bin/tty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tty/Makefile,v 1.4 2001/12/12 00:06:52 markm Exp $
 
 PROG=	tty
 
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 8e55ccb470e4f..1fd66b8c3483b 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tty/tty.1,v 1.9 2006/12/13 20:15:49 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4710e169c1bff..806fe4b797daa 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/tty/tty.c,v 1.9 2002/05/29 17:12:30 jmallett Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index 9aaf7754de527..967d2c6fcad81 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ul/Makefile,v 1.4 2001/12/11 23:27:23 markm Exp $
 
 PROG=	ul
 
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 0a0417074bde0..0eff155e78d87 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ul/ul.1,v 1.19 2007/02/27 12:06:02 ru Exp $
 .\"
 .Dd August 4, 2004
 .Dt UL 1
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 77559cf254fe7..50f55c4345f1a 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ul/ul.c,v 1.14 2005/05/21 09:55:09 ru Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 2a28464efa235..edec1419efa4d 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uname/uname.1,v 1.18 2005/01/18 13:43:54 ru Exp $
 .\"
 .Dd April 2, 2003
 .Dt UNAME 1
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 81aef452a74eb..3495a13e7f0e8 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uname/uname.c,v 1.14 2003/07/01 20:15:28 jmallett Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index 14014facb7b02..b1a5311954eae 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unexpand/Makefile,v 1.5 2004/12/21 08:47:30 ru Exp $
 
 PROG=	unexpand
 NO_MAN=
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index d59cd4ef8c7a1..71209258bbf5d 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/unexpand/unexpand.c,v 1.15 2006/10/13 16:22:25 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile
index b31709aa6e62f..8e39926e2ae3d 100644
--- a/usr.bin/unifdef/Makefile
+++ b/usr.bin/unifdef/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unifdef/Makefile,v 1.6 2003/06/04 10:01:10 fanf Exp $
 
 PROG=	unifdef
 SCRIPTS=unifdefall.sh
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 02cbfeba8ad52..2c3db5acc189c 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)unifdef.1	8.2 (Berkeley) 4/1/94
 .\"	$dotat: things/unifdef.1,v 1.51 2005/03/08 12:39:01 fanf2 Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/unifdef/unifdef.1,v 1.24 2005/05/21 09:55:09 ru Exp $
 .\"
 .Dd September 24, 2002
 .Dt UNIFDEF 1
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index dd2f23e08ff33..fe557a6a2feb3 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -46,7 +46,7 @@ __IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.171 2005/03/08 12:38:48 fanf2 Ex
 #endif
 #endif /* not lint */
 #ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05/21 09:55:09 ru Exp $");
 #endif
 
 /*
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh
index bcba08c9712b4..be3817d66e41e 100644
--- a/usr.bin/unifdef/unifdefall.sh
+++ b/usr.bin/unifdef/unifdefall.sh
@@ -3,7 +3,7 @@
 # remove all the #if's from a source file
 #
 #	$dotat: things/unifdefall.sh,v 1.9 2002/09/24 19:43:57 fanf2 Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unifdef/unifdefall.sh,v 1.2 2002/09/24 19:50:03 fanf Exp $
 
 set -e
 
diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile
index 2bcf18e53703a..e3f296663453c 100644
--- a/usr.bin/uniq/Makefile
+++ b/usr.bin/uniq/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uniq/Makefile,v 1.4 2001/12/11 23:27:23 markm Exp $
 
 PROG=	uniq
 
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index a12ad3a6ef1fd..63fe21182d213 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uniq/uniq.1,v 1.20 2007/01/15 23:25:51 keramida Exp $
 .\"
 .Dd July 3, 2004
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 02c1273df0f56..a111f7380fe46 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uniq/uniq.c,v 1.29 2007/05/17 00:19:56 jmallett Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index cb783ab95bb23..4ae052bb58f01 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/Makefile,v 1.8 2001/12/17 16:02:15 ru Exp $
 
 PROG=	units
 FILES=	units.lib
diff --git a/usr.bin/units/README b/usr.bin/units/README
index 974cbe9fee3f0..a4106cdf4a000 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/README,v 1.4 1999/08/28 01:07:09 peter Exp $
 
 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 227dd00b49224..1f65bd8f6d7cd 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/units/pathnames.h,v 1.4 1999/08/28 01:07:09 peter Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 96b84d6efa30c..5836544d7505a 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/units/units.1,v 1.18 2005/02/13 22:25:25 ru Exp $
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 9ca5cda7f8148..879860ce9a71e 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/units/units.c,v 1.10 2002/07/28 16:23:28 dwmalone Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index bd4502bf98234..e859c9b60ab1f 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $FreeBSD$
+/ $FreeBSD: src/usr.bin/units/units.lib,v 1.16 2004/05/30 16:09:12 dwmalone Exp $
 
 / primitive units
 
diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile
index 27fea4bad2a36..ad73b3643cbde 100644
--- a/usr.bin/unvis/Makefile
+++ b/usr.bin/unvis/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/unvis/Makefile,v 1.4 2001/12/11 23:27:23 markm Exp $
 
 PROG=	unvis
 
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index 658bfa323f006..21e3485da6254 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/unvis/unvis.1,v 1.7 2002/04/20 12:17:45 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt UNVIS 1
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 395c9adaefb07..8e33d1f2f05d6 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unvis/unvis.c,v 1.9 2002/09/04 23:29:08 dwmalone Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/usbhidaction/Makefile b/usr.bin/usbhidaction/Makefile
index 6c2f7a6b8496c..fb3b4a67bcb14 100644
--- a/usr.bin/usbhidaction/Makefile
+++ b/usr.bin/usbhidaction/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.bin/usbhidaction/Makefile,v 1.3 2005/01/28 16:08:08 ru Exp $
 #	$NetBSD: Makefile,v 1.4 2002/02/02 16:54:26 veego Exp $
 
 PROG=	usbhidaction
diff --git a/usr.bin/usbhidaction/usbhidaction.1 b/usr.bin/usbhidaction/usbhidaction.1
index 95420c8f79145..c93d836e69a2e 100644
--- a/usr.bin/usbhidaction/usbhidaction.1
+++ b/usr.bin/usbhidaction/usbhidaction.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/usbhidaction/usbhidaction.1,v 1.4 2007/06/30 03:58:01 imp Exp $
 .\" $NetBSD: usbhidaction.1,v 1.8 2003/02/25 10:35:59 wiz Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index e0d459d2c2b31..5ffc1b752327f 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,5 +1,5 @@
 /*      $NetBSD: usbhidaction.c,v 1.8 2002/06/11 06:06:21 itojun Exp $ */
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.bin/usbhidaction/usbhidaction.c,v 1.5 2007/06/30 03:58:01 imp Exp $ */
 
 /*
  * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile
index 3738b506cea25..45d05dc0b53f6 100644
--- a/usr.bin/usbhidctl/Makefile
+++ b/usr.bin/usbhidctl/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.4 1999/05/11 21:02:25 augustss Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/usbhidctl/Makefile,v 1.4 2002/04/15 09:33:34 ru Exp $
 
 PROG=	usbhidctl
 SRCS=	usbhid.c
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 08968c2a38489..95d07764770ec 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.bin/usbhidctl/usbhid.c,v 1.11 2006/11/23 05:07:32 grog Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.bin/usbhidctl/usbhidctl.1 b/usr.bin/usbhidctl/usbhidctl.1
index 8ba5ec163c05c..f21a55d4fdda4 100644
--- a/usr.bin/usbhidctl/usbhidctl.1
+++ b/usr.bin/usbhidctl/usbhidctl.1
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbhidctl.1,v 1.8 1999/05/11 21:03:58 augustss Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/usbhidctl/usbhidctl.1,v 1.7 2006/11/23 05:08:06 grog Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index 3d6524bc7a29f..2ce34fbc9cf68 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/users/Makefile,v 1.3 2001/12/11 23:27:23 markm Exp $
 
 PROG=	users
 
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index c3454c6784d0b..5d3c5c85d5253 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/users/users.1,v 1.7 2002/04/20 12:17:49 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt USERS 1
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index c90bfbdc149df..476c954be77a8 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[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/users/users.c,v 1.8 2002/09/04 23:29:09 dwmalone Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 37005f3ded523..690a5947aab29 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uudecode/Makefile,v 1.8 2004/12/21 08:47:30 ru Exp $
 
 PROG=	uudecode
 WARNS?=	4
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 093af7d2d4748..8066adcf5896f 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.49 2003/05/03 19:44:46 obrien Exp $");
 
 /*
  * uudecode [file ...]
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index c795753a10bca..c1cf2b5178099 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uuencode/Makefile,v 1.8 2002/05/19 20:39:42 jmallett Exp $
 
 PROG=	uuencode
 WARNS?=	4
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 7d61188471838..cf45c0b2237b8 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.28 2005/07/14 20:29:07 brueffer Exp $
 .\"
 .Dd January 27, 2002
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e4d83b446b16e..cb4fbfe087297 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uuencode/uuencode.c,v 1.18 2004/01/22 07:23:35 grehan Exp $");
 
 /*
  * uuencode [input] output
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index 34879d1f68cbb..9c9a0e895d4f6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.format.5,v 1.12 2001/10/09 11:05:27 ru Exp $
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
diff --git a/usr.bin/uuidgen/Makefile b/usr.bin/uuidgen/Makefile
index 04ce7f509731c..7ee9876252c54 100644
--- a/usr.bin/uuidgen/Makefile
+++ b/usr.bin/uuidgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.3 2007/04/09 19:16:48 pjd Exp $
 
 BINDIR=	/bin
 
diff --git a/usr.bin/uuidgen/uuidgen.1 b/usr.bin/uuidgen/uuidgen.1
index 58dff699cecb4..5de7fee05174e 100644
--- a/usr.bin/uuidgen/uuidgen.1
+++ b/usr.bin/uuidgen/uuidgen.1
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuidgen/uuidgen.1,v 1.7 2005/09/07 07:49:21 rse Exp $
 .\"
 .Dd September 7, 2005
 .Dt UUIDGEN 1
diff --git a/usr.bin/uuidgen/uuidgen.c b/usr.bin/uuidgen/uuidgen.c
index d5dac4bcacfb3..d2aeb70c3b3e2 100644
--- a/usr.bin/uuidgen/uuidgen.c
+++ b/usr.bin/uuidgen/uuidgen.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/uuidgen/uuidgen.c,v 1.3 2003/03/15 02:27:10 marcel Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 63ba3abec8174..1b2e01bf568e2 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vacation/Makefile,v 1.14 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/vacation
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 1a64c1c9f01f0..872505313b2cb 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vgrind/Makefile,v 1.14 2005/02/22 23:29:54 ru Exp $
 
 PROG=	vfontedpr
 SRCS=	regexp.c vfontedpr.c
diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile
index 8712ebb60585b..413f55adce917 100644
--- a/usr.bin/vgrind/RETEST/Makefile
+++ b/usr.bin/vgrind/RETEST/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vgrind/RETEST/Makefile,v 1.3 2004/12/21 08:47:30 ru Exp $
 
 PROG=	retest
 SRCS=	regexp.c retest.c
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index e1c1c5011ff29..6f3cd25d6d733 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/vgrind/extern.h,v 1.4 2002/03/22 01:42:41 imp Exp $
  */
 
 typedef int boolean;
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 199f3c6c119d7..2e887d72ce4f1 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vgrind/regexp.c,v 1.7 2002/03/22 01:42:41 imp Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vgrind/tmac.vgrind b/usr.bin/vgrind/tmac.vgrind
index 4b906eac7f539..64aee7e093a9a 100644
--- a/usr.bin/vgrind/tmac.vgrind
+++ b/usr.bin/vgrind/tmac.vgrind
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vgrind/tmac.vgrind,v 1.3 2005/09/23 12:55:22 ru Exp $
 .am vS
 ..
 .am vE
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index d1bb4d98ea158..078c697f1c444 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vgrind/vfontedpr.c,v 1.15 2003/10/26 05:03:11 peter Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index b5d5a89d4274f..a699c2d9daa5c 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vgrind/vgrind.1,v 1.15 2006/08/29 18:11:20 jkoshy Exp $
 .\"
 .Dd August 29, 2006
 .Dt VGRIND 1
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index bfc2f1bae5593..88a9404f74c9f 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -33,7 +33,7 @@
 #
 #       @(#)vgrind.sh	8.1 (Berkeley) 6/6/93
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vgrind/vgrind.sh,v 1.4 2003/05/31 21:02:50 schweikh Exp $
 #
 
 voptions=""
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 88189406764d8..09d071554fde6 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vgrind/vgrindefs.5,v 1.12 2005/01/18 13:43:55 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index c3d771174a2a8..848cb93c55610 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vgrind/vgrindefs.c,v 1.3 2001/12/11 23:10:26 markm Exp $");
 
 #define	BUFSIZ	1024
 #define MAXHOP	32	/* max number of tc= indirections */
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 7276b7b35bb8d..ee3cf4325fbd1 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vi/Makefile,v 1.43 2004/10/18 17:16:01 ru Exp $
 #
 
 SRCDIR=		${.CURDIR}/../../contrib/nvi
diff --git a/usr.bin/vi/config.h b/usr.bin/vi/config.h
index a8bee6775f81d..3b104d1991e46 100644
--- a/usr.bin/vi/config.h
+++ b/usr.bin/vi/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/vi/config.h,v 1.3 2000/04/16 17:34:33 jlemon Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h
index 72c8bb3daa45e..202186dcd07f3 100644
--- a/usr.bin/vi/pathnames.h
+++ b/usr.bin/vi/pathnames.h
@@ -1,5 +1,5 @@
 /* @(#)pathnames.h.in	8.4 (Berkeley) 6/26/96 */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/vi/pathnames.h,v 1.3 2003/05/05 22:49:23 obrien Exp $ */
 
 /* Read standard system paths first. */
 #include <paths.h>
diff --git a/usr.bin/vi/port.h b/usr.bin/vi/port.h
index bdd5faf2cf581..1be5b78b46dc1 100644
--- a/usr.bin/vi/port.h
+++ b/usr.bin/vi/port.h
@@ -1,6 +1,6 @@
 /* @(#)port.h.in	8.13 (Berkeley) 6/12/96 */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/vi/port.h,v 1.2 2002/03/22 01:42:41 imp Exp $ */
 
 /*
  * Declare the basic types, if they aren't already declared.  Named and
diff --git a/usr.bin/vis/extern.h b/usr.bin/vis/extern.h
index 5ae1d1a9eca60..bc7de9bc3676a 100644
--- a/usr.bin/vis/extern.h
+++ b/usr.bin/vis/extern.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/vis/extern.h,v 1.2 2002/03/22 01:42:42 imp Exp $
  */
 
 extern int foldit(char *, int, int);
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 6ad82c2dc2f4d..70cba4a08a138 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vis/foldit.c,v 1.6 2001/12/11 23:02:44 markm Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index 4d568c4c0da42..4e662a7db0987 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vis/vis.1,v 1.13 2006/12/23 19:15:39 ru Exp $
 .\"
 .Dd June 25, 2004
 .Dt VIS 1
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 8a76d24f7d355..b6b685b22be2e 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vis/vis.c,v 1.10 2002/09/04 23:29:09 dwmalone Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile
index 21795e9ac09f8..40c6955ce80f1 100644
--- a/usr.bin/vmstat/Makefile
+++ b/usr.bin/vmstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vmstat/Makefile,v 1.12 2005/07/25 22:35:10 rwatson Exp $
 
 PROG=	vmstat
 MAN=	vmstat.8
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 29dde136d0696..04955f00241ca 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.36 2006/11/02 19:53:57 rwatson Exp $
 .\"
 .Dd October 21, 2006
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 28d45c02c2af5..45c79bb2b0cb3 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.98 2007/07/27 20:01:22 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 1515a875ae7e0..dc1e89dc53a4b 100644
--- a/usr.bin/w/Makefile
+++ b/usr.bin/w/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/w/Makefile,v 1.8 2001/07/26 19:20:13 brian Exp $
 
 PROG=	w
 SRCS=	fmt.c pr_time.c proc_compare.c w.c
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 070d055b06167..b7861865c13d0 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/w/extern.h,v 1.5 2002/03/22 01:42:43 imp Exp $
  */
 
 
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 5ac060de4bcc4..01cba3fa84345 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/w/pr_time.c,v 1.19 2002/06/07 01:41:54 jmallett Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 8e807d161df25..dfe818466a7ed 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)proc_compare.c	8.2 (Berkeley) 9/23/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/w/proc_compare.c,v 1.9 2004/04/14 09:34:17 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index cc11c7110ce31..c7b6c6a509e2d 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/w/uptime.1,v 1.8 2002/05/09 11:47:40 joe Exp $
 .\"
 .Dd April 18, 1994
 .Dt UPTIME 1
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 0dfbd1b8b59e3..c0ac7392dd890 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/w/w.1,v 1.21 2006/12/14 19:02:48 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 379e6a43854df..30f84ea0dfa01 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/w/w.c,v 1.60 2006/05/11 17:24:47 phk Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index a977875942ab0..8e0f49faad322 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/wall/ttymsg.c,v 1.12 2006/01/27 08:52:14 ume Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
diff --git a/usr.bin/wall/ttymsg.h b/usr.bin/wall/ttymsg.h
index 31312aa94f55e..625c22d55b13a 100644
--- a/usr.bin/wall/ttymsg.h
+++ b/usr.bin/wall/ttymsg.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/wall/ttymsg.h,v 1.1 2001/09/09 14:23:31 dd Exp $ */
 
 const char	*ttymsg(struct iovec *, int, const char *, int);
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 36151253d1c57..7c92e630d4cf1 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/wall/wall.1,v 1.11 2004/07/17 04:15:27 tjr Exp $
 .\"
 .Dd July 17, 2004
 .Dt WALL 1
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 1a1d2a383732f..258cc948f322d 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/wall/wall.c,v 1.24 2006/02/21 13:01:00 cognet Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile
index edce9c1412c85..34407b7da7caa 100644
--- a/usr.bin/wc/Makefile
+++ b/usr.bin/wc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/wc/Makefile,v 1.2 2004/12/27 22:27:56 josef Exp $
 
 PROG=	wc
 WARNS?=	6
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index eeaaa74dbd9d2..f537786924e9e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/wc/wc.1,v 1.25 2006/12/21 22:59:07 ru Exp $
 .\"
 .Dd February 23, 2005
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 090ff7766a25c..d1d88f1a4e126 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)wc.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/wc/wc.c,v 1.21 2004/12/27 22:27:56 josef Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 8114290f968dd..50d07394a17a9 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/what/Makefile,v 1.3 2001/12/11 22:25:43 markm Exp $
 
 PROG=	what
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 923c4f207d330..b1cae7004959b 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
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/what/what.1,v 1.20 2006/12/14 00:02:44 ru Exp $
 .\"
 .Dd December 14, 2006
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 8e994e9a650f4..49d1e9af60ce8 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/what/what.c,v 1.11 2005/05/12 18:57:37 jmallett Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile
index d48b30d11782a..99f6e32ebfbc1 100644
--- a/usr.bin/whereis/Makefile
+++ b/usr.bin/whereis/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whereis/Makefile,v 1.8 2005/01/28 16:08:08 ru Exp $
 
 PROG=	whereis
 WARNS?=	5
diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h
index 09084aefa83f7..65f4f4c97da05 100644
--- a/usr.bin/whereis/pathnames.h
+++ b/usr.bin/whereis/pathnames.h
@@ -22,7 +22,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/whereis/pathnames.h,v 1.4 2002/08/22 01:50:51 johan Exp $
  */
 
 /* Where to look for libexec and games */
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index c5378b9f2b91c..bedbcf8ac1fd8 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whereis/whereis.1,v 1.22 2004/07/02 22:22:34 ru Exp $
 .\"
 .Dd August 22, 2002
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 70feb8a3eaaa7..394cb901d48dc 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -32,7 +32,7 @@
 
 #include <sys/types.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/whereis/whereis.c,v 1.15 2005/04/09 14:31:41 stefanf Exp $");
 
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index fdc121bb98205..2cda86415881f 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/which/Makefile,v 1.6 2000/08/29 23:30:52 green Exp $
 
 PROG=	which
 
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 52e010adb0a41..287eeaa285aea 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/which/which.1,v 1.27 2006/12/13 12:09:41 ru Exp $
 .\"
 .Dd December 13, 2006
 .Dt WHICH 1
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index 3b8224da43d62..e8ecea297b974 100644
--- a/usr.bin/which/which.c
+++ b/usr.bin/which/which.c
@@ -26,7 +26,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/which/which.c,v 1.6 2005/02/10 16:04:22 ru Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index e36b07cde550b..bcae0d2183e79 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/who/who.1,v 1.17 2005/01/17 07:44:35 ru Exp $
 .\"
 .Dd May 8, 2002
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index f94fcdb347432..29ae32a26c43e 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.22 2006/02/21 13:01:00 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index e6f82fd8f276c..4d3f45058cce1 100644
--- a/usr.bin/whois/Makefile
+++ b/usr.bin/whois/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whois/Makefile,v 1.7 2003/06/12 02:46:47 mike Exp $
 
 PROG=	whois
 
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 52da220917730..74ce34e83726e 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.36 2006/09/29 15:20:48 ru Exp $
 .\"
 .Dd January 23, 2006
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index c216556251756..7d5cd93628ef9 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/whois/whois.c,v 1.46 2007/04/14 14:32:48 ache Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 8d0daa4d8ad8e..ab90044c1763c 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/window/Makefile,v 1.11 2002/02/08 23:07:36 markm Exp $
 
 PROG=	window
 SRCS=	char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
diff --git a/usr.bin/window/alias.h b/usr.bin/window/alias.h
index 8b6aba37b7c52..0058b13f83eed 100644
--- a/usr.bin/window/alias.h
+++ b/usr.bin/window/alias.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/alias.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #define alias var
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index cd9a6ebc89071..3763ff7ab001e 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/char.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "char.h"
diff --git a/usr.bin/window/char.h b/usr.bin/window/char.h
index c4b957c6f84e9..cfc9a14145f89 100644
--- a/usr.bin/window/char.h
+++ b/usr.bin/window/char.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/char.h,v 1.4 2000/10/26 10:07:19 obrien Exp $
  */
 
 /*
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 698930ea44512..3447cf561820d 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index 049171d3bbd59..14026ec708aaa 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "@(#)$FreeBSD$";
+  "@(#)$FreeBSD: src/usr.bin/window/cmd1.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index 9633b7386de7c..188fb2d63a75d 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd2.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index 27a3173bd018b..362dbf7f84dfc 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd3.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd3.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index 82ed1bd7d5e64..1a724f7951de8 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd4.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd4.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index 60b0244d8622f..e3e4aba9708bb 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd5.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd5.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index 63689aa77c365..034ffec57c16f 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd6.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd6.c,v 1.3 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index 1039f2617464e..8a11cea449d9a 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)cmd7.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/cmd7.c,v 1.4 2001/05/17 09:38:47 obrien Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index 6294b936f4987..7b79c07f6197c 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)compress.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/compress.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index 78cf892743c40..7daf47fb4a577 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)context.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/context.c,v 1.4 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include "value.h"
diff --git a/usr.bin/window/context.h b/usr.bin/window/context.h
index df82b2707aed9..87e7c5f5c1dac 100644
--- a/usr.bin/window/context.h
+++ b/usr.bin/window/context.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)context.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/context.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/window/defs.h b/usr.bin/window/defs.h
index 6601e5d955008..4f1155aa1a8d8 100644
--- a/usr.bin/window/defs.h
+++ b/usr.bin/window/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/defs.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #include "ww.h"
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index 7e759c14d0479..cd3762f27c383 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)error.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/error.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index 85a54899b6251..77c7c213c7fa1 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)lcmd.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/lcmd.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/lcmd.h b/usr.bin/window/lcmd.h
index 6c58e2d547197..c78c72612f524 100644
--- a/usr.bin/window/lcmd.h
+++ b/usr.bin/window/lcmd.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lcmd.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/lcmd.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #define LCMD_NARG 20			/* maximum number of arguments */
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 1e072d6323b24..4dcaf07ad66e7 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)lcmd1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/lcmd1.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index a9972a9dfc963..347f868e7a9eb 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lcmd2.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/window/lcmd2.c,v 1.5 2004/04/04 19:11:01 charnier Exp $");
 
 #include "defs.h"
 #include <string.h> /* System string definitions. */
diff --git a/usr.bin/window/local.h b/usr.bin/window/local.h
index 685e320dc9f2a..fec9b6d7e3ceb 100644
--- a/usr.bin/window/local.h
+++ b/usr.bin/window/local.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/local.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 /*
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 844ca7609d789..ea272ce881c39 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -43,7 +43,7 @@ char copyright[] =
 #ifndef lint
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 4/2/94";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/main.c,v 1.8 2003/09/17 03:58:52 marcel Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 70d41dd79ad88..3c282a645461b 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mloop.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/mloop.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/window/mystring.h b/usr.bin/window/mystring.h
index 3d14ae681cc07..5a678e4eaa7a7 100644
--- a/usr.bin/window/mystring.h
+++ b/usr.bin/window/mystring.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/mystring.h,v 1.2 2000/10/26 10:00:52 obrien Exp $
  */
 
 #define STR_DEBUG
diff --git a/usr.bin/window/parser.h b/usr.bin/window/parser.h
index 30a45037c483b..0846fd9c3310b 100644
--- a/usr.bin/window/parser.h
+++ b/usr.bin/window/parser.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/parser.h,v 1.2 2000/10/26 10:00:52 obrien Exp $
  */
 
 #include "value.h"
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index ac9f9d358fb51..1a6fdcbb4705b 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser1.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser1.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index 75552de9d015f..6a3ac96fa9381 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser2.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser2.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index bd36d41a47138..4f29c7dac2ee6 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser3.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser3.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 338bdfb981214..de5ebbe8392fd 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser4.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser4.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index ddc81366c5c8c..61f48e0d805de 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)parser5.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/parser5.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "parser.h"
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index 785d0a343fa4b..d472369232468 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)scanner.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/scanner.c,v 1.5 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index 557c0beb878cb..224762b02f908 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/startup.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 57b5fa101b8ae..21c27eb1964f8 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)string.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/string.c,v 1.5 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include <string.h> /* System string definitions. */
diff --git a/usr.bin/window/token.h b/usr.bin/window/token.h
index 5e3f72c0ac1e3..25c715021d34b 100644
--- a/usr.bin/window/token.h
+++ b/usr.bin/window/token.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)token.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/token.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 #define token		(cx.x_token)
diff --git a/usr.bin/window/tt.h b/usr.bin/window/tt.h
index 53fe7b3efa4a6..a088819612e2f 100644
--- a/usr.bin/window/tt.h
+++ b/usr.bin/window/tt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tt.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/tt.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 /*
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index 53f177b002cbf..7bac2b157ebe1 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttf100.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttf100.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index ba84e849694e5..9f68c6f52a260 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttgeneric.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttgeneric.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index e1dab1ecaa2f9..a1654de0418b0 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tth19.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tth19.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index 54229b5ad334c..58a28096c2440 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tth29.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tth29.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 17b5961168df7..4cb574f9735f1 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttinit.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttinit.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 1be0fa056fd19..ba8fbfd4916cb 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttoutput.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttoutput.c,v 1.5 2001/07/26 11:02:37 sheldonh Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index 5cc82e641ff73..b9a1e2eba9cff 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tttermcap.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tttermcap.c,v 1.4 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include "tt.h"
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index 86e0d5ae4f383..fc90c18a856c8 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)tttvi925.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/tttvi925.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index 5e023bac263dc..5e8af0adf8f49 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -44,7 +44,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttwyse60.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttwyse60.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index 37e0194b56f08..d393cda7ab8a0 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -44,7 +44,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttwyse75.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttwyse75.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 2fd6fb97d84b5..4a0c112d9b8d5 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttzapple.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttzapple.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index 0e80711a34601..e4075b216b430 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)ttzentec.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/ttzentec.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/value.h b/usr.bin/window/value.h
index b55e210b6ba5a..f9c15088c3104 100644
--- a/usr.bin/window/value.h
+++ b/usr.bin/window/value.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)value.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/value.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 struct value {
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 8ef317591ac7d..bea3d8de795fc 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)var.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/var.c,v 1.5 2004/07/28 07:12:30 kan Exp $";
 #endif /* not lint */
 
 #include "value.h"
diff --git a/usr.bin/window/var.h b/usr.bin/window/var.h
index 645d2da4b10d4..b8bb4ddcc551d 100644
--- a/usr.bin/window/var.h
+++ b/usr.bin/window/var.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/var.h,v 1.2 2000/10/26 10:07:19 obrien Exp $
  */
 
 struct var {
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index c5f0e451725ce..2d696b706e0b6 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/win.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 307ae2e92592a..4dcc2e74beee9 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/window/window.1,v 1.17 2005/02/13 22:25:26 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt WINDOW 1
diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index d843ef3825362..5effa15181f78 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ww.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/ww.h,v 1.4 2000/10/16 08:28:50 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index 0a78f0605faed..44657d9f2542d 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwadd.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwadd.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index e02d4e5fa75eb..92ad0b1fb46ad 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwalloc.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwalloc.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index 2d63b173982d3..ac5b7c0f241a1 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwbox.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwbox.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 3ff46ece40598..7f3243e761fc1 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwchild.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwchild.c,v 1.5 2002/06/03 23:13:11 mike Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index ea58edcaa47fd..ea8cbd39d147c 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwclose.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwclose.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index bc0055eda7f5b..53bd715e50a7b 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwclreol.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwclreol.c,v 1.4 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index 1b8452bf1d1bd..d69350e131aed 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwclreos.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwclreos.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index 5b804c2a25175..1be6d354b301f 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwcursor.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwcursor.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
index 54062c20e45f2..5653077df1b00 100644
--- a/usr.bin/window/wwdata.c
+++ b/usr.bin/window/wwdata.c
@@ -37,5 +37,5 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdata.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdata.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index ba25cb00d3e90..cdacee2ec00f1 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdelchar.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdelchar.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index ef2912b16995e..5fb6fadba4576 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdelete.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdelete.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index dbeb12cd1dd9f..2d81b495110ce 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdelline.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdelline.c,v 1.3 2001/05/17 09:38:48 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 7988492de4a23..2251214758e1b 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwdump.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwdump.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index e8d62ab857b0b..83a4cc7d852ad 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwend.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwend.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index f60f7fa0a436a..8cc4d74a0afa3 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwenviron.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwenviron.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index 9282b87bcf7e2..fd44b239b7c11 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwerror.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwerror.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 414cc4bec8a41..9b2761838e427 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwflush.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwflush.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index 5cdd7779c5a03..3da79a389e8a8 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwframe.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwframe.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index 742576ca00aef..3696f172adfbe 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwgets.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwgets.c,v 1.6 2005/08/25 14:09:35 roberto Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 4803672920817..cb3490475fe87 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwinit.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwinit.c,v 1.13 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index a9a8c277eece3..7bd5e11901b4c 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwinschar.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwinschar.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 60e8b054d7203..a82f0f4addda3 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwinsline.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwinsline.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index 7803557c16b64..3daa5248eb39f 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwiomux.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwiomux.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 50ecf85791613..df9774c8c28d5 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwlabel.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwlabel.c,v 1.5 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index 945dca4e037d1..91c6537c3cf5b 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwmisc.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwmisc.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index 5db6caecf4ecc..06b6cf2903873 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwmove.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwmove.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index c6f906d8b7520..57546d506a832 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwopen.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwopen.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 1c74981aa775a..1cd1fc4d7eddd 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwprintf.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwprintf.c,v 1.4 2003/04/15 18:59:22 kan Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index d26280baf4c06..c28b33f56c32c 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwpty.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwpty.c,v 1.5 2001/09/28 22:46:13 billf Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index 8d0780e443d4c..5bf7a3f7b6268 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwputc.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwputc.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index dbc2960c00c93..4100c8e68baca 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwputs.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwputs.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index 66ac69c509621..0146a32d6448d 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwredraw.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwredraw.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index bdc2f7092ebc5..b6a9982fe6e20 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwredrawwin.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwredrawwin.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index 3332273be4594..8d2a7cf5027bf 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwrint.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwrint.c,v 1.4 2001/07/26 11:02:37 sheldonh Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index d0641a1e69c7c..d28d9d1dffbe9 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwscroll.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwscroll.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 443d1f31c5a6e..afca0467aeda4 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwsize.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwsize.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index 477f920a286c0..4e7dfd39622c8 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwspawn.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwspawn.c,v 1.6 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index ad3db5aa11067..a8075581b1459 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwsuspend.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwsuspend.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index 0be6590aeaff7..d4acb260d44e2 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwterminfo.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwterminfo.c,v 1.6 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #ifdef TERMINFO
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index 94de13cfbc1c4..beb8318aecdb0 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwtty.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwtty.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index 7fd6507046ccb..9d2c18ec718d0 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwunframe.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwunframe.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index 3c1ade7263e02..b948edcc6f691 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwupdate.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwupdate.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 29b3b73fb54bf..be6f97b4f2327 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)wwwrite.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/wwwrite.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 82dcb33bd17ff..a86a6def2ae6d 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)xx.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/xx.c,v 1.4 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/window/xx.h b/usr.bin/window/xx.h
index e49b85ededbbb..560a4edc60ede 100644
--- a/usr.bin/window/xx.h
+++ b/usr.bin/window/xx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xx.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/window/xx.h,v 1.2 2000/10/26 10:07:20 obrien Exp $
  */
 
 struct xx {
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index a6f9bed489314..6da49beecd93c 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -37,7 +37,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)xxflush.c	8.1 (Berkeley) 6/6/93";
 static char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/window/xxflush.c,v 1.3 2001/05/17 09:38:49 obrien Exp $";
 #endif /* not lint */
 
 #include "ww.h"
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index e7b24a14d8ab3..2854a585563ae 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/write/write.1,v 1.14 2005/05/21 09:55:09 ru Exp $
 .\"
 .Dd July 17, 2004
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 878c8c1d0ba1a..89a8ad94e8e2c 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/write/write.c,v 1.18.10.1 2007/11/21 16:25:00 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index 16162a1641e90..b3f046f3ffb6e 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xargs/Makefile,v 1.6 2003/03/28 16:24:11 mux Exp $
 
 PROG=	xargs
 SRCS=	xargs.c strnsubst.c
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index 33366b6a36275..687b83c11a7a7 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xargs/strnsubst.c,v 1.8 2005/12/30 23:22:50 jmallett Exp $");
 
 #include <err.h>
 #include <stdlib.h>
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index dd1d2a81d6689..b6a7d2d557064 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.37 2006/09/29 15:20:48 ru Exp $
 .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $
 .\"
 .Dd December 30, 2005
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 27f7cd309ebc5..b67c865ae63f8 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.62 2006/01/01 22:59:54 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 594f1dcfbf794..17edf5a77cf0e 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xinstall/Makefile,v 1.23 2005/01/25 14:34:57 ssouhlal Exp $
 
 PROG=		xinstall
 PROGNAME=	install
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 31ce10ab7bbae..994a6619d83e2 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xinstall/install.1,v 1.35 2006/09/29 15:20:48 ru Exp $
 .\"
 .Dd March 6, 2006
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index d0038de10bf21..6966de7c9814e 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.67 2006/03/06 21:52:59 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/xlint/Makefile b/usr.bin/xlint/Makefile
index 68264f4a7f756..ed1a4cf8c98a0 100644
--- a/usr.bin/xlint/Makefile
+++ b/usr.bin/xlint/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:23:45 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/Makefile,v 1.14 2003/06/15 13:03:37 markm Exp $
 
 .if ${LINT} == "lint"
 _llib=	llib
diff --git a/usr.bin/xlint/Makefile.inc b/usr.bin/xlint/Makefile.inc
index 0c1b97a5cdfa3..af488a49429fc 100644
--- a/usr.bin/xlint/Makefile.inc
+++ b/usr.bin/xlint/Makefile.inc
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.inc,v 1.8 2002/02/04 00:18:32 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/Makefile.inc,v 1.5 2004/02/23 20:21:21 johan Exp $
 
 WARNS?=		0
 
diff --git a/usr.bin/xlint/arch/ia64/targparam.h b/usr.bin/xlint/arch/ia64/targparam.h
index 7ec1038156f70..be01ed4673f48 100644
--- a/usr.bin/xlint/arch/ia64/targparam.h
+++ b/usr.bin/xlint/arch/ia64/targparam.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/xlint/arch/ia64/targparam.h,v 1.2 2003/11/03 05:09:57 marcel Exp $ */
 /*	$NetBSD: targparam.h,v 1.1 2002/01/18 20:39:18 thorpej Exp $	*/
 
 /*
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index b7f78c5afb267..4c6cbb0d56608 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 $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/lint1/Makefile,v 1.17 2004/02/05 22:44:25 ru Exp $
 
 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/lint1/cgram.y b/usr.bin/xlint/lint1/cgram.y
index 8791a2d3b8ed4..98fb2f4470354 100644
--- a/usr.bin/xlint/lint1/cgram.y
+++ b/usr.bin/xlint/lint1/cgram.y
@@ -37,7 +37,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: cgram.y,v 1.23 2002/01/31 19:36:53 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/cgram.y,v 1.8 2003/06/07 18:12:30 obrien Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index 69c7cda537750..46ade01bfd4f6 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: decl.c,v 1.29 2002/01/18 21:01:39 thorpej Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/decl.c,v 1.12 2003/01/01 18:13:44 schweikh Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/usr.bin/xlint/lint1/emit.c b/usr.bin/xlint/lint1/emit.c
index a770e5a8fbedb..30b9960e71142 100644
--- a/usr.bin/xlint/lint1/emit.c
+++ b/usr.bin/xlint/lint1/emit.c
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/xlint/lint1/emit.c,v 1.3 2006/12/29 13:08:46 yar Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c
index e62549c63c05b..5c0f5c60bee30 100644
--- a/usr.bin/xlint/lint1/emit1.c
+++ b/usr.bin/xlint/lint1/emit1.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: emit1.c,v 1.11 2002/01/31 19:36:54 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/emit1.c,v 1.2 2002/12/30 21:18:13 schweikh Exp $");
 
 #include <ctype.h>
 
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 5c56638d06371..694864a4891cf 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: err.c,v 1.17 2002/01/31 19:36:54 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/err.c,v 1.9 2002/07/19 16:38:20 markm Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c
index 68ade02e47522..2c8e41c108f49 100644
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: func.c,v 1.16 2002/01/03 04:25:15 thorpej Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/func.c,v 1.9 2002/03/03 15:12:19 markm Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c
index cf4cbddfa98fb..7cdb45430d5ab 100644
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: init.c,v 1.9 2001/09/18 18:15:54 wiz Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/init.c,v 1.2 2002/12/30 21:18:13 schweikh Exp $");
 
 #include <stdlib.h>
 
diff --git a/usr.bin/xlint/lint1/lint1.h b/usr.bin/xlint/lint1/lint1.h
index 4594f185dd268..45975e9a0c450 100644
--- a/usr.bin/xlint/lint1/lint1.h
+++ b/usr.bin/xlint/lint1/lint1.h
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/lint1.h,v 1.2 2003/01/01 18:13:44 schweikh Exp $");
 
 #include "lint.h"
 #include "op.h"
diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c
index 29c872f4ef88e..f89aab2183155 100644
--- a/usr.bin/xlint/lint1/main1.c
+++ b/usr.bin/xlint/lint1/main1.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: main1.c,v 1.11 2002/01/29 02:43:38 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/main1.c,v 1.4 2005/08/05 09:07:42 stefanf Exp $");
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/usr.bin/xlint/lint1/makeman b/usr.bin/xlint/lint1/makeman
index 9c2584640d870..cf6dc8364983b 100644
--- a/usr.bin/xlint/lint1/makeman
+++ b/usr.bin/xlint/lint1/makeman
@@ -73,7 +73,7 @@ cat << \__EOF
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xlint/lint1/makeman,v 1.3 2002/12/11 17:13:09 ru Exp $
 .\"
 .Dd July 5, 2000
 .Dt LINT 7
diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c
index 24e911e8cdfb2..89225bd5f5e4e 100644
--- a/usr.bin/xlint/lint1/mem1.c
+++ b/usr.bin/xlint/lint1/mem1.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: mem1.c,v 1.7 2002/01/31 19:36:54 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/mem1.c,v 1.10 2005/08/05 09:07:42 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h
index 0f9ca6800416f..b381000bf2e29 100644
--- a/usr.bin/xlint/lint1/param.h
+++ b/usr.bin/xlint/lint1/param.h
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/xlint/lint1/param.h,v 1.9 2004/05/14 13:44:36 cognet Exp $
  */
 
 /*
diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l
index ea5a2c57bdcd4..36994942af13f 100644
--- a/usr.bin/xlint/lint1/scan.l
+++ b/usr.bin/xlint/lint1/scan.l
@@ -37,7 +37,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: scan.l,v 1.26 2002/01/31 22:30:21 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/scan.l,v 1.12 2003/01/01 18:13:44 schweikh Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index 2a65d80a797d3..1226c403da955 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: tree.c,v 1.24 2002/01/31 22:30:20 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint1/tree.c,v 1.14 2003/01/01 18:13:44 schweikh Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index eaee12413cf2f..cc467398bc264 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:24:39 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/lint2/Makefile,v 1.5 2004/12/21 08:47:30 ru Exp $
 
 .PATH:	${.CURDIR}/../lint1
 
diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c
index ddb9df6777748..6279d7b75f1bf 100644
--- a/usr.bin/xlint/lint2/chk.c
+++ b/usr.bin/xlint/lint2/chk.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: chk.c,v 1.15 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/chk.c,v 1.2 2005/08/05 09:07:42 stefanf Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/xlint/lint2/emit2.c b/usr.bin/xlint/lint2/emit2.c
index 16c963203d5a2..334501e4c7f0d 100644
--- a/usr.bin/xlint/lint2/emit2.c
+++ b/usr.bin/xlint/lint2/emit2.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: emit2.c,v 1.8 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/emit2.c,v 1.2 2005/08/05 09:07:42 stefanf Exp $");
 
 #include <err.h>
 
diff --git a/usr.bin/xlint/lint2/hash.c b/usr.bin/xlint/lint2/hash.c
index a215aba8ce0c4..9eaa6e9bacef9 100644
--- a/usr.bin/xlint/lint2/hash.c
+++ b/usr.bin/xlint/lint2/hash.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: hash.c,v 1.7 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/hash.c,v 1.2 2005/08/05 09:07:42 stefanf Exp $");
 
 /*
  * XXX Really need a generalized hash table package
diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c
index a05ddf4cb74b3..974f83916e478 100644
--- a/usr.bin/xlint/lint2/main2.c
+++ b/usr.bin/xlint/lint2/main2.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: main2.c,v 1.5 2001/11/21 19:14:26 wiz Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/main2.c,v 1.2 2003/01/01 18:13:45 schweikh Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint2/mem2.c b/usr.bin/xlint/lint2/mem2.c
index 48e759ea21269..76e0eec0f1cc6 100644
--- a/usr.bin/xlint/lint2/mem2.c
+++ b/usr.bin/xlint/lint2/mem2.c
@@ -35,7 +35,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: mem2.c,v 1.6 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/mem2.c,v 1.8 2005/08/05 09:07:42 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c
index 6288cc1862b64..aa262a7ba04c1 100644
--- a/usr.bin/xlint/lint2/read.c
+++ b/usr.bin/xlint/lint2/read.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: read.c,v 1.12 2002/01/21 19:49:52 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/lint2/read.c,v 1.10 2005/08/05 09:07:42 stefanf Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/xlint/llib/Makefile b/usr.bin/xlint/llib/Makefile
index 9f1e3c1568ed5..e22093e1b507b 100644
--- a/usr.bin/xlint/llib/Makefile
+++ b/usr.bin/xlint/llib/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.7 2000/06/14 20:22:19 matt Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/llib/Makefile,v 1.13 2002/03/20 18:25:50 ru Exp $
 
 LIBS=	llib-lposix.ln llib-lstdc.ln
 
diff --git a/usr.bin/xlint/llib/llib-lposix b/usr.bin/xlint/llib/llib-lposix
index b3f9ca93d0d3b..6488ad567a4f3 100644
--- a/usr.bin/xlint/llib/llib-lposix
+++ b/usr.bin/xlint/llib/llib-lposix
@@ -1,5 +1,5 @@
 /*	$NetBSD: llib-lposix,v 1.2 1995/07/03 21:25:09 cgd Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/xlint/llib/llib-lposix,v 1.3 2002/06/21 09:23:12 phk Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
diff --git a/usr.bin/xlint/llib/llib-lstdc b/usr.bin/xlint/llib/llib-lstdc
index 83b44f24f950e..a6305ca1f22c8 100644
--- a/usr.bin/xlint/llib/llib-lstdc
+++ b/usr.bin/xlint/llib/llib-lstdc
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/xlint/llib/llib-lstdc,v 1.7 2002/03/03 15:12:43 markm Exp $
  */
 
 /* LINTLIBRARY */
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index 5dfdfb314a715..9cc4a048d7ceb 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/xlint/Makefile,v 1.8 2002/03/20 18:25:50 ru Exp $
 
 .PATH:	${.CURDIR}/../lint1
 
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 13ffce10dbc86..3a4cfdfb76988 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -30,7 +30,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xlint/xlint/lint.1,v 1.27 2005/02/13 22:25:26 ru Exp $
 .\"
 .Dd May 24, 2001
 .Dt LINT 1
diff --git a/usr.bin/xlint/xlint/pathnames.h b/usr.bin/xlint/xlint/pathnames.h
index 3f7d210530dac..3020935a7853b 100644
--- a/usr.bin/xlint/xlint/pathnames.h
+++ b/usr.bin/xlint/xlint/pathnames.h
@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/xlint/xlint/pathnames.h,v 1.6 2002/03/20 18:25:50 ru Exp $
  */
 
 /* directory where lint1 and lint2 reside */
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 82a118e99ab6d..ceee61dc10778 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -36,7 +36,7 @@
 #if defined(__RCSID) && !defined(lint)
 __RCSID("$NetBSD: xlint.c,v 1.27 2002/01/31 19:09:33 tv Exp $");
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xlint/xlint/xlint.c,v 1.27 2006/09/21 02:05:38 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 22c46d17a37fe..79ed1dee40f98 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xstr/xstr.1,v 1.12.10.1 2007/11/14 19:25:04 ru Exp $
 .\"
 .Dd December 30, 1993
 .Dt XSTR 1
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 7964dd9897a99..6a5af96a2fe19 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/xstr/xstr.c,v 1.10 2005/05/21 10:14:11 ru Exp $");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index e8b1024e82bb5..39c15d0c16290 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/yacc/Makefile,v 1.13 2002/02/08 23:07:36 markm Exp $
 
 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 24b1610cd13bb..df5538daf263a 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/closure.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index cb8b083bff411..b8588b2e1a511 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
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/yacc/defs.h,v 1.12 2002/06/11 11:27:20 robert Exp $
  */
 
 #include <assert.h>
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 9940dbc050c50..031250371aef5 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/error.c,v 1.15 2002/04/09 11:39:05 ru Exp $");
 
 /* routines for printing error messages  */
 
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 95d87de2dc1e7..039538bc7bc04 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/lalr.c,v 1.15 2002/06/11 11:27:20 robert Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index cd8d1a1e624ec..4a8d2af6f1aec 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/lr0.c,v 1.13 2002/06/11 11:27:20 robert Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 474de0b19157a..b486b67b70d92 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/main.c,v 1.22 2004/03/05 02:05:56 wes Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 1dde4dda5b0b1..6d009b9f41aeb 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/mkpar.c,v 1.19 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index b0b520a7e30dd..6b3bf7c99a38a 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/output.c,v 1.28 2002/06/11 11:27:20 robert Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 7c1132d494d91..2e42a6bbec916 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/reader.c,v 1.19 2002/08/25 13:23:09 charnier Exp $");
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index f765c912f5c8e..7b5530eeb18e8 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $");
 
 #include "defs.h"
 
@@ -65,7 +65,7 @@ const char *banner[] =
     "__unused",
     "#endif",
     "static char const ",
-    "yyrcsid[] = \"$FreeBSD$\";",
+    "yyrcsid[] = \"$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $\";",
     "#endif",
     "#define YYBYACC 1",
     "#define YYMAJOR 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index cb7b0bd45cb0d..6121780125590 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/symtab.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 282eaa3499a9e..c7dd4d063db92 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/verbose.c,v 1.13 2002/04/09 11:39:05 ru Exp $");
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 46d934dd758d5..5cf57acaebbde 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/yacc/warshall.c,v 1.12 2002/04/09 11:39:05 ru Exp $");
 
 #include "defs.h"
 
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 56bacbbda7b39..5914f9a93c8d1 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yacc.1,v 1.17 2005/01/18 13:43:56 ru Exp $
 .\"	$OpenBSD: yacc.1,v 1.14 2001/05/01 17:58:05 aaron Exp $
 .\"
 .Dd May 24, 1993
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index a4d9a31bd1e8f..09cb2ef42ef7a 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yyfix.1,v 1.7 2002/11/26 15:34:18 ru Exp $
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile
index e3e98dac215e1..70f6a28469ad5 100644
--- a/usr.bin/yes/Makefile
+++ b/usr.bin/yes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/yes/Makefile,v 1.4 2001/12/11 22:56:05 markm Exp $
 
 PROG=	yes
 
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 9b4b37712a6c7..03ecf0d8bf2bd 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yes/yes.1,v 1.7 2002/04/20 12:18:22 charnier Exp $
 .\"
 .Dd June 6, 1993
 .Dt YES 1
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index aae13b9a09b5b..edaa9b493c76b 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)yes.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/yes/yes.c,v 1.5 2002/11/09 21:00:39 dwmalone Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index 58ee6907f07f9..d596daa96a1af 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypcat/Makefile,v 1.6 2002/02/08 23:07:36 markm Exp $
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 8a2565200354b..86a528afa77c6 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypcat/ypcat.1,v 1.13 2002/04/20 12:18:24 charnier Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 55390433597ab..fd95452f8cbb0 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ypcat/ypcat.c,v 1.9 2005/05/21 09:55:10 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index 22e62996937e4..4bdbb64f07bed 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypmatch/Makefile,v 1.6 2002/02/08 23:07:37 markm Exp $
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 5f4a4cab278df..ebbbbf714c108 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypmatch/ypmatch.1,v 1.13 2002/04/20 12:18:26 charnier Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index d0904c51de905..e4475aa4c6535 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ypmatch/ypmatch.c,v 1.12 2005/05/21 09:55:10 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index f28f864ab0970..b6839f121b737 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypwhich/Makefile,v 1.7 2002/02/08 23:07:37 markm Exp $
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index fb2891e2ef186..1af63672515e7 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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ypwhich/ypwhich.1,v 1.10 2006/12/28 10:58:06 ru Exp $
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 8bfca24ed1325..ce81a0dbb6bd3 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.bin/ypwhich/ypwhich.c,v 1.16 2004/04/04 19:17:38 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/IPXrouted/IPXrouted.8 b/usr.sbin/IPXrouted/IPXrouted.8
index 6c3bd542e8df9..bc08a2c7b71b1 100644
--- a/usr.sbin/IPXrouted/IPXrouted.8
+++ b/usr.sbin/IPXrouted/IPXrouted.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.18 2004/07/02 23:12:38 ru Exp $
 .\"
 .Dd October 11, 1995
 .Dt IPXROUTED 8
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
index 44605ac04bd95..70d306342b010 100644
--- a/usr.sbin/IPXrouted/Makefile
+++ b/usr.sbin/IPXrouted/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/IPXrouted/Makefile,v 1.9 2004/02/04 10:18:05 ru Exp $
 
 PROG=	IPXrouted
 MAN=	IPXrouted.8
diff --git a/usr.sbin/IPXrouted/af.c b/usr.sbin/IPXrouted/af.c
index ea61762e00ef4..035856f31b0fa 100644
--- a/usr.sbin/IPXrouted/af.c
+++ b/usr.sbin/IPXrouted/af.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.c,v 1.8 2004/08/07 04:19:37 imp Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/af.h b/usr.sbin/IPXrouted/af.h
index 576a6c7adc04b..311a0dd9ff165 100644
--- a/usr.sbin/IPXrouted/af.h
+++ b/usr.sbin/IPXrouted/af.h
@@ -36,7 +36,7 @@
  *
  *	@(#)af.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/af.h,v 1.4 1999/08/28 01:15:01 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/defs.h b/usr.sbin/IPXrouted/defs.h
index c2b28a7a0d814..4b607e712c171 100644
--- a/usr.sbin/IPXrouted/defs.h
+++ b/usr.sbin/IPXrouted/defs.h
@@ -34,7 +34,7 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/defs.h,v 1.9 2002/02/18 20:35:26 mike Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/IPXrouted/if.c b/usr.sbin/IPXrouted/if.c
index 2c6e664ad44f7..8e44f9d035c0b 100644
--- a/usr.sbin/IPXrouted/if.c
+++ b/usr.sbin/IPXrouted/if.c
@@ -34,7 +34,7 @@
  *
  * static char sccsid[] = "@(#)if.c	5.1 (Berkeley) 6/4/85"; (routed/if.c)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/if.c,v 1.6 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index 651a8ae43609f..ed0ce9d1c5288 100644
--- a/usr.sbin/IPXrouted/input.c
+++ b/usr.sbin/IPXrouted/input.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/input.c,v 1.9 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/interface.h b/usr.sbin/IPXrouted/interface.h
index ed7b9889dcff0..a6c56f668dd77 100644
--- a/usr.sbin/IPXrouted/interface.h
+++ b/usr.sbin/IPXrouted/interface.h
@@ -34,7 +34,7 @@
  *
  *	@(#)interface.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/interface.h,v 1.4 1999/08/28 01:15:02 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/main.c b/usr.sbin/IPXrouted/main.c
index 773410a466e29..b90ea2c20ea58 100644
--- a/usr.sbin/IPXrouted/main.c
+++ b/usr.sbin/IPXrouted/main.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/main.c,v 1.13 2006/09/21 02:01:46 kan Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c
index 78922c9f38d03..1d00a30dc7588 100644
--- a/usr.sbin/IPXrouted/output.c
+++ b/usr.sbin/IPXrouted/output.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/output.c,v 1.9 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/protocol.h b/usr.sbin/IPXrouted/protocol.h
index 7fae5363cf02b..ae3b2b5b1e758 100644
--- a/usr.sbin/IPXrouted/protocol.h
+++ b/usr.sbin/IPXrouted/protocol.h
@@ -37,7 +37,7 @@
  *
  *	@(#)protocol.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/protocol.h,v 1.5 1999/08/28 01:15:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap.h b/usr.sbin/IPXrouted/sap.h
index b4e9dcb6ef517..639983deef00a 100644
--- a/usr.sbin/IPXrouted/sap.h
+++ b/usr.sbin/IPXrouted/sap.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap.h,v 1.7 1999/08/28 01:15:03 peter Exp $
  */
 #ifndef _SAP_H_
 #define _SAP_H_
diff --git a/usr.sbin/IPXrouted/sap_input.c b/usr.sbin/IPXrouted/sap_input.c
index 59281b29cac58..6fa5fa94088ff 100644
--- a/usr.sbin/IPXrouted/sap_input.c
+++ b/usr.sbin/IPXrouted/sap_input.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_input.c,v 1.7 1999/08/28 01:15:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_output.c b/usr.sbin/IPXrouted/sap_output.c
index d1f1a28d41929..a35463464908d 100644
--- a/usr.sbin/IPXrouted/sap_output.c
+++ b/usr.sbin/IPXrouted/sap_output.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_output.c,v 1.10 2002/05/30 21:49:15 wollman Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c
index e1572d1819579..a6024c56e643b 100644
--- a/usr.sbin/IPXrouted/sap_tables.c
+++ b/usr.sbin/IPXrouted/sap_tables.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/sap_tables.c,v 1.9 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #include "defs.h"
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c
index 2b9ccfac3658b..e9c01e381bd81 100644
--- a/usr.sbin/IPXrouted/startup.c
+++ b/usr.sbin/IPXrouted/startup.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/startup.c,v 1.11 2004/04/13 11:24:43 luigi Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/table.h b/usr.sbin/IPXrouted/table.h
index 3f9693f187f3e..e52fc7e5e9dbb 100644
--- a/usr.sbin/IPXrouted/table.h
+++ b/usr.sbin/IPXrouted/table.h
@@ -36,7 +36,7 @@
  *
  *	@(#)table.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/table.h,v 1.6 1999/08/28 01:15:05 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/IPXrouted/tables.c b/usr.sbin/IPXrouted/tables.c
index fee39217fab76..bd917177ed343 100644
--- a/usr.sbin/IPXrouted/tables.c
+++ b/usr.sbin/IPXrouted/tables.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/tables.c,v 1.8 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/timer.c b/usr.sbin/IPXrouted/timer.c
index 215973094a9a6..b5734c961e06c 100644
--- a/usr.sbin/IPXrouted/timer.c
+++ b/usr.sbin/IPXrouted/timer.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/timer.c,v 1.6 2003/11/15 17:10:56 trhodes Exp $
  */
 
 #ifndef lint
diff --git a/usr.sbin/IPXrouted/trace.c b/usr.sbin/IPXrouted/trace.c
index f1f86fa8ec71a..765389aaf425a 100644
--- a/usr.sbin/IPXrouted/trace.c
+++ b/usr.sbin/IPXrouted/trace.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)trace.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/IPXrouted/trace.c,v 1.11 2005/08/05 07:17:23 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/trace.h b/usr.sbin/IPXrouted/trace.h
index c83a9d1b45726..3916ad19e5dd5 100644
--- a/usr.sbin/IPXrouted/trace.h
+++ b/usr.sbin/IPXrouted/trace.h
@@ -37,7 +37,7 @@
  *
  *	@(#)trace.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/IPXrouted/trace.h,v 1.7 1999/08/28 01:15:07 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index f6a2fccfcf21c..bf301a4a1df9a 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/Makefile,v 1.375 2007/10/09 23:31:11 obrien Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
index 4347591cf563a..c2890ac8a3841 100644
--- a/usr.sbin/Makefile.inc
+++ b/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/Makefile.inc,v 1.3 2001/03/26 14:39:14 ru Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
index c45a0d69ff42f..e19362df7a0c8 100644
--- a/usr.sbin/ac/Makefile
+++ b/usr.sbin/ac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ac/Makefile,v 1.10 2004/03/08 20:01:34 gad Exp $
 
 PROG=	ac
 MAN=	ac.8
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index efe3e23c92ce9..bb9a75810b55f 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ac/ac.8,v 1.21 2005/01/18 20:02:28 ru Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 031099a4b9b80..a3d4f4c6cd228 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ac/ac.c,v 1.29 2004/03/08 20:02:23 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
index 7ea45a7df9295..041cb58274575 100644
--- a/usr.sbin/accton/Makefile
+++ b/usr.sbin/accton/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/accton/Makefile,v 1.7 2002/07/11 22:29:11 alfred Exp $
 
 PROG=	accton
 MAN=	accton.8
diff --git a/usr.sbin/accton/accton.8 b/usr.sbin/accton/accton.8
index 73c7d2926113d..039b2579d8482 100644
--- a/usr.sbin/accton/accton.8
+++ b/usr.sbin/accton/accton.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/accton/accton.8,v 1.13 2004/04/16 09:31:17 brueffer Exp $
 .\"
 .Dd May 21, 1993
 .Dt ACCTON 8
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index c1bb8b6b72c51..1fb83ff46f5ad 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)accton.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/accton/accton.c,v 1.8 2004/08/07 04:19:37 imp Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.sbin/acpi/Makefile b/usr.sbin/acpi/Makefile
index 8190bc7c3037f..c282fff4f9709 100644
--- a/usr.sbin/acpi/Makefile
+++ b/usr.sbin/acpi/Makefile
@@ -1,6 +1,6 @@
 # Makefile for acpi tools
 # $Id: Makefile,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/Makefile,v 1.3 2003/08/08 03:20:59 njl Exp $
 
 SUBDIR= acpiconf acpidb acpidump iasl
 
diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index 3237afbc32a2f..c2e86f0b3f873 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -1,5 +1,5 @@
 # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/Makefile.inc,v 1.9 2005/11/01 22:44:08 jkim Exp $
 
 ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
 CFLAGS+= -I${.CURDIR}/../../../sys
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
index bb0df4b406e51..ebbf0b4da6e78 100644
--- a/usr.sbin/acpi/acpiconf/Makefile
+++ b/usr.sbin/acpi/acpiconf/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2000/07/14 18:16:25 iwasaki Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/acpiconf/Makefile,v 1.5 2004/11/13 01:54:22 philip Exp $
 
 PROG=	acpiconf
 MAN=	acpiconf.8
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index 05d3a5de26194..eec3a386918a4 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/acpi/acpiconf/acpiconf.8,v 1.15 2005/02/09 18:04:39 ru Exp $
 .\"
 .Dd August 16, 2004
 .Dt ACPICONF 8
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 0797892215b3e..4a00bf21231c2 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$Id: acpiconf.c,v 1.5 2000/08/08 14:12:19 iwasaki Exp $
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpiconf/acpiconf.c,v 1.26 2007/06/21 22:50:36 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile
index 00e781e6a3239..21b9ce0ab1a8b 100644
--- a/usr.sbin/acpi/acpidb/Makefile
+++ b/usr.sbin/acpi/acpidb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/acpidb/Makefile,v 1.8 2007/03/22 18:16:43 jkim Exp $
 
 PROG=	acpidb
 SRCS=	acpidb.c
diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8
index 4ed97a6a399cf..afede2c8748c8 100644
--- a/usr.sbin/acpi/acpidb/acpidb.8
+++ b/usr.sbin/acpi/acpidb/acpidb.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/acpi/acpidb/acpidb.8,v 1.2 2004/06/06 17:49:57 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt ACPIDB 8
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 6893e5423d5ee..e5b1bb7de4fc8 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidb/acpidb.c,v 1.6 2007/03/22 18:16:43 jkim Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
index 21a4140defcc1..0e8e519b4aa7a 100644
--- a/usr.sbin/acpi/acpidump/Makefile
+++ b/usr.sbin/acpi/acpidump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/acpidump/Makefile,v 1.7 2003/08/28 03:33:07 njl Exp $
 
 PROG=	acpidump
 MAN=	acpidump.8
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 7be007e66d408..d9c98600a1043 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.32 2007/03/27 17:03:52 takawata Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index d9d9c2417dbc9..ef89eb0e62391 100644
--- a/usr.sbin/acpi/acpidump/acpi_user.c
+++ b/usr.sbin/acpi/acpidump/acpi_user.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpi_user.c,v 1.14 2007/07/28 17:46:04 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index 1401e387ea5a7..66ad209fff656 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/usr.sbin/acpi/acpidump/acpidump.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.8,v 1.24 2007/03/14 22:55:30 njl Exp $
 .\"
 .Dd February 14, 2005
 .Dt ACPIDUMP 8
diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c
index a601ac2616346..fee8f6dde10c7 100644
--- a/usr.sbin/acpi/acpidump/acpidump.c
+++ b/usr.sbin/acpi/acpidump/acpidump.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.c,v 1.12 2007/03/14 22:55:30 njl Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h
index 8d79168024d1e..44853a105ea39 100644
--- a/usr.sbin/acpi/acpidump/acpidump.h
+++ b/usr.sbin/acpi/acpidump/acpidump.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.h,v 1.22 2007/03/27 17:03:52 takawata Exp $
  */
 
 #ifndef _ACPIDUMP_H_
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
index aed6631b28088..09972698cc3de 100644
--- a/usr.sbin/acpi/iasl/Makefile
+++ b/usr.sbin/acpi/iasl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/acpi/iasl/Makefile,v 1.7 2007/03/22 18:16:43 jkim Exp $
 
 PROG=	iasl
 SRCS=	adfile.c adisasm.c adwalk.c
diff --git a/usr.sbin/acpi/iasl/iasl.8 b/usr.sbin/acpi/iasl/iasl.8
index fa80aa7a84ace..a1c8bea7b671b 100644
--- a/usr.sbin/acpi/iasl/iasl.8
+++ b/usr.sbin/acpi/iasl/iasl.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/acpi/iasl/iasl.8,v 1.2 2004/06/13 18:03:39 ru Exp $
 .\"
 .Dd August 7, 2003
 .Dt IASL 8
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index 0ca2dae1e97b6..c22cf3a921927 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/Makefile,v 1.19 2004/03/30 21:50:42 trhodes Exp $
 
 SCRIPTS=adduser.sh rmuser.sh
 MAN=	adduser.conf.5 adduser.8 rmuser.8
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 2df836ac5c194..0f5d74a42cea8 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.59.2.1 2007/10/28 21:06:34 mtm Exp $
 .\"
 .Dd June 7, 2006
 .Dt ADDUSER 8
diff --git a/usr.sbin/adduser/adduser.conf.5 b/usr.sbin/adduser/adduser.conf.5
index a78aeea59dcc8..01007299f229a 100644
--- a/usr.sbin/adduser/adduser.conf.5
+++ b/usr.sbin/adduser/adduser.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.conf.5,v 1.6 2007/04/12 08:39:13 ceri Exp $
 .\"
 .Dd April 12, 2007
 .Dt ADDUSER.CONF 5
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index 53c42de030a12..07e5364425151 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -24,7 +24,7 @@
 #
 #       Email: Mike Makonnen <mtm@FreeBSD.Org>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/adduser.sh,v 1.30.2.1 2007/10/28 21:06:34 mtm Exp $
 #
 
 # err msg
diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index 68a99b5935538..dd1869917eef8 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/adduser/rmuser.8,v 1.25 2006/12/05 23:20:14 ceri Exp $
 .\"
 .Dd May 10, 2002
 .Dt RMUSER 8
diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh
index d263217c15c2c..1fd22da5c240b 100644
--- a/usr.sbin/adduser/rmuser.sh
+++ b/usr.sbin/adduser/rmuser.sh
@@ -24,7 +24,7 @@
 #
 #	Email: Mike Makonnen <mtm@FreeBSD.Org>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9.10.1 2007/10/19 07:46:33 mtm Exp $
 #
 
 ATJOBDIR="/var/at/jobs"
diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index 37e42005884c3..0e8f3b8c1c3c7 100644
--- a/usr.sbin/amd/Makefile
+++ b/usr.sbin/amd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/Makefile,v 1.8 2001/07/20 06:19:36 obrien Exp $
 
 SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd \
 	scripts wire-test
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index c8451f6b1fc58..2859ce4fd0fe5 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/Makefile.inc,v 1.14 2006/03/21 09:00:51 ru Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index f56650ceb0305..0aaea98dda3cd 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/amd/Makefile,v 1.27 2006/03/21 09:00:51 ru Exp $
 #
 
 .include <bsd.own.mk>
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 74fc7492f5245..9dc1b4f79f2bd 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/amq/Makefile,v 1.15 2001/07/20 06:19:34 obrien Exp $
 #
 
 .PATH: ${.CURDIR}/../../../contrib/amd/amq
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
index e9c77073b290e..2432e22082244 100644
--- a/usr.sbin/amd/doc/Makefile
+++ b/usr.sbin/amd/doc/Makefile
@@ -1,6 +1,6 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/doc/Makefile,v 1.11 2001/07/20 06:19:34 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/doc
 
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 7f96a456dfe43..42cccc7f5765f 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/fixmount/Makefile,v 1.8 2001/07/20 06:19:35 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/fixmount \
        ${.CURDIR}/../../../contrib/amd/conf/checkmount
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 9ae55adfa7ac9..24616e8ec9a64 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/fsinfo/Makefile,v 1.13 2001/07/20 06:19:35 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/fsinfo
 
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 5b863dd5adcd9..0df0a8e1c5227 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/hlfsd/Makefile,v 1.8 2004/02/04 11:59:08 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/hlfsd
 
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index df770d1caf816..56b7cb98a4299 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -1,6 +1,6 @@
 # ex:ts=8
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/include/Makefile,v 1.10 2006/03/17 18:54:40 ru Exp $
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
diff --git a/usr.sbin/amd/include/aux_conf.h b/usr.sbin/amd/include/aux_conf.h
index 11e0b15280f5f..c5ccf5966d6c3 100644
--- a/usr.sbin/amd/include/aux_conf.h
+++ b/usr.sbin/amd/include/aux_conf.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/amd/include/aux_conf.h,v 1.4 2004/07/06 14:06:58 mbr Exp $ */
 
 /*
  * aux_conf.h:
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index fce7f0792cf53..ec3e964b91a13 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/amd/include/config.h,v 1.31 2005/08/06 16:52:30 phk Exp $
  *
  * portions derived from
  *      $NetBSD: config.h,v 1.11 1998/08/08 22:33:37 christos Exp $
diff --git a/usr.sbin/amd/include/newvers.sh b/usr.sbin/amd/include/newvers.sh
index 6a35d14b29ba7..e10bf26962279 100644
--- a/usr.sbin/amd/include/newvers.sh
+++ b/usr.sbin/amd/include/newvers.sh
@@ -1,5 +1,5 @@
 #	$NetBSD: mkconf,v 1.1.1.1 1997/07/24 21:20:12 christos Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/include/newvers.sh,v 1.9 2005/02/16 21:02:50 ru Exp $
 # mkconf
 # Generate local configuration parameters for amd
 #
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 7bca934fb6ac7..15c8dd1503f82 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/libamu/Makefile,v 1.8 2004/10/24 15:33:01 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/libamu \
        ${.CURDIR}/../../../contrib/amd/conf/transp \
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index ff792bd570dca..40212b1121dd6 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/mk-amd-map/Makefile,v 1.15 2001/07/20 06:19:35 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
 
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index c6bb1cc37a0bf..fcd012839062f 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/pawd/Makefile,v 1.5 2001/07/20 06:19:36 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/amq
 
diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
index 822b951449168..d72234aa19d5f 100644
--- a/usr.sbin/amd/scripts/Makefile
+++ b/usr.sbin/amd/scripts/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/scripts/Makefile,v 1.4 2001/07/20 06:19:36 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/scripts
 
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index a07e6902fe768..647f511a3d846 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -3,7 +3,7 @@
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/amd/wire-test/Makefile,v 1.8 2001/07/20 06:19:36 obrien Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/amd/wire-test
 
diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile
index b0f66cd15a866..8ea6acf9a5a29 100644
--- a/usr.sbin/ancontrol/Makefile
+++ b/usr.sbin/ancontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ancontrol/Makefile,v 1.13 2004/07/30 21:43:21 njl Exp $
 
 PROG=	ancontrol
 MAN=	ancontrol.8
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index 5ce4377ab90fd..5279f2e9c227c 100644
--- a/usr.sbin/ancontrol/ancontrol.8
+++ b/usr.sbin/ancontrol/ancontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.30 2005/02/13 22:25:26 ru Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 6ff491246c417..899baa3d7fad6 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -37,7 +37,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.25 2004/11/03 20:45:52 ceri Exp $");
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 043c3c763aeda..0eb4d0f62edcf 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apm/Makefile,v 1.17 2004/05/27 19:23:27 njl Exp $
 
 PROG=	apm
 MAN=	apm.8
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 1e36f639f509e..8693cfb8657d2 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -8,7 +8,7 @@
 .\" responsible for the proper functioning of this software, nor does
 .\" the author assume any responsibility for damages incurred with its
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/apm/apm.8,v 1.31 2005/05/30 18:44:43 will Exp $
 .\"
 .\" use.
 .Dd November 1, 1994
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 56432a4ab7a23..eef375a5cc630 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/apm/apm.c,v 1.38 2005/05/30 18:44:43 will Exp $");
 
 #include <sys/file.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 7e81b35dbc77d..5387261a8d450 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/apmd/Makefile,v 1.8 2004/01/21 13:38:17 ru Exp $
 
 PROG=	apmd
 MAN=	apmd.8
diff --git a/usr.sbin/apmd/README b/usr.sbin/apmd/README
index 59a56e33827d5..abaf406d1bb78 100644
--- a/usr.sbin/apmd/README
+++ b/usr.sbin/apmd/README
@@ -210,4 +210,4 @@ Created by: iwasaki@FreeBSD.org
 Edited by: jkh@FreeBSD.org
            nick@foobar.org
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/apmd/README,v 1.2 1999/08/28 01:15:24 peter Exp $
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index f94ea5d893428..a1d248f0918cc 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/apmd/apmd.8,v 1.22 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd June 28, 1999
 .Dt APMD 8 i386
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 67351f82d517e..8efaca1a50498 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/apmd/apmd.c,v 1.9 2007/02/05 07:35:23 kevlo Exp $";
 #endif /* not lint */
 
 #include <assert.h>
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index 1be5afa4bd198..7c819539ec151 100644
--- a/usr.sbin/apmd/apmd.h
+++ b/usr.sbin/apmd/apmd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmd.h,v 1.4 2002/07/11 18:22:42 alfred Exp $
  */
 
 #define APMD_CONFIGFILE		"/etc/apmd.conf"
diff --git a/usr.sbin/apmd/apmdlex.l b/usr.sbin/apmd/apmdlex.l
index 0e5cff30036e6..fc203d1f32931 100644
--- a/usr.sbin/apmd/apmdlex.l
+++ b/usr.sbin/apmd/apmdlex.l
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmdlex.l,v 1.3 2001/05/15 05:13:45 nsayer Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/apmd/apmdparse.y b/usr.sbin/apmd/apmdparse.y
index 597982bd98958..10d99e70580f4 100644
--- a/usr.sbin/apmd/apmdparse.y
+++ b/usr.sbin/apmd/apmdparse.y
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/apmd/apmdparse.y,v 1.5 2003/06/16 14:57:07 maxim Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index e619770e1e83e..a03117c6e165e 100644
--- a/usr.sbin/apmd/contrib/pccardq.c
+++ b/usr.sbin/apmd/contrib/pccardq.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/apmd/contrib/pccardq.c,v 1.6 2007/02/05 07:35:23 kevlo Exp $ */
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/arlcontrol/Makefile b/usr.sbin/arlcontrol/Makefile
index dc95a93bdd539..d29dc725b46ff 100644
--- a/usr.sbin/arlcontrol/Makefile
+++ b/usr.sbin/arlcontrol/Makefile
@@ -1,6 +1,6 @@
 #
 # $RISS: if_arl/arlconfig/Makefile,v 1.5 2003/01/13 08:05:29 frol Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/arlcontrol/Makefile,v 1.3 2005/02/09 10:35:28 stefanf Exp $
 #
 
 PROG=	arlcontrol
diff --git a/usr.sbin/arlcontrol/arlcontrol.8 b/usr.sbin/arlcontrol/arlcontrol.8
index d0e540934f726..f8260783491c5 100644
--- a/usr.sbin/arlcontrol/arlcontrol.8
+++ b/usr.sbin/arlcontrol/arlcontrol.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arlcontrol/arlcontrol.8,v 1.11 2005/01/18 20:02:29 ru Exp $
 .\"
 .Dd March 15, 2004
 .Dt ARLCONTROL 8 i386
diff --git a/usr.sbin/arlcontrol/arlcontrol.c b/usr.sbin/arlcontrol/arlcontrol.c
index cc45c37be767a..4f522caf54499 100644
--- a/usr.sbin/arlcontrol/arlcontrol.c
+++ b/usr.sbin/arlcontrol/arlcontrol.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/arlcontrol/arlcontrol.c,v 1.4 2005/05/20 12:44:04 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
index 6ca9dd204ffd4..bcd40e933487e 100644
--- a/usr.sbin/arp/Makefile
+++ b/usr.sbin/arp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/18/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/arp/Makefile,v 1.12 2004/04/13 11:45:28 luigi Exp $
 
 PROG=	arp
 MAN=	arp.4 arp.8
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 335a521247c15..adaa01c8c885f 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.4,v 1.24 2007/03/28 11:06:50 glebius Exp $
 .\"
 .Dd March 28, 2007
 .Dt ARP 4
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index 17b55fdb42361..78d3758914452 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)arp.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.25 2006/08/17 07:14:01 yar Exp $
 .\"
 .Dd August 17, 2006
 .Dt ARP 8
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index a4ec683d4caac..d7db424ea4bdf 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -42,7 +42,7 @@ static char const sccsid[] = "@(#)from: arp.c	8.2 (Berkeley) 1/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/arp/arp.c,v 1.65 2007/03/06 09:32:40 kevlo Exp $");
 
 /*
  * arp - display, set, and delete arp table entries
diff --git a/usr.sbin/asf/Makefile b/usr.sbin/asf/Makefile
index b4b7af350138d..f43b5d1bddab6 100644
--- a/usr.sbin/asf/Makefile
+++ b/usr.sbin/asf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/asf/Makefile,v 1.3 2006/06/18 11:14:40 yar Exp $
 
 PROG=	asf
 SRCS=	asf.c asf_kld.c asf_kvm.c asf_prog.c
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index 25b03089c7a66..19243d5d09333 100644
--- a/usr.sbin/asf/asf.8
+++ b/usr.sbin/asf/asf.8
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/asf/asf.8,v 1.12 2006/12/20 06:21:51 yar Exp $
 .\"
 .Dd December 20, 2006
 .Os
diff --git a/usr.sbin/asf/asf.c b/usr.sbin/asf/asf.c
index c913e3deb2ed5..006f4326724eb 100644
--- a/usr.sbin/asf/asf.c
+++ b/usr.sbin/asf/asf.c
@@ -26,7 +26,7 @@
 /* $Id: asf.c,v 1.4 2003/05/04 02:55:20 grog Exp grog $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/asf/asf.c,v 1.12 2006/12/20 06:20:04 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/asf/asf.h b/usr.sbin/asf/asf.h
index d03493620d717..b976714c22833 100644
--- a/usr.sbin/asf/asf.h
+++ b/usr.sbin/asf/asf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/asf/asf.h,v 1.1 2006/06/18 11:14:40 yar Exp $
  */
 
 #define	KERNFILE	"kernel"
diff --git a/usr.sbin/asf/asf_kld.c b/usr.sbin/asf/asf_kld.c
index 1d6a2b7d51e6f..8cb6e85aa72e0 100644
--- a/usr.sbin/asf/asf_kld.c
+++ b/usr.sbin/asf/asf_kld.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/asf/asf_kld.c,v 1.1 2006/06/18 11:14:40 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/linker.h>
diff --git a/usr.sbin/asf/asf_kvm.c b/usr.sbin/asf/asf_kvm.c
index aa4effe3bff6c..35f1ae497e5ad 100644
--- a/usr.sbin/asf/asf_kvm.c
+++ b/usr.sbin/asf/asf_kvm.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/asf/asf_kvm.c,v 1.1 2006/06/18 11:14:40 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/asf/asf_prog.c b/usr.sbin/asf/asf_prog.c
index 9a13cd65f7254..3000d2bc7b018 100644
--- a/usr.sbin/asf/asf_prog.c
+++ b/usr.sbin/asf/asf_prog.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/asf/asf_prog.c,v 1.1 2006/06/18 11:14:40 yar Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.sbin/atm/Makefile b/usr.sbin/atm/Makefile
index 2367085d25b6e..448fe059979e4 100644
--- a/usr.sbin/atm/Makefile
+++ b/usr.sbin/atm/Makefile
@@ -21,7 +21,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/Makefile,v 1.3 2001/07/20 06:19:37 obrien Exp $
 
 SUBDIR=	atmarpd \
 	scspd
diff --git a/usr.sbin/atm/Makefile.inc b/usr.sbin/atm/Makefile.inc
index 46723c133d512..8b7d65245ace4 100644
--- a/usr.sbin/atm/Makefile.inc
+++ b/usr.sbin/atm/Makefile.inc
@@ -21,6 +21,6 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/Makefile.inc,v 1.4 2001/07/20 06:19:37 obrien Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
index 1ed613cea6c9f..9917f4f18da2c 100644
--- a/usr.sbin/atm/atmarpd/Makefile
+++ b/usr.sbin/atm/atmarpd/Makefile
@@ -21,7 +21,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/Makefile,v 1.9 2001/07/20 06:19:37 obrien Exp $
 
 PROG=	atmarpd
 MAN=	atmarpd.8
diff --git a/usr.sbin/atm/atmarpd/atmarp_config.c b/usr.sbin/atm/atmarpd/atmarp_config.c
index d6d124e4f1b7a..b34d3706ef32f 100644
--- a/usr.sbin/atm/atmarpd/atmarp_config.c
+++ b/usr.sbin/atm/atmarpd/atmarp_config.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_config.c,v 1.4 2002/05/16 23:28:40 arr Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_config.c,v 1.4 2002/05/16 23:28:40 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_log.c b/usr.sbin/atm/atmarpd/atmarp_log.c
index 4f8d212ac98b0..be6b11873ec65 100644
--- a/usr.sbin/atm/atmarpd/atmarp_log.c
+++ b/usr.sbin/atm/atmarpd/atmarp_log.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.4 2003/07/29 13:40:51 harti Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_log.c,v 1.4 2003/07/29 13:40:51 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_scsp.c b/usr.sbin/atm/atmarpd/atmarp_scsp.c
index 6a22217f668b6..adf99e21d9970 100644
--- a/usr.sbin/atm/atmarpd/atmarp_scsp.c
+++ b/usr.sbin/atm/atmarpd/atmarp_scsp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_scsp.c,v 1.4 2002/05/16 23:28:40 arr Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_scsp.c,v 1.4 2002/05/16 23:28:40 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_subr.c b/usr.sbin/atm/atmarpd/atmarp_subr.c
index 6987a4b28e911..66c10af7d4d2d 100644
--- a/usr.sbin/atm/atmarpd/atmarp_subr.c
+++ b/usr.sbin/atm/atmarpd/atmarp_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $
  *
  */
 
@@ -68,7 +68,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_timer.c b/usr.sbin/atm/atmarpd/atmarp_timer.c
index c1c6cd95c6d86..0165b045c8ada 100644
--- a/usr.sbin/atm/atmarpd/atmarp_timer.c
+++ b/usr.sbin/atm/atmarpd/atmarp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_timer.c,v 1.4 2002/05/16 23:28:40 arr Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_timer.c,v 1.4 2002/05/16 23:28:40 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/atmarpd/atmarp_var.h b/usr.sbin/atm/atmarpd/atmarp_var.h
index 91a235fc844ac..2436c3230673a 100644
--- a/usr.sbin/atm/atmarpd/atmarp_var.h
+++ b/usr.sbin/atm/atmarpd/atmarp_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_var.h,v 1.4 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8
index dc09d2487b99d..000e90bac9c49 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.8
+++ b/usr.sbin/atm/atmarpd/atmarpd.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.8,v 1.8 2005/02/09 18:04:40 ru Exp $
 .\"
 .\"
 .Dd August 4, 1998
diff --git a/usr.sbin/atm/atmarpd/atmarpd.c b/usr.sbin/atm/atmarpd/atmarpd.c
index 2cb5f70be8ee4..79d55d2685c8c 100644
--- a/usr.sbin/atm/atmarpd/atmarpd.c
+++ b/usr.sbin/atm/atmarpd/atmarpd.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.6 2003/07/29 13:40:52 harti Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include "atmarp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarpd.c,v 1.6 2003/07/29 13:40:52 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index 7130c2bae5c1b..bc914830feaf6 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -21,7 +21,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $FreeBSD$
+#	@(#) $FreeBSD: src/usr.sbin/atm/scspd/Makefile,v 1.13 2001/07/20 06:19:37 obrien Exp $
 
 PROG=	scspd
 MAN=	scspd.8
diff --git a/usr.sbin/atm/scspd/scsp_cafsm.c b/usr.sbin/atm/scspd/scsp_cafsm.c
index 05a1e244a9cea..9827439ae7fcd 100644
--- a/usr.sbin/atm/scspd/scsp_cafsm.c
+++ b/usr.sbin/atm/scspd/scsp_cafsm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config.c b/usr.sbin/atm/scspd/scsp_config.c
index f692069646783..d5376d70df0bb 100644
--- a/usr.sbin/atm/scspd/scsp_config.c
+++ b/usr.sbin/atm/scspd/scsp_config.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -60,7 +60,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config_lex.c b/usr.sbin/atm/scspd/scsp_config_lex.c
index 20002b2c2b58b..b64a13e62d029 100644
--- a/usr.sbin/atm/scspd/scsp_config_lex.c
+++ b/usr.sbin/atm/scspd/scsp_config_lex.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_lex.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_config_parse.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_lex.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_config_parse.y b/usr.sbin/atm/scspd/scsp_config_parse.y
index b5c34b96c5652..d525ec9172d1f 100644
--- a/usr.sbin/atm/scspd/scsp_config_parse.y
+++ b/usr.sbin/atm/scspd/scsp_config_parse.y
@@ -24,7 +24,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -66,7 +66,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_hfsm.c b/usr.sbin/atm/scspd/scsp_hfsm.c
index 8010290f8470e..32ddde524feac 100644
--- a/usr.sbin/atm/scspd/scsp_hfsm.c
+++ b/usr.sbin/atm/scspd/scsp_hfsm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.4 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -58,7 +58,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.4 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_if.c b/usr.sbin/atm/scspd/scsp_if.c
index 9d88f0a50e302..47eadfe0f8547 100644
--- a/usr.sbin/atm/scspd/scsp_if.c
+++ b/usr.sbin/atm/scspd/scsp_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_if.h b/usr.sbin/atm/scspd/scsp_if.h
index 844ee2c821356..53c6347650a23 100644
--- a/usr.sbin/atm/scspd/scsp_if.h
+++ b/usr.sbin/atm/scspd/scsp_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.h,v 1.2 1999/08/28 01:15:33 peter Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_input.c b/usr.sbin/atm/scspd/scsp_input.c
index 2e3fbb0b67685..a2844a7b172f3 100644
--- a/usr.sbin/atm/scspd/scsp_input.c
+++ b/usr.sbin/atm/scspd/scsp_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.5 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.5 2002/10/10 00:32:55 alfred Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_log.c b/usr.sbin/atm/scspd/scsp_log.c
index 8b76c3edf35a4..7774ab8fceb16 100644
--- a/usr.sbin/atm/scspd/scsp_log.c
+++ b/usr.sbin/atm/scspd/scsp_log.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_log.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -67,7 +67,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_log.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_msg.c b/usr.sbin/atm/scspd/scsp_msg.c
index 63e0e40a5031a..9d50599b7e32d 100644
--- a/usr.sbin/atm/scspd/scsp_msg.c
+++ b/usr.sbin/atm/scspd/scsp_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -61,7 +61,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_msg.h b/usr.sbin/atm/scspd/scsp_msg.h
index bedea8aefb3fe..bb0e1094ce3b1 100644
--- a/usr.sbin/atm/scspd/scsp_msg.h
+++ b/usr.sbin/atm/scspd/scsp_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_msg.h,v 1.3 2002/05/16 23:57:37 arr Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scsp_output.c b/usr.sbin/atm/scspd/scsp_output.c
index c2ea657b84dcc..83968e39deb6a 100644
--- a/usr.sbin/atm/scspd/scsp_output.c
+++ b/usr.sbin/atm/scspd/scsp_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_output.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_output.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_print.c b/usr.sbin/atm/scspd/scsp_print.c
index eb9d6f5d870d4..cde820820eba3 100644
--- a/usr.sbin/atm/scspd/scsp_print.c
+++ b/usr.sbin/atm/scspd/scsp_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_print.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_print.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_socket.c b/usr.sbin/atm/scspd/scsp_socket.c
index 3cfa294867b7d..77b2d9270f362 100644
--- a/usr.sbin/atm/scspd/scsp_socket.c
+++ b/usr.sbin/atm/scspd/scsp_socket.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_socket.c,v 1.4 2002/05/16 23:57:37 arr Exp $
  *
  */
 
@@ -63,7 +63,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_socket.c,v 1.4 2002/05/16 23:57:37 arr Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_subr.c b/usr.sbin/atm/scspd/scsp_subr.c
index 58a5abfbc007c..56f898523aa5c 100644
--- a/usr.sbin/atm/scspd/scsp_subr.c
+++ b/usr.sbin/atm/scspd/scsp_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_subr.c,v 1.5 2003/07/29 13:40:52 harti Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_timer.c b/usr.sbin/atm/scspd/scsp_timer.c
index 82e49fc4a3611..68b7cd5d68e81 100644
--- a/usr.sbin/atm/scspd/scsp_timer.c
+++ b/usr.sbin/atm/scspd/scsp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.3 1999/08/28 01:15:34 peter Exp $
  *
  */
 
@@ -57,7 +57,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_timer.c,v 1.3 1999/08/28 01:15:34 peter Exp $");
 #endif
 
 
diff --git a/usr.sbin/atm/scspd/scsp_var.h b/usr.sbin/atm/scspd/scsp_var.h
index fbbddc74e5e33..14ef9b4f6741b 100644
--- a/usr.sbin/atm/scspd/scsp_var.h
+++ b/usr.sbin/atm/scspd/scsp_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_var.h,v 1.4 2002/10/10 00:32:55 alfred Exp $
  *
  */
 
diff --git a/usr.sbin/atm/scspd/scspd.8 b/usr.sbin/atm/scspd/scspd.8
index fd468db20d67d..1613fd473a0d3 100644
--- a/usr.sbin/atm/scspd/scspd.8
+++ b/usr.sbin/atm/scspd/scspd.8
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/atm/scspd/scspd.8,v 1.8 2005/02/09 18:04:40 ru Exp $
 .\"
 .Dd August 21, 1998
 .Dt SCSPD 8
diff --git a/usr.sbin/atm/scspd/scspd.c b/usr.sbin/atm/scspd/scspd.c
index 30d7015d90b35..fad9eeb260163 100644
--- a/usr.sbin/atm/scspd/scspd.c
+++ b/usr.sbin/atm/scspd/scspd.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $FreeBSD$
+ *	@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.6 2004/05/24 13:21:24 stefanf Exp $
  *
  */
 
@@ -65,7 +65,7 @@
 #include "scsp_var.h"
 
 #ifndef lint
-__RCSID("@(#) $FreeBSD$");
+__RCSID("@(#) $FreeBSD: src/usr.sbin/atm/scspd/scspd.c,v 1.6 2004/05/24 13:21:24 stefanf Exp $");
 #endif
 
 
diff --git a/usr.sbin/audit/Makefile b/usr.sbin/audit/Makefile
index ed195c0eec032..d45bb45c083dd 100644
--- a/usr.sbin/audit/Makefile
+++ b/usr.sbin/audit/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/audit/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $
 #
 
 OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
diff --git a/usr.sbin/auditd/Makefile b/usr.sbin/auditd/Makefile
index 7a28be2413d35..ea344d8bde1f8 100644
--- a/usr.sbin/auditd/Makefile
+++ b/usr.sbin/auditd/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/auditd/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $
 #
 
 OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
diff --git a/usr.sbin/auditreduce/Makefile b/usr.sbin/auditreduce/Makefile
index 73b355de4e12a..66ae9d6d3587c 100644
--- a/usr.sbin/auditreduce/Makefile
+++ b/usr.sbin/auditreduce/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/auditreduce/Makefile,v 1.2 2006/09/25 11:56:20 rwatson Exp $
 #
 
 OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile
index b4c9b4f36217b..697ecc129f7ed 100644
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/authpf/Makefile,v 1.4 2006/09/21 18:16:22 kan Exp $
 
 .PATH:	${.CURDIR}/../../contrib/pf/authpf
 .PATH:	${.CURDIR}/../../contrib/pf/pfctl
diff --git a/usr.sbin/bluetooth/Makefile b/usr.sbin/bluetooth/Makefile
index ed6f83aca4035..2c86040ac1e62 100644
--- a/usr.sbin/bluetooth/Makefile
+++ b/usr.sbin/bluetooth/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/09/08 02:28:35 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/Makefile,v 1.7 2006/09/07 21:47:49 emax Exp $
 
 SUBDIR= \
 	bcmfw \
diff --git a/usr.sbin/bluetooth/Makefile.inc b/usr.sbin/bluetooth/Makefile.inc
index c0e05cfa1da6b..a86a900383ad2 100644
--- a/usr.sbin/bluetooth/Makefile.inc
+++ b/usr.sbin/bluetooth/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/Makefile.inc,v 1.1 2003/10/12 22:04:22 emax Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 
diff --git a/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt b/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
index e3a235e0d82e6..417d5c0748669 100644
--- a/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
+++ b/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt,v 1.1 2003/05/10 22:03:45 julian Exp $
 
 BCM firmware version 2.15
 Copyright (c) 2000-2002 Broadcom Corporation
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile b/usr.sbin/bluetooth/bcmfw/Makefile
index 2427cf419aee7..bfc7af1da4100 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile
+++ b/usr.sbin/bluetooth/bcmfw/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/08/14 20:05:58 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bcmfw/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		bcmfw
 MAN=		bcmfw.8
diff --git a/usr.sbin/bluetooth/bcmfw/README b/usr.sbin/bluetooth/bcmfw/README
index 0d769d8e90369..e71f5df17000b 100644
--- a/usr.sbin/bluetooth/bcmfw/README
+++ b/usr.sbin/bluetooth/bcmfw/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/bluetooth/bcmfw/README,v 1.2 2003/05/11 02:19:10 julian Exp $
 
 This directory will eventually also contain copies of the broadcom firmware.
 
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8
index e79935070725e..061f3d2752b03 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.8
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bcmfw.8,v 1.7 2003/05/21 00:33:40 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bcmfw/bcmfw.8,v 1.7 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd March 31, 2003
 .Dt BCMFW 8
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.c b/usr.sbin/bluetooth/bcmfw/bcmfw.c
index cd4679de009d7..84fb9ea976cc9 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.c
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bcmfw.c,v 1.4 2003/04/27 19:28:09 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bcmfw/bcmfw.c,v 1.2 2004/06/25 23:14:06 imp Exp $
  *
  * Based on Linux BlueZ BlueFW-0.9 package
  *
diff --git a/usr.sbin/bluetooth/bt3cfw/Makefile b/usr.sbin/bluetooth/bt3cfw/Makefile
index 90bf7517253e3..608aa10c32080 100644
--- a/usr.sbin/bluetooth/bt3cfw/Makefile
+++ b/usr.sbin/bluetooth/bt3cfw/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/08/14 20:06:00 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		bt3cfw
 MAN=		bt3cfw.8
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
index 54df178741fdd..f32c4bc0b05e2 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bt3cfw.8,v 1.4 2003/05/21 00:34:51 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/bt3cfw.8,v 1.7 2005/01/18 20:02:30 ru Exp $
 .\"
 .Dd November 11, 2002
 .Dt BT3CFW 8
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.c b/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
index aadb6b6b67621..3c395e709891d 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bt3cfw.c,v 1.2 2003/05/21 22:40:29 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bt3cfw/bt3cfw.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile b/usr.sbin/bluetooth/bthidcontrol/Makefile
index 6c9eafb735c15..4b70802e8cd8a 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/Makefile,v 1.1 2004/04/10 00:18:00 emax Exp $
 
 .PATH:	${.CURDIR}/../bthidd
 
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
index 7625b39e0e3b6..bfbcf4d382511 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bthidcontrol.8,v 1.1 2004/02/13 21:44:41 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8,v 1.4 2006/10/31 00:26:58 markus Exp $
 .\"
 .Dd October 30, 2006
 .Dt BTHIDCONTROL 8
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
index 900bda5d559b2..016aaf78cb27d 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidcontrol.c,v 1.2 2004/02/13 21:44:41 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c,v 1.2 2006/10/31 00:26:58 markus Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
index 50ed2fa1a8307..6e7ae724d74b7 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidcontrol.h,v 1.1 2004/02/12 23:25:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h,v 1.1 2004/04/10 00:18:00 emax Exp $
  */
 
 #ifndef __BTHIDCONTROL_H__
diff --git a/usr.sbin/bluetooth/bthidcontrol/hid.c b/usr.sbin/bluetooth/bthidcontrol/hid.c
index 9fb6220da5a82..eaf18775f6bd3 100644
--- a/usr.sbin/bluetooth/bthidcontrol/hid.c
+++ b/usr.sbin/bluetooth/bthidcontrol/hid.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hid.c,v 1.3 2004/02/17 22:14:57 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/hid.c,v 1.2 2006/10/31 00:26:58 markus Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/sdp.c b/usr.sbin/bluetooth/bthidcontrol/sdp.c
index 032863edb2afb..4610b8aa0e00d 100644
--- a/usr.sbin/bluetooth/bthidcontrol/sdp.c
+++ b/usr.sbin/bluetooth/bthidcontrol/sdp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp.c,v 1.3 2004/02/17 22:14:57 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/sdp.c,v 1.2 2006/02/10 19:54:17 markus Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile
index 128bd20eee794..259cb77378afb 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile
+++ b/usr.sbin/bluetooth/bthidd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2006/09/07 21:36:55 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidd/Makefile,v 1.7 2007/10/01 18:15:10 ru Exp $
 
 PROG=		bthidd
 MAN=		bthidd.8
diff --git a/usr.sbin/bluetooth/bthidd/bthid_config.h b/usr.sbin/bluetooth/bthidd/bthid_config.h
index 71cb42562ef28..1c84f6735c1ab 100644
--- a/usr.sbin/bluetooth/bthidd/bthid_config.h
+++ b/usr.sbin/bluetooth/bthidd/bthid_config.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthid_config.h,v 1.4 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthid_config.h,v 1.3 2006/09/07 21:47:49 emax Exp $
  */
 
 #ifndef _BTHID_CONFIG_H_
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.8 b/usr.sbin/bluetooth/bthidd/bthidd.8
index 37aaa3d4761fd..bc99612ef2a6a 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.8
+++ b/usr.sbin/bluetooth/bthidd/bthidd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: bthidd.8,v 1.1 2006/09/07 21:36:55 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.8,v 1.2 2006/10/10 22:38:31 markus Exp $
 .\"
 .Dd September 7, 2006
 .Dt BTHIDD 8
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.c b/usr.sbin/bluetooth/bthidd/bthidd.c
index b93fd3dd6df41..92b8a67183e76 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.c
+++ b/usr.sbin/bluetooth/bthidd/bthidd.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidd.c,v 1.8 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.c,v 1.5 2006/09/07 21:47:49 emax Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
index e23dc1252f959..e3997c008ea1b 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
+++ b/usr.sbin/bluetooth/bthidd/bthidd.conf.sample
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.conf.sample,v 1.3 2006/09/07 21:47:49 emax Exp $
 
 device {
 	bdaddr			00:50:f2:e5:68:84;
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.h b/usr.sbin/bluetooth/bthidd/bthidd.h
index 3485fc3bb21bf..2d79477215231 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.h
+++ b/usr.sbin/bluetooth/bthidd/bthidd.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidd.h,v 1.7 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/bthidd.h,v 1.3 2006/09/07 21:47:49 emax Exp $
  */
 
 #ifndef _BTHIDD_H_
diff --git a/usr.sbin/bluetooth/bthidd/client.c b/usr.sbin/bluetooth/bthidd/client.c
index 59f0d19a1ce8d..69536a9a81227 100644
--- a/usr.sbin/bluetooth/bthidd/client.c
+++ b/usr.sbin/bluetooth/bthidd/client.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: client.c,v 1.7 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/client.c,v 1.6 2006/11/02 18:57:09 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/hid.c b/usr.sbin/bluetooth/bthidd/hid.c
index 9b5e5ec4cd398..1ef1f0ce42eee 100644
--- a/usr.sbin/bluetooth/bthidd/hid.c
+++ b/usr.sbin/bluetooth/bthidd/hid.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hid.c,v 1.5 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/hid.c,v 1.6 2006/10/09 22:27:23 markus Exp $
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index e1ab870d800eb..7e8b57d709314 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbd.c,v 1.4 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/kbd.c,v 1.4 2006/09/08 15:05:38 emax Exp $
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/kbd.h b/usr.sbin/bluetooth/bthidd/kbd.h
index 552f310092b42..c135f3ff9ee03 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.h
+++ b/usr.sbin/bluetooth/bthidd/kbd.h
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbd.h,v 1.3 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/kbd.h,v 1.2 2006/09/07 21:47:49 emax Exp $
  */
 
 #ifndef _KBD_H_
diff --git a/usr.sbin/bluetooth/bthidd/lexer.l b/usr.sbin/bluetooth/bthidd/lexer.l
index a25ae92065973..ce6fda5c6cc9a 100644
--- a/usr.sbin/bluetooth/bthidd/lexer.l
+++ b/usr.sbin/bluetooth/bthidd/lexer.l
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $Id: lexer.l,v 1.3 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/lexer.l,v 1.3 2006/09/07 21:47:49 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y
index ca49059a035b1..50dedab815305 100644
--- a/usr.sbin/bluetooth/bthidd/parser.y
+++ b/usr.sbin/bluetooth/bthidd/parser.y
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $Id: parser.y,v 1.7 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/parser.y,v 1.7 2006/11/27 22:52:11 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/server.c b/usr.sbin/bluetooth/bthidd/server.c
index d76bd62664eb3..b2506742b43cc 100644
--- a/usr.sbin/bluetooth/bthidd/server.c
+++ b/usr.sbin/bluetooth/bthidd/server.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: server.c,v 1.9 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/server.c,v 1.6 2006/09/21 02:32:27 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/session.c b/usr.sbin/bluetooth/bthidd/session.c
index b9f331bf7e7f1..2916a6d76e598 100644
--- a/usr.sbin/bluetooth/bthidd/session.c
+++ b/usr.sbin/bluetooth/bthidd/session.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: session.c,v 1.3 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/session.c,v 1.3 2006/09/07 21:47:49 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile b/usr.sbin/bluetooth/hccontrol/Makefile
index 592247e11ad96..25bf2eefe653b 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile
+++ b/usr.sbin/bluetooth/hccontrol/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:06:17 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hccontrol/Makefile,v 1.3 2003/10/12 22:04:23 emax Exp $
 
 PROG=		hccontrol
 MAN=		hccontrol.8
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.8 b/usr.sbin/bluetooth/hccontrol/hccontrol.8
index b98a0fc59b533..35f55aafb0807 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.8
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hccontrol.8,v 1.6 2003/08/06 21:26:38 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hccontrol/hccontrol.8,v 1.9 2006/05/22 17:58:19 markus Exp $
 .\"
 .Dd June 14, 2002
 .Dt HCCONTROL 8
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.c b/usr.sbin/bluetooth/hccontrol/hccontrol.c
index 089869b3cf03b..4d4ec88c5cc5c 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.c
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.c,v 1.5 2003/09/05 00:38:24 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/hccontrol.c,v 1.5 2006/06/02 00:29:01 markus Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.h b/usr.sbin/bluetooth/hccontrol/hccontrol.h
index cd56ebfb7bc70..768932d6eb8df 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.h
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.h,v 1.2 2003/05/19 17:29:29 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/hccontrol.h,v 1.7 2006/09/21 02:41:04 emax Exp $
  */
 
 #ifndef _HCCONTROL_H_
diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index 38f77eb9ab639..5cf5e74159c19 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: host_controller_baseband.c,v 1.4 2003/08/18 19:19:53 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c,v 1.6 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/info.c b/usr.sbin/bluetooth/hccontrol/info.c
index d7bad36bb8ded..d68da47012adb 100644
--- a/usr.sbin/bluetooth/hccontrol/info.c
+++ b/usr.sbin/bluetooth/hccontrol/info.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: info.c,v 1.3 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/info.c,v 1.4 2006/02/23 23:19:12 markus Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index ea880cd091e39..99c0bbf2db523 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: link_control.c,v 1.4 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/link_control.c,v 1.11 2006/09/21 17:16:37 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index 67b32d5a0d61b..134fcbea193b6 100644
--- a/usr.sbin/bluetooth/hccontrol/link_policy.c
+++ b/usr.sbin/bluetooth/hccontrol/link_policy.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: link_policy.c,v 1.3 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/link_policy.c,v 1.6 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/hccontrol/node.c b/usr.sbin/bluetooth/hccontrol/node.c
index ede2153b6cedb..eeefe805bf5ea 100644
--- a/usr.sbin/bluetooth/hccontrol/node.c
+++ b/usr.sbin/bluetooth/hccontrol/node.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: node.c,v 1.6 2003/07/22 21:14:02 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/node.c,v 1.4 2006/05/22 17:58:09 markus Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/hccontrol/send_recv.c b/usr.sbin/bluetooth/hccontrol/send_recv.c
index 5c2aea9456b26..2c67372bc7f48 100644
--- a/usr.sbin/bluetooth/hccontrol/send_recv.c
+++ b/usr.sbin/bluetooth/hccontrol/send_recv.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: send_recv.c,v 1.2 2003/05/21 22:40:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/send_recv.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/status.c b/usr.sbin/bluetooth/hccontrol/status.c
index 33645765cbd48..0caf81465add0 100644
--- a/usr.sbin/bluetooth/hccontrol/status.c
+++ b/usr.sbin/bluetooth/hccontrol/status.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: status.c,v 1.2 2003/05/21 22:40:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/status.c,v 1.5 2004/04/09 23:58:53 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/util.c b/usr.sbin/bluetooth/hccontrol/util.c
index 4bb5000c087a8..5dd7160d98f78 100644
--- a/usr.sbin/bluetooth/hccontrol/util.c
+++ b/usr.sbin/bluetooth/hccontrol/util.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: util.c,v 1.2 2003/05/19 17:29:29 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hccontrol/util.c,v 1.7 2006/09/21 02:41:04 emax Exp $
  */
  
 #include <sys/param.h>
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile b/usr.sbin/bluetooth/hcsecd/Makefile
index e544ed4e61804..6f710647bd518 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile
+++ b/usr.sbin/bluetooth/hcsecd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.8 2003/08/14 20:06:20 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hcsecd/Makefile,v 1.4 2004/09/14 20:04:33 emax Exp $
 
 PROG=		hcsecd
 MAN=		hcsecd.8 hcsecd.conf.5
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.8 b/usr.sbin/bluetooth/hcsecd/hcsecd.8
index 8b7084d2de30a..6678898c33351 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.8
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hcsecd.8,v 1.8 2003/09/08 18:54:20 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.8,v 1.6 2006/02/11 15:36:37 markus Exp $
 .\"
 .Dd November 16, 2002
 .Dt HCSECD 8
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.c b/usr.sbin/bluetooth/hcsecd/hcsecd.c
index de7a77581b13e..88040b596f56d 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.c
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hcsecd.c,v 1.6 2003/08/18 19:19:55 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.c,v 1.5 2006/09/21 17:16:37 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf b/usr.sbin/bluetooth/hcsecd/hcsecd.conf
index 127ce04b74d65..67344bf371e00 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf
@@ -1,6 +1,6 @@
 #
 # $Id: hcsecd.conf,v 1.1 2002/11/24 20:22:39 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.conf,v 1.1 2003/05/10 21:50:35 julian Exp $
 #
 # HCI security daemon configuration file
 #
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5 b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
index 189ca66606c53..6de5f2603dafd 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hcsecd.conf.5,v 1.1 2003/05/26 22:49:23 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5,v 1.2 2004/06/13 18:03:40 ru Exp $
 .\"
 .Dd May 26, 2003
 .Dt HCSECD.CONF 5
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.h b/usr.sbin/bluetooth/hcsecd/hcsecd.h
index acfc8875a0112..8e1292d2e5957 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.h
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hcsecd.h,v 1.3 2003/09/08 18:54:21 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/hcsecd.h,v 1.3 2004/04/09 23:58:53 emax Exp $
  */
 
 #ifndef _HCSECD_H_
diff --git a/usr.sbin/bluetooth/hcsecd/lexer.l b/usr.sbin/bluetooth/hcsecd/lexer.l
index 2430d7e2982c0..8669afdd0365c 100644
--- a/usr.sbin/bluetooth/hcsecd/lexer.l
+++ b/usr.sbin/bluetooth/hcsecd/lexer.l
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Id: lexer.l,v 1.1 2002/11/24 20:22:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/lexer.l,v 1.1 2003/05/10 21:50:35 julian Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/bluetooth/hcsecd/parser.y b/usr.sbin/bluetooth/hcsecd/parser.y
index 385bff257b3ac..07c357c34c820 100644
--- a/usr.sbin/bluetooth/hcsecd/parser.y
+++ b/usr.sbin/bluetooth/hcsecd/parser.y
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $Id: parser.y,v 1.5 2003/06/07 21:22:30 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcsecd/parser.y,v 1.4 2004/09/14 20:04:33 emax Exp $
  */
 
 #include <sys/fcntl.h>
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile b/usr.sbin/bluetooth/hcseriald/Makefile
index ed0bf32438208..597bdc411c364 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile
+++ b/usr.sbin/bluetooth/hcseriald/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/08/14 20:06:21 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/hcseriald/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		hcseriald
 MAN=		hcseriald.8
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.8 b/usr.sbin/bluetooth/hcseriald/hcseriald.8
index 111b28cc60b60..fb50b654e8659 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.8
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: hcseriald.8,v 1.3 2003/05/21 00:47:26 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/hcseriald/hcseriald.8,v 1.6 2004/11/02 20:12:06 emax Exp $
 .\"
 .Dd June 14, 2002
 .Dt HCSERIALD 8
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.c b/usr.sbin/bluetooth/hcseriald/hcseriald.c
index ee8d19c7a9955..6d16da585fe58 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.c
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: hcseriald.c,v 1.3 2003/05/21 22:40:32 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/hcseriald/hcseriald.c,v 1.5 2004/11/02 20:12:06 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/l2control/Makefile b/usr.sbin/bluetooth/l2control/Makefile
index 847ff4ba97d69..ca573f71b56c7 100644
--- a/usr.sbin/bluetooth/l2control/Makefile
+++ b/usr.sbin/bluetooth/l2control/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/08/14 20:06:22 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/l2control/Makefile,v 1.3 2003/10/12 22:04:23 emax Exp $
 
 PROG=		l2control
 MAN=		l2control.8
diff --git a/usr.sbin/bluetooth/l2control/l2cap.c b/usr.sbin/bluetooth/l2control/l2cap.c
index c23106c3db3fe..cf2697faaff03 100644
--- a/usr.sbin/bluetooth/l2control/l2cap.c
+++ b/usr.sbin/bluetooth/l2control/l2cap.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2cap.c,v 1.5 2003/05/16 19:52:37 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2control/l2cap.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/l2control/l2control.8 b/usr.sbin/bluetooth/l2control/l2control.8
index 794b6a72a9a62..78756e98ca9d4 100644
--- a/usr.sbin/bluetooth/l2control/l2control.8
+++ b/usr.sbin/bluetooth/l2control/l2control.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: l2control.8,v 1.5 2003/05/21 00:53:00 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/l2control/l2control.8,v 1.6 2005/01/17 07:44:37 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt L2CONTROL 8
diff --git a/usr.sbin/bluetooth/l2control/l2control.c b/usr.sbin/bluetooth/l2control/l2control.c
index 585021c98433b..a1641a7506bed 100644
--- a/usr.sbin/bluetooth/l2control/l2control.c
+++ b/usr.sbin/bluetooth/l2control/l2control.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2control.c,v 1.6 2003/09/05 00:38:25 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2control/l2control.c,v 1.3 2003/10/12 22:04:23 emax Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/bluetooth/l2control/l2control.h b/usr.sbin/bluetooth/l2control/l2control.h
index 43d456164be83..354bf0a101676 100644
--- a/usr.sbin/bluetooth/l2control/l2control.h
+++ b/usr.sbin/bluetooth/l2control/l2control.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2control.h,v 1.1 2002/11/24 20:22:41 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2control/l2control.h,v 1.2 2003/05/10 21:50:36 julian Exp $
  */
 
 #ifndef _L2CONTROL_H_
diff --git a/usr.sbin/bluetooth/l2ping/Makefile b/usr.sbin/bluetooth/l2ping/Makefile
index bc130e33aac90..92b4f0847669a 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile
+++ b/usr.sbin/bluetooth/l2ping/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.6 2003/08/14 20:06:24 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/l2ping/Makefile,v 1.4 2005/01/28 16:08:09 ru Exp $
 
 PROG=		l2ping
 MAN=		l2ping.8
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.8 b/usr.sbin/bluetooth/l2ping/l2ping.8
index 477f4ecc1a707..1b2bee2ed8de9 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.8
+++ b/usr.sbin/bluetooth/l2ping/l2ping.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: l2ping.8,v 1.3 2003/05/21 01:00:19 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/l2ping/l2ping.8,v 1.10 2005/01/18 20:02:31 ru Exp $
 .\"
 .Dd June 14, 2002
 .Dt L2PING 8
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.c b/usr.sbin/bluetooth/l2ping/l2ping.c
index d7e1b1e03fac0..92f89e616f89e 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.c
+++ b/usr.sbin/bluetooth/l2ping/l2ping.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: l2ping.c,v 1.5 2003/05/16 19:54:40 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/l2ping/l2ping.c,v 1.7 2005/09/01 22:45:25 emax Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
index adac64eca14ac..73c0bded3d02d 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/rfcomm_pppd/Makefile,v 1.2 2003/10/12 22:04:24 emax Exp $
 
 .PATH:	${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd
 
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
index 1f5efff36955a..74c4b96df50cd 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: rfcomm_pppd.8,v 1.7 2003/09/07 18:32:11 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8,v 1.14 2007/05/13 18:59:22 pav Exp $
 .\"
 .Dd February 4, 2003
 .Dt RFCOMM_PPPD 8
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
index 7a879bbfb3907..ce93b73c4a7be 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_pppd.c,v 1.5 2003/09/07 18:32:11 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c,v 1.6 2006/09/21 02:32:28 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile b/usr.sbin/bluetooth/sdpcontrol/Makefile
index c0ec8d423f746..245c03a675ba4 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2003/09/08 02:27:27 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/Makefile,v 1.1 2003/10/12 22:04:24 emax Exp $
 
 PROG=		sdpcontrol
 MAN=		sdpcontrol.8
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
index d1b9ae5d60fc4..b4dc81444c22c 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sdpcontrol.8,v 1.1 2003/09/08 02:27:27 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8,v 1.6 2005/07/09 19:04:43 markus Exp $
 .\"
 .Dd September 7, 2003
 .Dt SDPCONTROL 8
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
index fca2015c9c029..fd9657b6efd8d 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdpcontrol.c,v 1.1 2003/09/08 02:27:27 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c,v 1.4 2004/08/05 16:32:41 emax Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
index 4a1ee76f383d8..513c14bfdb1b8 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sdpcontrol.h,v 1.1 2003/09/08 02:27:27 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h,v 1.1 2003/10/12 22:04:24 emax Exp $
  */
 
 #ifndef __SDPCONTROL_H__
diff --git a/usr.sbin/bluetooth/sdpcontrol/search.c b/usr.sbin/bluetooth/sdpcontrol/search.c
index e7d824436aa4b..c36154f8571cf 100644
--- a/usr.sbin/bluetooth/sdpcontrol/search.c
+++ b/usr.sbin/bluetooth/sdpcontrol/search.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: search.c,v 1.2 2003/09/08 17:35:15 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpcontrol/search.c,v 1.4.10.1 2007/11/21 17:28:04 emax Exp $
  */
 
 #include <netinet/in.h>
diff --git a/usr.sbin/bluetooth/sdpd/Makefile b/usr.sbin/bluetooth/sdpd/Makefile
index db97aa9a12309..9926a6e2c7ad4 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile
+++ b/usr.sbin/bluetooth/sdpd/Makefile
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.1 2004/01/20 21:27:55 max Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bluetooth/sdpd/Makefile,v 1.2 2005/01/05 18:37:37 emax Exp $
 
 PROG=		sdpd
 MAN=		sdpd.8
diff --git a/usr.sbin/bluetooth/sdpd/bgd.c b/usr.sbin/bluetooth/sdpd/bgd.c
index 70dda891072f5..bcdd1b11adb83 100644
--- a/usr.sbin/bluetooth/sdpd/bgd.c
+++ b/usr.sbin/bluetooth/sdpd/bgd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: bgd.c,v 1.4 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/bgd.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpd/dun.c b/usr.sbin/bluetooth/sdpd/dun.c
index e7aeb78d679ea..5fe69313ebe4f 100644
--- a/usr.sbin/bluetooth/sdpd/dun.c
+++ b/usr.sbin/bluetooth/sdpd/dun.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: dun.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/dun.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ftrn.c b/usr.sbin/bluetooth/sdpd/ftrn.c
index bcebfc79807fa..abad5671899f7 100644
--- a/usr.sbin/bluetooth/sdpd/ftrn.c
+++ b/usr.sbin/bluetooth/sdpd/ftrn.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ftrn.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/ftrn.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/irmc.c b/usr.sbin/bluetooth/sdpd/irmc.c
index d28a1205be670..5496e5841929d 100644
--- a/usr.sbin/bluetooth/sdpd/irmc.c
+++ b/usr.sbin/bluetooth/sdpd/irmc.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: irmc.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/irmc.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/irmc_command.c b/usr.sbin/bluetooth/sdpd/irmc_command.c
index 10dafe0b1ed27..2f8195744183c 100644
--- a/usr.sbin/bluetooth/sdpd/irmc_command.c
+++ b/usr.sbin/bluetooth/sdpd/irmc_command.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: irmc_command.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/irmc_command.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/lan.c b/usr.sbin/bluetooth/sdpd/lan.c
index a5612eda64a7c..2b65f340ad40e 100644
--- a/usr.sbin/bluetooth/sdpd/lan.c
+++ b/usr.sbin/bluetooth/sdpd/lan.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: lan.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/lan.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <arpa/inet.h>
diff --git a/usr.sbin/bluetooth/sdpd/log.c b/usr.sbin/bluetooth/sdpd/log.c
index b03f7e141d230..4db28b61db454 100644
--- a/usr.sbin/bluetooth/sdpd/log.c
+++ b/usr.sbin/bluetooth/sdpd/log.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: log.c,v 1.1 2004/01/07 23:15:00 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/log.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/sdpd/log.h b/usr.sbin/bluetooth/sdpd/log.h
index 8c9ce778cfdd6..6bcfd3e88916c 100644
--- a/usr.sbin/bluetooth/sdpd/log.h
+++ b/usr.sbin/bluetooth/sdpd/log.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: log.h,v 1.1 2004/01/07 23:15:00 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/log.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _LOG_H_
diff --git a/usr.sbin/bluetooth/sdpd/main.c b/usr.sbin/bluetooth/sdpd/main.c
index 1df3bf0d5887b..7ccaf3becd4c8 100644
--- a/usr.sbin/bluetooth/sdpd/main.c
+++ b/usr.sbin/bluetooth/sdpd/main.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: main.c,v 1.8 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/main.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/select.h>
diff --git a/usr.sbin/bluetooth/sdpd/opush.c b/usr.sbin/bluetooth/sdpd/opush.c
index 36359daa98ef6..1b1efe1889373 100644
--- a/usr.sbin/bluetooth/sdpd/opush.c
+++ b/usr.sbin/bluetooth/sdpd/opush.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: opush.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/opush.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/profile.c b/usr.sbin/bluetooth/sdpd/profile.c
index 3ba0159de8db6..bf71459533acb 100644
--- a/usr.sbin/bluetooth/sdpd/profile.c
+++ b/usr.sbin/bluetooth/sdpd/profile.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: profile.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/profile.c,v 1.2 2004/07/28 07:15:44 kan Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/profile.h b/usr.sbin/bluetooth/sdpd/profile.h
index 0ca42211de115..a78d180a8763b 100644
--- a/usr.sbin/bluetooth/sdpd/profile.h
+++ b/usr.sbin/bluetooth/sdpd/profile.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: profile.h,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/profile.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _PROFILE_H_
diff --git a/usr.sbin/bluetooth/sdpd/provider.c b/usr.sbin/bluetooth/sdpd/provider.c
index b0f5347018f86..cd8ca2d914754 100644
--- a/usr.sbin/bluetooth/sdpd/provider.c
+++ b/usr.sbin/bluetooth/sdpd/provider.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: provider.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/provider.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/provider.h b/usr.sbin/bluetooth/sdpd/provider.h
index b48bc8dfe4278..5edd5d32bf113 100644
--- a/usr.sbin/bluetooth/sdpd/provider.h
+++ b/usr.sbin/bluetooth/sdpd/provider.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: provider.h,v 1.6 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/provider.h,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #ifndef _PROVIDER_H_
diff --git a/usr.sbin/bluetooth/sdpd/sar.c b/usr.sbin/bluetooth/sdpd/sar.c
index 4fc25d92b1188..189ae2268e5b9 100644
--- a/usr.sbin/bluetooth/sdpd/sar.c
+++ b/usr.sbin/bluetooth/sdpd/sar.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sar.c,v 1.2 2004/01/08 23:46:51 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sar.c,v 1.2 2004/02/26 20:44:55 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/scr.c b/usr.sbin/bluetooth/sdpd/scr.c
index d0c9ec5f29d6c..54cb87cc04e18 100644
--- a/usr.sbin/bluetooth/sdpd/scr.c
+++ b/usr.sbin/bluetooth/sdpd/scr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: scr.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/scr.c,v 1.2 2005/12/06 17:56:36 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sd.c b/usr.sbin/bluetooth/sdpd/sd.c
index 52f6c953bd090..683a831c76225 100644
--- a/usr.sbin/bluetooth/sdpd/sd.c
+++ b/usr.sbin/bluetooth/sdpd/sd.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sd.c,v 1.4 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sd.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sdpd.8 b/usr.sbin/bluetooth/sdpd/sdpd.8
index 0844e30ee15d0..ed1b961f8ec70 100644
--- a/usr.sbin/bluetooth/sdpd/sdpd.8
+++ b/usr.sbin/bluetooth/sdpd/sdpd.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Id: sdpd.8,v 1.1 2004/01/13 19:31:54 max Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bluetooth/sdpd/sdpd.8,v 1.5 2005/12/06 17:56:36 emax Exp $
 .\"
 .Dd January 13, 2004
 .Dt SDPD 8
diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c
index 816c6f5e6c2f2..b57887c1cf8f2 100644
--- a/usr.sbin/bluetooth/sdpd/server.c
+++ b/usr.sbin/bluetooth/sdpd/server.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: server.c,v 1.6 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.c,v 1.6 2007/02/23 19:37:47 emax Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/bluetooth/sdpd/server.h b/usr.sbin/bluetooth/sdpd/server.h
index d7ef55e20244a..8ec187c592078 100644
--- a/usr.sbin/bluetooth/sdpd/server.h
+++ b/usr.sbin/bluetooth/sdpd/server.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: server.h,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.h,v 1.2 2005/12/06 17:56:36 emax Exp $
  */
 
 #ifndef _SERVER_H_
diff --git a/usr.sbin/bluetooth/sdpd/sp.c b/usr.sbin/bluetooth/sdpd/sp.c
index 31a9585a25e1c..79a1e868f1076 100644
--- a/usr.sbin/bluetooth/sdpd/sp.c
+++ b/usr.sbin/bluetooth/sdpd/sp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sp.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sp.c,v 1.1 2004/01/20 20:48:26 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/srr.c b/usr.sbin/bluetooth/sdpd/srr.c
index fd636d56d4460..099f118433263 100644
--- a/usr.sbin/bluetooth/sdpd/srr.c
+++ b/usr.sbin/bluetooth/sdpd/srr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: srr.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/srr.c,v 1.2 2005/12/06 17:56:36 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssar.c b/usr.sbin/bluetooth/sdpd/ssar.c
index eac92351c8241..f15234b203ef5 100644
--- a/usr.sbin/bluetooth/sdpd/ssar.c
+++ b/usr.sbin/bluetooth/sdpd/ssar.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ssar.c,v 1.4 2004/01/12 22:54:31 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/ssar.c,v 1.2 2005/01/05 18:37:37 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssr.c b/usr.sbin/bluetooth/sdpd/ssr.c
index ac27548575cc3..54ada37f1410b 100644
--- a/usr.sbin/bluetooth/sdpd/ssr.c
+++ b/usr.sbin/bluetooth/sdpd/ssr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ssr.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/ssr.c,v 1.3 2005/01/05 18:37:37 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sur.c b/usr.sbin/bluetooth/sdpd/sur.c
index 143eaf3dbec98..aa7285712e9e8 100644
--- a/usr.sbin/bluetooth/sdpd/sur.c
+++ b/usr.sbin/bluetooth/sdpd/sur.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: sur.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/sur.c,v 1.2 2005/12/06 17:56:36 emax Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/uuid-private.h b/usr.sbin/bluetooth/sdpd/uuid-private.h
index db8d13ba76a5b..c6d5b80c00f79 100644
--- a/usr.sbin/bluetooth/sdpd/uuid-private.h
+++ b/usr.sbin/bluetooth/sdpd/uuid-private.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: uuid-private.h,v 1.1 2004/12/09 18:20:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/uuid-private.h,v 1.1 2005/01/05 18:37:37 emax Exp $
  */
 
 #ifndef _UUID_PRIVATE_H_
diff --git a/usr.sbin/bluetooth/sdpd/uuid.c b/usr.sbin/bluetooth/sdpd/uuid.c
index 1989bc5e797d1..f37a3c28fd1f4 100644
--- a/usr.sbin/bluetooth/sdpd/uuid.c
+++ b/usr.sbin/bluetooth/sdpd/uuid.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $Id: uuid.c,v 1.1 2004/12/09 18:20:26 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/uuid.c,v 1.1 2005/01/05 18:37:37 emax Exp $
  */
 
 #include <bluetooth.h>
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
index dc02cad7b41d0..c084d7bc786cc 100644
--- a/usr.sbin/boot0cfg/Makefile
+++ b/usr.sbin/boot0cfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/boot0cfg/Makefile,v 1.9 2005/07/15 08:04:32 phk Exp $
 
 PROG=	boot0cfg
 MAN=	boot0cfg.8
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 0b0b4f2fb7d27..3b5fba66e35aa 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -22,7 +22,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.8,v 1.32 2007/06/07 07:43:04 pav Exp $
 .\"
 .Dd June 7, 2007
 .Dt BOOT0CFG 8
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 6fd0587ba7cbd..0e6964bbbc3b3 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/boot0cfg/boot0cfg.c,v 1.20 2005/07/15 08:04:32 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile
index 9b0e70316315a..167f4d2deb2db 100644
--- a/usr.sbin/boot98cfg/Makefile
+++ b/usr.sbin/boot98cfg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/boot98cfg/Makefile,v 1.6 2005/07/15 15:32:52 nyan Exp $
 
 PROG=	boot98cfg
 MAN=	boot98cfg.8
diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8
index 96ebbcdd0fd3f..88bb5b86cbd13 100644
--- a/usr.sbin/boot98cfg/boot98cfg.8
+++ b/usr.sbin/boot98cfg/boot98cfg.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/boot98cfg/boot98cfg.8,v 1.12 2005/01/18 20:02:31 ru Exp $
 .\"
 .Dd July 10, 2000
 .Dt BOOT98CFG 8
diff --git a/usr.sbin/boot98cfg/boot98cfg.c b/usr.sbin/boot98cfg/boot98cfg.c
index 45c79c99793de..1404e8f8028d0 100644
--- a/usr.sbin/boot98cfg/boot98cfg.c
+++ b/usr.sbin/boot98cfg/boot98cfg.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/boot98cfg/boot98cfg.c,v 1.7 2005/07/15 15:32:52 nyan Exp $");
 
 #include <sys/param.h>
 #include <sys/diskpc98.h>
diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile
index c4e3361ecfabf..ec5f7b51c0fbb 100644
--- a/usr.sbin/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/Makefile,v 1.2 2001/07/20 06:19:38 obrien Exp $
 
 SUBDIR=	bootparamd callbootd
 
diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc
index 1e4d46f113a51..e55d2e469d6d3 100644
--- a/usr.sbin/bootparamd/Makefile.inc
+++ b/usr.sbin/bootparamd/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	5.1 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/Makefile.inc,v 1.2 2001/07/20 06:19:38 obrien Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index 5d2047b463cc5..fe7f15af6ff8e 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/bootparamd/Makefile,v 1.16 2006/03/17 18:54:40 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/bootparamd/bootparamd/README b/usr.sbin/bootparamd/bootparamd/README
index 508ee0f63401f..c32819a81f816 100644
--- a/usr.sbin/bootparamd/bootparamd/README
+++ b/usr.sbin/bootparamd/bootparamd/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/bootparamd/bootparamd/README,v 1.2 2001/07/23 12:05:27 kris Exp $
 
 This directory contains a version of the rpc.bootparamd, which have been 
 written using the Sun's RPC protocol for bootparamd. To use it you must 
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index 6048a8f11fa1a..0c47bc27e2954 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8
@@ -1,5 +1,5 @@
 .\" @(#)bootparamd.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.15 2005/01/18 20:02:31 ru Exp $
 .Dd December 14, 2000
 .Dt BOOTPARAMD 8
 .Os
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 238686bcdc1d9..1a10874f2b4ce 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.c,v 1.12 2004/11/13 20:40:31 bz Exp $";
 #endif /* not lint */
 
 #ifdef YP
diff --git a/usr.sbin/bootparamd/bootparamd/bootparams.5 b/usr.sbin/bootparamd/bootparamd/bootparams.5
index c7c6785f47e1c..ef575a90b0b9c 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparams.5
+++ b/usr.sbin/bootparamd/bootparamd/bootparams.5
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: Id: bootparams.5,v 1.2 1994/10/03 19:26:13 gwr Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparams.5,v 1.11 2001/01/24 12:22:39 ru Exp $
 .\"
 .Dd October 2, 1994
 .Dt BOOTPARAMS 5
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index 4468232e63a09..47984d802daf1 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/bootparamd/main.c,v 1.10 2004/06/08 12:11:19 stefanf Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index 5a08d608a4c8a..37d52013bebf4 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bootparamd/callbootd/Makefile,v 1.14 2005/02/09 12:17:52 stefanf Exp $
 
 PROG=	callbootd
 NO_MAN=
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 5ed460857b549..1fc2523d11bdf 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/bootparamd/callbootd/callbootd.c,v 1.10 2003/06/20 04:54:27 jmg Exp $";
 #endif /* not lint */
 
 #include "bootparam_prot.h"
diff --git a/usr.sbin/bsnmpd/Makefile b/usr.sbin/bsnmpd/Makefile
index c948108f4f41c..7e680329b7c8b 100644
--- a/usr.sbin/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/Makefile,v 1.2 2005/03/14 17:32:16 harti Exp $
 
 SUBDIR=	gensnmptree	\
 	bsnmpd		\
diff --git a/usr.sbin/bsnmpd/Makefile.inc b/usr.sbin/bsnmpd/Makefile.inc
index 265f86d1ed55a..d2fca0e3f5a5c 100644
--- a/usr.sbin/bsnmpd/Makefile.inc
+++ b/usr.sbin/bsnmpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/Makefile.inc,v 1.1 2003/11/10 09:22:40 harti Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 9fbf3667920f2..06bf4226c2267 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.16 2006/11/08 10:36:57 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile b/usr.sbin/bsnmpd/gensnmptree/Makefile
index 11c6a3b28f180..396b2145d5246 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/gensnmptree/Makefile,v 1.4 2005/10/04 15:03:39 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile
index 578d1734d1c94..e1676895478c5 100644
--- a/usr.sbin/bsnmpd/modules/Makefile
+++ b/usr.sbin/bsnmpd/modules/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile,v 1.15 2006/12/29 19:24:51 bz Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index ecd2538b5fec4..66f5f67b8f44b 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.13 2007/06/18 18:47:54 rafan Exp $
 
 SHLIB_MAJOR=	5
 WARNS?=		6
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
index 83c4e5c26bbcb..7c2083986bcb2 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
@@ -26,7 +26,7 @@
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --  
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt,v 1.1 2004/08/09 16:36:04 harti Exp $
 --
 -- Private Begemot MIB for ATM interfaces on FreeBSD
 --
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
index 4bba7cb5d2170..c96f6fddc5737 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/Makefile,v 1.4 2005/11/10 10:14:56 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def b/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
index 6cc61d0121844..8cb00580a5677 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def,v 1.1 2004/08/09 16:36:04 harti Exp $
 #
 # SNMP module for ATM hardware interfaces.
 #
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
index 525e80548a5f0..10ecbc15aec07 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c,v 1.1 2004/08/09 16:36:04 harti Exp $
  *
  * SNMP module for ATM hardware interfaces - FreeBSD/Ng specific part.
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
index d55ea3cf27d13..3c6c0234ba514 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
@@ -23,7 +23,7 @@
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt,v 1.3 2007/08/08 19:27:50 syrinx Exp $
 --
 
 BEGEMOT-BRIDGE-MIB DEFINITIONS ::= BEGIN
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt
index 9f87b6557c0af..98b8f0c0550be 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt
@@ -13,7 +13,7 @@
 -- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
 -- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt,v 1.1 2006/11/19 15:42:48 syrinx Exp $
 --
 
 BRIDGE-MIB DEFINITIONS ::= BEGIN
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
index 5d0afec43acbc..f556821e07b58 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile,v 1.2 2006/12/07 22:36:17 syrinx Exp $
 #
 
 MOD=	bridge
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt
index ea6648e031b27..2e3a214d808be 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt
@@ -13,7 +13,7 @@
 -- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
 -- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt,v 1.1 2006/12/07 22:36:17 syrinx Exp $
 --
 
 RSTP-MIB DEFINITIONS ::= BEGIN
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
index 781517f609522..6a03e468a81b2 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
@@ -26,7 +26,7 @@
  * Bridge MIB implementation for SNMPd.
  * Bridge addresses.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c,v 1.3 2006/12/15 20:01:57 syrinx Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
index 4586e32114ec4..7d3b65a1d28b4 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
@@ -26,7 +26,7 @@
  * Bridge MIB implementation for SNMPd.
  * Bridge interface objects.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c,v 1.6 2006/12/29 19:23:38 bz Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
index 0ad8cbf47f0e3..1777c52ea3ef9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
@@ -26,7 +26,7 @@
  * Bridge MIB implementation for SNMPd.
  * Bridge pfil controls.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c,v 1.2 2006/12/15 20:01:57 syrinx Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
index fe2af043c1121..f879e106ba309 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
@@ -26,7 +26,7 @@
  * Bridge MIB implementation for SNMPd.
  * Bridge ports.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c,v 1.6 2007/08/08 19:27:50 syrinx Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
index 81acc4dc95e70..7b9431a439e01 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
@@ -25,7 +25,7 @@
  *
  * Bridge MIB implementation for SNMPd.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c,v 1.3 2006/12/15 20:01:57 syrinx Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
index 7f48950e4e87e..0f04dbb4beca4 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
@@ -25,7 +25,7 @@
  *
  * Bridge MIB implementation for SNMPd.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h,v 1.5 2007/08/08 19:27:50 syrinx Exp $
  */
 
 #ifndef	SNMP_BRIDGE_H
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index 9684d686feea2..e47c617be83d7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -26,7 +26,7 @@
  * Bridge MIB implementation for SNMPd.
  * Bridge OS specific ioctls.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c,v 1.7 2007/08/08 19:27:50 syrinx Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
index cbebda06e9ea2..fc955d8d28ccf 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def,v 1.3 2007/08/08 19:27:50 syrinx Exp $
 #
 
 #include "tc.def"
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
index 24c8969e8425e..4296cde29370e 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3,v 1.4 2007/08/08 19:27:50 syrinx Exp $
 .\"
 .Dd August 6, 2007
 .Dt snmp_bridge 3
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt
index ee8d284af95fc..91eac368a1019 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt
@@ -26,7 +26,7 @@
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt,v 1.2 2006/01/09 13:01:26 harti Exp $
 --
 -- Additional stuff for the HOST-RESOURCES MIB.
 --
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
index 2922f45aa8b11..8c45f104a8e87 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile,v 1.3 2006/01/26 10:13:32 harti Exp $
 #
 
 LPRSRC=	${.CURDIR}/../../../lpr/common_source
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c
index f1cc5e3e33d61..9549b76dd03aa 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c,v 1.2 2006/01/09 13:01:26 harti Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
index 7e81436491677..2ce43c95321c9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c,v 1.4 2007/03/09 16:29:15 xride Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c
index 200f1ec5e6f49..0158c1eecfea7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c,v 1.5 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c
index a35743b949f01..41c7063a0e7bf 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c,v 1.3 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c
index 4329a1cc39201..a82dcc303bd25 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c,v 1.3 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
index 65c0012f816d5..8d75c5be6cb60 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c,v 1.4 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c
index 883d67a53bcbe..bacda9a5cba31 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c,v 1.3 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c
index 33f7b2d34e13e..aa87bf32892ba 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c,v 1.6 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
index 945a9bde55a7b..19ce04fc21e19 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c,v 1.4 2006/01/12 07:44:40 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c
index 47112da777085..1e66965073963 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c
@@ -37,7 +37,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c,v 1.2 2006/01/09 13:01:26 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h
index 567368adabd8b..160422ba2bfa5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h
@@ -28,7 +28,7 @@
  *
  * Host Resources MIB for SNMPd.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h,v 1.3 2006/07/14 09:07:56 harti Exp $
  */
 
 #ifndef HOSTRES_SNMP_H_1132245017
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c
index 488d9f520e3e7..82b9ef46afc29 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c,v 1.3 2006/07/14 09:07:56 harti Exp $
  */
 
 /*
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c
index 5fa5b4ce26826..311e970d50412 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c,v 1.3 2006/07/14 09:07:56 harti Exp $
  *
  * Host Resources MIB implementation for SNMPd: instrumentation for
  * hrSWInstalledTable
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c
index 1f8264820b37f..5d7c1f7d39a11 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c,v 1.5 2006/07/14 09:07:56 harti Exp $
  *
  * Host Resources MIB for SNMPd. Implementation for hrSWRunTable
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def
index e92d903f57280..18fd46f67b0c1 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def,v 1.2 2006/01/09 13:01:26 harti Exp $
 #
 # This is the .def file for both HOST-RESOURCES-MIB and HOST-RESOURCES-TYPES
 #
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
index 05c247dcaf032..6d8a75fd64a3b 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3,v 1.4 2006/09/30 19:07:02 ru Exp $
 .\"
 .Dd January 3, 2006
 .Dt snmp_hostres 3
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
index 278dc24da68bd..625e75a6915cb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile,v 1.8 2006/02/27 20:46:34 ru Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
index 1896fe696ed8c..6631658bba264 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
@@ -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.
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt,v 1.2 2003/11/15 15:26:34 harti Exp $
 --
 -- Private MIB for netgraph part of Begemot SNMP daemon.
 --
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
index 7caf7e40bbee6..7af67b4b0c61d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile,v 1.7 2005/11/10 10:14:56 harti Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def b/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
index eff59ff15c7c7..9f6eba9feb80e 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
@@ -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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def,v 1.1 2003/11/10 09:17:34 harti Exp $
 #
 # Definition of the tree implemented by snmp_netgraph.
 #
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
index 8742e15ac04b5..8051d080fd04d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3,v 1.10 2005/11/24 14:23:16 ru Exp $
 .\"
 .Dd November 14, 2003
 .Dt SNMP_NETGRAPH 3
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
index d9d136a5228a6..12bfefc19e2f5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c,v 1.6 2005/11/10 10:12:01 harti Exp $
  *
  * Netgraph interface for SNMPd.
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h
index 21e553c30916a..e716acf771156 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h,v 1.1 2003/11/10 09:17:34 harti Exp $
  *
  * Netgraph interface for SNMPd. Exported stuff.
  */
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
index 72ebdb7116766..3babe02a0567d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
@@ -6,7 +6,7 @@
 -- this stuff is worth it, you can buy me a beer in return.   -Philip Paeps
 -- ----------------------------------------------------------------------------
 --
--- $FreeBSD$
+-- $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt,v 1.1 2005/03/14 22:16:39 philip Exp $
 -- 
 
 BEGEMOT-PF-MIB DEFINITIONS ::= BEGIN
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index 74724644cf497..b5d2c7e6827f0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile,v 1.2 2005/11/10 10:14:57 harti Exp $
 # 
 # Author: Philip Paeps <philip@freebsd.org>
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index e12e28387ad96..58f2291aab8ea 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c,v 1.8 2007/07/03 12:46:07 mlaier Exp $
  */
 
 #include <bsnmp/snmpmod.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
index 003a3ec9acb99..0997a631ae5a5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def,v 1.1 2005/03/14 22:16:39 philip Exp $
 #
 
 (1 internet
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 6ca452eec1c2a..144afdf5ace27 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/btxld/Makefile,v 1.12 2006/01/23 13:55:32 delphij Exp $
 
 PROG=	btxld
 MAN=	btxld.8
diff --git a/usr.sbin/btxld/btx.h b/usr.sbin/btxld/btx.h
index 86f0ede0759cd..0c41bf5678982 100644
--- a/usr.sbin/btxld/btx.h
+++ b/usr.sbin/btxld/btx.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/btx.h,v 1.2 1999/08/28 01:15:41 peter Exp $
  */
 
 #ifndef _BTX_H_
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 5b514f619cbd2..304f55f87cffa 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -22,7 +22,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/btxld/btxld.8,v 1.7 2005/01/18 20:02:32 ru Exp $
 .\"
 .Dd September 12, 1998
 .Dt BTXLD 8
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index f255fa552818b..4d512287b9eec 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/btxld/btxld.c,v 1.10 2006/01/23 13:55:32 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 2790d5a9d168f..0cae7c5ce2b43 100644
--- a/usr.sbin/btxld/elfh.c
+++ b/usr.sbin/btxld/elfh.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/elfh.c,v 1.5 2004/06/22 17:05:37 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/btxld/elfh.h b/usr.sbin/btxld/elfh.h
index a4ab1348ae9b2..89160aec1f516 100644
--- a/usr.sbin/btxld/elfh.h
+++ b/usr.sbin/btxld/elfh.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/btxld/elfh.h,v 1.3 2000/01/04 14:10:36 marcel Exp $
  */
 
 #include <sys/elf32.h>
diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
index 6f032737e9277..7d235c8d9f84c 100644
--- a/usr.sbin/burncd/Makefile
+++ b/usr.sbin/burncd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.8 2002/12/30 10:57:41 obrien Exp $
 
 PROG=	burncd
 MAN=	burncd.8
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 18c1bc46a11be..95f90e2eceac6 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/burncd/burncd.8,v 1.38 2005/07/14 20:29:07 brueffer Exp $
 .\"
 .Dd May 2, 2005
 .Os
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 2800f5236be54..f849723e2af6b 100644
--- a/usr.sbin/burncd/burncd.c
+++ b/usr.sbin/burncd/burncd.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/burncd/burncd.c,v 1.45 2005/05/13 20:06:44 ru Exp $
  */
 
 #include <unistd.h>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index 40addadc52ef4..b968089a77003 100644
--- a/usr.sbin/cdcontrol/Makefile
+++ b/usr.sbin/cdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cdcontrol/Makefile,v 1.10 2003/04/04 17:49:13 obrien Exp $
 
 PROG= cdcontrol
 
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 7f1e94a378049..2d65644421136 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.40 2005/01/18 20:02:32 ru Exp $
 .\"
 .Dd May 8, 2002
 .Dt CDCONTROL 1
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index 040106faf65c2..e811465cf9bb8 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.49 2005/10/19 15:37:43 stefanf Exp $");
 
 #include <sys/cdio.h>
 #include <sys/cdrio.h>
diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
index 1c52f4680f83b..683d4f35ba1be 100644
--- a/usr.sbin/chkgrp/Makefile
+++ b/usr.sbin/chkgrp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chkgrp/Makefile,v 1.7 2001/07/20 06:19:39 obrien Exp $
 
 PROG=	chkgrp
 MAN=	chkgrp.8
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 581fd64c37e03..1c997fe4bece7 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.16 2005/06/14 12:26:34 ru Exp $
 .\"
 .Dd May 26, 2005
 .Dt CHKGRP 8
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index eca26afa60f27..9bc080b5a22d9 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/chkgrp/chkgrp.c,v 1.11 2005/08/25 17:01:06 cperciva Exp $");
 
 #include <err.h>
 #include <ctype.h>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 63c5a22f05daf..4d0bb5dc2a3e7 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chown/Makefile,v 1.12 2003/04/25 09:02:59 johan Exp $
 
 PROG=	chown
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1
index 0b3a7892ab87e..81544e6c6b06c 100644
--- a/usr.sbin/chown/chgrp.1
+++ b/usr.sbin/chown/chgrp.1
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.19 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd April 25, 2003
 .Dt CHGRP 1
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index f617f73555048..98c6fb2ed945e 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chown/chown.8,v 1.25 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd April 25, 2003
 .Dt CHOWN 8
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index 0918265840e54..4a180b53cd2ad 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/chown/chown.c,v 1.29 2004/08/07 04:19:37 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
index d28de6668e262..681cde1defbb0 100644
--- a/usr.sbin/chroot/Makefile
+++ b/usr.sbin/chroot/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/chroot/Makefile,v 1.7 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	chroot
 MAN=	chroot.8
diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8
index d847175b32c70..26d55af05922c 100644
--- a/usr.sbin/chroot/chroot.8
+++ b/usr.sbin/chroot/chroot.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/chroot/chroot.8,v 1.13 2004/08/07 04:19:37 imp Exp $
 .\"
 .Dd June 7, 2003
 .Dt CHROOT 8
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index f33db7a245882..f8b8e41202603 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/chroot/chroot.c,v 1.11 2004/08/07 04:19:37 imp Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
index 23430a8bb1af2..5ee9b32ef9d2d 100644
--- a/usr.sbin/ckdist/Makefile
+++ b/usr.sbin/ckdist/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ckdist/Makefile,v 1.5 2001/07/20 06:19:39 obrien Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
diff --git a/usr.sbin/ckdist/ckdist.1 b/usr.sbin/ckdist/ckdist.1
index 91a8091602136..5651f7c19ab95 100644
--- a/usr.sbin/ckdist/ckdist.1
+++ b/usr.sbin/ckdist/ckdist.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1997 Robert Nordier
 .\" All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ckdist/ckdist.1,v 1.11 2006/12/27 13:52:57 ru Exp $
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index 92bcd0d81a43e..56b2776a903ac 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ckdist/ckdist.c,v 1.5 2003/03/13 23:34:18 robert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index ac828818e367a..3a063d8aa460e 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,5 +1,5 @@
 # 	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/config/Makefile,v 1.38 2007/10/01 18:15:11 ru Exp $
 
 PROG=	config
 MAN=	config.5 config.8
diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5
index f523b7d33ce0a..3befd4fd96913 100644
--- a/usr.sbin/config/config.5
+++ b/usr.sbin/config/config.5
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/config/config.5,v 1.10 2006/10/24 00:44:40 imp Exp $
 .\"
 .Dd December 3, 2005
 .Dt CONFIG 5
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 01abc94991136..69ade50eea447 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)config.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.46 2007/05/12 19:38:18 wkoszek Exp $
 .\"
 .Dd May 8, 2007
 .Dt CONFIG 8
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 759eef0399582..5fe5e6ef2fc9d 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/config.h,v 1.62 2007/05/17 04:53:52 imp Exp $
  */
 
 /*
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 36a7bf7eed413..2f20c2cba0b97 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -67,7 +67,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.y	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/config.y,v 1.78 2007/05/17 04:53:52 imp Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index 2bcce11684095..bdef464882f05 100644
--- a/usr.sbin/config/configvers.h
+++ b/usr.sbin/config/configvers.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.45 2007/05/13 02:36:41 wkoszek Exp $
  */
 
 /*
@@ -47,7 +47,7 @@
  *     %VERSREQ field in the Makefile.$ARCH of all the affected makefiles
  *     (typically all of them).
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.45 2007/05/13 02:36:41 wkoszek Exp $
  */
 #define	CONFIGVERS	600006
 #define	MAJOR_VERS(x)	((x) / 100000)
diff --git a/usr.sbin/config/kernconf.tmpl b/usr.sbin/config/kernconf.tmpl
index 182614b937b0f..993c449f04a07 100644
--- a/usr.sbin/config/kernconf.tmpl
+++ b/usr.sbin/config/kernconf.tmpl
@@ -2,7 +2,7 @@
  * This file acts as a template for config.c that will be generated in the
  * kernel build directory after config(8) has been successfully run.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/kernconf.tmpl,v 1.2 2007/05/16 16:08:04 wkoszek Exp $
  */
 #include "opt_config.h"
 #ifdef INCLUDE_CONFIG_FILE
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 2f2886e284484..5a91a71a4ee3e 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lang.l	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/config/lang.l,v 1.45 2007/05/12 19:38:18 wkoszek Exp $
  */
 
 #include <assert.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index a3b300a8da348..5f3867576b143 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/main.c,v 1.76 2007/05/17 04:53:52 imp Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index fd7f1b3ac67dc..0e0721fc3d173 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkheaders.c,v 1.31 2005/11/25 22:25:34 ru Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 9e7ef60462b8f..0aa73e9bc1b28 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.91 2006/10/24 07:12:31 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index c4bd62464409f..6884c1761fee8 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -33,7 +33,7 @@
 static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/config/mkoptions.c,v 1.34 2006/06/07 01:43:26 delphij Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile
index 62f853cd26732..13df35704fd81 100644
--- a/usr.sbin/cron/Makefile
+++ b/usr.sbin/cron/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/Makefile,v 1.2 2001/07/20 06:19:42 obrien Exp $
 
 SUBDIR=	lib cron crontab
 
diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc
index 900730b2e9431..fbe0c53cd41cb 100644
--- a/usr.sbin/cron/Makefile.inc
+++ b/usr.sbin/cron/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/Makefile.inc,v 1.4 2005/06/10 06:12:52 des Exp $
 
 LIBCRON= ${.OBJDIR}/../lib/libcron.a
 
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index 77ca47a1dc09c..6629c624e3ee6 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/cron/Makefile,v 1.17 2007/10/01 18:17:24 ru Exp $
 
 PROG=	cron
 MAN=	cron.8
diff --git a/usr.sbin/cron/cron/compat.h b/usr.sbin/cron/cron/compat.h
index 905c3aaf3bd94..956920f47773a 100644
--- a/usr.sbin/cron/cron/compat.h
+++ b/usr.sbin/cron/cron/compat.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/compat.h,v 1.5 1999/08/28 01:15:49 peter Exp $
  */
 
 #ifndef __P
diff --git a/usr.sbin/cron/cron/config.h b/usr.sbin/cron/cron/config.h
index 6d77da27580d5..5e7402822ea68 100644
--- a/usr.sbin/cron/cron/config.h
+++ b/usr.sbin/cron/cron/config.h
@@ -17,7 +17,7 @@
 
 /* config.h - configurables for Vixie Cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/config.h,v 1.8 1999/08/28 01:15:49 peter Exp $
  */
 
 #if !defined(_PATH_SENDMAIL)
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index b0d1a9136ebdb..2b9b197f6eb34 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/cron/cron.8,v 1.25 2007/06/17 17:25:53 yar Exp $
 .\"
 .Dd June 17, 2007
 .Dt CRON 8
diff --git a/usr.sbin/cron/cron/cron.c b/usr.sbin/cron/cron/cron.c
index 671d9709039a2..f9665b7921d01 100644
--- a/usr.sbin/cron/cron/cron.c
+++ b/usr.sbin/cron/cron/cron.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/cron.c,v 1.18 2006/07/20 09:11:08 stefanf Exp $";
 #endif
 
 #define	MAIN_PROGRAM
diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h
index 6277719aa7216..24193a6ec3eb1 100644
--- a/usr.sbin/cron/cron/cron.h
+++ b/usr.sbin/cron/cron/cron.h
@@ -17,7 +17,7 @@
 
 /* cron.h - header for vixie's cron
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/cron.h,v 1.17 2007/06/17 17:25:53 yar Exp $
  *
  * vix 14nov88 [rest of log is in RCS]
  * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley]
diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c
index 6c364c9070741..bb3240961f577 100644
--- a/usr.sbin/cron/cron/database.c
+++ b/usr.sbin/cron/cron/database.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/database.c,v 1.9 2007/06/17 17:25:53 yar Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the log]
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index afc8317cde247..adef724970c8f 100644
--- a/usr.sbin/cron/cron/do_command.c
+++ b/usr.sbin/cron/cron/do_command.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/do_command.c,v 1.27 2007/06/17 17:25:53 yar Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/job.c b/usr.sbin/cron/cron/job.c
index 6d1b1af6e4748..3b9360d7cd603 100644
--- a/usr.sbin/cron/cron/job.c
+++ b/usr.sbin/cron/cron/job.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/job.c,v 1.6 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/cron/pathnames.h b/usr.sbin/cron/cron/pathnames.h
index ba91bfdc61f9b..0af56984c1e5c 100644
--- a/usr.sbin/cron/cron/pathnames.h
+++ b/usr.sbin/cron/cron/pathnames.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cron/cron/pathnames.h,v 1.5 1999/08/28 01:15:50 peter Exp $
  */
 
 #if (defined(BSD)) && (BSD >= 199103) || defined(__linux) || defined(AIX)
diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c
index 428de2e15202e..11e97a002c85f 100644
--- a/usr.sbin/cron/cron/popen.c
+++ b/usr.sbin/cron/cron/popen.c
@@ -28,7 +28,7 @@
 static char sccsid[] = "@(#)popen.c	5.7 (Berkeley) 2/14/89";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/popen.c,v 1.15 2006/06/11 21:13:49 maxim Exp $";
 #endif /* not lint */
 
 #include "cron.h"
diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c
index 16fd61723a867..7d43eed6b6b54 100644
--- a/usr.sbin/cron/cron/user.c
+++ b/usr.sbin/cron/cron/user.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/cron/user.c,v 1.8 1999/08/28 01:15:50 peter Exp $";
 #endif
 
 /* vix 26jan87 [log is in RCS file]
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index 6b9486dc1500c..663ec2f850775 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/crontab/Makefile,v 1.14 2004/11/03 18:01:21 ru Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index b634d314a64df..93b6593428260 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/usr.sbin/cron/crontab/crontab.1
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.1,v 1.15 2005/01/18 20:02:33 ru Exp $
 .\"
 .Dd December 29, 1993
 .Dt CRONTAB 1
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index 7ae8c2acd0e72..7a083896c4a34 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/cron/crontab/crontab.5,v 1.28 2005/07/31 13:41:23 brueffer Exp $
 .\"
 .Dd July 31, 2005
 .Dt CRONTAB 5
diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c
index 9ddd4b007202e..a548757111a03 100644
--- a/usr.sbin/cron/crontab/crontab.c
+++ b/usr.sbin/cron/crontab/crontab.c
@@ -18,7 +18,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/crontab/crontab.c,v 1.24 2006/09/03 17:52:19 ru Exp $";
 #endif
 
 /* crontab - install and manage per-user crontab files
diff --git a/usr.sbin/cron/doc/CONVERSION b/usr.sbin/cron/doc/CONVERSION
index f30df7d197508..1d679c98bebe6 100644
--- a/usr.sbin/cron/doc/CONVERSION
+++ b/usr.sbin/cron/doc/CONVERSION
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/CONVERSION,v 1.5 2001/02/06 11:21:45 asmodai Exp $
 
 Conversion of BSD 4.[23] crontab files:
 
diff --git a/usr.sbin/cron/doc/FEATURES b/usr.sbin/cron/doc/FEATURES
index 821d1f3a3af2c..76e1b6f081e00 100644
--- a/usr.sbin/cron/doc/FEATURES
+++ b/usr.sbin/cron/doc/FEATURES
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/FEATURES,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 Features of Vixie's cron relative to BSD 4.[23] and SysV crons:
 
diff --git a/usr.sbin/cron/doc/INSTALL b/usr.sbin/cron/doc/INSTALL
index 7f4c9974da64a..fd49df3cc2850 100644
--- a/usr.sbin/cron/doc/INSTALL
+++ b/usr.sbin/cron/doc/INSTALL
@@ -15,7 +15,7 @@
  * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
  */
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/INSTALL,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 Read the comments at the top of the Makefile, then edit the area marked
 'configurable stuff'.
diff --git a/usr.sbin/cron/doc/MAIL b/usr.sbin/cron/doc/MAIL
index 3549e94d575a5..461fa420a7854 100644
--- a/usr.sbin/cron/doc/MAIL
+++ b/usr.sbin/cron/doc/MAIL
@@ -3,7 +3,7 @@
   version of cron.  it is presented here for its entertainment value.
   --vix ]
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/MAIL,v 1.4 1999/08/28 01:15:53 peter Exp $
 
 From ptsfa!lll-crg!ames!acornrc!bob Wed Dec 31 10:07:08 1986
 Date: Wed, 31 Dec 86 08:59:31 pst
diff --git a/usr.sbin/cron/doc/Makefile.vixie b/usr.sbin/cron/doc/Makefile.vixie
index 8df1301c689d3..de40c702e818a 100644
--- a/usr.sbin/cron/doc/Makefile.vixie
+++ b/usr.sbin/cron/doc/Makefile.vixie
@@ -17,7 +17,7 @@
 
 # Makefile for vixie's cron
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/doc/Makefile.vixie,v 1.5 1999/08/28 01:15:53 peter Exp $
 #
 # vix 03mar88 [moved to RCS, rest of log is in there]
 # vix 30mar87 [goodbye, time.c; hello, getopt]
diff --git a/usr.sbin/cron/doc/README b/usr.sbin/cron/doc/README
index eaced9e65d94e..2a5ccd667995f 100644
--- a/usr.sbin/cron/doc/README
+++ b/usr.sbin/cron/doc/README
@@ -69,4 +69,4 @@ have to go edit a couple of files... So, here's the checklist:
 	if you like it, change your /etc/{rc,rc.local} to use it instead of
 		the old one.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/cron/doc/README,v 1.4 1999/08/28 01:15:53 peter Exp $
diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile
index 296ebd05c06b1..426a526a5bd56 100644
--- a/usr.sbin/cron/lib/Makefile
+++ b/usr.sbin/cron/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cron/lib/Makefile,v 1.8 2007/06/17 17:25:53 yar Exp $
 
 LIB=	cron
 INTERNALLIB=
diff --git a/usr.sbin/cron/lib/compat.c b/usr.sbin/cron/lib/compat.c
index 96860128882f0..6bf92fd3d39ff 100644
--- a/usr.sbin/cron/lib/compat.c
+++ b/usr.sbin/cron/lib/compat.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/cron/lib/compat.c,v 1.7 2000/12/09 09:35:44 obrien Exp $";
 #endif
 
 /* vix 30dec93 [broke this out of misc.c - see RCS log for history]
diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c
index 33ace49fd0c3c..42aba0a99815c 100644
--- a/usr.sbin/cron/lib/entry.c
+++ b/usr.sbin/cron/lib/entry.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/entry.c,v 1.19 2007/06/17 17:25:53 yar Exp $";
 #endif
 
 /* vix 26jan87 [RCS'd; rest of log is in RCS file]
diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c
index fd358176b1249..5abeddea42a6a 100644
--- a/usr.sbin/cron/lib/env.c
+++ b/usr.sbin/cron/lib/env.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/env.c,v 1.12 2003/02/10 11:20:58 thomas Exp $";
 #endif
 
 
diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c
index e557afc424bc8..8583577598567 100644
--- a/usr.sbin/cron/lib/misc.c
+++ b/usr.sbin/cron/lib/misc.c
@@ -17,7 +17,7 @@
 
 #if !defined(lint) && !defined(LINT)
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/cron/lib/misc.c,v 1.13 2005/08/24 17:51:36 pjd Exp $";
 #endif
 
 /* vix 26jan87 [RCS has the rest of the log]
diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile
index 6bf600fce66b8..27da39fc6d988 100644
--- a/usr.sbin/crunch/Makefile
+++ b/usr.sbin/crunch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/Makefile,v 1.2 2001/07/20 06:19:43 obrien Exp $
 
 SUBDIR=	crunchgen crunchide
 
diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc
index f8ffe675db6ef..0b3b5431dcfa4 100644
--- a/usr.sbin/crunch/Makefile.inc
+++ b/usr.sbin/crunch/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/Makefile.inc,v 1.2 2001/07/20 06:19:43 obrien Exp $
 
 # modify to taste
 BINDIR?= /usr/bin
diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile
index 8d0a78b190276..e170394604eca 100644
--- a/usr.sbin/crunch/crunchgen/Makefile
+++ b/usr.sbin/crunch/crunchgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/crunchgen/Makefile,v 1.6 2001/07/20 06:19:42 obrien Exp $
 
 PROG=	crunchgen
 SRCS=	crunchgen.c crunched_skel.c
diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c
index 2cf957670113e..49bbe612ed8aa 100644
--- a/usr.sbin/crunch/crunchgen/crunched_main.c
+++ b/usr.sbin/crunch/crunchgen/crunched_main.c
@@ -23,7 +23,7 @@
  *			   Computer Science Department
  *			   University of Maryland at College Park
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/crunch/crunchgen/crunched_main.c,v 1.8 2002/08/09 02:39:38 gshapiro Exp $
  */
 /*
  * crunched_main.c - main program for crunched binaries, it branches to a
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index b7313b9fab17c..473e22d41c93f 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -22,7 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.31 2006/09/29 17:57:01 ru Exp $
 .\"
 .Dd December 23, 2005
 .Dt CRUNCHGEN 1
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 71f6d5b277d54..fdd9a92091e5a 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -23,7 +23,7 @@
  *			   Computer Science Department
  *			   University of Maryland at College Park
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.c,v 1.39 2006/11/27 01:35:11 jb Exp $
  */
 /*
  * ========================================================================
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index 0f8525456733c..58d69c02bbd27 100644
--- a/usr.sbin/crunch/crunchide/Makefile
+++ b/usr.sbin/crunch/crunchide/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/crunchide/Makefile,v 1.8 2006/08/22 07:51:09 ru Exp $
 
 PROG=   crunchide
 SRCS=	crunchide.c
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index ef9947dae56c5..f5516751e595e 100644
--- a/usr.sbin/crunch/crunchide/crunchide.1
+++ b/usr.sbin/crunch/crunchide/crunchide.1
@@ -22,7 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/crunch/crunchide/crunchide.1,v 1.12 2004/07/02 23:12:40 ru Exp $
 .\"
 .Dd June 14, 1994
 .Dt CRUNCHIDE 1
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index 165b3bc95f8aa..e07a5b59c0c15 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: crunchide.c,v 1.8 1997/11/01 06:51:45 lukem Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/crunch/crunchide/crunchide.c,v 1.11 2007/03/06 09:32:40 kevlo Exp $ */
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 University of Maryland
diff --git a/usr.sbin/crunch/crunchide/exec_aout.c b/usr.sbin/crunch/crunchide/exec_aout.c
index a608c23316664..d78fad7ad18c1 100644
--- a/usr.sbin/crunch/crunchide/exec_aout.c
+++ b/usr.sbin/crunch/crunchide/exec_aout.c
@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: exec_aout.c,v 1.6 1997/08/02 21:30:17 perry Exp $");
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/crunch/crunchide/exec_aout.c,v 1.5 2004/06/22 17:05:38 obrien Exp $");
 #endif
  
 #include <unistd.h>
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index 25207d2f680f9..529da3d504ed1 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -34,7 +34,7 @@
 __RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $");
 #endif
 #endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/crunch/crunchide/exec_elf32.c,v 1.15 2005/12/18 04:52:37 marcel Exp $");
  
 #ifndef ELFSIZE
 #define ELFSIZE         32
diff --git a/usr.sbin/crunch/crunchide/extern.h b/usr.sbin/crunch/crunchide/extern.h
index 4200bc3d40225..50eb27d47bc1f 100644
--- a/usr.sbin/crunch/crunchide/extern.h
+++ b/usr.sbin/crunch/crunchide/extern.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: extern.h,v 1.5 1998/05/06 13:16:57 mycroft Exp $	*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/crunch/crunchide/extern.h,v 1.4 2002/05/25 13:39:20 ru Exp $ */
 
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile
index 6dd49acc1a158..abb6984af5f1e 100644
--- a/usr.sbin/crunch/examples/Makefile
+++ b/usr.sbin/crunch/examples/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/Makefile,v 1.7 2004/12/21 08:47:31 ru Exp $
 
 CRUNCHED=	fixit
 
diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf
index 1fb93856c7f15..d9c4853acf679 100644
--- a/usr.sbin/crunch/examples/filesystem.conf
+++ b/usr.sbin/crunch/examples/filesystem.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/filesystem.conf,v 1.8 1999/08/28 01:15:57 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/gnu/usr.bin /usr/src/usr.sbin
 srcdirs /usr/src/sbin/i386
diff --git a/usr.sbin/crunch/examples/kcopy.conf b/usr.sbin/crunch/examples/kcopy.conf
index 3284e868c51b1..f86366bc99b8b 100644
--- a/usr.sbin/crunch/examples/kcopy.conf
+++ b/usr.sbin/crunch/examples/kcopy.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/kcopy.conf,v 1.7 1999/08/28 01:15:57 peter Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin
 
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index 45a10de0cf455..0cde0cc1b647d 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -5,7 +5,7 @@
 #
 #       This produces a 4608000 byte binary.  Pretty sick and twisted, eh?
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/crunch/examples/really-big.conf,v 1.7 2006/11/22 00:34:17 rodrigc Exp $
 #
 
 # =========================================================================
diff --git a/usr.sbin/ctm/Makefile b/usr.sbin/ctm/Makefile
index 630aab0940dd9..a1e600ce8dbca 100644
--- a/usr.sbin/ctm/Makefile
+++ b/usr.sbin/ctm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile,v 1.7 1999/08/28 01:15:57 peter Exp $
 
 SUBDIR=	ctm ctm_rmail ctm_smail ctm_dequeue
 
diff --git a/usr.sbin/ctm/Makefile.inc b/usr.sbin/ctm/Makefile.inc
index c6c2c5aebdff1..49b7f433b8163 100644
--- a/usr.sbin/ctm/Makefile.inc
+++ b/usr.sbin/ctm/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/Makefile.inc,v 1.4 1999/08/28 01:15:58 peter Exp $
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/ctm/README b/usr.sbin/ctm/README
index 94c779afcf85f..2fdf4b734678f 100644
--- a/usr.sbin/ctm/README
+++ b/usr.sbin/ctm/README
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/README,v 1.10 2002/03/25 14:12:09 phk Exp $
 #
 
 What will I not find in this file ?
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
index c0cf79a64d926..853eeabecd9ef 100644
--- a/usr.sbin/ctm/ctm/Makefile
+++ b/usr.sbin/ctm/ctm/Makefile
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm/Makefile,v 1.18 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	ctm
 MAN=	ctm.1 ctm.5
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 732b0b9a9685b..77fddf9391935 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.29 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index 678837e6182e6..e73b76d2987aa 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.5,v 1.18 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd March 25, 1995
 .Os
diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index 0ea4895ca4017..ce4bf8ca724d8 100644
--- a/usr.sbin/ctm/ctm/ctm.c
+++ b/usr.sbin/ctm/ctm/ctm.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm.c,v 1.21 2002/03/25 13:53:29 phk Exp $
  *
  * This is the client program of 'CTM'.  It will apply a CTM-patch to a
  * collection of files.
diff --git a/usr.sbin/ctm/ctm/ctm.h b/usr.sbin/ctm/ctm/ctm.h
index b733539bbd977..3c8138cf0afea 100644
--- a/usr.sbin/ctm/ctm/ctm.h
+++ b/usr.sbin/ctm/ctm/ctm.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm.h,v 1.18 2003/04/07 08:09:53 mckay Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c
index e3ec464030e2a..90d734879ca77 100644
--- a/usr.sbin/ctm/ctm/ctm_ed.c
+++ b/usr.sbin/ctm/ctm/ctm_ed.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_ed.c,v 1.11 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_input.c b/usr.sbin/ctm/ctm/ctm_input.c
index 32166d311f122..d91a729008994 100644
--- a/usr.sbin/ctm/ctm/ctm_input.c
+++ b/usr.sbin/ctm/ctm/ctm_input.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_input.c,v 1.10 2003/04/07 08:09:53 mckay Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c
index 026a3204a44a0..f0de3c1c61045 100644
--- a/usr.sbin/ctm/ctm/ctm_pass1.c
+++ b/usr.sbin/ctm/ctm/ctm_pass1.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass1.c,v 1.17 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c
index a0b857ab5dc0f..9bc94faf62bac 100644
--- a/usr.sbin/ctm/ctm/ctm_pass2.c
+++ b/usr.sbin/ctm/ctm/ctm_pass2.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass2.c,v 1.20 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c
index 34c6d87c1d53c..2f0d4a51a9752 100644
--- a/usr.sbin/ctm/ctm/ctm_pass3.c
+++ b/usr.sbin/ctm/ctm/ctm_pass3.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_pass3.c,v 1.20 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_passb.c b/usr.sbin/ctm/ctm/ctm_passb.c
index ee3a69c5fbca9..87f9e87dbeecc 100644
--- a/usr.sbin/ctm/ctm/ctm_passb.c
+++ b/usr.sbin/ctm/ctm/ctm_passb.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Joseph Koshy
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_passb.c,v 1.6 2001/05/06 03:03:44 kris Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c
index 66389431d7e35..02bd536b74e6f 100644
--- a/usr.sbin/ctm/ctm/ctm_syntax.c
+++ b/usr.sbin/ctm/ctm/ctm_syntax.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm/ctm_syntax.c,v 1.11 2002/03/25 13:53:29 phk Exp $
  *
  */
 
diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile
index 07a234f0599d1..361331d258165 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm_dequeue/Makefile,v 1.5 2004/12/21 08:47:31 ru Exp $
 
 .PATH: ${.CURDIR}/../ctm_rmail
 
diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
index 783fd3f4a1a62..bb635b70b5d6a 100644
--- a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
+++ b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c,v 1.11 2002/09/21 01:28:40 wollman Exp $
  */
 
 /*
diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile
index e2052b9228c76..b42349dab1ba4 100644
--- a/usr.sbin/ctm/ctm_rmail/Makefile
+++ b/usr.sbin/ctm/ctm_rmail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm_rmail/Makefile,v 1.8 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	ctm_rmail
 MLINKS=	ctm_rmail.1 ctm_smail.1 \
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 5476e491f4efc..df20531adc6c4 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.32 2005/02/13 22:25:27 ru Exp $
 .\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
index a46a58aa87348..9ef5b948ff818 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
@@ -9,7 +9,7 @@
  * In return you should think about all the nice people who give away software.
  * Maybe you should write some free software too.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.c,v 1.17 2002/01/22 22:54:52 iedowse Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/ctm_rmail/error.c b/usr.sbin/ctm/ctm_rmail/error.c
index 56d3dc68d5f7d..b755b5d9fb2fb 100644
--- a/usr.sbin/ctm/ctm_rmail/error.c
+++ b/usr.sbin/ctm/ctm_rmail/error.c
@@ -14,7 +14,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/ctm/ctm_rmail/error.c,v 1.3 2001/05/06 03:03:45 kris Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/ctm_rmail/error.h b/usr.sbin/ctm/ctm_rmail/error.h
index c631b6712ccbd..ed71efb217f85 100644
--- a/usr.sbin/ctm/ctm_rmail/error.h
+++ b/usr.sbin/ctm/ctm_rmail/error.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ctm/ctm_rmail/error.h,v 1.2 2001/05/06 03:03:45 kris Exp $ */
 
 extern	void	err_set_log(char *log_file);
 extern	void	err_prog_name(char *name);
diff --git a/usr.sbin/ctm/ctm_rmail/options.h b/usr.sbin/ctm/ctm_rmail/options.h
index 86c1247b6487d..7ba029607b68d 100644
--- a/usr.sbin/ctm/ctm_rmail/options.h
+++ b/usr.sbin/ctm/ctm_rmail/options.h
@@ -49,7 +49,7 @@
  * Based on recollection of the original options.h produced at the University
  * of Queensland by Ross Patterson (and possibly others).
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_rmail/options.h,v 1.6 2002/04/22 13:44:43 des Exp $
  */
 
 static char *O_usage;
diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile
index 980e9bf02d3e9..40d407ee86a4d 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile
+++ b/usr.sbin/ctm/ctm_smail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/ctm_smail/Makefile,v 1.6 2004/12/21 08:47:31 ru Exp $
 
 .PATH: ${.CURDIR}/../ctm_rmail
 
diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c
index a0dc03c8f59d4..8ca090d10e813 100644
--- a/usr.sbin/ctm/ctm_smail/ctm_smail.c
+++ b/usr.sbin/ctm/ctm_smail/ctm_smail.c
@@ -11,7 +11,7 @@
  * In return you should think about all the nice people who give away software.
  * Maybe you should write some free software too.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/ctm_smail/ctm_smail.c,v 1.13 2003/07/13 06:38:13 kris Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile
index cefd70448c685..262787b1b9521 100644
--- a/usr.sbin/ctm/mkCTM/Makefile
+++ b/usr.sbin/ctm/mkCTM/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/Makefile,v 1.9 2005/01/28 16:08:10 ru Exp $
 
 PROG=	mkctm
 NO_MAN=
diff --git a/usr.sbin/ctm/mkCTM/dequeue b/usr.sbin/ctm/mkCTM/dequeue
index 697ec0b5be850..e24dd827c1287 100755
--- a/usr.sbin/ctm/mkCTM/dequeue
+++ b/usr.sbin/ctm/mkCTM/dequeue
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/dequeue,v 1.4 1999/08/28 01:16:03 peter Exp $
 
 L=/home/ctm/log.dequeue
 /usr/sbin/ctm_dequeue -n 1 -l $L /home/ctm/queue/ctm-cvs-cur
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index 02b154427e9a2..1bad689b98267 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -1,6 +1,6 @@
 #!/usr/local/bin/tclsh7.4
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ctm/mkCTM/mkCTM,v 1.21 2003/01/01 18:49:01 schweikh Exp $
 
 #############################################################################
 ### Do we already have this delta ?
diff --git a/usr.sbin/ctm/mkCTM/mkctm.c b/usr.sbin/ctm/mkCTM/mkctm.c
index d2c73e20809a2..2693a69953183 100644
--- a/usr.sbin/ctm/mkCTM/mkctm.c
+++ b/usr.sbin/ctm/mkCTM/mkctm.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ctm/mkCTM/mkctm.c,v 1.13 2004/01/26 04:27:22 mckay Exp $ */
 
 /* Still missing:
  *
@@ -14,7 +14,7 @@
  *	dir1		"Soll"
  *	dir2		"Ist"
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ctm/mkCTM/mkctm.c,v 1.13 2004/01/26 04:27:22 mckay Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/cxgbtool/Makefile b/usr.sbin/cxgbtool/Makefile
index d97c51317822a..75310f2d7dae3 100644
--- a/usr.sbin/cxgbtool/Makefile
+++ b/usr.sbin/cxgbtool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/cxgbtool/Makefile,v 1.1 2007/03/14 02:51:57 kmacy Exp $
 
 PROG=	cxgbtool
 SRCS=	cxgbtool.c
diff --git a/usr.sbin/cxgbtool/cxgbtool.c b/usr.sbin/cxgbtool/cxgbtool.c
index 6c5effa89702b..a73f4e671ef7f 100644
--- a/usr.sbin/cxgbtool/cxgbtool.c
+++ b/usr.sbin/cxgbtool/cxgbtool.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/cxgbtool/cxgbtool.c,v 1.2 2007/03/15 04:09:40 kmacy Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/cxgbtool/reg_defs.c b/usr.sbin/cxgbtool/reg_defs.c
index 734061fa17a64..d768385b8e9b2 100644
--- a/usr.sbin/cxgbtool/reg_defs.c
+++ b/usr.sbin/cxgbtool/reg_defs.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cxgbtool/reg_defs.c,v 1.1 2007/03/14 02:51:57 kmacy Exp $
  */
 
 /* This file is automatically generated --- do not edit */
diff --git a/usr.sbin/cxgbtool/reg_defs_t3.c b/usr.sbin/cxgbtool/reg_defs_t3.c
index f5f816301f128..f54757abf9b8f 100644
--- a/usr.sbin/cxgbtool/reg_defs_t3.c
+++ b/usr.sbin/cxgbtool/reg_defs_t3.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cxgbtool/reg_defs_t3.c,v 1.1 2007/03/14 02:51:57 kmacy Exp $
  */
 
 
diff --git a/usr.sbin/cxgbtool/reg_defs_t3b.c b/usr.sbin/cxgbtool/reg_defs_t3b.c
index 3adee90a4d7e5..e46f79e8d6150 100644
--- a/usr.sbin/cxgbtool/reg_defs_t3b.c
+++ b/usr.sbin/cxgbtool/reg_defs_t3b.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cxgbtool/reg_defs_t3b.c,v 1.1 2007/03/14 02:51:57 kmacy Exp $
  */
 
 /* This file is automatically generated --- do not edit */
diff --git a/usr.sbin/cxgbtool/version.h b/usr.sbin/cxgbtool/version.h
index 228c0bfbebbf1..9aa7197e7d3e1 100644
--- a/usr.sbin/cxgbtool/version.h
+++ b/usr.sbin/cxgbtool/version.h
@@ -19,7 +19,7 @@
 /* $Date: 2007/02/05 18:46:24 $ $RCSfile: version.h,v $ $Revision: 1.9 $ */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/cxgbtool/version.h,v 1.1 2007/03/14 02:51:57 kmacy Exp $
  */
 
 #ifndef __CXGBTOOL_VERSION_H
diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile
index 3ca3e91ad193e..0b3d8db0935b1 100644
--- a/usr.sbin/daemon/Makefile
+++ b/usr.sbin/daemon/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/daemon/Makefile,v 1.3 2005/08/24 17:24:39 pjd Exp $
 
 PROG=	daemon
 MAN=	daemon.8
diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8
index c284427fab361..803d7279c06f8 100644
--- a/usr.sbin/daemon/daemon.8
+++ b/usr.sbin/daemon/daemon.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/daemon/daemon.8,v 1.9 2007/03/19 12:12:53 trhodes Exp $
 .\"
 .Dd March 19, 2007
 .Dt DAEMON 8
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index 540ebf35df7e1..7fccad04b5e53 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/daemon/daemon.c,v 1.8 2007/04/19 16:43:30 peter Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile
index 47efe5274be14..86a4d272120fb 100644
--- a/usr.sbin/dconschat/Makefile
+++ b/usr.sbin/dconschat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dconschat/Makefile,v 1.2 2005/01/27 14:52:46 delphij Exp $
 
 PROG=	dconschat
 MAN=	dconschat.8
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index b34d968debaa7..44f2d00c523ef 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/dconschat/dconschat.8,v 1.8 2007/06/15 12:09:16 simokawa Exp $
 .\"
 .\"
 .Dd February 11, 2003
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index 4334cf81cefbe..36835d882981a 100644
--- a/usr.sbin/dconschat/dconschat.c
+++ b/usr.sbin/dconschat/dconschat.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: dconschat.c,v 1.76 2003/10/23 06:21:13 simokawa Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/dconschat/dconschat.c,v 1.15 2007/07/12 13:08:00 simokawa Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
index 52e4d6d279e29..ffe9f1b413726 100644
--- a/usr.sbin/devinfo/Makefile
+++ b/usr.sbin/devinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/devinfo/Makefile,v 1.6 2002/05/12 14:23:15 rwatson Exp $
 
 PROG=	devinfo
 MAN=	devinfo.8
diff --git a/usr.sbin/devinfo/devinfo.8 b/usr.sbin/devinfo/devinfo.8
index 6c893dc66a5af..d114dee93dc3f 100644
--- a/usr.sbin/devinfo/devinfo.8
+++ b/usr.sbin/devinfo/devinfo.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/devinfo/devinfo.8,v 1.9 2006/09/29 16:46:01 ru Exp $
 .\"
 .Dd November 28, 2005
 .Os
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index c32e57b07b5ad..2a19c32f45a20 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/devinfo/devinfo.c,v 1.6.2.1 2007/10/31 16:17:24 jhb Exp $");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.sbin/digictl/Makefile b/usr.sbin/digictl/Makefile
index 029dfee11e535..5d314247021d8 100644
--- a/usr.sbin/digictl/Makefile
+++ b/usr.sbin/digictl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/digictl/Makefile,v 1.6 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	digictl
 MAN=	digictl.8
diff --git a/usr.sbin/digictl/digictl.8 b/usr.sbin/digictl/digictl.8
index 2ac98ea4e3b22..02f9a4c1e404b 100644
--- a/usr.sbin/digictl/digictl.8
+++ b/usr.sbin/digictl/digictl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/digictl/digictl.8,v 1.7 2005/01/18 20:02:33 ru Exp $
 .Dd June 20, 2001
 .Dt DIGICTL 8
 .Os
diff --git a/usr.sbin/digictl/digictl.c b/usr.sbin/digictl/digictl.c
index 0aa5f68f2578c..02b8ab7be59d6 100644
--- a/usr.sbin/digictl/digictl.c
+++ b/usr.sbin/digictl/digictl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/digictl/digictl.c,v 1.5 2002/04/22 13:44:43 des Exp $
  */
 
 #include <errno.h>
diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile
index 5ffa27f6f0d83..d7fcec20d295e 100644
--- a/usr.sbin/diskinfo/Makefile
+++ b/usr.sbin/diskinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/diskinfo/Makefile,v 1.3 2004/05/24 22:52:32 pjd Exp $
 
 PROG=	diskinfo
 MAN=	diskinfo.8
diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8
index dfc7040f349ff..8ae3853247787 100644
--- a/usr.sbin/diskinfo/diskinfo.8
+++ b/usr.sbin/diskinfo/diskinfo.8
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/diskinfo/diskinfo.8,v 1.7 2005/01/18 20:02:33 ru Exp $
 .\"
 .Dd November 9, 2004
 .Dt DISKINFO 8
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index 48b019b1a143b..c4fcff37ebda6 100644
--- a/usr.sbin/diskinfo/diskinfo.c
+++ b/usr.sbin/diskinfo/diskinfo.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/diskinfo/diskinfo.c,v 1.9 2007/05/06 00:25:21 pjd Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile
index 3ac90058106de..1907257ba73ed 100644
--- a/usr.sbin/dnssec-keygen/Makefile
+++ b/usr.sbin/dnssec-keygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dnssec-keygen/Makefile,v 1.4 2007/06/02 23:19:57 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile
index 7c4ca65a78cc0..eff678baf36cd 100644
--- a/usr.sbin/dnssec-signzone/Makefile
+++ b/usr.sbin/dnssec-signzone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/dnssec-signzone/Makefile,v 1.4 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
index 93e3e07122284..6da435abf7570 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/editmap/Makefile,v 1.3 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/editmap
diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
index e5a3b12559aa9..fdac97098acb7 100644
--- a/usr.sbin/edquota/Makefile
+++ b/usr.sbin/edquota/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/edquota/Makefile,v 1.8 2003/04/04 17:49:13 obrien Exp $
 
 PROG=	edquota
 MAN=	edquota.8
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index 7cf72dd111863..7f930e73e214c 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/edquota/edquota.8,v 1.24 2007/02/04 14:26:01 mpp Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 83de530dbe0d1..5f874474fee46 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.26 2007/02/04 06:33:14 mpp Exp $");
 
 /*
  * Disk quota editor.
diff --git a/usr.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h
index 53bfbfefeb96d..98b5cd6d8ef76 100644
--- a/usr.sbin/edquota/pathnames.h
+++ b/usr.sbin/edquota/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/edquota/pathnames.h,v 1.2 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile
index fa5f411d44281..7c95129bab3c9 100644
--- a/usr.sbin/eeprom/Makefile
+++ b/usr.sbin/eeprom/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/eeprom/Makefile,v 1.3 2004/05/22 16:56:04 marius Exp $
 
 .PATH: ${.CURDIR}/../ofwdump
 
diff --git a/usr.sbin/eeprom/eeprom.8 b/usr.sbin/eeprom/eeprom.8
index 81cb2d36e9301..efe9437caa929 100644
--- a/usr.sbin/eeprom/eeprom.8
+++ b/usr.sbin/eeprom/eeprom.8
@@ -34,7 +34,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: NetBSD: eeprom.8,v 1.11 2003/03/31 01:31:39 perry Exp
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/eeprom/eeprom.8,v 1.7 2006/12/05 23:20:14 ceri Exp $
 .\"
 .Dd September 1, 2006
 .Dt EEPROM 8 sparc64
diff --git a/usr.sbin/eeprom/eeprom.c b/usr.sbin/eeprom/eeprom.c
index ecd9267a03374..c47855b1915a1 100644
--- a/usr.sbin/eeprom/eeprom.c
+++ b/usr.sbin/eeprom/eeprom.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/eeprom/eeprom.c,v 1.4 2004/05/22 16:56:04 marius Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/eeprom/ofw_options.c b/usr.sbin/eeprom/ofw_options.c
index c7a8dbd2599fb..4aab83b39156d 100644
--- a/usr.sbin/eeprom/ofw_options.c
+++ b/usr.sbin/eeprom/ofw_options.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/eeprom/ofw_options.c,v 1.4 2006/09/01 20:07:15 marius Exp $");
 
 /*
  * Handlers for Open Firmware /options node.
diff --git a/usr.sbin/eeprom/ofw_options.h b/usr.sbin/eeprom/ofw_options.h
index 5bc66567e31c3..1ef25c583e261 100644
--- a/usr.sbin/eeprom/ofw_options.h
+++ b/usr.sbin/eeprom/ofw_options.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/eeprom/ofw_options.h,v 1.1 2004/05/22 16:56:04 marius Exp $
  */
 
 #ifndef OFW_OPTIONS_H
diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile
index ae349752d6899..49af4b1f0ef81 100644
--- a/usr.sbin/extattr/Makefile
+++ b/usr.sbin/extattr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/extattr/Makefile,v 1.1 2002/08/30 08:53:03 phk Exp $
 
 PROG=	rmextattr
 MAN=	rmextattr.8
diff --git a/usr.sbin/extattr/rmextattr.8 b/usr.sbin/extattr/rmextattr.8
index c51fa6d922fed..ca7203bb2e4f8 100644
--- a/usr.sbin/extattr/rmextattr.8
+++ b/usr.sbin/extattr/rmextattr.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/extattr/rmextattr.8,v 1.4 2003/02/24 22:53:25 ru Exp $
 .\"
 .Dd August 30, 2000
 .Dt RMEXTATTR 8
diff --git a/usr.sbin/extattr/rmextattr.c b/usr.sbin/extattr/rmextattr.c
index 0c65d7b29bce7..f18941ee3d0dd 100644
--- a/usr.sbin/extattr/rmextattr.c
+++ b/usr.sbin/extattr/rmextattr.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/extattr/rmextattr.c,v 1.6 2003/06/05 04:30:00 rwatson Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
index 5eb1945d3b945..46cf7e25b73a2 100644
--- a/usr.sbin/extattrctl/Makefile
+++ b/usr.sbin/extattrctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/extattrctl/Makefile,v 1.10 2003/04/04 17:49:14 obrien Exp $
 
 PROG=	extattrctl
 MAN=	extattrctl.8
diff --git a/usr.sbin/extattrctl/extattrctl.8 b/usr.sbin/extattrctl/extattrctl.8
index c5850ab4ef196..f33363a1164ef 100644
--- a/usr.sbin/extattrctl/extattrctl.8
+++ b/usr.sbin/extattrctl/extattrctl.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/extattrctl/extattrctl.8,v 1.24 2005/02/09 18:04:40 ru Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for file system extended attribute.
diff --git a/usr.sbin/extattrctl/extattrctl.c b/usr.sbin/extattrctl/extattrctl.c
index 103fcd345a92d..7f82daf6af19c 100644
--- a/usr.sbin/extattrctl/extattrctl.c
+++ b/usr.sbin/extattrctl/extattrctl.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/extattrctl/extattrctl.c,v 1.19 2002/04/19 01:42:55 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile
index e1898ed333a45..f4267113b08bb 100644
--- a/usr.sbin/faithd/Makefile
+++ b/usr.sbin/faithd/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/faithd/Makefile,v 1.10 2004/01/17 02:27:55 ru Exp $
 
 PROG=	faithd
 MAN=	faithd.8
diff --git a/usr.sbin/faithd/README b/usr.sbin/faithd/README
index 6628bf63dcbcc..b521d4bfa49f7 100644
--- a/usr.sbin/faithd/README
+++ b/usr.sbin/faithd/README
@@ -2,7 +2,7 @@ Configuring FAITH IPv6-to-IPv4 TCP relay
 
 Kazu Yamamoto and Jun-ichiro itojun Hagino
 $KAME: README,v 1.10 2003/01/06 21:40:33 sumikawa Exp $
-$FreeBSD$
+$FreeBSD: src/usr.sbin/faithd/README,v 1.8 2003/11/14 17:34:08 ume Exp $
 
 
 Introduction
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 5d16989902fab..33642c7441407 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/faithd/faithd.8,v 1.19 2005/01/17 07:44:39 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt FAITHD 8
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index 3df90a5953703..8858921fb5aa8 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/faithd.c,v 1.10 2003/11/14 17:34:08 ume Exp $
  */
 
 /*
diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h
index f4224321ddd0b..58dce6a076574 100644
--- a/usr.sbin/faithd/faithd.h
+++ b/usr.sbin/faithd/faithd.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/faithd.h,v 1.5 2003/11/14 17:34:08 ume Exp $
  */
 
 extern char logname[];
diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c
index 19ad5eeb6c342..dcaaa54c04ee9 100644
--- a/usr.sbin/faithd/ftp.c
+++ b/usr.sbin/faithd/ftp.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.12 2005/05/02 07:44:24 suz Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c
index 138c948927f1c..57678a3abfc01 100644
--- a/usr.sbin/faithd/prefix.c
+++ b/usr.sbin/faithd/prefix.c
@@ -1,5 +1,5 @@
 /*	$KAME: prefix.c,v 1.13 2003/09/02 22:50:17 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/faithd/prefix.c,v 1.4 2003/11/14 17:34:08 ume Exp $	*/
 
 /*
  * Copyright (C) 2000 WIDE Project.
diff --git a/usr.sbin/faithd/prefix.h b/usr.sbin/faithd/prefix.h
index 2a2963982ca9c..87e5e38950e52 100644
--- a/usr.sbin/faithd/prefix.h
+++ b/usr.sbin/faithd/prefix.h
@@ -1,5 +1,5 @@
 /*	$KAME: prefix.h,v 1.4 2001/09/05 03:04:21 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/faithd/prefix.h,v 1.2 2002/04/19 04:46:24 suz Exp $	*/
 
 /*
  * Copyright (C) 2000 WIDE Project.
diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c
index 714df9a159c28..ca36e69ea3374 100644
--- a/usr.sbin/faithd/tcp.c
+++ b/usr.sbin/faithd/tcp.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/faithd/tcp.c,v 1.5 2003/11/14 17:34:08 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/faithd/test/faithd.rb b/usr.sbin/faithd/test/faithd.rb
index 682f540db98ac..0ff35630287e2 100644
--- a/usr.sbin/faithd/test/faithd.rb
+++ b/usr.sbin/faithd/test/faithd.rb
@@ -4,7 +4,7 @@
 # functionality.
 #
 # $Id: faithd.rb,v 1.1.2.4 1999/05/10 17:06:30 itojun Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/faithd/test/faithd.rb,v 1.2 2003/11/14 17:34:08 ume Exp $
 
 require "socket"
 require "thread"
diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile
index e2b54aa067085..5c4cf8db00a26 100644
--- a/usr.sbin/fdcontrol/Makefile
+++ b/usr.sbin/fdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdcontrol/Makefile,v 1.12 2005/01/08 15:46:05 delphij Exp $
 
 .PATH: ${.CURDIR}/../fdread
 
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index cbc6883cdd6c0..24754d3512e09 100644
--- a/usr.sbin/fdcontrol/fdcontrol.8
+++ b/usr.sbin/fdcontrol/fdcontrol.8
@@ -24,7 +24,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.21 2006/10/25 10:44:58 ru Exp $
 .\"
 .Dd December 25, 2001
 .Os
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index f1a923393d76e..b4598f95f6543 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.c,v 1.14 2005/10/26 22:23:52 peter Exp $");
 
 #include <sys/fdcio.h>
 #include <sys/file.h>
diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
index a172811ec055b..4a08f2f712f54 100644
--- a/usr.sbin/fdformat/Makefile
+++ b/usr.sbin/fdformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdformat/Makefile,v 1.13 2005/01/08 15:46:05 delphij Exp $
 
 .PATH: ${.CURDIR}/../fdread
 
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 25891c0f003b9..eb3828a99d012 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.31 2007/02/28 10:24:34 ru Exp $
 .\"
 .Dd December 25, 2001
 .Os
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 8e29e40fc8571..a39c879ea6ea1 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdformat/fdformat.c,v 1.22 2004/08/20 15:14:25 phk Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile
index 2868a3c38f03b..eff0ddb97ad73 100644
--- a/usr.sbin/fdread/Makefile
+++ b/usr.sbin/fdread/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdread/Makefile,v 1.5 2005/01/08 15:46:06 delphij Exp $
 
 PROG=	fdread
 SRCS=	fdread.c fdutil.c
diff --git a/usr.sbin/fdread/fdread.1 b/usr.sbin/fdread/fdread.1
index 20a79fc145317..7e7328a0c7ec6 100644
--- a/usr.sbin/fdread/fdread.1
+++ b/usr.sbin/fdread/fdread.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdread/fdread.1,v 1.8 2005/02/13 22:25:28 ru Exp $
 .\"
 .\"
 .Dd May 14, 2001
diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c
index 2539b3a5a2b2b..fcb8d17d9400b 100644
--- a/usr.sbin/fdread/fdread.c
+++ b/usr.sbin/fdread/fdread.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdread/fdread.c,v 1.8 2006/07/20 09:38:46 stefanf Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/fdread/fdutil.c b/usr.sbin/fdread/fdutil.c
index c1f4d8f18dfb1..17a92423e6254 100644
--- a/usr.sbin/fdread/fdutil.c
+++ b/usr.sbin/fdread/fdutil.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdread/fdutil.c,v 1.8 2005/01/08 15:46:06 delphij Exp $
  */
 
 #include <dev/ic/nec765.h>
diff --git a/usr.sbin/fdread/fdutil.h b/usr.sbin/fdread/fdutil.h
index a093228508979..b7cb79a8396f9 100644
--- a/usr.sbin/fdread/fdutil.h
+++ b/usr.sbin/fdread/fdutil.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdread/fdutil.h,v 1.2 2001/12/15 19:09:04 joerg Exp $
  */
 
 
diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile
index ba6f047ff1611..a60fe96994257 100644
--- a/usr.sbin/fdwrite/Makefile
+++ b/usr.sbin/fdwrite/Makefile
@@ -5,7 +5,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fdwrite/Makefile,v 1.11 2005/01/08 15:46:06 delphij Exp $
 
 PROG=	fdwrite
 WARNS?=	6
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 28df514f26451..a39d56c9c307c 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.24 2005/02/13 22:25:28 ru Exp $
 .\"
 .\"
 .Dd September 16, 1993
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index 3c220916e84ee..9094c35964bc3 100644
--- a/usr.sbin/fdwrite/fdwrite.c
+++ b/usr.sbin/fdwrite/fdwrite.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fdwrite/fdwrite.c,v 1.15 2005/01/08 15:46:06 delphij Exp $
  *
  */
 
diff --git a/usr.sbin/flowctl/Makefile b/usr.sbin/flowctl/Makefile
index d47993b0996df..b6785dcec72f3 100644
--- a/usr.sbin/flowctl/Makefile
+++ b/usr.sbin/flowctl/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/flowctl/Makefile,v 1.2 2004/09/17 22:37:45 glebius Exp $
 #
 
 PROG=	flowctl
diff --git a/usr.sbin/flowctl/flowctl.8 b/usr.sbin/flowctl/flowctl.8
index e72486bbf8008..2159adbf058b0 100644
--- a/usr.sbin/flowctl/flowctl.8
+++ b/usr.sbin/flowctl/flowctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/flowctl/flowctl.8,v 1.3 2005/03/23 09:40:18 glebius Exp $
 .\"
 .Dd March 23, 2005
 .Os
diff --git a/usr.sbin/flowctl/flowctl.c b/usr.sbin/flowctl/flowctl.c
index 856fe583a3bb8..94e1ec33db5c6 100644
--- a/usr.sbin/flowctl/flowctl.c
+++ b/usr.sbin/flowctl/flowctl.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcs_id[] =
-    "@(#) $FreeBSD$";
+    "@(#) $FreeBSD: src/usr.sbin/flowctl/flowctl.c,v 1.5 2005/03/23 09:40:18 glebius Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/freebsd-update/Makefile b/usr.sbin/freebsd-update/Makefile
index c5d4b0014ea62..099b10d61621f 100644
--- a/usr.sbin/freebsd-update/Makefile
+++ b/usr.sbin/freebsd-update/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/freebsd-update/Makefile,v 1.2 2006/09/01 09:07:11 ru Exp $
 
 SCRIPTS=freebsd-update.sh
 MAN=	freebsd-update.8
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index f50d36a84adaa..a257282de95ea 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/freebsd-update/freebsd-update.8,v 1.3.2.1 2007/11/14 05:10:45 cperciva Exp $
 .\"
 .Dd November 11, 2007
 .Dt FREEBSD-UPDATE 8
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index d603109de1cde..4d3765abb91db 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -25,7 +25,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/freebsd-update/freebsd-update.sh,v 1.8.2.2 2007/11/21 14:35:57 cperciva Exp $
 
 #### Usage function -- called from command-line handling code.
 
diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
index 67660c8cad30f..00727033527e9 100644
--- a/usr.sbin/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ftp-proxy/Makefile,v 1.1 2007/07/03 12:46:07 mlaier Exp $
 
 SUBDIR= libevent ftp-proxy
 
diff --git a/usr.sbin/ftp-proxy/Makefile.inc b/usr.sbin/ftp-proxy/Makefile.inc
index 5abb7c023cc84..22b9761c5b3de 100644
--- a/usr.sbin/ftp-proxy/Makefile.inc
+++ b/usr.sbin/ftp-proxy/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ftp-proxy/Makefile.inc,v 1.1 2007/07/03 12:46:07 mlaier Exp $
 
 LIBEVENT= ${.OBJDIR}/../libevent/libevent.a
 
diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
index 773c25d912565..51e9d5f9d2b64 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ftp-proxy/ftp-proxy/Makefile,v 1.1 2007/07/03 12:46:08 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/pf/ftp-proxy
 
diff --git a/usr.sbin/ftp-proxy/libevent/Makefile b/usr.sbin/ftp-proxy/libevent/Makefile
index acc546fe60680..1d511b1100571 100644
--- a/usr.sbin/ftp-proxy/libevent/Makefile
+++ b/usr.sbin/ftp-proxy/libevent/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ftp-proxy/libevent/Makefile,v 1.1 2007/07/03 12:46:08 mlaier Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/pf/libevent
 
diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile
index 9694d5edb6485..9b24fa3e17f62 100644
--- a/usr.sbin/fwcontrol/Makefile
+++ b/usr.sbin/fwcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/fwcontrol/Makefile,v 1.5 2006/10/26 22:33:38 imp Exp $
 
 PROG=	fwcontrol
 SRCS=	fwcontrol.c fwcrom.c fwdv.c fwmpegts.c
diff --git a/usr.sbin/fwcontrol/fwcontrol.8 b/usr.sbin/fwcontrol/fwcontrol.8
index 31f57e339a16b..6c40f05a58671 100644
--- a/usr.sbin/fwcontrol/fwcontrol.8
+++ b/usr.sbin/fwcontrol/fwcontrol.8
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/fwcontrol/fwcontrol.8,v 1.18 2006/12/29 13:08:46 yar Exp $
 .\"
 .Dd October 24, 2006
 .Dt FWCONTROL 8
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index de4206e01254b..337a126cf0b9b 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/fwcontrol/fwcontrol.c,v 1.23 2006/10/26 22:33:38 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index 7b749e61128e2..def095b2e9041 100644
--- a/usr.sbin/fwcontrol/fwdv.c
+++ b/usr.sbin/fwcontrol/fwdv.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fwcontrol/fwdv.c,v 1.7 2007/06/17 10:20:55 simokawa Exp $
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/fwcontrol/fwmethods.h b/usr.sbin/fwcontrol/fwmethods.h
index 9ac82e6fab8db..9cb23f30c5968 100644
--- a/usr.sbin/fwcontrol/fwmethods.h
+++ b/usr.sbin/fwcontrol/fwmethods.h
@@ -1,7 +1,7 @@
 /*-
  * This file is in the public domain.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fwcontrol/fwmethods.h,v 1.1 2006/10/26 22:33:38 imp Exp $
  */
 
 typedef void (fwmethod)(int dev_fd, const char *filename, char ich, int count);
diff --git a/usr.sbin/fwcontrol/fwmpegts.c b/usr.sbin/fwcontrol/fwmpegts.c
index 4ad8432aa9b6a..b97244b2e31a2 100644
--- a/usr.sbin/fwcontrol/fwmpegts.c
+++ b/usr.sbin/fwcontrol/fwmpegts.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/fwcontrol/fwmpegts.c,v 1.1 2006/10/26 22:33:38 imp Exp $
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/getfmac/Makefile b/usr.sbin/getfmac/Makefile
index ad496570afdde..58aebcd2721b1 100644
--- a/usr.sbin/getfmac/Makefile
+++ b/usr.sbin/getfmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/getfmac/Makefile,v 1.4 2005/01/27 14:52:46 delphij Exp $
 
 PROG=   getfmac
 MAN=	getfmac.8
diff --git a/usr.sbin/getfmac/getfmac.8 b/usr.sbin/getfmac/getfmac.8
index f8ebb314c3dbd..5f933afdcb572 100644
--- a/usr.sbin/getfmac/getfmac.8
+++ b/usr.sbin/getfmac/getfmac.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/getfmac/getfmac.8,v 1.6 2003/01/15 03:12:48 chris Exp $
 .\"
 .Dd June 27, 2002
 .Dt GETFMAC 8
diff --git a/usr.sbin/getfmac/getfmac.c b/usr.sbin/getfmac/getfmac.c
index 7c03d5903e542..30263289a49a0 100644
--- a/usr.sbin/getfmac/getfmac.c
+++ b/usr.sbin/getfmac/getfmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/getfmac/getfmac.c,v 1.3 2005/01/27 14:44:38 delphij Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile
index 87e6d28889ca6..1cf1d5d3450bf 100644
--- a/usr.sbin/getpmac/Makefile
+++ b/usr.sbin/getpmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/getpmac/Makefile,v 1.5 2005/01/27 14:52:46 delphij Exp $
 
 PROG=   getpmac
 MAN=	getpmac.8
diff --git a/usr.sbin/getpmac/getpmac.8 b/usr.sbin/getpmac/getpmac.8
index 307c9628f8900..0283c2bbaf913 100644
--- a/usr.sbin/getpmac/getpmac.8
+++ b/usr.sbin/getpmac/getpmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/getpmac/getpmac.8,v 1.4 2003/02/24 22:53:25 ru Exp $
 .\"
 .Dd January 14, 2003
 .Dt GETPMAC 8
diff --git a/usr.sbin/getpmac/getpmac.c b/usr.sbin/getpmac/getpmac.c
index 6e815584cdc74..3b3be13707524 100644
--- a/usr.sbin/getpmac/getpmac.c
+++ b/usr.sbin/getpmac/getpmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/getpmac/getpmac.c,v 1.3 2005/01/27 14:44:39 delphij Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile
index a02cf4658f272..b12ca8bfe3425 100644
--- a/usr.sbin/gstat/Makefile
+++ b/usr.sbin/gstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/gstat/Makefile,v 1.8 2007/01/30 15:10:37 ru Exp $
 
 PROG=	gstat
 MAN=	gstat.8
diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8
index 06abd1772f05e..d351304b0b326 100644
--- a/usr.sbin/gstat/gstat.8
+++ b/usr.sbin/gstat/gstat.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/gstat/gstat.8,v 1.9 2006/09/29 16:51:29 ru Exp $
 .\"
 .Dd May 20, 2006
 .Dt GSTAT 8
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index f982235044dd1..8367c52c6ea3f 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/gstat/gstat.c,v 1.14 2007/03/29 07:23:49 des Exp $
  */
 
 
diff --git a/usr.sbin/i4b/Makefile b/usr.sbin/i4b/Makefile
index 01f76421a1fa9..8aeecf77c3055 100644
--- a/usr.sbin/i4b/Makefile
+++ b/usr.sbin/i4b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/Makefile,v 1.8 2001/12/31 09:31:51 joerg Exp $
 
 SUBDIR=	dtmfdecode g711conv isdnd isdndebug isdndecode isdnmonitor isdnphone \
 	isdntel isdntelctl isdntest isdntrace man
diff --git a/usr.sbin/i4b/Makefile.inc b/usr.sbin/i4b/Makefile.inc
index 11954191e2eae..ee19662287a43 100644
--- a/usr.sbin/i4b/Makefile.inc
+++ b/usr.sbin/i4b/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/Makefile.inc,v 1.2 2001/07/20 06:19:50 obrien Exp $
 
 # if you don't like curses stuff in the daemon (i.e. don't intend
 # to ever run it in the foreground but are using the monitoring
diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile
index 74a9df7cde9db..234a291d6ab8b 100644
--- a/usr.sbin/i4b/dtmfdecode/Makefile
+++ b/usr.sbin/i4b/dtmfdecode/Makefile
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/dtmfdecode/Makefile,v 1.9 2001/07/20 06:19:47 obrien Exp $
 #
 #	last edit-date: [Tue Dec 14 21:17:46 1999]
 #
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1 b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
index 53f673af6e9c7..f1cf0e90ab503 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.1
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: dtmfdecode.1,v 1.6 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfdecode.1,v 1.13 2004/07/02 23:12:42 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:53:13 1999]
 .\"
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
index 16c68e62e0227..3b8763204c3d7 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
+++ b/usr.sbin/i4b/dtmfdecode/dtmfdecode.c
@@ -8,7 +8,7 @@
  *
  * $Id: dtmfdecode.c,v 1.6 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfdecode.c,v 1.5 2003/01/01 18:49:01 schweikh Exp $
  *
  * Extract DTMF signalling from ISDN4BSD A-law coded audio data
  *
diff --git a/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu b/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
index f4e0c07c5763b..22c95db7af3e8 100644
--- a/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
+++ b/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/i4b/dtmfdecode/dtmfsounds.al.uu,v 1.1 1999/12/14 21:07:22 hm Exp $
 begin 666 dtmfsounds.al
 M5555U=74U-564-34UU%5U-?1UM'7UM37U=5555145%545%155%555%555=75
 M5575U=75U-15U5555575U575U=75U=75U=34U-35U-35U=75U=55U=5555%0
diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile
index f24d6e8d568b5..4572a7f8c17b7 100644
--- a/usr.sbin/i4b/g711conv/Makefile
+++ b/usr.sbin/i4b/g711conv/Makefile
@@ -1,6 +1,6 @@
 #---------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/g711conv/Makefile,v 1.6 2001/07/20 06:19:48 obrien Exp $
 #
 #	last edit-date: [Thu May 20 11:58:43 1999]
 #
diff --git a/usr.sbin/i4b/g711conv/g711conv.1 b/usr.sbin/i4b/g711conv/g711conv.1
index 1a7b328138055..975dfaab824e3 100644
--- a/usr.sbin/i4b/g711conv/g711conv.1
+++ b/usr.sbin/i4b/g711conv/g711conv.1
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: g711conv.1,v 1.3 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.1,v 1.12 2005/01/18 20:02:34 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:54:33 1999]
 .\"
diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c
index f158a9d2e34c1..63a5ec11bd830 100644
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@@ -69,7 +69,7 @@
  *
  *	$Id: g711conv.c,v 1.5 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.c,v 1.7 2007/07/06 07:19:45 bz Exp $
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index ce6c51c464e64..2bb3947d32342 100644
--- a/usr.sbin/i4b/isdnd/Makefile
+++ b/usr.sbin/i4b/isdnd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnd/Makefile,v 1.14 2004/08/13 14:21:49 ru Exp $
 
 PROG=	isdnd
 MAN=	isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 isdnd.8
diff --git a/usr.sbin/i4b/isdnd/alias.c b/usr.sbin/i4b/isdnd/alias.c
index f91a0a17b44e0..0fe24ff4e79de 100644
--- a/usr.sbin/i4b/isdnd/alias.c
+++ b/usr.sbin/i4b/isdnd/alias.c
@@ -32,7 +32,7 @@
  *		
  *      $Id: alias.c,v 1.8 1999/12/13 21:25:24 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/alias.c,v 1.8 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:04:40 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/config.h b/usr.sbin/i4b/isdnd/config.h
index a4b05f171bc85..e63c28ef26881 100644
--- a/usr.sbin/i4b/isdnd/config.h
+++ b/usr.sbin/i4b/isdnd/config.h
@@ -27,7 +27,7 @@
  *	i4b daemon - compile time configuration header file
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/config.h,v 1.8 2001/05/25 08:36:44 hm Exp $
  *
  *      last edit-date: [Mon May 21 11:21:15 2001]
  *
diff --git a/usr.sbin/i4b/isdnd/controller.c b/usr.sbin/i4b/isdnd/controller.c
index bdaa3c4bde8cc..52a76a4155ba6 100644
--- a/usr.sbin/i4b/isdnd/controller.c
+++ b/usr.sbin/i4b/isdnd/controller.c
@@ -27,7 +27,7 @@
  *	i4b daemon - controller state support routines
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/controller.c,v 1.16 2006/07/09 21:16:06 twinterg Exp $
  *
  *      last edit-date: [Sat May 13 13:24:05 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/curses.c b/usr.sbin/i4b/isdnd/curses.c
index a086b23c129c7..9fb6de0f76635 100644
--- a/usr.sbin/i4b/isdnd/curses.c
+++ b/usr.sbin/i4b/isdnd/curses.c
@@ -27,7 +27,7 @@
  *	i4b daemon - curses fullscreen output
  *	-------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/curses.c,v 1.10 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:05:36 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/dial.c b/usr.sbin/i4b/isdnd/dial.c
index 158e1c0ed0874..0a844f4e41de8 100644
--- a/usr.sbin/i4b/isdnd/dial.c
+++ b/usr.sbin/i4b/isdnd/dial.c
@@ -27,7 +27,7 @@
  *	i4b daemon - dial handling routines
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/dial.c,v 1.10 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:05:52 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/exec.c b/usr.sbin/i4b/isdnd/exec.c
index 2f24384eb370e..df660e8af2f67 100644
--- a/usr.sbin/i4b/isdnd/exec.c
+++ b/usr.sbin/i4b/isdnd/exec.c
@@ -27,7 +27,7 @@
  *	exec.h - supplemental program/script execution
  *	----------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/exec.c,v 1.14 2006/05/13 14:59:58 hm Exp $
  *
  *      last edit-date: [Sat May 13 16:55:23 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/fsm.c b/usr.sbin/i4b/isdnd/fsm.c
index b87b17e1c1131..8ac5b08f197bf 100644
--- a/usr.sbin/i4b/isdnd/fsm.c
+++ b/usr.sbin/i4b/isdnd/fsm.c
@@ -27,7 +27,7 @@
  *	FSM for isdnd
  *	-------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/fsm.c,v 1.10 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:06:40 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/holiday.c b/usr.sbin/i4b/isdnd/holiday.c
index 714bd066ba344..2f1a2c487596a 100644
--- a/usr.sbin/i4b/isdnd/holiday.c
+++ b/usr.sbin/i4b/isdnd/holiday.c
@@ -27,7 +27,7 @@
  *	isdnd - holiday file handling
  *      =============================
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/holiday.c,v 1.4 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:06:56 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index b3c749a7aed5a..8f463e0e43d3d 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.8,v 1.29 2000/05/02 11:50:28 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.24 2007/07/06 07:19:45 bz Exp $
 .\"
 .\"	last edit-date: [Wed May  2 10:48:30 2001]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.acct.5 b/usr.sbin/i4b/isdnd/isdnd.acct.5
index b2db667db7424..546a8e279a955 100644
--- a/usr.sbin/i4b/isdnd/isdnd.acct.5
+++ b/usr.sbin/i4b/isdnd/isdnd.acct.5
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.acct.5,v 1.11 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.15 2004/07/02 23:12:42 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:58:12 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h
index 4e65bfe6efec0..6b5ba62ac4265 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -27,7 +27,7 @@
  *	i4b daemon - main header file
  *	-----------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.21 2007/07/06 07:19:45 bz Exp $
  *
  *      last edit-date: [Sat May 13 13:18:48 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/isdnd.rates.5 b/usr.sbin/i4b/isdnd/isdnd.rates.5
index b4542e07591b2..d043aa3aa35a3 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rates.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rates.5
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.rates.5,v 1.10 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.15 2004/07/02 23:12:42 ru Exp $
 .\"
 .\"     last edit-date: [Mon Dec 13 22:59:31 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index d3d2ed894d0b9..3232576fd8ee8 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.36 2005/07/31 03:30:47 keramida Exp $
 .\"
 .\"     last edit-date: [Sun Aug 11 20:07:38 2002]
 .\"
diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c
index 41179091d1765..141e872255e15 100644
--- a/usr.sbin/i4b/isdnd/log.c
+++ b/usr.sbin/i4b/isdnd/log.c
@@ -27,7 +27,7 @@
  *	i4b daemon - logging routines
  *	-----------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/log.c,v 1.11 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:07:18 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c
index df531b7032107..e15ead8c5c869 100644
--- a/usr.sbin/i4b/isdnd/main.c
+++ b/usr.sbin/i4b/isdnd/main.c
@@ -27,7 +27,7 @@
  *	i4b daemon - main program entry
  *	-------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/main.c,v 1.18 2006/07/09 05:53:23 cperciva Exp $
  *
  *      last edit-date: [Sat May 13 13:03:56 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c
index 36739d10c657b..8fd1313142a6c 100644
--- a/usr.sbin/i4b/isdnd/monitor.c
+++ b/usr.sbin/i4b/isdnd/monitor.c
@@ -33,7 +33,7 @@
  *	i4b daemon - network monitor server module
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/monitor.c,v 1.13 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:08:15 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/msghdl.c b/usr.sbin/i4b/isdnd/msghdl.c
index 4787a9540ceef..7dac3df41a42a 100644
--- a/usr.sbin/i4b/isdnd/msghdl.c
+++ b/usr.sbin/i4b/isdnd/msghdl.c
@@ -27,7 +27,7 @@
  *	i4b daemon - message from kernel handling routines
  *	--------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.13 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:09:33 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/pathnames.h b/usr.sbin/i4b/isdnd/pathnames.h
index 44f9c6d9ca413..2e7ab0651bc77 100644
--- a/usr.sbin/i4b/isdnd/pathnames.h
+++ b/usr.sbin/i4b/isdnd/pathnames.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pathnames.h,v 1.11 2000/10/09 11:17:07 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pathnames.h,v 1.7 2000/10/09 14:22:38 hm Exp $
  *
  *      last edit-date: [Mon Oct  2 22:55:28 2000]
  *
diff --git a/usr.sbin/i4b/isdnd/pcause.c b/usr.sbin/i4b/isdnd/pcause.c
index 99aa089846be7..bf9262682f422 100644
--- a/usr.sbin/i4b/isdnd/pcause.c
+++ b/usr.sbin/i4b/isdnd/pcause.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.c,v 1.13 2000/10/09 12:53:29 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/pcause.c,v 1.8 2000/10/09 14:22:38 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:48:07 1999]
  *
diff --git a/usr.sbin/i4b/isdnd/process.c b/usr.sbin/i4b/isdnd/process.c
index a71048f44a773..499a810e3f203 100644
--- a/usr.sbin/i4b/isdnd/process.c
+++ b/usr.sbin/i4b/isdnd/process.c
@@ -29,7 +29,7 @@
  *
  *	$Id: process.c,v 1.8 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/process.c,v 1.8 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:09:55 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/rates.c b/usr.sbin/i4b/isdnd/rates.c
index 5843f2ca10701..b324d11d0362f 100644
--- a/usr.sbin/i4b/isdnd/rates.c
+++ b/usr.sbin/i4b/isdnd/rates.c
@@ -37,7 +37,7 @@
  *
  *	$Id: rates.c,v 1.11 2000/10/09 12:53:29 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rates.c,v 1.9 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:10:09 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_config.c b/usr.sbin/i4b/isdnd/rc_config.c
index 6f84e21c10f48..14d2d2376f594 100644
--- a/usr.sbin/i4b/isdnd/rc_config.c
+++ b/usr.sbin/i4b/isdnd/rc_config.c
@@ -27,7 +27,7 @@
  *	i4b daemon - config file processing
  *	-----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_config.c,v 1.18 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:11:48 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_parse.y b/usr.sbin/i4b/isdnd/rc_parse.y
index 6427500f90754..8830762524dd4 100644
--- a/usr.sbin/i4b/isdnd/rc_parse.y
+++ b/usr.sbin/i4b/isdnd/rc_parse.y
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration parser
  *	-----------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_parse.y,v 1.12 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:27:28 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/rc_scan.l b/usr.sbin/i4b/isdnd/rc_scan.l
index 988a4fb7c42bc..381885ad4ac5d 100644
--- a/usr.sbin/i4b/isdnd/rc_scan.l
+++ b/usr.sbin/i4b/isdnd/rc_scan.l
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration lexical analyzer
  *	---------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/rc_scan.l,v 1.13 2002/08/12 07:52:39 hm Exp $
  *
  *      last edit-date: [Sun Aug 11 12:27:50 2002]
  *
diff --git a/usr.sbin/i4b/isdnd/support.c b/usr.sbin/i4b/isdnd/support.c
index 156ed29b80eee..d2f4535b54339 100644
--- a/usr.sbin/i4b/isdnd/support.c
+++ b/usr.sbin/i4b/isdnd/support.c
@@ -27,7 +27,7 @@
  *	i4b daemon - misc support routines
  *	----------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/support.c,v 1.17 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:19:23 2006]
  *
diff --git a/usr.sbin/i4b/isdnd/timer.c b/usr.sbin/i4b/isdnd/timer.c
index 90bee198cad1d..a8c8ea0bf070f 100644
--- a/usr.sbin/i4b/isdnd/timer.c
+++ b/usr.sbin/i4b/isdnd/timer.c
@@ -27,7 +27,7 @@
  *	i4b daemon - timer/timing support routines
  *	------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnd/timer.c,v 1.10 2006/05/13 12:42:55 hm Exp $
  *
  *      last edit-date: [Sat May 13 13:13:13 2006]
  *
diff --git a/usr.sbin/i4b/isdndebug/Makefile b/usr.sbin/i4b/isdndebug/Makefile
index 5a31de9553659..ab80369241d1c 100644
--- a/usr.sbin/i4b/isdndebug/Makefile
+++ b/usr.sbin/i4b/isdndebug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdndebug/Makefile,v 1.5 2001/07/20 06:19:48 obrien Exp $
 
 PROG=	isdndebug
 MAN= 	isdndebug.8
diff --git a/usr.sbin/i4b/isdndebug/isdndebug.8 b/usr.sbin/i4b/isdndebug/isdndebug.8
index 0a9f24ca23982..faede48a28236 100644
--- a/usr.sbin/i4b/isdndebug/isdndebug.8
+++ b/usr.sbin/i4b/isdndebug/isdndebug.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdndebug.8,v 1.11 2000/05/31 08:15:29 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.18 2004/07/02 23:12:43 ru Exp $
 .\"
 .\"	last edit-date: [Wed May 31 10:15:07 2000]
 .\"
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index 3586173b6255a..2684c61b701f8 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -27,7 +27,7 @@
  *	main.c - i4b set debug options
  *	------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndebug/main.c,v 1.13 2007/07/06 07:19:45 bz Exp $
  *
  *      last edit-date: [Mon May 21 10:09:23 2001]
  *
diff --git a/usr.sbin/i4b/isdndecode/Makefile b/usr.sbin/i4b/isdndecode/Makefile
index 9dbd971b83cb3..83f5f104e93c2 100644
--- a/usr.sbin/i4b/isdndecode/Makefile
+++ b/usr.sbin/i4b/isdndecode/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdndecode/Makefile,v 1.5 2001/07/20 06:19:48 obrien Exp $
 
 PROG=	isdndecode
 MAN=	isdndecode.8
diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h
index 7eb544b8bbcc4..0e23808fa7eba 100644
--- a/usr.sbin/i4b/isdndecode/decode.h
+++ b/usr.sbin/i4b/isdndecode/decode.h
@@ -29,7 +29,7 @@
  *
  *	$Id: decode.h,v 1.6 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/decode.h,v 1.8 2007/07/06 07:19:45 bz Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:50 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.c b/usr.sbin/i4b/isdndecode/facility.c
index c4502a8daf2b4..50dc338de9f29 100644
--- a/usr.sbin/i4b/isdndecode/facility.c
+++ b/usr.sbin/i4b/isdndecode/facility.c
@@ -29,7 +29,7 @@
  *
  *	$Id: facility.c,v 1.5 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Feb 21 16:15:43 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/facility.h b/usr.sbin/i4b/isdndecode/facility.h
index f4cfe10e25209..ef1bb80fbd28a 100644
--- a/usr.sbin/i4b/isdndecode/facility.h
+++ b/usr.sbin/i4b/isdndecode/facility.h
@@ -29,7 +29,7 @@
  *
  *	$Id: facility.h,v 1.5 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/facility.h,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Feb 21 16:16:04 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/isdndecode.8 b/usr.sbin/i4b/isdndecode/isdndecode.8
index 628bcbe38bb5d..e658c26faf3fb 100644
--- a/usr.sbin/i4b/isdndecode/isdndecode.8
+++ b/usr.sbin/i4b/isdndecode/isdndecode.8
@@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Mon Feb 21 16:15:09 2000]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.17 2005/01/18 20:02:34 ru Exp $
 .\"
 .Dd February 21, 2000
 .Dt ISDNDECODE 8
diff --git a/usr.sbin/i4b/isdndecode/layer1.c b/usr.sbin/i4b/isdndecode/layer1.c
index c08b628e9a451..e1b0cc988115a 100644
--- a/usr.sbin/i4b/isdndecode/layer1.c
+++ b/usr.sbin/i4b/isdndecode/layer1.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer1.c,v 1.4 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer1.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:34 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer2.c b/usr.sbin/i4b/isdndecode/layer2.c
index 1e5398680188d..49ebd2df20c1a 100644
--- a/usr.sbin/i4b/isdndecode/layer2.c
+++ b/usr.sbin/i4b/isdndecode/layer2.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer2.c,v 1.5 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer2.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:50:41 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3.c b/usr.sbin/i4b/isdndecode/layer3.c
index 12a7633195655..152104218e1c4 100644
--- a/usr.sbin/i4b/isdndecode/layer3.c
+++ b/usr.sbin/i4b/isdndecode/layer3.c
@@ -27,7 +27,7 @@
  *	layer3.c - decode and print layer 3 (Q.931) information
  *	-------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3.c,v 1.9 2002/03/26 15:13:02 hm Exp $
  *
  *      last edit-date: [Tue Mar 26 14:39:02 2002]
  *
diff --git a/usr.sbin/i4b/isdndecode/layer3_subr.c b/usr.sbin/i4b/isdndecode/layer3_subr.c
index 6fcedd24439d7..23fa645992a00 100644
--- a/usr.sbin/i4b/isdndecode/layer3_subr.c
+++ b/usr.sbin/i4b/isdndecode/layer3_subr.c
@@ -29,7 +29,7 @@
  *
  *	$Id: layer3_subr.c,v 1.8 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.8 2001/04/26 08:40:35 kris Exp $
  *
  *      last edit-date: [Mon Feb 21 15:45:16 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/main.c b/usr.sbin/i4b/isdndecode/main.c
index 76afab109d479..997a3e0b9a23b 100644
--- a/usr.sbin/i4b/isdndecode/main.c
+++ b/usr.sbin/i4b/isdndecode/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.13 2000/02/21 15:17:17 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/main.c,v 1.10 2003/06/07 18:43:09 imp Exp $
  *
  *      last edit-date: [Mon Feb 21 16:19:30 2000]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.c b/usr.sbin/i4b/isdndecode/pcause.c
index 610a9609c179d..ac3d0da8513fe 100644
--- a/usr.sbin/i4b/isdndecode/pcause.c
+++ b/usr.sbin/i4b/isdndecode/pcause.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.c,v 1.5 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/pcause.c,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:20 1999]
  *
diff --git a/usr.sbin/i4b/isdndecode/pcause.h b/usr.sbin/i4b/isdndecode/pcause.h
index 2c1c7f403e5b6..d30cbc8f9573e 100644
--- a/usr.sbin/i4b/isdndecode/pcause.h
+++ b/usr.sbin/i4b/isdndecode/pcause.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause.h,v 1.4 1999/12/13 21:25:25 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdndecode/pcause.h,v 1.7 2000/10/09 14:22:41 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:32 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile
index ed241c16afb44..1cf2ca486c0d7 100644
--- a/usr.sbin/i4b/isdnmonitor/Makefile
+++ b/usr.sbin/i4b/isdnmonitor/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnmonitor/Makefile,v 1.9 2004/08/13 14:21:49 ru Exp $
 
 PROG=	isdnmonitor
 MAN=	isdnmonitor.8
diff --git a/usr.sbin/i4b/isdnmonitor/curses.c b/usr.sbin/i4b/isdnmonitor/curses.c
index 1e7eec15b68d1..55e6356455f2d 100644
--- a/usr.sbin/i4b/isdnmonitor/curses.c
+++ b/usr.sbin/i4b/isdnmonitor/curses.c
@@ -29,7 +29,7 @@
  *
  *	$Id: curses.c,v 1.10 1999/12/13 21:25:25 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/curses.c,v 1.2 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:51:47 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8 b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
index 46e1a377f92a7..bcb8a71226ddc 100644
--- a/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
+++ b/usr.sbin/i4b/isdnmonitor/isdnmonitor.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnmonitor.8,v 1.8 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.19 2005/01/18 20:02:34 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:04:25 1999]
 .\"
diff --git a/usr.sbin/i4b/isdnmonitor/main.c b/usr.sbin/i4b/isdnmonitor/main.c
index 65ddb5b9c10e7..21d9ee877c8f0 100644
--- a/usr.sbin/i4b/isdnmonitor/main.c
+++ b/usr.sbin/i4b/isdnmonitor/main.c
@@ -35,7 +35,7 @@
  *
  *	$Id: main.c,v 1.35 2000/08/24 11:48:57 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.10 2006/07/09 05:53:24 cperciva Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:11 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/monitor.h b/usr.sbin/i4b/isdnmonitor/monitor.h
index 4862c4835e3af..a1535398e92e2 100644
--- a/usr.sbin/i4b/isdnmonitor/monitor.h
+++ b/usr.sbin/i4b/isdnmonitor/monitor.h
@@ -35,7 +35,7 @@
  *
  *	$Id: monitor.h,v 1.16 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monitor.h,v 1.8 2003/01/01 18:49:01 schweikh Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:18 1999]
  *
diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h
index d6763449c898e..1a754f58f262e 100644
--- a/usr.sbin/i4b/isdnmonitor/monprivate.h
+++ b/usr.sbin/i4b/isdnmonitor/monprivate.h
@@ -29,7 +29,7 @@
  *
  *	$Id: monprivate.h,v 1.10 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.3 2007/07/06 07:19:45 bz Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:25 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/Makefile b/usr.sbin/i4b/isdnphone/Makefile
index 3527e8cef36da..662046d98f486 100644
--- a/usr.sbin/i4b/isdnphone/Makefile
+++ b/usr.sbin/i4b/isdnphone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdnphone/Makefile,v 1.4 2001/07/20 06:19:50 obrien Exp $
 
 PROG=	isdnphone
 MAN=	isdnphone.8
diff --git a/usr.sbin/i4b/isdnphone/audio.c b/usr.sbin/i4b/isdnphone/audio.c
index 2dc88d6afc2e7..c7dbc933ea09f 100644
--- a/usr.sbin/i4b/isdnphone/audio.c
+++ b/usr.sbin/i4b/isdnphone/audio.c
@@ -29,7 +29,7 @@
  *
  *	$Id: audio.c,v 1.5 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/audio.c,v 1.1 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:39 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/defs.h b/usr.sbin/i4b/isdnphone/defs.h
index fade94b40c577..9c7c112769f2f 100644
--- a/usr.sbin/i4b/isdnphone/defs.h
+++ b/usr.sbin/i4b/isdnphone/defs.h
@@ -29,7 +29,7 @@
  *
  *	$Id: defs.h,v 1.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/defs.h,v 1.3 2007/07/06 07:19:46 bz Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:46 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/display.c b/usr.sbin/i4b/isdnphone/display.c
index 1dff9a16f3f98..6cd987e3ddb2b 100644
--- a/usr.sbin/i4b/isdnphone/display.c
+++ b/usr.sbin/i4b/isdnphone/display.c
@@ -29,7 +29,7 @@
  *
  *	$Id: display.c,v 1.4 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/display.c,v 1.1 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:55 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/isdn.c b/usr.sbin/i4b/isdnphone/isdn.c
index 34719c7272699..8cc0c07604404 100644
--- a/usr.sbin/i4b/isdnphone/isdn.c
+++ b/usr.sbin/i4b/isdnphone/isdn.c
@@ -29,7 +29,7 @@
  *
  *	$Id: isdn.c,v 1.4 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/isdn.c,v 1.1 2000/10/09 14:22:42 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:05 1999]
  *
diff --git a/usr.sbin/i4b/isdnphone/isdnphone.8 b/usr.sbin/i4b/isdnphone/isdnphone.8
index 5ba4782ccd3c9..214907e4cc24b 100644
--- a/usr.sbin/i4b/isdnphone/isdnphone.8
+++ b/usr.sbin/i4b/isdnphone/isdnphone.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdnphone/isdnphone.8,v 1.9 2002/08/27 14:46:22 hm Exp $
 .\"
 .\"	last edit-date: [Tue Aug 27 16:42:12 2002]
 .\"
diff --git a/usr.sbin/i4b/isdnphone/main.c b/usr.sbin/i4b/isdnphone/main.c
index 8a9b92a39e190..243977a0d582d 100644
--- a/usr.sbin/i4b/isdnphone/main.c
+++ b/usr.sbin/i4b/isdnphone/main.c
@@ -27,7 +27,7 @@
  *	isdnphone - main module
  *	=======================
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdnphone/main.c,v 1.5 2006/07/09 05:53:24 cperciva Exp $
  *
  *      last edit-date: [Tue Aug 27 16:38:55 2002]
  *
diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile
index e3aff090b1966..749143aab5aeb 100644
--- a/usr.sbin/i4b/isdntel/Makefile
+++ b/usr.sbin/i4b/isdntel/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntel/Makefile,v 1.7 2001/07/20 06:19:49 obrien Exp $
 
 PROG=	isdntel
 MAN=	isdntel.8
diff --git a/usr.sbin/i4b/isdntel/alias.c b/usr.sbin/i4b/isdntel/alias.c
index 0f4dae712a155..8a07e24d4e1cb 100644
--- a/usr.sbin/i4b/isdntel/alias.c
+++ b/usr.sbin/i4b/isdntel/alias.c
@@ -29,7 +29,7 @@
  *
  *      $Id: alias.c,v 1.9 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/alias.c,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:37 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/alias.h b/usr.sbin/i4b/isdntel/alias.h
index 813d5bd790959..a82fdc389406d 100644
--- a/usr.sbin/i4b/isdntel/alias.h
+++ b/usr.sbin/i4b/isdntel/alias.h
@@ -29,7 +29,7 @@
  *
  *      $Id: alias.h,v 1.5 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/alias.h,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:44 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 0d8d38652b930..6fa27ead9ae56 100644
--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@@ -29,7 +29,7 @@
  *
  *	$Id: defs.h,v 1.10 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/defs.h,v 1.8 2007/07/06 07:19:46 bz Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:50 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/display.c b/usr.sbin/i4b/isdntel/display.c
index 53e6637d51550..bc1662871721d 100644
--- a/usr.sbin/i4b/isdntel/display.c
+++ b/usr.sbin/i4b/isdntel/display.c
@@ -29,7 +29,7 @@
  *
  *	$Id: display.c,v 1.9 2000/07/19 08:56:24 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/display.c,v 1.7 2000/10/09 14:22:44 hm Exp $
  *
  *      last edit-date: [Wed Jul 19 10:08:06 2000]
  *
diff --git a/usr.sbin/i4b/isdntel/files.c b/usr.sbin/i4b/isdntel/files.c
index bf05b4237cd2d..dbddaf00b8f63 100644
--- a/usr.sbin/i4b/isdntel/files.c
+++ b/usr.sbin/i4b/isdntel/files.c
@@ -29,7 +29,7 @@
  *
  *      $Id: files.c,v 1.8 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/files.c,v 1.8 2003/06/07 18:44:04 imp Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:06 1999]
  *
diff --git a/usr.sbin/i4b/isdntel/isdntel.8 b/usr.sbin/i4b/isdntel/isdntel.8
index 430c9f2df6f9d..d83f5fb1ee380 100644
--- a/usr.sbin/i4b/isdntel/isdntel.8
+++ b/usr.sbin/i4b/isdntel/isdntel.8
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:05:59 1999]
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.18 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	$Id: isdntel.8,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
diff --git a/usr.sbin/i4b/isdntel/main.c b/usr.sbin/i4b/isdntel/main.c
index 6bea966627034..a08e6cd7304e9 100644
--- a/usr.sbin/i4b/isdntel/main.c
+++ b/usr.sbin/i4b/isdntel/main.c
@@ -29,7 +29,7 @@
  *
  *      $Id: main.c,v 1.12 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntel/main.c,v 1.10 2003/06/07 18:42:05 imp Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:26 1999]
  *
diff --git a/usr.sbin/i4b/isdntelctl/Makefile b/usr.sbin/i4b/isdntelctl/Makefile
index 41b771e9616e1..bd841fafcdfcc 100644
--- a/usr.sbin/i4b/isdntelctl/Makefile
+++ b/usr.sbin/i4b/isdntelctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntelctl/Makefile,v 1.5 2001/07/20 06:19:49 obrien Exp $
 
 PROG=	isdntelctl
 MAN= 	isdntelctl.8
diff --git a/usr.sbin/i4b/isdntelctl/isdntelctl.8 b/usr.sbin/i4b/isdntelctl/isdntelctl.8
index 4afaf00a9f7cf..1d5a1f8dd9f40 100644
--- a/usr.sbin/i4b/isdntelctl/isdntelctl.8
+++ b/usr.sbin/i4b/isdntelctl/isdntelctl.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntelctl.8,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.17 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:06:45 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c
index 0e9c8ff2cfa81..eba8e997cf9b9 100644
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.12 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntelctl/main.c,v 1.12 2007/07/06 07:19:46 bz Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:50 1999]
  *
diff --git a/usr.sbin/i4b/isdntest/Makefile b/usr.sbin/i4b/isdntest/Makefile
index 88b491a8c8c9f..8081a042c9d3b 100644
--- a/usr.sbin/i4b/isdntest/Makefile
+++ b/usr.sbin/i4b/isdntest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntest/Makefile,v 1.7 2003/04/13 14:21:56 bde Exp $
 
 PROG=	isdntest
 MAN=	isdntest.8
diff --git a/usr.sbin/i4b/isdntest/isdntest.8 b/usr.sbin/i4b/isdntest/isdntest.8
index 243d70b1b1349..760665c3fb2e1 100644
--- a/usr.sbin/i4b/isdntest/isdntest.8
+++ b/usr.sbin/i4b/isdntest/isdntest.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntest.8,v 1.10 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntest/isdntest.8,v 1.17 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:07:23 1999]
 .\"
diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c
index 08c7b896f051b..8ef7cb3d5b855 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -29,7 +29,7 @@
  *
  *	$Id: main.c,v 1.16 2000/03/13 16:18:38 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntest/main.c,v 1.11 2007/07/06 07:19:46 bz Exp $
  *
  *      last edit-date: [Sat May 13 16:50:38 2006]
  *
diff --git a/usr.sbin/i4b/isdntrace/1tr6.c b/usr.sbin/i4b/isdntrace/1tr6.c
index db2bc7177a4a7..4c27aaf33bc05 100644
--- a/usr.sbin/i4b/isdntrace/1tr6.c
+++ b/usr.sbin/i4b/isdntrace/1tr6.c
@@ -29,7 +29,7 @@
  *
  *	$Id: 1tr6.c,v 1.6 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/1tr6.c,v 1.7 2000/10/09 14:22:46 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:55:31 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/Makefile b/usr.sbin/i4b/isdntrace/Makefile
index eae0919b299b4..107543402a7a2 100644
--- a/usr.sbin/i4b/isdntrace/Makefile
+++ b/usr.sbin/i4b/isdntrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/isdntrace/Makefile,v 1.7 2001/07/20 06:19:49 obrien Exp $
 
 PROG=	isdntrace
 MAN=	isdntrace.8
diff --git a/usr.sbin/i4b/isdntrace/cable.txt b/usr.sbin/i4b/isdntrace/cable.txt
index 21a1cdb830b35..48ed5f02512cf 100644
--- a/usr.sbin/i4b/isdntrace/cable.txt
+++ b/usr.sbin/i4b/isdntrace/cable.txt
@@ -5,7 +5,7 @@
  *
  *	$Id: cable.txt,v 1.4 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/cable.txt,v 1.7 2000/10/09 14:22:48 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:55:42 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/isdntrace.8 b/usr.sbin/i4b/isdntrace/isdntrace.8
index 166f42063a5a9..6c8b895ac05d4 100644
--- a/usr.sbin/i4b/isdntrace/isdntrace.8
+++ b/usr.sbin/i4b/isdntrace/isdntrace.8
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntrace.8,v 1.14 2000/02/13 15:26:52 hm Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.21 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Wed Nov  1 15:52:28 2000]
 .\"
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.c b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
index b319d7452e34b..062e3a06a54f9 100644
--- a/usr.sbin/i4b/isdntrace/pcause_1tr6.c
+++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_1tr6.c,v 1.6 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:03 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_1tr6.h b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
index 67f50deedc857..23ce02b28ddf5 100644
--- a/usr.sbin/i4b/isdntrace/pcause_1tr6.h
+++ b/usr.sbin/i4b/isdntrace/pcause_1tr6.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_1tr6.h,v 1.5 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:10 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.c b/usr.sbin/i4b/isdntrace/pcause_q850.c
index 57eaf32dc955d..5fd6dd1b7cfc6 100644
--- a/usr.sbin/i4b/isdntrace/pcause_q850.c
+++ b/usr.sbin/i4b/isdntrace/pcause_q850.c
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_q850.c,v 1.6 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_q850.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:18 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/pcause_q850.h b/usr.sbin/i4b/isdntrace/pcause_q850.h
index ea21770ca3b7a..4413d5513d74f 100644
--- a/usr.sbin/i4b/isdntrace/pcause_q850.h
+++ b/usr.sbin/i4b/isdntrace/pcause_q850.h
@@ -29,7 +29,7 @@
  *
  *	$Id: pcause_q850.h,v 1.5 1999/12/13 21:25:26 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_q850.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *	last edit-date: [Mon Dec 13 21:56:25 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q921.c b/usr.sbin/i4b/isdntrace/q921.c
index e8c14dc67110c..b3df045dead3e 100644
--- a/usr.sbin/i4b/isdntrace/q921.c
+++ b/usr.sbin/i4b/isdntrace/q921.c
@@ -32,7 +32,7 @@
  *
  *	$Id: q921.c,v 1.4 1999/12/13 21:25:26 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q921.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Mon Dec 13 21:56:46 1999]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931.c b/usr.sbin/i4b/isdntrace/q931.c
index d69453eb9f914..e8d88cade1ec6 100644
--- a/usr.sbin/i4b/isdntrace/q931.c
+++ b/usr.sbin/i4b/isdntrace/q931.c
@@ -27,7 +27,7 @@
  *	q931.c - print Q.931 traces
  *	---------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931.c,v 1.8 2001/10/18 08:03:23 hm Exp $
  *
  *      last edit-date: [Wed Oct 17 14:49:16 2001]
  *
diff --git a/usr.sbin/i4b/isdntrace/q931_util.c b/usr.sbin/i4b/isdntrace/q931_util.c
index 9f82283d39d97..be32b09ef03f2 100644
--- a/usr.sbin/i4b/isdntrace/q931_util.c
+++ b/usr.sbin/i4b/isdntrace/q931_util.c
@@ -29,7 +29,7 @@
  *
  *	$Id: q931_util.c,v 1.11 2000/02/15 12:48:14 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q931_util.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Tue Feb 15 13:52:09 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.c b/usr.sbin/i4b/isdntrace/q932_fac.c
index 0a0099d3edce3..ce47506caa09e 100644
--- a/usr.sbin/i4b/isdntrace/q932_fac.c
+++ b/usr.sbin/i4b/isdntrace/q932_fac.c
@@ -29,7 +29,7 @@
  *
  *	$Id: q932_fac.c,v 1.8 2000/02/24 16:32:46 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.c,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Thu Feb 24 17:36:47 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/q932_fac.h b/usr.sbin/i4b/isdntrace/q932_fac.h
index 563de3a6a28df..a85a1809cce32 100644
--- a/usr.sbin/i4b/isdntrace/q932_fac.h
+++ b/usr.sbin/i4b/isdntrace/q932_fac.h
@@ -29,7 +29,7 @@
  *
  *	$Id: q932_fac.h,v 1.7 2000/02/18 16:27:39 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/q932_fac.h,v 1.7 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Fri Feb 18 17:26:07 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.c b/usr.sbin/i4b/isdntrace/trace.c
index 2ba1ca59ed5b4..07af98e075c13 100644
--- a/usr.sbin/i4b/isdntrace/trace.c
+++ b/usr.sbin/i4b/isdntrace/trace.c
@@ -37,7 +37,7 @@
  *
  *	$Id: trace.c,v 1.19 2000/08/28 07:06:42 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.c,v 1.10 2003/06/07 18:35:45 imp Exp $
  *
  *      last edit-date: [Mon Aug 28 09:03:46 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h
index 95c68618b2720..a7d33d2bbe74c 100644
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@@ -37,7 +37,7 @@
  *
  *	$Id: trace.h,v 1.12 2000/02/14 16:25:22 hm Exp $ 
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.h,v 1.8 2007/07/06 07:19:46 bz Exp $
  *
  *      last edit-date: [Mon Feb 14 14:43:40 2000]
  *
diff --git a/usr.sbin/i4b/isdntrace/unknownl3.c b/usr.sbin/i4b/isdntrace/unknownl3.c
index 8967a6a9b037c..b976bca0a6961 100644
--- a/usr.sbin/i4b/isdntrace/unknownl3.c
+++ b/usr.sbin/i4b/isdntrace/unknownl3.c
@@ -29,7 +29,7 @@
  *
  *	$Id: unknownl3.c,v 1.2 2000/02/13 15:26:52 hm Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/i4b/isdntrace/unknownl3.c,v 1.1 2000/10/09 14:22:49 hm Exp $
  *
  *      last edit-date: [Sun Feb 13 14:16:44 2000]
  *
diff --git a/usr.sbin/i4b/man/Makefile b/usr.sbin/i4b/man/Makefile
index 75e464bfbfb00..5b2d80c44ac01 100644
--- a/usr.sbin/i4b/man/Makefile
+++ b/usr.sbin/i4b/man/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/i4b/man/Makefile,v 1.10 2007/07/04 16:21:27 bz Exp $
 MAN=	i4b.4 i4bcapi.4 i4bctl.4 i4bq921.4 \
 	i4bq931.4 i4brbch.4 i4btel.4 i4btrc.4 iavc.4 isic.4 ifpi.4 \
 	ifpi2.4 ifpnp.4 ihfc.4 itjc.4 iwic.4
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index be7b22447c7f3..16842540084b8 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4b.4,v 1.15 2007/07/06 07:19:46 bz Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:07:13 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bcapi.4 b/usr.sbin/i4b/man/i4bcapi.4
index 95d2bba068865..ef710d69e62ab 100644
--- a/usr.sbin/i4b/man/i4bcapi.4
+++ b/usr.sbin/i4b/man/i4bcapi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bcapi.4,v 1.3 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Fri May 25 09:38:45 2001]
 .\"
diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4
index 20b42e83edbb1..3beec85592414 100644
--- a/usr.sbin/i4b/man/i4bctl.4
+++ b/usr.sbin/i4b/man/i4bctl.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bctl.4,v 1.11 2002/07/28 18:21:47 hm Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:21:03 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bing.4 b/usr.sbin/i4b/man/i4bing.4
index 0322088e09eb4..5640078d28bd5 100644
--- a/usr.sbin/i4b/man/i4bing.4
+++ b/usr.sbin/i4b/man/i4bing.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bing.4,v 1.8 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:21:13 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index 6bbc1faea49b9..26e046e8d0502 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bipr.4,v 1.14 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:29:08 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index 7ef4a96f8ce45..b9fafad8c8bd2 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bisppp.4,v 1.16 2005/01/21 10:35:40 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:43:22 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index ecd7293337799..8c1b6dad6a25f 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq921.4,v 1.13 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:49:44 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index 937840d771217..22a4b53f7b86c 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4bq931.4,v 1.13 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:11:55 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index aaa6044b03494..b38c12b7537f9 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4brbch.4,v 1.14 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 12:52:34 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index d8e17f4cda3ce..54c3055737946 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btel.4,v 1.17 2005/01/21 10:35:40 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:14:06 2002]
 .\"
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index cbd6a7f44caeb..91583a843ae0b 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/i4btrc.4,v 1.15 2002/11/27 15:24:11 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 14:21:03 2002]
 .\"
diff --git a/usr.sbin/i4b/man/iavc.4 b/usr.sbin/i4b/man/iavc.4
index e737e645a28a8..e5008509f39dd 100644
--- a/usr.sbin/i4b/man/iavc.4
+++ b/usr.sbin/i4b/man/iavc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/iavc.4,v 1.4 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:37:51 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ifpi.4 b/usr.sbin/i4b/man/ifpi.4
index f2f3cdf20f2f5..8a5c82f2dcb1f 100644
--- a/usr.sbin/i4b/man/ifpi.4
+++ b/usr.sbin/i4b/man/ifpi.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ifpi.4,v 1.8 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:38:40 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ifpi2.4 b/usr.sbin/i4b/man/ifpi2.4
index 4889079c76358..38733045882f9 100644
--- a/usr.sbin/i4b/man/ifpi2.4
+++ b/usr.sbin/i4b/man/ifpi2.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ifpi2.4,v 1.5 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:38:22 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ifpnp.4 b/usr.sbin/i4b/man/ifpnp.4
index bf892189057b5..7e8d7356c37e5 100644
--- a/usr.sbin/i4b/man/ifpnp.4
+++ b/usr.sbin/i4b/man/ifpnp.4
@@ -24,7 +24,7 @@
 .\"
 .\"	$Ust: src/i4b/man/ifpnp.4,v 1.4 2000/04/18 08:26:31 ust Exp $
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ifpnp.4,v 1.8 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:39:35 2002]
 .\"
diff --git a/usr.sbin/i4b/man/ihfc.4 b/usr.sbin/i4b/man/ihfc.4
index 4d91391acb940..ddd35d0b45f3d 100644
--- a/usr.sbin/i4b/man/ihfc.4
+++ b/usr.sbin/i4b/man/ihfc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/ihfc.4,v 1.11 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:47:55 2002]
 .\"
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index e545c08f4c77f..5a202fa057319 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/isic.4,v 1.20 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 20:14:24 2002]
 .\"
diff --git a/usr.sbin/i4b/man/itjc.4 b/usr.sbin/i4b/man/itjc.4
index be4f9fe46c0d7..39b27c41e9fd3 100644
--- a/usr.sbin/i4b/man/itjc.4
+++ b/usr.sbin/i4b/man/itjc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/itjc.4,v 1.5 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Fri Jan 12 10:07:04 2001]
 .\"
diff --git a/usr.sbin/i4b/man/iwic.4 b/usr.sbin/i4b/man/iwic.4
index 8d9b4df7bae82..98d6a15cf5674 100644
--- a/usr.sbin/i4b/man/iwic.4
+++ b/usr.sbin/i4b/man/iwic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/i4b/man/iwic.4,v 1.9 2005/01/18 20:02:35 ru Exp $
 .\"
 .\"	last edit-date: [Sun Jul 28 16:49:47 2002]
 .\"
diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile
index 62de0b9485a09..c087f8ba0bf24 100644
--- a/usr.sbin/ifmcstat/Makefile
+++ b/usr.sbin/ifmcstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ifmcstat/Makefile,v 1.11 2007/06/13 02:08:04 sepotvin Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index c0effbae501bb..92f6dc568f9b7 100644
--- a/usr.sbin/ifmcstat/ifmcstat.8
+++ b/usr.sbin/ifmcstat/ifmcstat.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.9 2007/04/10 00:26:12 bms Exp $
 .\"
 .Dd April 10, 2007
 .Dt IFMCSTAT 8
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 9fe8b153db340..97bee97619a83 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.c,v 1.17 2007/04/10 00:26:12 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 35f2c222e583d..db597e0f67a55 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/inetd/Makefile,v 1.37 2007/07/05 08:56:46 bz Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index ad7a82e479b78..a6c6b440516a0 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/inetd/builtins.c,v 1.45 2006/04/17 19:55:25 dwmalone Exp $");
 
 #include <sys/filio.h>
 #include <sys/ioccom.h>
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 9b30226dd0686..6813188dc27b4 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.84 2006/09/14 08:36:53 ru Exp $
 .\"
 .Dd September 14, 2006
 .Dt INETD 8
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 56791b22bd1a2..f46e4f8633fa7 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)from: inetd.c	8.4 (Berkeley) 4/13/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.136 2007/07/01 12:08:08 gnn Exp $");
 
 /*
  * Inetd - Internet super-server
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index e0a83bd9761bf..4f4f28034f9f2 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/inetd.h,v 1.17 2006/09/14 08:36:53 ru Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index d4fd81d12faa6..28e3759941f6b 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/inetd/pathnames.h,v 1.7 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index 558b09bbd6cca..bb35c2dd1efad 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/iostat/Makefile,v 1.14 2004/02/04 10:20:43 ru Exp $
 
 PROG=	iostat
 MAN=	iostat.8
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index e7ceb628fb1b2..49833f7fe3880 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/iostat/iostat.8,v 1.29 2006/09/29 17:57:02 ru Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 111d927d24bfe..2338fb1367afd 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/iostat/iostat.c,v 1.36 2007/08/03 15:45:55 maxim Exp $
  */
 /*
  * Parts of this program are derived from the original FreeBSD iostat
diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile
index cd2510eb0e19a..2822bc6176de5 100644
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ip6addrctl/Makefile,v 1.1 2003/10/30 17:46:40 ume Exp $
 
 PROG=	ip6addrctl
 MAN=	ip6addrctl.8
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8
index 59154d447b1e1..105bfc64db0a8 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.8
+++ b/usr.sbin/ip6addrctl/ip6addrctl.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ip6addrctl/ip6addrctl.8,v 1.3 2005/01/17 07:44:41 ru Exp $
 .\"
 .Dd September 25, 2001
 .Dt IP6ADDRCTL 8
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c
index 12802b468d6b9..e32b68e0d81a7 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.c
+++ b/usr.sbin/ip6addrctl/ip6addrctl.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ip6addrctl/ip6addrctl.c,v 1.3 2003/12/26 17:04:44 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
index a2b3759de5f77..4c1cab8c2967c 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
+++ b/usr.sbin/ip6addrctl/ip6addrctl.conf.sample
@@ -1,7 +1,7 @@
 # default policy table based on RFC 3484.
 # usage: ip6addrctl install path_to_this_file
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ip6addrctl/ip6addrctl.conf.sample,v 1.2 2003/12/26 17:10:58 ume Exp $
 #
 #Format:
 #Prefix       Precedence Label
diff --git a/usr.sbin/ipfwpcap/Makefile b/usr.sbin/ipfwpcap/Makefile
index d16f888c67a6a..139deb946cced 100644
--- a/usr.sbin/ipfwpcap/Makefile
+++ b/usr.sbin/ipfwpcap/Makefile
@@ -1,7 +1,7 @@
 #
 # From: Id: Makefile,v 1.2 2004/01/15 16:20:56 pkern Exp
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ipfwpcap/Makefile,v 1.2 2006/05/22 07:14:54 joel Exp $
 #
 
 PROG=	ipfwpcap
diff --git a/usr.sbin/ipfwpcap/ipfwpcap.8 b/usr.sbin/ipfwpcap/ipfwpcap.8
index 53787fcbb5456..87c6d6c8fd480 100644
--- a/usr.sbin/ipfwpcap/ipfwpcap.8
+++ b/usr.sbin/ipfwpcap/ipfwpcap.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ipfwpcap/ipfwpcap.8,v 1.4 2006/11/12 21:43:21 joel Exp $
 .\"
 .Dd May 22, 2006
 .Dt IPFWPCAP 8
diff --git a/usr.sbin/ipfwpcap/ipfwpcap.c b/usr.sbin/ipfwpcap/ipfwpcap.c
index db0f3724135d2..dfba5cb5b90f7 100644
--- a/usr.sbin/ipfwpcap/ipfwpcap.c
+++ b/usr.sbin/ipfwpcap/ipfwpcap.c
@@ -21,7 +21,7 @@
  *
  * From: Header: /local/src/local.lib/SRC/ipfwpcap/RCS/ipfwpcap.c,v 1.4 2004/01/15 16:19:07 pkern Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ipfwpcap/ipfwpcap.c,v 1.2 2006/09/04 19:30:44 sam Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 812cbc96c7651..ccdebe1b1dc83 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jail/Makefile,v 1.10 2004/11/17 10:01:48 delphij Exp $
 
 PROG=	jail
 MAN=	jail.8
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 147c210e04f6d..a76358e42a4aa 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -31,7 +31,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/jail/jail.8,v 1.84 2007/04/05 21:17:52 pjd Exp $
 .\"
 .Dd April 5, 2007
 .Dt JAIL 8
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index e21fcc847d490..77b9902a4965c 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/jail/jail.c,v 1.25 2006/05/12 15:14:43 matteo Exp $");
 
 #include <sys/param.h>
 #include <sys/jail.h>
diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile
index 2bf817cb84b6b..0031e303af38e 100644
--- a/usr.sbin/jexec/Makefile
+++ b/usr.sbin/jexec/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jexec/Makefile,v 1.2 2006/04/19 10:12:10 delphij Exp $
 
 PROG=	jexec
 MAN=	jexec.8
diff --git a/usr.sbin/jexec/jexec.8 b/usr.sbin/jexec/jexec.8
index 7dbdffedabba4..e83252eb0e0a4 100644
--- a/usr.sbin/jexec/jexec.8
+++ b/usr.sbin/jexec/jexec.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/jexec/jexec.8,v 1.4 2006/09/29 17:57:02 ru Exp $
 .\"
 .Dd April 19, 2006
 .Dt JEXEC 8
diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c
index a4c0ff832d42e..46af0fa0f9786 100644
--- a/usr.sbin/jexec/jexec.c
+++ b/usr.sbin/jexec/jexec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/jexec/jexec.c,v 1.4 2006/09/29 17:04:03 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index 3968946ce6429..d0b499b7dde9f 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/jls/Makefile,v 1.1 2003/04/09 03:04:12 mike Exp $
 
 PROG=	jls
 MAN=	jls.8
diff --git a/usr.sbin/jls/jls.8 b/usr.sbin/jls/jls.8
index 4dc68c77ad286..71aa152348c2a 100644
--- a/usr.sbin/jls/jls.8
+++ b/usr.sbin/jls/jls.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/jls/jls.8,v 1.1 2003/04/09 03:04:12 mike Exp $
 .\"
 .Dd April 8, 2003
 .Dt JLS 8
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 23a39468a9d1b..f1b157620a3ea 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/jls/jls.c,v 1.5 2005/08/19 11:03:49 pjd Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index ca1b6e697bd49..5bd41be7eb8cb 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdcontrol/Makefile,v 1.11 2003/04/04 17:49:14 obrien Exp $
 
 PROG=	kbdcontrol
 MAN=	kbdcontrol.1 kbdmap.5
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 176a7226de41d..a15bdc8d8bc49 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.42 2006/11/16 13:43:05 ru Exp $
 .\"
 .Dd November 16, 2006
 .Dt KBDCONTROL 1
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index c800233d44530..6f5e7f10ae284 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.51 2006/11/16 12:27:51 ru Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/kbdcontrol/kbdmap.5 b/usr.sbin/kbdcontrol/kbdmap.5
index 5d9776d9a039b..2a283941a3849 100644
--- a/usr.sbin/kbdcontrol/kbdmap.5
+++ b/usr.sbin/kbdcontrol/kbdmap.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdcontrol/kbdmap.5,v 1.7 2004/08/21 12:58:09 simon Exp $
 .\"
 .Dd September 11, 2000
 .Dt KBDMAP 5
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index 17e10c266f0ec..459da39693edf 100644
--- a/usr.sbin/kbdcontrol/lex.h
+++ b/usr.sbin/kbdcontrol/lex.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kbdcontrol/lex.h,v 1.14 2002/07/11 21:13:37 alfred Exp $
  */
 
 #define TNOP		256
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index 7d9fd53fa04b6..f2dd9319f361b 100644
--- a/usr.sbin/kbdcontrol/lex.l
+++ b/usr.sbin/kbdcontrol/lex.l
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kbdcontrol/lex.l,v 1.15 2002/07/11 21:12:18 alfred Exp $
  */
 
 %{
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index ec493416a5737..66e298a2f09a4 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kbdmap/Makefile,v 1.14 2005/01/28 16:08:10 ru Exp $
 
 PROG=	kbdmap
 LINKS=	${BINDIR}/kbdmap ${BINDIR}/vidfont
diff --git a/usr.sbin/kbdmap/TODO b/usr.sbin/kbdmap/TODO
index cef30f79ba1bc..fadc755727b07 100644
--- a/usr.sbin/kbdmap/TODO
+++ b/usr.sbin/kbdmap/TODO
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/kbdmap/TODO,v 1.2 2000/09/13 09:16:57 dwmalone Exp $
 
 o remember some hackers to translate Languages.phrases into
   Norwegian, Russian, Danish, Swedish
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index a359b383fb849..e501be455f3cd 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.34 2006/12/25 18:36:53 ru Exp $
 .Dd July 3, 2002
 .Dt KBDMAP 1
 .Os
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index 474553d7fa700..0d67614a99033 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.6 2007/08/27 21:56:42 murray Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/kbdmap/kbdmap.h b/usr.sbin/kbdmap/kbdmap.h
index e57fa8c3c9afe..7761c97438b92 100644
--- a/usr.sbin/kbdmap/kbdmap.h
+++ b/usr.sbin/kbdmap/kbdmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kbdmap/kbdmap.h,v 1.1 2002/07/03 14:56:08 markm Exp $
  */
 
 
diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile
index 7da462b4f3b58..3830f3086cc7a 100644
--- a/usr.sbin/kernbb/Makefile
+++ b/usr.sbin/kernbb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.10 2003/12/03 07:43:03 phk Exp $
 
 PROG=	kernbb
 MAN=	kernbb.8
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index 3d6fe02657446..f47b7406ea0e7 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kernbb/kernbb.8,v 1.19 2004/08/07 04:27:50 imp Exp $
 .\"
 .Dd May 22, 1995
 .Dt KERNBB 8
diff --git a/usr.sbin/kernbb/kernbb.c b/usr.sbin/kernbb/kernbb.c
index 1ecd5ad794c44..c8ff57662e3d0 100644
--- a/usr.sbin/kernbb/kernbb.c
+++ b/usr.sbin/kernbb/kernbb.c
@@ -9,7 +9,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.17 2004/05/29 01:22:53 tjr Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 54075da676381..18a702c353b28 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/keyserv/Makefile,v 1.14 2004/08/06 07:27:06 cperciva Exp $
 
 PROG=	keyserv
 MAN=	keyserv.8
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 45f6f6e9de78d..98518165fa9c2 100644
--- a/usr.sbin/keyserv/crypt_server.c
+++ b/usr.sbin/keyserv/crypt_server.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/crypt_server.c,v 1.9 2002/09/17 01:49:00 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8
index 726f91cc00c42..8d42fe4a24c56 100644
--- a/usr.sbin/keyserv/keyserv.8
+++ b/usr.sbin/keyserv/keyserv.8
@@ -2,7 +2,7 @@
 .\"macro stdmacro
 .\" Copyright 1989 AT&T
 .\" @(#)keyserv.8c 1.8 89/03/29 SMI;
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/keyserv/keyserv.8,v 1.11 2002/08/13 16:07:27 ru Exp $
 .\".TH KEYSERV 8C "9 September 1987"
 .Dd September 14, 1992
 .Dt KEYSERV 8
diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 9a907a7f379a1..8bff879794a45 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)keyserv.c	1.15	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/keyserv.c,v 1.11 2003/02/18 01:35:58 kris Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/keyserv/keyserv.h b/usr.sbin/keyserv/keyserv.h
index 549a41bae2538..8b7173c2bca2e 100644
--- a/usr.sbin/keyserv/keyserv.h
+++ b/usr.sbin/keyserv/keyserv.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/keyserv/keyserv.h,v 1.4 2005/02/10 09:09:18 stefanf Exp $
  */
 extern void setmodulus __P((char *modx));
 
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index 566b1c79834cf..9a0d041169b97 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)setkey.c	1.11	94/04/25 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/keyserv/setkey.c,v 1.3 1999/08/28 01:16:41 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index bf19401b494d2..a9e692523700e 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kgmon/Makefile,v 1.6 2004/08/30 03:12:49 marcel Exp $
 
 PROG=	kgmon
 MAN=	kgmon.8
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index b783d6fe19c06..05db6615e13d3 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kgmon/kgmon.8,v 1.16 2005/01/18 20:02:36 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index bdb2da269f56f..925b29c65967a 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -38,7 +38,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kgmon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.15 2006/06/29 09:18:16 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index 013c65fe33c92..b65f7e8979da8 100644
--- a/usr.sbin/kgzip/Makefile
+++ b/usr.sbin/kgzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kgzip/Makefile,v 1.11 2003/06/11 21:36:06 obrien Exp $
 
 PROG=	kgzip
 MAN=	kgzip.8
diff --git a/usr.sbin/kgzip/aouthdr.c b/usr.sbin/kgzip/aouthdr.c
index 27541e6cae11b..be49b15ca799f 100644
--- a/usr.sbin/kgzip/aouthdr.c
+++ b/usr.sbin/kgzip/aouthdr.c
@@ -24,7 +24,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/aouthdr.c,v 1.1 2000/11/04 13:02:00 rnordier Exp $
  */
 
 #include <stddef.h>
diff --git a/usr.sbin/kgzip/aouthdr.h b/usr.sbin/kgzip/aouthdr.h
index 63c2dff669047..580d73433efe0 100644
--- a/usr.sbin/kgzip/aouthdr.h
+++ b/usr.sbin/kgzip/aouthdr.h
@@ -24,7 +24,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/aouthdr.h,v 1.1 2000/11/04 13:02:00 rnordier Exp $
  */
 
 #include <a.out.h>
diff --git a/usr.sbin/kgzip/elfhdr.c b/usr.sbin/kgzip/elfhdr.c
index 12b1d5f5b3409..7ff2ac98411bc 100644
--- a/usr.sbin/kgzip/elfhdr.c
+++ b/usr.sbin/kgzip/elfhdr.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/elfhdr.c,v 1.4 2004/06/22 17:05:39 obrien Exp $
  */
 
 #include <sys/endian.h>
diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index 57333b0ad47cb..c16025aa6cd18 100644
--- a/usr.sbin/kgzip/elfhdr.h
+++ b/usr.sbin/kgzip/elfhdr.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/elfhdr.h,v 1.4 2003/02/04 16:01:00 ru Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgz.h b/usr.sbin/kgzip/kgz.h
index 3cc8e13d45533..84c45b31bb892 100644
--- a/usr.sbin/kgzip/kgz.h
+++ b/usr.sbin/kgzip/kgz.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgz.h,v 1.2 1999/08/28 01:16:43 peter Exp $
  */
 
 #ifndef _KGZ_H_
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 0ea4f0e796c16..d6f9eeff90d83 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgzcmp.c,v 1.12 2004/09/01 20:42:38 julian Exp $
  */
 
 #define	_KERNEL
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 7f810d4e64602..cb79d711bf798 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -22,7 +22,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kgzip/kgzip.8,v 1.10 2005/01/18 20:02:36 ru Exp $
 .\"
 .Dd July 19, 1999
 .Dt KGZIP 8
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index d6c48f2069e44..b21b35d3ba7b9 100644
--- a/usr.sbin/kgzip/kgzip.c
+++ b/usr.sbin/kgzip/kgzip.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/kgzip/kgzip.c,v 1.8 2003/06/11 21:37:19 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/kgzip.h b/usr.sbin/kgzip/kgzip.h
index f04f2a4cf14f9..1377f34b3c12d 100644
--- a/usr.sbin/kgzip/kgzip.h
+++ b/usr.sbin/kgzip/kgzip.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgzip.h,v 1.3 2000/11/04 13:02:00 rnordier Exp $
  */
 
 #include "kgz.h"
diff --git a/usr.sbin/kgzip/kgzld.c b/usr.sbin/kgzip/kgzld.c
index 11a20a5a274e9..be8437b61c235 100644
--- a/usr.sbin/kgzip/kgzld.c
+++ b/usr.sbin/kgzip/kgzld.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/kgzld.c,v 1.5 2004/06/22 17:05:39 obrien Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kgzip/xio.c b/usr.sbin/kgzip/xio.c
index 64481ffb6ce58..a3774086f1fa2 100644
--- a/usr.sbin/kgzip/xio.c
+++ b/usr.sbin/kgzip/xio.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kgzip/xio.c,v 1.3 2000/11/20 20:35:35 rnordier Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile
index 33337fd8a180e..0df71554a1c7d 100644
--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.10 2006/08/04 21:29:39 marcel Exp $
 
 PROG=	kldxref
 MAN=	kldxref.8
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index 276771d1985bf..acb3d0ec90029 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef.c,v 1.9 2005/12/18 04:52:37 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kldxref/ef.h b/usr.sbin/kldxref/ef.h
index 5bb19857507ae..56895cd700b88 100644
--- a/usr.sbin/kldxref/ef.h
+++ b/usr.sbin/kldxref/ef.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/kldxref/ef.h,v 1.6 2005/12/18 04:52:37 marcel Exp $ */
 
 #ifndef _EF_H_
 #define _EF_H_
diff --git a/usr.sbin/kldxref/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c
index 5a1d192a3defd..b013e621b94e2 100644
--- a/usr.sbin/kldxref/ef_amd64.c
+++ b/usr.sbin/kldxref/ef_amd64.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_amd64.c,v 1.3 2005/12/18 04:52:37 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c
index 49173543ae401..be2a7715844d0 100644
--- a/usr.sbin/kldxref/ef_i386.c
+++ b/usr.sbin/kldxref/ef_i386.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_i386.c,v 1.3 2005/12/18 04:52:37 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_nop.c b/usr.sbin/kldxref/ef_nop.c
index cbbd43cc23c9b..9f7623e0126de 100644
--- a/usr.sbin/kldxref/ef_nop.c
+++ b/usr.sbin/kldxref/ef_nop.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_nop.c,v 1.3 2004/08/28 19:31:10 iedowse Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index f58fa371f32ed..b9af769253122 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_obj.c,v 1.5 2006/01/12 08:01:38 jasone Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c
index a96a727a3ebae..0cbd0f0f32841 100644
--- a/usr.sbin/kldxref/ef_powerpc.c
+++ b/usr.sbin/kldxref/ef_powerpc.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_powerpc.c,v 1.3 2005/12/18 04:52:37 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/ef_sparc64.c b/usr.sbin/kldxref/ef_sparc64.c
index 7ba2a43ba7ced..695c5e25cbc7c 100644
--- a/usr.sbin/kldxref/ef_sparc64.c
+++ b/usr.sbin/kldxref/ef_sparc64.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/ef_sparc64.c,v 1.5 2005/12/18 04:52:37 marcel Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/kldxref/fileformat b/usr.sbin/kldxref/fileformat
index 2eddcca4a14d9..b7be2621695ba 100644
--- a/usr.sbin/kldxref/fileformat
+++ b/usr.sbin/kldxref/fileformat
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.sbin/kldxref/fileformat,v 1.1 2001/09/11 01:13:15 peter Exp $
 
     linker.hints file consists from the one or more records. First record of
 file is special and determines its version:
diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8
index a6174b6bd1943..8c6274fdc41d1 100644
--- a/usr.sbin/kldxref/kldxref.8
+++ b/usr.sbin/kldxref/kldxref.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/kldxref/kldxref.8,v 1.8 2004/06/01 09:34:04 ru Exp $
 .\"
 .Dd October 9, 2001
 .Dt KLDXREF 8
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index a7c065474de6d..5be4551cb1b43 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/kldxref/kldxref.c,v 1.14 2006/08/05 18:22:11 imp Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index 017aadf277261..7ddcd72752b4f 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lastlogin/Makefile,v 1.5 2001/07/20 06:20:31 obrien Exp $
 
 PROG=	lastlogin
 MAN=	lastlogin.8
diff --git a/usr.sbin/lastlogin/lastlogin.8 b/usr.sbin/lastlogin/lastlogin.8
index 03a587d0eccca..af9b07bc7692f 100644
--- a/usr.sbin/lastlogin/lastlogin.8
+++ b/usr.sbin/lastlogin/lastlogin.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lastlogin/lastlogin.8,v 1.4 2004/07/02 23:12:46 ru Exp $
 .\"	$NetBSD: lastlogin.8,v 1.3 1998/02/06 06:20:39 perry Exp $
 .\"
 .\" Copyright (c) 1996 John M. Vinopal
diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c
index 21c82c3636dd5..0323c5baf666b 100644
--- a/usr.sbin/lastlogin/lastlogin.c
+++ b/usr.sbin/lastlogin/lastlogin.c
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.sbin/lastlogin/lastlogin.c,v 1.8 2002/07/11 18:26:39 alfred Exp $");
 __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $");
 #endif
 
diff --git a/usr.sbin/lmcconfig/Makefile b/usr.sbin/lmcconfig/Makefile
index b75ec2c8ce8b3..c0ddcc5d3ee85 100644
--- a/usr.sbin/lmcconfig/Makefile
+++ b/usr.sbin/lmcconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lmcconfig/Makefile,v 1.2 2006/09/01 09:24:28 ru Exp $
 
 PROG=	lmcconfig
 MAN=	lmcconfig.8
diff --git a/usr.sbin/lmcconfig/lmcconfig.8 b/usr.sbin/lmcconfig/lmcconfig.8
index ad3ef2773287d..ccac541931863 100644
--- a/usr.sbin/lmcconfig/lmcconfig.8
+++ b/usr.sbin/lmcconfig/lmcconfig.8
@@ -40,7 +40,7 @@
 .\" this program; if not, write to the Free Software Foundation, Inc., 59 
 .\" Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lmcconfig/lmcconfig.8,v 1.3 2005/12/13 17:07:52 ru Exp $
 .\"
 .Dd October 3, 2005
 .Dt LMCCONFIG 8
diff --git a/usr.sbin/lmcconfig/lmcconfig.c b/usr.sbin/lmcconfig/lmcconfig.c
index f94c4d1bb6cc5..662a5db4fbbde 100644
--- a/usr.sbin/lmcconfig/lmcconfig.c
+++ b/usr.sbin/lmcconfig/lmcconfig.c
@@ -62,7 +62,7 @@
  *    cc -o lmcconfig lmcconfig.c
  * Install the executable program in /usr/local/sbin/lmcconfig.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lmcconfig/lmcconfig.c,v 1.1 2005/10/03 07:09:41 scottl Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index 3cd0eb64643ae..267cf5a9a1dbe 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile,v 1.10 2003/06/12 03:32:21 gad Exp $
 
 SUBDIR=	common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \
 	filters filters.ru SMM.doc
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index ab667dd119a1a..4739d4d771bc9 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/Makefile.inc,v 1.11 2006/07/27 14:52:12 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/lpr/SMM.doc/Makefile b/usr.sbin/lpr/SMM.doc/Makefile
index d80c8ce60d178..5120df600afa5 100644
--- a/usr.sbin/lpr/SMM.doc/Makefile
+++ b/usr.sbin/lpr/SMM.doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/SMM.doc/Makefile,v 1.5 2004/10/24 15:33:03 ru Exp $
 
 BINDIR=	/usr/share/doc
 VOLUME=	smm/07.lpd
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index ffffffbb2bd19..663cbac3f4b92 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/chkprintcap/Makefile,v 1.12 2002/06/23 20:57:16 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index c2524a159c701..f64d61d90ebfd 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.8,v 1.8 2004/07/02 23:12:46 ru Exp $
 .Dd November 30, 1997
 .Dt CHKPRINTCAP 8
 .Os
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c
index 91e8299d5826a..b2889a3162dbd 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -31,7 +31,7 @@ static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/chkprintcap/chkprintcap.c,v 1.8 2003/07/15 08:48:30 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index da2828290b8be..2dbc7b62db43d 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -32,7 +32,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/chkprintcap/skimprintcap.c,v 1.3 2003/07/15 08:48:30 gad Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.h b/usr.sbin/lpr/chkprintcap/skimprintcap.h
index af74b48a5a468..0be910cfa985d 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.h
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/chkprintcap/skimprintcap.h,v 1.1 2001/12/15 23:35:55 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index 14db0b77b798e..dc3e59ccf4868 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/common_source/Makefile,v 1.11 2004/10/24 15:33:03 ru Exp $
 
 #
 # Library of internal routines for the print spooler suite.
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index d28ac1fcdd95e..1804bb09c4cae 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)common.c	8.5 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/common.c,v 1.34 2004/12/31 00:36:28 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c
index 20a153f7698bc..bef89b4549be6 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.c
+++ b/usr.sbin/lpr/common_source/ctlinfo.c
@@ -32,7 +32,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.c,v 1.10 2004/12/31 00:18:42 gad Exp $");
 
 /*
  * ctlinfo - This collection of routines will know everything there is to
diff --git a/usr.sbin/lpr/common_source/ctlinfo.h b/usr.sbin/lpr/common_source/ctlinfo.h
index 95fe572478427..4a1ac9f70370e 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.h
+++ b/usr.sbin/lpr/common_source/ctlinfo.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/ctlinfo.h,v 1.3 2003/07/14 05:15:21 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 6c03621d57100..f9d76987fc275 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)displayq.c	8.4 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/displayq.c,v 1.26 2004/12/31 00:36:28 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h
index 19b13319fd7f8..f9686d5b5785e 100644
--- a/usr.sbin/lpr/common_source/lp.cdefs.h
+++ b/usr.sbin/lpr/common_source/lp.cdefs.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.cdefs.h,v 1.1 2003/07/14 05:13:55 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 891ed2f1bda39..b009c6cb9e295 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	From: @(#)lp.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.h,v 1.25 2004/12/31 00:36:28 gad Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index 6f018b0756a1a..abec49e8f5097 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lp.local.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/lp.local.h,v 1.4 2003/08/01 00:06:41 gad Exp $
  */
 
 /*
diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c
index de572f86a2491..c17cdcd8a0a41 100644
--- a/usr.sbin/lpr/common_source/matchjobs.c
+++ b/usr.sbin/lpr/common_source/matchjobs.c
@@ -33,7 +33,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.c,v 1.5 2004/12/31 00:36:28 gad Exp $");
 
 /*
  * movejobs.c - The lpc commands which move jobs around.
diff --git a/usr.sbin/lpr/common_source/matchjobs.h b/usr.sbin/lpr/common_source/matchjobs.h
index 6e4b9ffe20058..b67f951f170c0 100644
--- a/usr.sbin/lpr/common_source/matchjobs.h
+++ b/usr.sbin/lpr/common_source/matchjobs.h
@@ -30,7 +30,7 @@
  * or FreeBSD, Inc.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/common_source/matchjobs.h,v 1.2 2003/07/14 05:15:21 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 2a1e0c80a5dfc..b5a977852613a 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -39,7 +39,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/net.c,v 1.9 2005/05/13 16:43:28 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 0d3644b1b7958..e5ca28840b745 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)printcap.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/printcap.c,v 1.11 2003/07/14 20:17:55 gad Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c
index b650e5c76c052..e7d2c536eb4d2 100644
--- a/usr.sbin/lpr/common_source/request.c
+++ b/usr.sbin/lpr/common_source/request.c
@@ -31,7 +31,7 @@ static const char copyright[] =
 	"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/request.c,v 1.5 2003/07/14 20:20:58 gad Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index d6fd6148ccddb..3d567d7ab70a5 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)rmjob.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/rmjob.c,v 1.21 2004/12/31 00:36:28 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/uio.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 08c2e6f54cf8a..dcb1c9a9c3a43 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)startdaemon.c	8.2 (Berkeley) 4/17/94";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/common_source/startdaemon.c,v 1.12 2003/07/14 20:20:58 gad Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile
index ee15541fae74e..f8d01950f233d 100644
--- a/usr.sbin/lpr/filters.ru/Makefile
+++ b/usr.sbin/lpr/filters.ru/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/Makefile,v 1.7 2002/04/22 10:46:12 ru Exp $
 
 SUBDIR=	koi2alt koi2855
 
diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc
index a312e73941ec5..8ab5bc36259f1 100644
--- a/usr.sbin/lpr/filters.ru/Makefile.inc
+++ b/usr.sbin/lpr/filters.ru/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/Makefile.inc,v 1.2 2001/07/20 06:19:55 obrien Exp $
 
 BINDIR=	/usr/libexec/lpr/ru
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index 361783ed24e45..12152a2711122 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.7 2006/03/09 19:52:44 gad Exp $
 
 PROG=	koi2855
 NO_MAN=
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 8ecc3eff6dae0..9485f25fc2d43 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -26,7 +26,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/koi2855.c,v 1.4 2003/07/15 07:01:01 gad Exp $");
 
 /*
  * KOI8-R -> CP855 conversion filter (Russian character sets)
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index e410d9a7cd9b4..ef8d71196d4af 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.7 2006/03/09 19:52:44 gad Exp $
 
 PROG=	koi2alt
 NO_MAN=
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index a7a5b5dc54087..392bfdcd8722e 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
+++ b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
@@ -25,7 +25,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c,v 1.3 2003/07/15 07:01:01 gad Exp $");
 
 /*
  * KOI8-R -> CP866 conversion filter (Russian character sets)
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index b55b536c1ce6f..6534772c01089 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.7 2006/03/09 19:52:43 gad Exp $
 
 BINDIR=	/usr/libexec/lpr
 
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 41879a2ee58d1..4b397a9663b40 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)lpf.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/filters/lpf.c,v 1.9 2003/07/15 07:01:01 gad Exp $");
 
 /*
  * 	filter which reads the output of nroff and converts lines
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index 2fcec43ec80b5..32cd076fef555 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/Makefile,v 1.8 2001/07/20 06:19:55 obrien Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 8ed842d55e57b..feb6f155f3e35 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.18 2004/07/02 23:12:46 ru Exp $
 .\"
 .Dd January 22, 1995
 .Dt LP 1
diff --git a/usr.sbin/lpr/lp/lp.sh b/usr.sbin/lpr/lp/lp.sh
index e7c06882c0f90..b0e91cf9b9cc0 100644
--- a/usr.sbin/lpr/lp/lp.sh
+++ b/usr.sbin/lpr/lp/lp.sh
@@ -36,7 +36,7 @@
 #
 # Posix 1003.2 compliant print spooler interface.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lp/lp.sh,v 1.7 2000/03/08 10:02:11 sheldonh Exp $
 #
 
 ncopies=""
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index f050857dd0316..761549774789f 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpc/Makefile,v 1.12 2002/07/17 00:51:19 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 06ea4b0f7e8b9..b78c694bbf4cc 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/cmds.c,v 1.32 2003/07/14 22:24:28 gad Exp $");
 
 /*
  * lpc -- line printer control program -- commands:
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 21dc6e1c99034..5ca02f74a82dd 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/cmdtab.c,v 1.11 2003/07/14 22:24:28 gad Exp $");
 
 #include "lpc.h"
 #include "extern.h"
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index fe82d460ade62..8d53150254a49 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -33,7 +33,7 @@
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpc/extern.h,v 1.12 2003/07/14 22:24:28 gad Exp $
  */
 
 
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index ea792413e38c0..fd97ec293ab77 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpc.8	8.5 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.24 2005/02/13 22:25:28 ru Exp $
 .\"
 .Dd July 16, 2002
 .Dt LPC 8
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index e279f3ab5a085..cc0f8b36e47b9 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/lpc.c,v 1.31 2005/10/19 16:37:52 stefanf Exp $");
 
 #include <sys/param.h>
 
diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index 73e4cc52764cd..1a56150db1156 100644
--- a/usr.sbin/lpr/lpc/lpc.h
+++ b/usr.sbin/lpr/lpc/lpc.h
@@ -32,7 +32,7 @@
  *
  *	@(#)lpc.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpc/lpc.h,v 1.5 2002/06/15 22:51:58 gad Exp $
  */
 
 /*
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index 60c9b38d57089..ea78ffbef51ee 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -33,7 +33,7 @@
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpc/movejobs.c,v 1.3 2003/07/14 22:24:28 gad Exp $");
 
 /*
  * movejobs.c - The lpc commands which move jobs around.
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 9af36556604c0..57ac27660b43c 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpd/Makefile,v 1.14 2002/06/23 20:57:17 gad Exp $
 
 PROG=	lpd
 MAN=	lpd.8
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 14cb9e1bcffc4..a4ccbd1dfb593 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      From: @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/lpr/lpd/extern.h,v 1.9 2003/07/14 15:54:40 gad Exp $
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8
index 7c7afab72f5d3..eaac1454fca84 100644
--- a/usr.sbin/lpr/lpd/lpd.8
+++ b/usr.sbin/lpr/lpd/lpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.31 2005/02/13 22:25:28 ru Exp $
 .\"
 .Dd June 6, 2001
 .Dt LPD 8
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 51a228b7578a1..67aaed97a4d73 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/lpd.c,v 1.41 2005/05/13 16:43:28 ume Exp $");
 
 /*
  * lpd -- line printer daemon.
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 5ebaabdbeef8b..3a2349f1f8567 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/lpdchar.c,v 1.7 2003/07/14 19:59:33 gad Exp $");
 
 /*
  *	Character set for line printer daemon
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 8a05212128a33..58a510aaf4c2b 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/modes.c,v 1.10 2003/07/14 19:59:33 gad Exp $");
 
 #include <stddef.h>
 #include <string.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 58efe6db272b0..b98215a1d7bc8 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/printjob.c,v 1.64 2006/07/07 01:12:26 gad Exp $");
 
 /*
  * printjob -- print jobs in the queue.
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 13519a81b9d6e..a0ea7ad49a245 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpd/recvjob.c,v 1.32 2007/03/06 09:32:40 kevlo Exp $");
 
 /*
  * Receive printer jobs from the network, queue them and
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 4df437e06c326..b0ea2aefd50c4 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpq/Makefile,v 1.12 2002/06/23 20:57:17 gad Exp $
 
 BINDIR=	/usr/bin
 
diff --git a/usr.sbin/lpr/lpq/lpq.1 b/usr.sbin/lpr/lpq/lpq.1
index 3678256bb38de..1c257e42f6b96 100644
--- a/usr.sbin/lpr/lpq/lpq.1
+++ b/usr.sbin/lpr/lpq/lpq.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpq.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpq/lpq.1,v 1.12 2005/01/18 20:02:37 ru Exp $
 .\"
 .Dd April 28, 1995
 .Dt LPQ 1
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index e1809cfe643b2..cffd0fe81ceb1 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpq/lpq.c,v 1.12 2003/07/15 08:48:30 gad Exp $");
 
 /*
  * Spool Queue examination program
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 1ff376de4cd4a..63d8e9179008e 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lpr/Makefile,v 1.12 2002/06/23 20:57:18 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index 00146ac52d4b1..17866730f2eb2 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.21 2005/01/18 20:02:37 ru Exp $
 .\" "
 .Dd June 6, 1993
 .Dt LPR 1
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 98e9cea4327a8..3443841e5bb42 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)lpr.c	8.4 (Berkeley) 4/28/95";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lpr/lpr.c,v 1.44 2003/07/15 08:40:31 gad Exp $");
 
 /*
  *      lpr -- off line print
diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5
index 1ea6fea53ba13..1f1f62515a03f 100644
--- a/usr.sbin/lpr/lpr/printcap.5
+++ b/usr.sbin/lpr/lpr/printcap.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)printcap.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/printcap.5,v 1.33 2004/07/02 23:12:47 ru Exp $
 .\"
 .Dd October 11, 2000
 .Dt PRINTCAP 5
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index 44bc93ac27ecb..63a9fe6277d8f 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lprm/Makefile,v 1.13 2002/06/23 20:57:18 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index a19461448a818..11d04654d66eb 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lprm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lprm/lprm.1,v 1.14 2005/01/18 20:02:37 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt LPRM 1
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 47f233c4802a7..d88d2713bd046 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lprm.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lprm/lprm.c,v 1.10 2003/07/15 08:48:30 gad Exp $");
 
 /*
  * lprm - remove the current user's spool entry
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 65b1c7c8fef81..348930d1176ae 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/lptest/Makefile,v 1.6 2003/07/15 08:45:06 gad Exp $
 
 PROG=	lptest
 
diff --git a/usr.sbin/lpr/lptest/lptest.1 b/usr.sbin/lpr/lptest/lptest.1
index c34934e6a42f6..7f36f09ce893a 100644
--- a/usr.sbin/lpr/lptest/lptest.1
+++ b/usr.sbin/lpr/lptest/lptest.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lptest.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/lptest/lptest.1,v 1.6 2002/04/20 12:26:36 charnier Exp $
 .\"
 .Dd December 30, 1993
 .Dt LPTEST 1
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 304296392e92e..994c27458fb11 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)lptest.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/lptest/lptest.c,v 1.6 2004/09/27 08:24:05 phk Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index bd895a71a3054..e2487a6cd8653 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lpr/pac/Makefile,v 1.11 2002/06/23 20:57:18 gad Exp $
 
 .PATH: ${.CURDIR}/../common_source
 
diff --git a/usr.sbin/lpr/pac/pac.8 b/usr.sbin/lpr/pac/pac.8
index b6e10a0c739b8..c693c707754a9 100644
--- a/usr.sbin/lpr/pac/pac.8
+++ b/usr.sbin/lpr/pac/pac.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pac.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lpr/pac/pac.8,v 1.9 2005/01/18 20:02:37 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt PAC 8
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 34a247f551092..3d21521efafa9 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lpr/pac/pac.c,v 1.15 2003/07/15 08:48:30 gad Exp $");
 
 /*
  * Do Printer accounting summary.
diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile
index 3f7a939a7e170..17de12916f3b6 100644
--- a/usr.sbin/lptcontrol/Makefile
+++ b/usr.sbin/lptcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/lptcontrol/Makefile,v 1.7 2004/10/01 20:04:20 schweikh Exp $
 
 PROG=	lptcontrol
 MAN=	lptcontrol.8
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index 772307884d8b0..8bd6a308d7a22 100644
--- a/usr.sbin/lptcontrol/lptcontrol.8
+++ b/usr.sbin/lptcontrol/lptcontrol.8
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.23 2005/01/18 20:02:37 ru Exp $
 .Dd October 1, 2004
 .Dt LPTCONTROL 8
 .Os
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 62e5b85478bac..ff809d454798f 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.16 2005/01/25 14:25:18 ssouhlal Exp $");
 
 #include <dev/ppbus/lptio.h>
 
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index 86137b09c6978..9ab5c9e3fe6a0 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 9/21/96
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mailstats/Makefile,v 1.11 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/mailstats
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 252f5e772413f..81661569768e5 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mailwrapper/Makefile,v 1.15 2006/06/06 05:01:12 delphij Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 587826bcc141b..9758b1cf064ac 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -1,6 +1,6 @@
 .\"	$NetBSD: mailwrapper.8,v 1.11 2002/02/08 01:38:50 ross Exp $
 .\"	$OpenBSD: mailwrapper.8,v 1.8 2003/06/12 12:59:51 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.14 2006/09/29 17:57:02 ru Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index d696d25f3ac62..ec5c74e7bfde7 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.11 2006/08/07 10:29:18 delphij Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index d8ae498ce0048..bb224646363e3 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/mailwrapper/pathnames.h,v 1.3 2000/01/10 03:20:13 imp Exp $ */
 
 /*
  * Copyright (c) 1998
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index 5d30c67ae6340..8d728eb3a2f8d 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/10/97
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/makemap/Makefile,v 1.12 2005/06/10 06:12:52 des Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/makemap
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 9e0c12ecb9a9b..1b99f6a3ab3f8 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/Makefile,v 1.12 2001/04/07 11:21:28 ru Exp $
 
 SCRIPTS=manctl.sh
 MAN=	manctl.8
diff --git a/usr.sbin/manctl/manctl.8 b/usr.sbin/manctl/manctl.8
index b8e001dbc872f..d906f8c544154 100644
--- a/usr.sbin/manctl/manctl.8
+++ b/usr.sbin/manctl/manctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/manctl/manctl.8,v 1.13 2002/07/14 14:44:10 charnier Exp $
 .Dd January 1, 1996
 .Dt MANCTL 8
 .Os
diff --git a/usr.sbin/manctl/manctl.sh b/usr.sbin/manctl/manctl.sh
index 23e20870ab95f..1f435f18c87d0 100644
--- a/usr.sbin/manctl/manctl.sh
+++ b/usr.sbin/manctl/manctl.sh
@@ -30,7 +30,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/manctl/manctl.sh,v 1.12 2001/01/20 04:30:41 jedgar Exp $
 #
 # manctl: 
 #	a utility for manipulating manual pages
diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile
index 25009dbb478f8..0aa4c5bdf5309 100644
--- a/usr.sbin/memcontrol/Makefile
+++ b/usr.sbin/memcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/memcontrol/Makefile,v 1.6 2005/01/07 12:06:30 delphij Exp $
 
 PROG=	memcontrol
 MAN=	memcontrol.8
diff --git a/usr.sbin/memcontrol/memcontrol.8 b/usr.sbin/memcontrol/memcontrol.8
index ad0e5330671b2..9fd6a7be8b301 100644
--- a/usr.sbin/memcontrol/memcontrol.8
+++ b/usr.sbin/memcontrol/memcontrol.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.10 2002/11/27 15:31:08 ru Exp $
 .\"
 .Dd September 15, 2002
 .Dt MEMCONTROL 8
diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index b6cb25f000e11..6620f7d5274df 100644
--- a/usr.sbin/memcontrol/memcontrol.c
+++ b/usr.sbin/memcontrol/memcontrol.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/memcontrol/memcontrol.c,v 1.10 2005/03/29 20:17:47 anholt Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
index 257fbeba4ca47..45e7d7ffbf887 100644
--- a/usr.sbin/mergemaster/Makefile
+++ b/usr.sbin/mergemaster/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/Makefile,v 1.9 2003/06/04 09:38:04 dougb Exp $
 
 SCRIPTS=mergemaster.sh
 MAN=	mergemaster.8
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 63cf2ab1ee88f..4a350b7388bd2 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.36 2006/04/30 22:09:47 gordon Exp $
 .\"
 .Dd February 4, 2006
 .Dt MERGEMASTER 8
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index e21d466fc9e8b..03f6ed0391763 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -8,7 +8,7 @@
 # Copyright 1998-2004 Douglas Barton
 # DougB@FreeBSD.org
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.54.4.1 2007/12/24 06:33:22 dougb Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile
index e86fceec116e6..df0e6884c5d55 100644
--- a/usr.sbin/mixer/Makefile
+++ b/usr.sbin/mixer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mixer/Makefile,v 1.10 2001/07/20 06:20:00 obrien Exp $
 
 PROG=	mixer
 MAN=	mixer.8
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 381c6ed11d99a..fb0f7fe8f56e2 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.25 2007/05/09 05:33:54 maxim Exp $
 .\"
 .Dd April 13, 2005
 .Dt MIXER 8
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 36cbddfc8be48..3917912bf51a8 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.23 2006/01/01 20:19:49 ariff Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 0e9da4926104f..3c240d72a3e30 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mld6query/Makefile,v 1.6 2006/07/27 15:31:11 yar Exp $
 
 PROG=	mld6query
 MAN=	mld6query.8
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index 1f73203433e41..f8c8db5a7f01c 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -1,5 +1,5 @@
 /*	$KAME: mld6.c,v 1.15 2003/04/02 11:29:54 suz Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/mld6query/mld6.c,v 1.3 2003/10/24 18:26:30 ume Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
diff --git a/usr.sbin/mld6query/mld6query.8 b/usr.sbin/mld6query/mld6query.8
index 8ec867f44f43c..d6652db58ecad 100644
--- a/usr.sbin/mld6query/mld6query.8
+++ b/usr.sbin/mld6query/mld6query.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mld6query/mld6query.8,v 1.6 2005/02/09 18:04:40 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt MLD6QUERY 8
diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile
index 95964a5854ffd..ab2985ded66ae 100644
--- a/usr.sbin/mlxcontrol/Makefile
+++ b/usr.sbin/mlxcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mlxcontrol/Makefile,v 1.5 2001/07/20 06:20:01 obrien Exp $
 
 PROG=	mlxcontrol
 MAN=	mlxcontrol.8
diff --git a/usr.sbin/mlxcontrol/command.c b/usr.sbin/mlxcontrol/command.c
index a3647676c330f..5b72a5b8ef241 100644
--- a/usr.sbin/mlxcontrol/command.c
+++ b/usr.sbin/mlxcontrol/command.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/command.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/config.c b/usr.sbin/mlxcontrol/config.c
index a52565840de48..0efcbefc88518 100644
--- a/usr.sbin/mlxcontrol/config.c
+++ b/usr.sbin/mlxcontrol/config.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/config.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/interface.c b/usr.sbin/mlxcontrol/interface.c
index 5cbf7b609aa49..dfb0e58d00a91 100644
--- a/usr.sbin/mlxcontrol/interface.c
+++ b/usr.sbin/mlxcontrol/interface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/interface.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.8 b/usr.sbin/mlxcontrol/mlxcontrol.8
index 542f9948b4d73..f085741b1ac39 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.8
+++ b/usr.sbin/mlxcontrol/mlxcontrol.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mlxcontrol/mlxcontrol.8,v 1.9 2005/01/18 20:02:38 ru Exp $
 .\"
 .Dd April 10, 2000
 .Dt MLXCONTROL 8
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h
index ab0f2ab4f8190..7e6c4dd2856aa 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.h
+++ b/usr.sbin/mlxcontrol/mlxcontrol.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/mlxcontrol.h,v 1.4 2004/10/02 16:42:33 stefanf Exp $
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index 37cd2b7e3143e..96209b6a5d212 100644
--- a/usr.sbin/mlxcontrol/util.c
+++ b/usr.sbin/mlxcontrol/util.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/mlxcontrol/util.c,v 1.2 2000/04/11 23:04:17 msmith Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mount_nwfs/Makefile b/usr.sbin/mount_nwfs/Makefile
index 8fbb9a8c3ba47..ba18c2a8ef916 100644
--- a/usr.sbin/mount_nwfs/Makefile
+++ b/usr.sbin/mount_nwfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_nwfs/Makefile,v 1.7 2004/02/23 20:21:21 johan Exp $
 
 PROG=	mount_nwfs
 SRCS=	mount_nwfs.c getmntopts.c
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.8 b/usr.sbin/mount_nwfs/mount_nwfs.8
index 3946f71615f01..c1852a2521099 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.8
+++ b/usr.sbin/mount_nwfs/mount_nwfs.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mount_nwfs/mount_nwfs.8,v 1.21 2005/02/13 22:25:28 ru Exp $
 .Dd October 14, 1999
 .Dt MOUNT_NWFS 8
 .Os
diff --git a/usr.sbin/mount_nwfs/mount_nwfs.c b/usr.sbin/mount_nwfs/mount_nwfs.c
index 98a5f8e7e2478..028f804745882 100644
--- a/usr.sbin/mount_nwfs/mount_nwfs.c
+++ b/usr.sbin/mount_nwfs/mount_nwfs.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mount_nwfs/mount_nwfs.c,v 1.9 2006/05/11 17:23:57 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index 991a36f3e549c..a2895e6152a1b 100644
--- a/usr.sbin/mount_portalfs/Makefile
+++ b/usr.sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_portalfs/Makefile,v 1.21 2007/01/20 23:24:11 rodrigc Exp $
 
 PROG=	mount_portalfs
 SRCS=	mount_portalfs.c activate.c conf.c cred.c getmntopts.c pt_conf.c \
diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index 7d35d48875276..302dc6c0267b4 100644
--- a/usr.sbin/mount_portalfs/activate.c
+++ b/usr.sbin/mount_portalfs/activate.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/activate.c,v 1.12 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <errno.h>
 #include <string.h>
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index f6b34bd39f44a..1d0f7963de524 100644
--- a/usr.sbin/mount_portalfs/conf.c
+++ b/usr.sbin/mount_portalfs/conf.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/conf.c,v 1.11 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <errno.h>
 #include <limits.h>
diff --git a/usr.sbin/mount_portalfs/cred.c b/usr.sbin/mount_portalfs/cred.c
index 9e5d9f3f222b3..08f2d6e1abd0b 100644
--- a/usr.sbin/mount_portalfs/cred.c
+++ b/usr.sbin/mount_portalfs/cred.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/cred.c,v 1.1 2005/03/11 08:39:58 dds Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.8 b/usr.sbin/mount_portalfs/mount_portalfs.8
index ffbcb0860796e..4ad961ed55161 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.8
+++ b/usr.sbin/mount_portalfs/mount_portalfs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mount_portalfs/mount_portalfs.8,v 1.19 2005/06/14 12:26:35 ru Exp $
 .\"
 .Dd March 11, 2005
 .Dt MOUNT_PORTALFS 8
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index 9a8c49c6787e7..baac59d376f4e 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/mount_portalfs.c,v 1.24 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/mount_portalfs/pathnames.h b/usr.sbin/mount_portalfs/pathnames.h
index 9373c7d75de1d..5dbf2cf229506 100644
--- a/usr.sbin/mount_portalfs/pathnames.h
+++ b/usr.sbin/mount_portalfs/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mount_portalfs/pathnames.h,v 1.6 2004/08/07 04:27:50 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/mount_portalfs/portal.conf b/usr.sbin/mount_portalfs/portal.conf
index 398cfb29936d2..bae6560df9042 100644
--- a/usr.sbin/mount_portalfs/portal.conf
+++ b/usr.sbin/mount_portalfs/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_portalfs/portal.conf,v 1.5 2005/03/10 22:10:16 dds Exp $
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/usr.sbin/mount_portalfs/portald.h b/usr.sbin/mount_portalfs/portald.h
index 5bd63ed7555da..9580ba1eb8929 100644
--- a/usr.sbin/mount_portalfs/portald.h
+++ b/usr.sbin/mount_portalfs/portald.h
@@ -32,7 +32,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mount_portalfs/portald.h,v 1.11 2007/01/20 21:35:11 rodrigc Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index 7f1e8175eaba5..8291de89e8eca 100644
--- a/usr.sbin/mount_portalfs/pt_conf.c
+++ b/usr.sbin/mount_portalfs/pt_conf.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_conf.c,v 1.9 2005/03/10 22:10:16 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/mount_portalfs/pt_exec.c b/usr.sbin/mount_portalfs/pt_exec.c
index 86a47e9619cd0..cce63d20373f8 100644
--- a/usr.sbin/mount_portalfs/pt_exec.c
+++ b/usr.sbin/mount_portalfs/pt_exec.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_exec.c,v 1.8 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/usr.sbin/mount_portalfs/pt_file.c b/usr.sbin/mount_portalfs/pt_file.c
index 270f8123e6f4a..9e699d830aa7c 100644
--- a/usr.sbin/mount_portalfs/pt_file.c
+++ b/usr.sbin/mount_portalfs/pt_file.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_file.c,v 1.13 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/mount_portalfs/pt_pipe.c b/usr.sbin/mount_portalfs/pt_pipe.c
index fd54b7ed03158..f7588fcfabb00 100644
--- a/usr.sbin/mount_portalfs/pt_pipe.c
+++ b/usr.sbin/mount_portalfs/pt_pipe.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_pipe.c,v 1.3 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index d9a2a1eef7193..8caa4f3f2e61e 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_tcp.c,v 1.13 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcplisten.c b/usr.sbin/mount_portalfs/pt_tcplisten.c
index b7febb1913987..21e6b5a4b8eeb 100644
--- a/usr.sbin/mount_portalfs/pt_tcplisten.c
+++ b/usr.sbin/mount_portalfs/pt_tcplisten.c
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mount_portalfs/pt_tcplisten.c,v 1.5 2007/01/20 21:35:11 rodrigc Exp $");
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index ade4fad2f1cf0..74e3aa7848178 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mount_smbfs/Makefile,v 1.8 2005/11/16 02:47:12 rodrigc Exp $
 
 PROG=	mount_smbfs
 SRCS=	mount_smbfs.c getmntopts.c
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index c141d8a0c8d09..92ffa0c4b5f5d 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mountd/Makefile,v 1.17 2006/05/23 17:10:17 rodrigc Exp $
 
 PROG=	mountd
 SRCS=	mountd.c getmntopts.c
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index 5a078fb640e42..7718808884162 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mountd/exports.5,v 1.28 2006/01/29 08:44:05 jkoshy Exp $
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index c6d8d1497998b..3d5548e07fb95 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mountd/mountd.8,v 1.30 2007/02/03 00:15:46 pjd Exp $
 .\"
 .Dd February 3, 2007
 .Dt MOUNTD 8
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index f7cb72698f924..169c247fbc9a1 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mountd.c	8.15 (Berkeley) 5/1/95";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.94 2007/04/13 10:25:49 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.sbin/mountd/netgroup.5 b/usr.sbin/mountd/netgroup.5
index c94f8807d5651..a09487efeeabe 100644
--- a/usr.sbin/mountd/netgroup.5
+++ b/usr.sbin/mountd/netgroup.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mountd/netgroup.5,v 1.14 2005/01/18 20:02:38 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
diff --git a/usr.sbin/mountd/pathnames.h b/usr.sbin/mountd/pathnames.h
index 2b7397799ee4a..41e46e40ed4cc 100644
--- a/usr.sbin/mountd/pathnames.h
+++ b/usr.sbin/mountd/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mountd/pathnames.h,v 1.2 2004/08/07 04:27:51 imp Exp $
  */
 #include <paths.h>
 
diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile
index a313a213ac80c..0070bb48720d4 100644
--- a/usr.sbin/moused/Makefile
+++ b/usr.sbin/moused/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/moused/Makefile,v 1.9 2007/03/11 20:02:26 philip Exp $
 
 PROG=	moused
 MAN=	moused.8
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index c78086ef9d0c7..e728ce9968fae 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.61 2007/03/11 20:02:26 philip Exp $
 .\"
 .Dd November 12, 2004
 .Dt MOUSED 8
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index ea5062eb13e9d..d43a12f730042 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -45,7 +45,7 @@
  **/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/moused/moused.c,v 1.79 2007/06/17 20:27:54 philip Exp $");
 
 #include <sys/param.h>
 #include <sys/consio.h>
diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile
index a9221f979c6df..2aa75f873af1a 100644
--- a/usr.sbin/mptable/Makefile
+++ b/usr.sbin/mptable/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mptable/Makefile,v 1.7 2003/09/30 04:09:21 peter Exp $
 
 PROG=	mptable
 WARNS?=	6
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 445285b3fc010..d1aa278892a92 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mptable/mptable.1,v 1.10 2005/02/13 22:25:29 ru Exp $
 .\"
 .Dd April 28, 1997
 .Dt MPTABLE 1
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 1ca6dfe150c54..6d60e56690283 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/mptable/mptable.c,v 1.19 2005/02/06 12:54:54 obrien Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile
index 95bbe12184a6a..e253cfd68c884 100644
--- a/usr.sbin/mtest/Makefile
+++ b/usr.sbin/mtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtest/Makefile,v 1.5 2007/03/09 01:00:05 bms Exp $
 
 PROG=	mtest
 MAN=	mtest.8
diff --git a/usr.sbin/mtest/mtest.8 b/usr.sbin/mtest/mtest.8
index 8bc6f33d3e23b..f94a9e428ce42 100644
--- a/usr.sbin/mtest/mtest.8
+++ b/usr.sbin/mtest/mtest.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mtest/mtest.8,v 1.9 2007/03/08 18:56:37 bms Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd March 8, 2007
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index 28c0fc6ced332..2b34049acaec6 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtest/mtest.c,v 1.9 2007/06/12 16:24:55 bms Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 2977c4722b570..d3de7b27a47d2 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/Makefile,v 1.27 2005/03/29 11:44:17 tobez Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 44556d67a0ea9..8567769dd0f20 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/compare.c,v 1.34 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index f1b0313a746d4..e06b837e0be50 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/create.c,v 1.37 2005/03/29 11:44:17 tobez Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c
index 21a49b04f7447..3614af54ef698 100644
--- a/usr.sbin/mtree/excludes.c
+++ b/usr.sbin/mtree/excludes.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/excludes.c,v 1.8 2003/10/21 08:27:05 phk Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>		/* XXX for mtree.h */
diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h
index 4b6fb3c1839a6..4c7adb2f68f8e 100644
--- a/usr.sbin/mtree/extern.h
+++ b/usr.sbin/mtree/extern.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mtree/extern.h,v 1.13 2004/01/11 19:38:48 phk Exp $
  */
 extern uint32_t crc_total;
 
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 65667d6011387..09b8b5d27c609 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif /*not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.17 2006/07/03 10:55:21 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 439eaab525abe..ce924105664a7 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mtree.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.56 2007/06/16 08:26:00 maxim Exp $
 .\"
 .Dd June 16, 2007
 .Dt MTREE 8
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 76f623c23e2de..950f6a2a44869 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.29 2004/06/04 19:29:28 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/mtree.h b/usr.sbin/mtree/mtree.h
index fb22f0d62370a..cdff1b0ae5b1f 100644
--- a/usr.sbin/mtree/mtree.h
+++ b/usr.sbin/mtree/mtree.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtree.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/mtree/mtree.h,v 1.8 2006/07/03 10:55:21 maxim Exp $
  */
 
 #include <string.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index cb86f94c4f6af..c26eed9e81e1d 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.23 2006/07/03 10:55:21 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/mtree/specspec.c b/usr.sbin/mtree/specspec.c
index f85882e0deef7..bc5a468cdefbe 100644
--- a/usr.sbin/mtree/specspec.c
+++ b/usr.sbin/mtree/specspec.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/specspec.c,v 1.6 2005/03/29 11:44:17 tobez Exp $");
 
 #include <err.h>
 #include <grp.h>
diff --git a/usr.sbin/mtree/test/test00.sh b/usr.sbin/mtree/test/test00.sh
index fce801bcd20ea..a2e4b2806639d 100644
--- a/usr.sbin/mtree/test/test00.sh
+++ b/usr.sbin/mtree/test/test00.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test00.sh,v 1.3 2003/11/05 22:26:08 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test01.sh b/usr.sbin/mtree/test/test01.sh
index e4d3fc302bfed..d056b91288317 100644
--- a/usr.sbin/mtree/test/test01.sh
+++ b/usr.sbin/mtree/test/test01.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test01.sh,v 1.1 2003/10/30 12:01:32 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test02.sh b/usr.sbin/mtree/test/test02.sh
index a7aa9168382c4..450ebb3d397ff 100644
--- a/usr.sbin/mtree/test/test02.sh
+++ b/usr.sbin/mtree/test/test02.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test02.sh,v 1.1 2003/10/31 13:39:19 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test03.sh b/usr.sbin/mtree/test/test03.sh
index bb3a5b5397e0f..52e08c31c3fd7 100644
--- a/usr.sbin/mtree/test/test03.sh
+++ b/usr.sbin/mtree/test/test03.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test03.sh,v 1.2 2005/03/29 11:44:17 tobez Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test04.sh b/usr.sbin/mtree/test/test04.sh
index 38acda2bf469b..453d14667fc29 100644
--- a/usr.sbin/mtree/test/test04.sh
+++ b/usr.sbin/mtree/test/test04.sh
@@ -5,7 +5,7 @@
 #
 # Please see src/share/examples/etc/bsd-style-copyright.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test04.sh,v 1.1 2003/11/13 11:02:57 phk Exp $
 #
 
 set -e
diff --git a/usr.sbin/mtree/test/test05.sh b/usr.sbin/mtree/test/test05.sh
index eda544f4ff368..b4c8ecaa5c537 100644
--- a/usr.sbin/mtree/test/test05.sh
+++ b/usr.sbin/mtree/test/test05.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/mtree/test/test05.sh,v 1.1 2006/07/03 10:55:22 maxim Exp $
 #
 # Test for 'optional' keyword.
 #
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 7078dbeca678e..3be4c572d7efd 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/mtree/verify.c,v 1.25 2006/07/03 10:55:21 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
index 8728b4ad15e90..1c59ccf7a687b 100644
--- a/usr.sbin/named-checkconf/Makefile
+++ b/usr.sbin/named-checkconf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named-checkconf/Makefile,v 1.6 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile
index 169c00adce4e1..5471667ef7503 100644
--- a/usr.sbin/named-checkzone/Makefile
+++ b/usr.sbin/named-checkzone/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named-checkzone/Makefile,v 1.5 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index 7ea9d06509642..fa1019df58810 100644
--- a/usr.sbin/named.reload/Makefile
+++ b/usr.sbin/named.reload/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.reload/Makefile,v 1.9 2004/09/21 19:01:47 des Exp $
 
 SCRIPTS=	named.reload.sh
 MAN=		named.reload.8
diff --git a/usr.sbin/named.reload/named.reload.8 b/usr.sbin/named.reload/named.reload.8
index 64587742350e2..d416ee9572580 100644
--- a/usr.sbin/named.reload/named.reload.8
+++ b/usr.sbin/named.reload/named.reload.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.8 2004/09/21 19:01:47 des Exp $
 .\"
 .Dd September 21, 2004
 .Dt NAMED.RELOAD 8
diff --git a/usr.sbin/named.reload/named.reload.sh b/usr.sbin/named.reload/named.reload.sh
index d1ee3afeda9ab..b4461af89396e 100644
--- a/usr.sbin/named.reload/named.reload.sh
+++ b/usr.sbin/named.reload/named.reload.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.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named.reload/named.reload.sh,v 1.3 2004/09/21 19:01:47 des Exp $
 #
 
 rndc=/usr/sbin/rndc
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 64470588be40f..8463271b7dd9a 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.43 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/ndiscvt/Makefile b/usr.sbin/ndiscvt/Makefile
index 90ecebbdc5520..6b1e920f88d06 100644
--- a/usr.sbin/ndiscvt/Makefile
+++ b/usr.sbin/ndiscvt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndiscvt/Makefile,v 1.7 2005/04/24 20:21:22 wpaul Exp $
 
 .PATH:	${.CURDIR}/../../sys/compat/ndis
 
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 8a8495671db5c..d838171548176 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf-parse.y,v 1.2 2004/01/02 04:31:06 wpaul Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index cc1508bba4a2a..4d361041dd3ed 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf-token.l,v 1.3 2004/01/11 21:10:35 mdodd Exp $");
 
 #include <regex.h>
 #include <ctype.h>
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index c3d965c82245b..759ebf68edf08 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/inf.c,v 1.16 2005/05/15 19:46:14 wpaul Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/ndiscvt/inf.h b/usr.sbin/ndiscvt/inf.h
index 8d0b0c123de4b..6367f3edab78b 100644
--- a/usr.sbin/ndiscvt/inf.h
+++ b/usr.sbin/ndiscvt/inf.h
@@ -1,7 +1,7 @@
 /*
  * $Id: inf.h,v 1.3 2003/11/30 21:58:16 winter Exp $
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ndiscvt/inf.h,v 1.1 2003/12/11 22:38:14 wpaul Exp $
  */
 
 #define W_MAX	16
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index 532de8ec3a880..910720744afde 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ndiscvt/ndiscvt.8,v 1.9 2006/10/10 07:19:30 trhodes Exp $
 .\"
 .Dd December 10, 2003
 .Dt NDISCVT 8
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 733af8a3c0fc9..ede373956192e 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/ndiscvt.c,v 1.13 2006/09/21 01:47:32 kan Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/ndiscvt/ndisgen.8 b/usr.sbin/ndiscvt/ndisgen.8
index c293b6723d620..71db05992dbc1 100644
--- a/usr.sbin/ndiscvt/ndisgen.8
+++ b/usr.sbin/ndiscvt/ndisgen.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ndiscvt/ndisgen.8,v 1.3 2005/07/23 18:47:18 dougb Exp $
 .\"
 .Dd April 24, 2005
 .Dt NDISGEN 8
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
index 6de8fe6af9a21..afcdf3e4f7a1c 100644
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ b/usr.sbin/ndiscvt/ndisgen.sh
@@ -30,7 +30,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndiscvt/ndisgen.sh,v 1.5 2005/07/23 18:47:18 dougb Exp $
 #
 
 header () {
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
index 30e74bfc9e303..33de446bcf854 100644
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ b/usr.sbin/ndiscvt/windrv_stub.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/windrv_stub.c,v 1.2 2005/05/08 23:07:51 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index f1566919a2f26..f8fc4496d0bf1 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -11,7 +11,7 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ndp/Makefile,v 1.6 2006/07/27 15:31:12 yar Exp $
 
 .PATH: ${.CURDIR}/../../contrib/tcpdump
 
diff --git a/usr.sbin/ndp/gnuc.h b/usr.sbin/ndp/gnuc.h
index c6412965c9db3..5c6b29e3a309e 100644
--- a/usr.sbin/ndp/gnuc.h
+++ b/usr.sbin/ndp/gnuc.h
@@ -1,2 +1,2 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ndp/gnuc.h,v 1.1 2000/01/06 12:40:40 shin Exp $ */
 /* this is dummy to pacify gmt2local.c. */
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index 70f51560a6a65..49675918a3c53 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ndp/ndp.8,v 1.19 2005/11/18 10:54:34 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt NDP 8
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 80a50266f278f..0b720ba5f0411 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.22 2007/03/06 09:32:40 kevlo Exp $	*/
 /*	$KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index 9c301a1b9d1d5..3f20a9d9a607e 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/newsyslog/Makefile,v 1.16 2004/03/12 16:03:26 trhodes Exp $
 
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
diff --git a/usr.sbin/newsyslog/extern.h b/usr.sbin/newsyslog/extern.h
index c350226f591a6..51869292a5511 100644
--- a/usr.sbin/newsyslog/extern.h
+++ b/usr.sbin/newsyslog/extern.h
@@ -29,7 +29,7 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/newsyslog/extern.h,v 1.2 2003/09/23 00:00:26 gad Exp $
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 3db563f2964cb..03bc4c74ff40a 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.51 2005/06/14 12:26:35 ru Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\"
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index a357062f00a6f..08bb9d99e7db7 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.107 2006/08/17 18:15:43 delphij Exp $");
 
 #define	OSF
 #ifndef COMPRESS_POSTFIX
diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5
index 6848bc9f27157..c5f2be9f9890b 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.5
+++ b/usr.sbin/newsyslog/newsyslog.conf.5
@@ -5,7 +5,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"     from: @(#)newsyslog.8
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.conf.5,v 1.6.2.1 2007/12/02 08:45:05 remko Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\"
diff --git a/usr.sbin/newsyslog/pathnames.h b/usr.sbin/newsyslog/pathnames.h
index 3d2c6ff29c8f8..53139db4fa342 100644
--- a/usr.sbin/newsyslog/pathnames.h
+++ b/usr.sbin/newsyslog/pathnames.h
@@ -18,7 +18,7 @@ M.I.T. and the M.I.T. S.I.P.B. make no representations about
 the suitability of this software for any purpose.  It is
 provided "as is" without express or implied warranty.
 
- $FreeBSD$
+ $FreeBSD: src/usr.sbin/newsyslog/pathnames.h,v 1.3 2001/07/30 15:17:17 obrien Exp $
 
 */
 
diff --git a/usr.sbin/newsyslog/ptimes.c b/usr.sbin/newsyslog/ptimes.c
index 474c69daba53c..15bed332c7ceb 100644
--- a/usr.sbin/newsyslog/ptimes.c
+++ b/usr.sbin/newsyslog/ptimes.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/ptimes.c,v 1.5 2004/06/07 21:53:27 gad Exp $");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 21ca3f377a658..1170de1c4a493 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nfsd/Makefile,v 1.17 2004/11/06 18:15:44 delphij Exp $
 
 PROG=	nfsd
 MAN=	nfsd.8
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index 64c181e66c9c7..8d06b703f5a0c 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nfsd/nfsd.8,v 1.24 2005/01/17 07:44:42 ru Exp $
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 09795ec80f729..cb7c4e3230f61 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/nfsd/nfsd.c,v 1.34 2005/12/21 10:12:05 delphij Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index e02265d771bdf..5d6148790350e 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ngctl/Makefile,v 1.22 2007/10/09 23:31:11 obrien Exp $
 # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
 
 .include <bsd.own.mk>
diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c
index 9b1a2751d136d..06f3ec958f12b 100644
--- a/usr.sbin/ngctl/config.c
+++ b/usr.sbin/ngctl/config.c
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/config.c,v 1.6 2006/07/17 08:35:47 stefanf Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c
index cd5307e499c22..56aed9ba2cf21 100644
--- a/usr.sbin/ngctl/connect.c
+++ b/usr.sbin/ngctl/connect.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/connect.c,v 1.5 2006/06/28 10:38:38 glebius Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c
index d64e32d7f4cf3..ffbbd265bec4f 100644
--- a/usr.sbin/ngctl/debug.c
+++ b/usr.sbin/ngctl/debug.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/debug.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
  */
 
 #include <netgraph.h>
diff --git a/usr.sbin/ngctl/dot.c b/usr.sbin/ngctl/dot.c
index bd4673fda4b4c..fc15a319078f5 100644
--- a/usr.sbin/ngctl/dot.c
+++ b/usr.sbin/ngctl/dot.c
@@ -35,7 +35,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/dot.c,v 1.5 2007/02/06 08:48:28 kevlo Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c
index da4174c27e75b..8a98bc69003eb 100644
--- a/usr.sbin/ngctl/list.c
+++ b/usr.sbin/ngctl/list.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/list.c,v 1.9 2007/02/06 08:48:28 kevlo Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 5747bca713840..ae5bd561eca29 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/main.c,v 1.23 2007/02/06 08:48:28 kevlo Exp $
  * $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
  */
 
diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c
index 1c6896b1d18cd..68bb62255c235 100644
--- a/usr.sbin/ngctl/mkpeer.c
+++ b/usr.sbin/ngctl/mkpeer.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/mkpeer.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index f74efde1bca9a..f42fc536ded0b 100644
--- a/usr.sbin/ngctl/msg.c
+++ b/usr.sbin/ngctl/msg.c
@@ -35,7 +35,7 @@
  * OF SUCH DAMAGE.
  *
  * $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/msg.c,v 1.8 2006/09/21 01:48:47 kan Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c
index 7149d35dbc88b..43134e5232f5c 100644
--- a/usr.sbin/ngctl/name.c
+++ b/usr.sbin/ngctl/name.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/name.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index ce77069d31859..30bfdfb87eac3 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.16 2005/01/17 07:44:42 ru Exp $
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .Dd January 19, 1999
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index 4d8c2adb76911..6ccd78425df67 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/ngctl.h,v 1.13 2006/05/24 14:46:55 glebius Exp $
  */
 
 #define MAX_CMD_ALIAS	8
diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c
index 9a47a9d66fdfe..6d9b0467c3c24 100644
--- a/usr.sbin/ngctl/rmhook.c
+++ b/usr.sbin/ngctl/rmhook.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/rmhook.c,v 1.5 2006/06/28 10:38:38 glebius Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c
index 26eea04682734..d9a3ec481f4a9 100644
--- a/usr.sbin/ngctl/show.c
+++ b/usr.sbin/ngctl/show.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/show.c,v 1.7 2007/02/06 08:48:28 kevlo Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c
index b06beb5ca0ff9..7ca61fee62308 100644
--- a/usr.sbin/ngctl/shutdown.c
+++ b/usr.sbin/ngctl/shutdown.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/shutdown.c,v 1.4 2006/06/28 10:38:38 glebius Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c
index 7827c631513d9..65989ed9cb6ba 100644
--- a/usr.sbin/ngctl/status.c
+++ b/usr.sbin/ngctl/status.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/status.c,v 1.5 2006/07/17 08:35:47 stefanf Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c
index 5ed4b53d00ea1..8ed87957c40bb 100644
--- a/usr.sbin/ngctl/types.c
+++ b/usr.sbin/ngctl/types.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/types.c,v 1.7 2006/07/17 08:35:47 stefanf Exp $
  */
 
 #include <err.h>
diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c
index 4114211705c60..9a5453445d7b8 100644
--- a/usr.sbin/ngctl/write.c
+++ b/usr.sbin/ngctl/write.c
@@ -30,7 +30,7 @@
  * THIS SOFTWARE, EVEN IF ARCHIE L. COBBS IS ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ngctl/write.c,v 1.3 2006/06/28 10:38:38 glebius Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile
index 73f2df3bf935d..8b060169b2b9f 100644
--- a/usr.sbin/nghook/Makefile
+++ b/usr.sbin/nghook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nghook/Makefile,v 1.8 2004/02/23 20:21:21 johan Exp $
 # $Whistle: Makefile,v 1.4 1999/01/16 04:44:33 archie Exp $
 
 PROG=	nghook
diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c
index 700ca5e1a59d1..391508ac01c2c 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/main.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nghook/main.c,v 1.11 2003/10/24 10:01:36 harti Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 7d2c7fa5f5cc8..c0960ec429744 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/usr.sbin/nghook/nghook.8
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.17 2005/01/18 20:02:39 ru Exp $
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp $
 .\"
 .Dd October 24, 2003
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index 0b4c0db25d1c1..830123fa2e6fc 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nologin/Makefile,v 1.13 2004/12/21 09:59:44 ru Exp $
 
 PROG=	nologin
 MAN=	nologin.5 nologin.8
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index f8a21beb78fde..da3b73e0a1297 100644
--- a/usr.sbin/nologin/nologin.5
+++ b/usr.sbin/nologin/nologin.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nologin/nologin.5,v 1.15 2007/05/10 11:22:24 yar Exp $
 .\"
 .Dd May 10, 2007
 .Dt NOLOGIN 5
diff --git a/usr.sbin/nologin/nologin.8 b/usr.sbin/nologin/nologin.8
index d03aa33d96b41..04078ff77e243 100644
--- a/usr.sbin/nologin/nologin.8
+++ b/usr.sbin/nologin/nologin.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nologin/nologin.8,v 1.14 2004/08/07 04:27:52 imp Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/usr.sbin/nologin/nologin.c b/usr.sbin/nologin/nologin.c
index 658637ef2ae81..788c90f0e0e3e 100644
--- a/usr.sbin/nologin/nologin.c
+++ b/usr.sbin/nologin/nologin.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nologin/nologin.c,v 1.6 2005/01/04 20:07:12 delphij Exp $");
 
 #include <stdio.h>
 #include <syslog.h>
diff --git a/usr.sbin/nscd/Makefile b/usr.sbin/nscd/Makefile
index f743797701b84..f6c7aa361d3cb 100644
--- a/usr.sbin/nscd/Makefile
+++ b/usr.sbin/nscd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nscd/Makefile,v 1.4 2007/09/27 12:30:11 bushman Exp $
 
 PROG=	nscd
 MAN=	nscd.conf.5 nscd.8
diff --git a/usr.sbin/nscd/agent.c b/usr.sbin/nscd/agent.c
index 2d58ef1b48c8b..bc6e666335b0f 100644
--- a/usr.sbin/nscd/agent.c
+++ b/usr.sbin/nscd/agent.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/agent.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <assert.h>
 #include <string.h>
diff --git a/usr.sbin/nscd/agent.h b/usr.sbin/nscd/agent.h
index ebe8974ee2a1c..0c430cc1c8bb4 100644
--- a/usr.sbin/nscd/agent.h
+++ b/usr.sbin/nscd/agent.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/agent.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_AGENT_H__
diff --git a/usr.sbin/nscd/agents/Makefile.inc b/usr.sbin/nscd/agents/Makefile.inc
index 1be32e1d986f5..892f0c8bcf1fe 100644
--- a/usr.sbin/nscd/agents/Makefile.inc
+++ b/usr.sbin/nscd/agents/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nscd/agents/Makefile.inc,v 1.2 2007/09/27 12:30:10 bushman Exp $
 
 SRCS += passwd.c group.c services.c
diff --git a/usr.sbin/nscd/agents/group.c b/usr.sbin/nscd/agents/group.c
index b9190be448494..a66995123acef 100644
--- a/usr.sbin/nscd/agents/group.c
+++ b/usr.sbin/nscd/agents/group.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/agents/group.c,v 1.2 2007/09/27 12:30:10 bushman Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/nscd/agents/group.h b/usr.sbin/nscd/agents/group.h
index e6c73973f1d26..77fbf9e1d4691 100644
--- a/usr.sbin/nscd/agents/group.h
+++ b/usr.sbin/nscd/agents/group.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/agents/group.h,v 1.2 2007/09/27 12:30:10 bushman Exp $
  */
 
 #include "../agent.h"
diff --git a/usr.sbin/nscd/agents/passwd.c b/usr.sbin/nscd/agents/passwd.c
index 50c55babc633d..4b7594ad2c89f 100644
--- a/usr.sbin/nscd/agents/passwd.c
+++ b/usr.sbin/nscd/agents/passwd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/agents/passwd.c,v 1.2 2007/09/27 12:30:10 bushman Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/usr.sbin/nscd/agents/passwd.h b/usr.sbin/nscd/agents/passwd.h
index 956a50d780082..16a3f2530a870 100644
--- a/usr.sbin/nscd/agents/passwd.h
+++ b/usr.sbin/nscd/agents/passwd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/agents/passwd.h,v 1.2 2007/09/27 12:30:10 bushman Exp $
  */
 
 #include "../agent.h"
diff --git a/usr.sbin/nscd/agents/services.c b/usr.sbin/nscd/agents/services.c
index b0a2eb99fad80..9840baf620434 100644
--- a/usr.sbin/nscd/agents/services.c
+++ b/usr.sbin/nscd/agents/services.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/agents/services.c,v 1.3 2007/09/27 12:30:10 bushman Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/nscd/agents/services.h b/usr.sbin/nscd/agents/services.h
index 0b77c87a9979e..c8796cb5b5292 100644
--- a/usr.sbin/nscd/agents/services.h
+++ b/usr.sbin/nscd/agents/services.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/agents/services.h,v 1.2 2007/09/27 12:30:10 bushman Exp $
  */
 
 #include "../agent.h"
diff --git a/usr.sbin/nscd/cachelib.c b/usr.sbin/nscd/cachelib.c
index 4f771cc864c35..f5d8f1e211353 100644
--- a/usr.sbin/nscd/cachelib.c
+++ b/usr.sbin/nscd/cachelib.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/cachelib.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <sys/time.h>
 #include <assert.h>
diff --git a/usr.sbin/nscd/cachelib.h b/usr.sbin/nscd/cachelib.h
index b1c8af8553a4d..5f6d898c9575f 100644
--- a/usr.sbin/nscd/cachelib.h
+++ b/usr.sbin/nscd/cachelib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/cachelib.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_CACHELIB_H__
diff --git a/usr.sbin/nscd/cacheplcs.c b/usr.sbin/nscd/cacheplcs.c
index a7ee38de4801f..76ad808cf4774 100644
--- a/usr.sbin/nscd/cacheplcs.c
+++ b/usr.sbin/nscd/cacheplcs.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/cacheplcs.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <assert.h>
 #include <string.h>
diff --git a/usr.sbin/nscd/cacheplcs.h b/usr.sbin/nscd/cacheplcs.h
index 8eba15fee356f..80eeb37632f8c 100644
--- a/usr.sbin/nscd/cacheplcs.h
+++ b/usr.sbin/nscd/cacheplcs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/cacheplcs.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_CACHEPLCS_H__
diff --git a/usr.sbin/nscd/config.c b/usr.sbin/nscd/config.c
index bc3eb49eeb71b..4d51d818e6ac0 100644
--- a/usr.sbin/nscd/config.c
+++ b/usr.sbin/nscd/config.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/config.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <assert.h>
 #include <math.h>
diff --git a/usr.sbin/nscd/config.h b/usr.sbin/nscd/config.h
index a3205c968bbc2..0e02f1f879560 100644
--- a/usr.sbin/nscd/config.h
+++ b/usr.sbin/nscd/config.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/config.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_CONFIG_H__
diff --git a/usr.sbin/nscd/debug.c b/usr.sbin/nscd/debug.c
index 420c517c1159e..2c1413afb1770 100644
--- a/usr.sbin/nscd/debug.c
+++ b/usr.sbin/nscd/debug.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/debug.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <stdio.h>
 #include "debug.h"
diff --git a/usr.sbin/nscd/debug.h b/usr.sbin/nscd/debug.h
index 71f530088d025..d2399fd9a02dc 100644
--- a/usr.sbin/nscd/debug.h
+++ b/usr.sbin/nscd/debug.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/debug.h,v 1.2 2007/08/09 13:06:11 bushman Exp $
  */
 
 #ifndef __NSCD_DEBUG_H__
diff --git a/usr.sbin/nscd/hashtable.h b/usr.sbin/nscd/hashtable.h
index 86dad9f92b343..3c42841f93d88 100644
--- a/usr.sbin/nscd/hashtable.h
+++ b/usr.sbin/nscd/hashtable.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/hashtable.h,v 1.2 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __CACHELIB_HASHTABLE_H__
diff --git a/usr.sbin/nscd/log.c b/usr.sbin/nscd/log.c
index adfc5bf8c1c80..476ad779b83ca 100644
--- a/usr.sbin/nscd/log.c
+++ b/usr.sbin/nscd/log.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/log.c,v 1.3 2007/09/27 12:30:11 bushman Exp $");
 
 #include <assert.h>
 #include <stdarg.h>
diff --git a/usr.sbin/nscd/log.h b/usr.sbin/nscd/log.h
index e02efb5cd1e45..484d7a3726f44 100644
--- a/usr.sbin/nscd/log.h
+++ b/usr.sbin/nscd/log.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/log.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_LOG_H__
diff --git a/usr.sbin/nscd/mp_rs_query.c b/usr.sbin/nscd/mp_rs_query.c
index 3375cc363a7d2..9fe28ef0ab9c3 100644
--- a/usr.sbin/nscd/mp_rs_query.c
+++ b/usr.sbin/nscd/mp_rs_query.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/mp_rs_query.c,v 1.3 2007/09/27 12:30:11 bushman Exp $");
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/usr.sbin/nscd/mp_rs_query.h b/usr.sbin/nscd/mp_rs_query.h
index 91f13cc96c89a..76f2b65b2f245 100644
--- a/usr.sbin/nscd/mp_rs_query.h
+++ b/usr.sbin/nscd/mp_rs_query.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/mp_rs_query.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_MP_RS_QUERY_H__
diff --git a/usr.sbin/nscd/mp_ws_query.c b/usr.sbin/nscd/mp_ws_query.c
index 7eae1d8dd4b01..428d9a1dcaba4 100644
--- a/usr.sbin/nscd/mp_ws_query.c
+++ b/usr.sbin/nscd/mp_ws_query.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/mp_ws_query.c,v 1.3 2007/09/27 12:30:11 bushman Exp $");
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/usr.sbin/nscd/mp_ws_query.h b/usr.sbin/nscd/mp_ws_query.h
index ead1d351055bf..b36d5c0feb3aa 100644
--- a/usr.sbin/nscd/mp_ws_query.h
+++ b/usr.sbin/nscd/mp_ws_query.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/mp_ws_query.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_MP_WS_QUERY_H__
diff --git a/usr.sbin/nscd/nscd.8 b/usr.sbin/nscd/nscd.8
index 1def32cbaf3f3..176c09b997c34 100644
--- a/usr.sbin/nscd/nscd.8
+++ b/usr.sbin/nscd/nscd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nscd/nscd.8,v 1.10 2007/09/27 12:30:11 bushman Exp $
 .\"
 .Dd October 20, 2005
 .Dt NSCD 8
diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c
index 00bc1dd989b99..1485c670c8fe3 100644
--- a/usr.sbin/nscd/nscd.c
+++ b/usr.sbin/nscd/nscd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/nscd.c,v 1.4 2007/09/27 12:30:11 bushman Exp $");
 
 #include <sys/types.h>
 #include <sys/event.h>
diff --git a/usr.sbin/nscd/nscd.conf.5 b/usr.sbin/nscd/nscd.conf.5
index f7292027580d0..f58ceca1ea26c 100644
--- a/usr.sbin/nscd/nscd.conf.5
+++ b/usr.sbin/nscd/nscd.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nscd/nscd.conf.5,v 1.6 2007/09/27 12:30:11 bushman Exp $
 .\"
 .Dd April 30, 2006
 .Dt NSCD.CONF 5
diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c
index e7459e7ff1294..5ac37c5c7fcd3 100644
--- a/usr.sbin/nscd/nscdcli.c
+++ b/usr.sbin/nscd/nscdcli.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/nscdcli.c,v 1.3 2007/09/27 12:30:11 bushman Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscdcli.h b/usr.sbin/nscd/nscdcli.h
index cfbd7e62060ee..448baa82f2f30 100644
--- a/usr.sbin/nscd/nscdcli.h
+++ b/usr.sbin/nscd/nscdcli.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/nscdcli.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_NSCDCLI_H__
diff --git a/usr.sbin/nscd/parser.c b/usr.sbin/nscd/parser.c
index b877efa6cf447..119c98bc25c1a 100644
--- a/usr.sbin/nscd/parser.c
+++ b/usr.sbin/nscd/parser.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/parser.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/usr.sbin/nscd/parser.h b/usr.sbin/nscd/parser.h
index 413b784d4eef2..b607219dffaaa 100644
--- a/usr.sbin/nscd/parser.h
+++ b/usr.sbin/nscd/parser.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/parser.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_PARSER_H__
diff --git a/usr.sbin/nscd/protocol.c b/usr.sbin/nscd/protocol.c
index 08cea92309957..9f5db4174a8cc 100644
--- a/usr.sbin/nscd/protocol.c
+++ b/usr.sbin/nscd/protocol.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/protocol.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/usr.sbin/nscd/protocol.h b/usr.sbin/nscd/protocol.h
index 6894d3c4b6de9..2ecde0436e801 100644
--- a/usr.sbin/nscd/protocol.h
+++ b/usr.sbin/nscd/protocol.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/protocol.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_PROTOCOL_H__
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index 2714386c58a20..0b04d7a8fdadb 100644
--- a/usr.sbin/nscd/query.c
+++ b/usr.sbin/nscd/query.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/query.c,v 1.4 2007/09/27 12:30:11 bushman Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/nscd/query.h b/usr.sbin/nscd/query.h
index 383d8065917ea..c6d1a37ab1ff1 100644
--- a/usr.sbin/nscd/query.h
+++ b/usr.sbin/nscd/query.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/query.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_QUERY_H__
diff --git a/usr.sbin/nscd/singletons.c b/usr.sbin/nscd/singletons.c
index 669d12be2abdd..707666cbf2a4e 100644
--- a/usr.sbin/nscd/singletons.c
+++ b/usr.sbin/nscd/singletons.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/nscd/singletons.c,v 1.2 2007/09/27 12:30:11 bushman Exp $");
 
 #include "singletons.h"
 
diff --git a/usr.sbin/nscd/singletons.h b/usr.sbin/nscd/singletons.h
index dfd891fe10c6a..9cbe66e111ef7 100644
--- a/usr.sbin/nscd/singletons.h
+++ b/usr.sbin/nscd/singletons.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nscd/singletons.h,v 1.3 2007/09/27 12:30:11 bushman Exp $
  */
 
 #ifndef __NSCD_SINGLETONS_H__
diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile
index e3ab3c7bde821..3bcc9f5ed58a0 100644
--- a/usr.sbin/ntp/Makefile
+++ b/usr.sbin/ntp/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ntpd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/Makefile,v 1.12 2006/03/15 11:17:31 ru Exp $
 
 SUBDIR=	libntp libparse ntpd ntpdc ntpq ntpdate ntptrace \
 	ntptime ntp-keygen sntp
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index dee65986e1714..cb9cb66756315 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/Makefile.inc,v 1.9 2006/03/17 18:54:41 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index ff6cb575e6d45..368ffe8e67ca9 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1,6 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/ntp/config.h,v 1.13 2005/06/23 21:37:27 roberto Exp $ */
 
 /* Is adjtime() accurate? */
 /* #undef ADJTIME_IS_ACCURATE */
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 902c4db9060a8..e8daf9028b799 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.14 2006/05/17 10:50:34 pav Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/ntp/doc/ntp-keygen.8 b/usr.sbin/ntp/doc/ntp-keygen.8
index 8266129822c38..464d9acc630e4 100644
--- a/usr.sbin/ntp/doc/ntp-keygen.8
+++ b/usr.sbin/ntp/doc/ntp-keygen.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntp-keygen.8,v 1.2 2006/09/30 19:07:03 ru Exp $
 .\"
 .Dd May 17, 2006
 .Dt NTP-KEYGEN 8
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index 264a250a92335..74d071518a29d 100644
--- a/usr.sbin/ntp/doc/ntp.conf.5
+++ b/usr.sbin/ntp/doc/ntp.conf.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntp.conf.5,v 1.23 2006/12/31 18:53:45 ceri Exp $
 .\"
 .Dd December 21, 2006
 .Dt NTP.CONF 5
diff --git a/usr.sbin/ntp/doc/ntp.keys.5 b/usr.sbin/ntp/doc/ntp.keys.5
index dc9531ce245ef..6b741b92a1b40 100644
--- a/usr.sbin/ntp/doc/ntp.keys.5
+++ b/usr.sbin/ntp/doc/ntp.keys.5
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntp.keys.5,v 1.6 2002/12/27 12:15:38 schweikh Exp $
 .\"
 .Dd January 13, 2000
 .Dt NTP.KEYS 5
diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8
index 5194b758c6d03..f540a016f16eb 100644
--- a/usr.sbin/ntp/doc/ntpd.8
+++ b/usr.sbin/ntp/doc/ntpd.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.15 2007/06/12 13:28:55 motoyuki Exp $
 .\"
 .Dd May 17, 2006
 .Dt NTPD 8
diff --git a/usr.sbin/ntp/doc/ntpdate.8 b/usr.sbin/ntp/doc/ntpdate.8
index f361f17133af9..294e90ab7438e 100644
--- a/usr.sbin/ntp/doc/ntpdate.8
+++ b/usr.sbin/ntp/doc/ntpdate.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdate.8,v 1.10 2006/05/17 10:50:35 pav Exp $
 .\"
 .Dd May 17, 2006
 .Dt NTPDATE 8
diff --git a/usr.sbin/ntp/doc/ntpdc.8 b/usr.sbin/ntp/doc/ntpdc.8
index 35ea7aa1c1001..fe76347cb6325 100644
--- a/usr.sbin/ntp/doc/ntpdc.8
+++ b/usr.sbin/ntp/doc/ntpdc.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpdc.8,v 1.15 2006/09/29 17:57:03 ru Exp $
 .\"
 .Dd May 17, 2006
 .Dt NTPDC 8
diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8
index 60a5fb9e7d02e..a1a86bc60bd63 100644
--- a/usr.sbin/ntp/doc/ntpq.8
+++ b/usr.sbin/ntp/doc/ntpq.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.19 2006/09/29 17:57:03 ru Exp $
 .\"
 .Dd May 17, 2006
 .Dt NTPQ 8
diff --git a/usr.sbin/ntp/doc/ntptime.8 b/usr.sbin/ntp/doc/ntptime.8
index f130307457f32..3ce0e3627e6f0 100644
--- a/usr.sbin/ntp/doc/ntptime.8
+++ b/usr.sbin/ntp/doc/ntptime.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntptime.8,v 1.4 2002/07/14 14:44:40 charnier Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPTIME 8
diff --git a/usr.sbin/ntp/doc/ntptrace.8 b/usr.sbin/ntp/doc/ntptrace.8
index 554a3c0c27c80..687935baf79a3 100644
--- a/usr.sbin/ntp/doc/ntptrace.8
+++ b/usr.sbin/ntp/doc/ntptrace.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntptrace.8,v 1.7 2004/07/02 23:12:51 ru Exp $
 .\"
 .Dd January 6, 2000
 .Dt NTPTRACE 8
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 19039105bf2d9..b1284eb166c58 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/libntp/Makefile,v 1.10 2004/10/24 15:33:04 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/libntp \
 	${.CURDIR}/../../../contrib/ntp/libisc
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index 22d7ca38c4dc5..841ababbbc8c2 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/libparse/Makefile,v 1.7 2004/10/24 15:33:04 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/libparse
 
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 5211b6f4f2d73..755267c5c05ae 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntp-keygen/Makefile,v 1.7 2006/03/17 18:54:41 ru Exp $
 
 NO_MAN=
 
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 82c99c8fb35f0..d56402667e535 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpd/Makefile,v 1.14 2006/03/17 18:54:41 ru Exp $
 
 NO_MAN=
 
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index a72f550049fe8..ecd19cd0ef0fd 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpdate/Makefile,v 1.6 2004/12/21 08:47:33 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
 
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 1e42b43f307e2..cdffcbc4af5a6 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpdc/Makefile,v 1.11 2006/03/17 18:54:41 ru Exp $
 
 NO_MAN=
 
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 6e749d63b3f4d..13af8e3923892 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntpq/Makefile,v 1.11 2006/03/17 18:54:42 ru Exp $
 
 NO_MAN=
 
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index db5885ddceb35..59d0cd5187b74 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptime/Makefile,v 1.6 2005/01/28 16:08:11 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/util
 
diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile
index 8d7547cf5ea15..7f7b27be35735 100644
--- a/usr.sbin/ntp/ntptrace/Makefile
+++ b/usr.sbin/ntp/ntptrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/ntptrace/Makefile,v 1.7 2005/09/28 07:52:27 ru Exp $
 
 .PATH:	${.CURDIR}/../scripts
 
diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver
index d54386d5fd6a2..4f340ee043f4b 100755
--- a/usr.sbin/ntp/scripts/mkver
+++ b/usr.sbin/ntp/scripts/mkver
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/mkver,v 1.9 2004/07/20 15:44:32 roberto Exp $
 #
 PROG=${1-UNKNOWN}
 
diff --git a/usr.sbin/ntp/scripts/ntptrace b/usr.sbin/ntp/scripts/ntptrace
index 8a895c4ba0be6..4319623c5f9ef 100644
--- a/usr.sbin/ntp/scripts/ntptrace
+++ b/usr.sbin/ntp/scripts/ntptrace
@@ -1,6 +1,6 @@
 #! /usr/local/bin/perl -w
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/ntptrace,v 1.1 2004/07/20 15:44:32 roberto Exp $
 
 # John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org
 
diff --git a/usr.sbin/ntp/scripts/ntpver b/usr.sbin/ntp/scripts/ntpver
index 6dbc510db8c21..f457be9a0379c 100755
--- a/usr.sbin/ntp/scripts/ntpver
+++ b/usr.sbin/ntp/scripts/ntpver
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/scripts/ntpver,v 1.1 1999/12/13 14:09:56 roberto Exp $
 # print version string of NTP daemon
 # Copyright (c) 1997 by Ulrich Windl
 # Modified 970318: Harlan Stenn: rewritten...
diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile
index f7a9eb9a29963..3793c8b4ecc53 100644
--- a/usr.sbin/ntp/sntp/Makefile
+++ b/usr.sbin/ntp/sntp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ntp/sntp/Makefile,v 1.3 2004/12/21 08:47:34 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/ntp/sntp
 
diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile
index 3cca037565074..ab2b151316c52 100644
--- a/usr.sbin/nvram/Makefile
+++ b/usr.sbin/nvram/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/nvram/Makefile,v 1.2 2006/09/30 09:02:38 ru Exp $
 
 PROG=	nvram
 MAN=	nvram.8
diff --git a/usr.sbin/nvram/nvram.8 b/usr.sbin/nvram/nvram.8
index 5c41a41454dd7..73dafcbb99fd2 100644
--- a/usr.sbin/nvram/nvram.8
+++ b/usr.sbin/nvram/nvram.8
@@ -23,7 +23,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/nvram/nvram.8,v 1.2 2006/09/30 19:07:03 ru Exp $
 .\"
 .Dd August 1, 2006
 .Dt NVRAM 8 powerpc
diff --git a/usr.sbin/nvram/nvram.c b/usr.sbin/nvram/nvram.c
index 9d56f9d537b1c..54dc6ec401351 100644
--- a/usr.sbin/nvram/nvram.c
+++ b/usr.sbin/nvram/nvram.c
@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/nvram/nvram.c,v 1.1 2006/08/01 22:19:01 sobomax Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile
index b94ffd1bf59b7..88063a89f72d1 100644
--- a/usr.sbin/ofwdump/Makefile
+++ b/usr.sbin/ofwdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ofwdump/Makefile,v 1.4 2004/05/22 16:51:11 marius Exp $
 
 PROG=	ofwdump
 MAN=	ofwdump.8
diff --git a/usr.sbin/ofwdump/ofw_util.c b/usr.sbin/ofwdump/ofw_util.c
index 71361d452511e..223ef16d10a37 100644
--- a/usr.sbin/ofwdump/ofw_util.c
+++ b/usr.sbin/ofwdump/ofw_util.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ofwdump/ofw_util.c,v 1.5 2004/05/22 16:51:11 marius Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/ofwdump/ofw_util.h b/usr.sbin/ofwdump/ofw_util.h
index af8f01f233b20..3c562bbac7d52 100644
--- a/usr.sbin/ofwdump/ofw_util.h
+++ b/usr.sbin/ofwdump/ofw_util.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ofwdump/ofw_util.h,v 1.3 2004/05/22 16:51:11 marius Exp $
  */
 
 #ifndef OFW_UTIL_H
diff --git a/usr.sbin/ofwdump/ofwdump.8 b/usr.sbin/ofwdump/ofwdump.8
index 995d93704d18f..cc97125175834 100644
--- a/usr.sbin/ofwdump/ofwdump.8
+++ b/usr.sbin/ofwdump/ofwdump.8
@@ -21,7 +21,7 @@
 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ofwdump/ofwdump.8,v 1.5 2004/07/02 23:12:51 ru Exp $
 .\"
 .Dd October 18, 2002
 .Dt OFWDUMP 8 sparc64
diff --git a/usr.sbin/ofwdump/ofwdump.c b/usr.sbin/ofwdump/ofwdump.c
index ea25caa16dafe..15eb85f9a1b12 100644
--- a/usr.sbin/ofwdump/ofwdump.c
+++ b/usr.sbin/ofwdump/ofwdump.c
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ofwdump/ofwdump.c,v 1.2 2004/05/22 16:51:11 marius Exp $");
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/openfirmio.h>
diff --git a/usr.sbin/ofwdump/pathnames.h b/usr.sbin/ofwdump/pathnames.h
index 32f5fe624db62..22b65f1125821 100644
--- a/usr.sbin/ofwdump/pathnames.h
+++ b/usr.sbin/ofwdump/pathnames.h
@@ -22,7 +22,7 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ofwdump/pathnames.h,v 1.1 2002/10/18 15:37:15 tmm Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/pccard/Makefile b/usr.sbin/pccard/Makefile
index 18bd019ff67d5..1ae13e175bee1 100644
--- a/usr.sbin/pccard/Makefile
+++ b/usr.sbin/pccard/Makefile
@@ -1,5 +1,5 @@
 # Makefile for pccardc/pccardd.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/Makefile,v 1.8 2006/10/18 21:09:43 imp Exp $
 
 SUBDIR=	dumpcis
 
diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc
index 265f86d1ed55a..ecb517b91d10d 100644
--- a/usr.sbin/pccard/Makefile.inc
+++ b/usr.sbin/pccard/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/Makefile.inc,v 1.10 2005/10/17 15:28:25 ru Exp $
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/pccard/dumpcis/Makefile b/usr.sbin/pccard/dumpcis/Makefile
index 795c05c05846f..d8e90bc894fe6 100644
--- a/usr.sbin/pccard/dumpcis/Makefile
+++ b/usr.sbin/pccard/dumpcis/Makefile
@@ -1,6 +1,6 @@
 #	pccardc Makefile
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/dumpcis/Makefile,v 1.1 2006/10/18 21:09:43 imp Exp $
 
 .PATH: ${.CURDIR}/../pccardd ${.CURDIR}/../pccardc
 
diff --git a/usr.sbin/pccard/dumpcis/dumpcis.8 b/usr.sbin/pccard/dumpcis/dumpcis.8
index 518eadd690742..c41c22e2f63cf 100644
--- a/usr.sbin/pccard/dumpcis/dumpcis.8
+++ b/usr.sbin/pccard/dumpcis/dumpcis.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pccard/dumpcis/dumpcis.8,v 1.2 2006/11/13 09:12:25 ru Exp $
 .\"
 .Dd October 18, 2006
 .Dt DUMPCIS 8
diff --git a/usr.sbin/pccard/dumpcis/main.c b/usr.sbin/pccard/dumpcis/main.c
index 317195c1f8e14..58944444fffdf 100644
--- a/usr.sbin/pccard/dumpcis/main.c
+++ b/usr.sbin/pccard/dumpcis/main.c
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pccard/dumpcis/main.c,v 1.1 2006/10/18 21:09:43 imp Exp $");
 
 int dumpcisfile_main(int, char **);
 
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index d0649a2dc42c5..7dc2727f0ccdb 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -1,6 +1,6 @@
 #	pccardc Makefile
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pccard/pccardc/Makefile,v 1.16 2003/04/04 17:49:16 obrien Exp $
 
 .PATH: ${.CURDIR}/../pccardd
 
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
index be62c56238a7b..94825ed0e0623 100644
--- a/usr.sbin/pccard/pccardc/beep.c
+++ b/usr.sbin/pccard/pccardc/beep.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/beep.c,v 1.3 2002/04/22 13:44:45 des Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pccard/pccardc/dumpcis.c b/usr.sbin/pccard/pccardc/dumpcis.c
index d5fc7579933f6..309528754659c 100644
--- a/usr.sbin/pccard/pccardc/dumpcis.c
+++ b/usr.sbin/pccard/pccardc/dumpcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/dumpcis.c,v 1.12 1999/08/28 01:17:31 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/dumpcisfile.c b/usr.sbin/pccard/pccardc/dumpcisfile.c
index 6a415ba44e50f..621b264f2ad43 100644
--- a/usr.sbin/pccard/pccardc/dumpcisfile.c
+++ b/usr.sbin/pccard/pccardc/dumpcisfile.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/dumpcisfile.c,v 1.1 2003/02/25 22:14:38 green Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c
index 11ee0bb882083..5fe2cc1dd9eea 100644
--- a/usr.sbin/pccard/pccardc/enabler.c
+++ b/usr.sbin/pccard/pccardc/enabler.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/enabler.c,v 1.14 2003/07/18 21:53:42 dds Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardc.8 b/usr.sbin/pccard/pccardc/pccardc.8
index e1e0925d4bb27..18ccdbb042b7a 100644
--- a/usr.sbin/pccard/pccardc/pccardc.8
+++ b/usr.sbin/pccard/pccardc/pccardc.8
@@ -26,7 +26,7 @@
 .\"
 .\" Translated to English by Hiroki Sato <hrs@geocities.co.jp>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.21 2007/05/12 12:42:00 pav Exp $
 .\"
 .Dd November 14, 1998
 .Dt PCCARDC 8
diff --git a/usr.sbin/pccard/pccardc/pccardc.c b/usr.sbin/pccard/pccardc/pccardc.c
index c1f6eced75074..6781a0e3e927f 100644
--- a/usr.sbin/pccard/pccardc/pccardc.c
+++ b/usr.sbin/pccard/pccardc/pccardc.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.c,v 1.13 2004/05/16 22:08:17 stefanf Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/pccardmem.c b/usr.sbin/pccard/pccardc/pccardmem.c
index 0b1d1764c16d9..818ff6c544b87 100644
--- a/usr.sbin/pccard/pccardc/pccardmem.c
+++ b/usr.sbin/pccard/pccardc/pccardmem.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/pccardmem.c,v 1.13 2003/06/09 06:16:18 imp Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/power.c b/usr.sbin/pccard/pccardc/power.c
index 59d43a57436ad..9622f6151ec47 100644
--- a/usr.sbin/pccard/pccardc/power.c
+++ b/usr.sbin/pccard/pccardc/power.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pccard/pccardc/power.c,v 1.3 2002/04/22 13:44:45 des Exp $ */
 
 /*
  * Code cleanup, bug-fix and extension
diff --git a/usr.sbin/pccard/pccardc/printcis.c b/usr.sbin/pccard/pccardc/printcis.c
index f8a53b3cc8675..8a89c23f224bf 100644
--- a/usr.sbin/pccard/pccardc/printcis.c
+++ b/usr.sbin/pccard/pccardc/printcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/printcis.c,v 1.13 2001/05/07 21:51:54 dmlb Exp $";
 #endif /* not lint */
 
 /* 
diff --git a/usr.sbin/pccard/pccardc/rdmap.c b/usr.sbin/pccard/pccardc/rdmap.c
index 3ac81f930ca98..93f7ff8e8ed15 100644
--- a/usr.sbin/pccard/pccardc/rdmap.c
+++ b/usr.sbin/pccard/pccardc/rdmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdmap.c,v 1.12 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/rdreg.c b/usr.sbin/pccard/pccardc/rdreg.c
index a3171487998a3..9d6b7bbc568ba 100644
--- a/usr.sbin/pccard/pccardc/rdreg.c
+++ b/usr.sbin/pccard/pccardc/rdreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/rdreg.c,v 1.12 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrattr.c b/usr.sbin/pccard/pccardc/wrattr.c
index cc3df8ecbee8e..6166a6518c369 100644
--- a/usr.sbin/pccard/pccardc/wrattr.c
+++ b/usr.sbin/pccard/pccardc/wrattr.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrattr.c,v 1.13 1999/08/28 01:17:33 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardc/wrreg.c b/usr.sbin/pccard/pccardc/wrreg.c
index 5fda2a72f24ca..84f6089282224 100644
--- a/usr.sbin/pccard/pccardc/wrreg.c
+++ b/usr.sbin/pccard/pccardc/wrreg.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardc/wrreg.c,v 1.12 1999/08/28 01:17:34 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pccard/pccardd/readcis.c b/usr.sbin/pccard/pccardd/readcis.c
index 73b72efb9eafa..c087ab61a6d26 100644
--- a/usr.sbin/pccard/pccardd/readcis.c
+++ b/usr.sbin/pccard/pccardd/readcis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pccard/pccardd/readcis.c,v 1.26 2003/03/14 21:11:01 imp Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/pccard/pccardd/readcis.h b/usr.sbin/pccard/pccardd/readcis.h
index 8ebd74531fe2f..a0b2e1726246c 100644
--- a/usr.sbin/pccard/pccardd/readcis.h
+++ b/usr.sbin/pccard/pccardd/readcis.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pccard/pccardd/readcis.h,v 1.15 2003/02/25 22:14:38 green Exp $
  */
 
 struct tuple {
diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile
index e57e736fe2c16..ac14d41c4c2ee 100644
--- a/usr.sbin/pciconf/Makefile
+++ b/usr.sbin/pciconf/Makefile
@@ -1,5 +1,5 @@
 #	$ANA: Makefile,v 1.1.1.1 1996/09/25 21:12:57 wollman Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pciconf/Makefile,v 1.10 2007/02/02 19:54:17 jhb Exp $
 
 PROG=	pciconf
 SRCS=	pciconf.c cap.c
diff --git a/usr.sbin/pciconf/cap.c b/usr.sbin/pciconf/cap.c
index 1ccb8f870c27b..9f2ffb6a5191a 100644
--- a/usr.sbin/pciconf/cap.c
+++ b/usr.sbin/pciconf/cap.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pciconf/cap.c,v 1.2.2.2 2007/11/08 21:33:40 jhb Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pciconf/pathnames.h b/usr.sbin/pciconf/pathnames.h
index 719615a478fc0..b5cebb6f1dabe 100644
--- a/usr.sbin/pciconf/pathnames.h
+++ b/usr.sbin/pciconf/pathnames.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pciconf/pathnames.h,v 1.2 2000/12/07 10:52:59 msmith Exp $ */
 #define	_PATH_DEVPCI	"/dev/pci"
 #define	_PATH_PCIVDB	"/usr/share/misc/pci_vendors"
diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8
index d7d5234dbd167..d4df958ae2fe5 100644
--- a/usr.sbin/pciconf/pciconf.8
+++ b/usr.sbin/pciconf/pciconf.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.30.2.1 2007/11/27 17:00:24 marck Exp $
 .\"
 .Dd November 27, 2007
 .Dt PCICONF 8
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index a6ac3154655cd..062ff4ce18aca 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pciconf/pciconf.c,v 1.30 2007/10/04 22:27:08 se Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/pciconf/pciconf.h b/usr.sbin/pciconf/pciconf.h
index 2e87c63cab46d..3188572cc9bdf 100644
--- a/usr.sbin/pciconf/pciconf.h
+++ b/usr.sbin/pciconf/pciconf.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pciconf/pciconf.h,v 1.1.4.1 2007/11/08 21:33:40 jhb Exp $
  */
 
 #ifndef __PCICONF_H__
diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile
index 875d078435eaa..61ed4732999fb 100644
--- a/usr.sbin/periodic/Makefile
+++ b/usr.sbin/periodic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/Makefile,v 1.4 2001/04/07 11:21:33 ru Exp $
 
 SCRIPTS=periodic.sh
 MAN=	periodic.8
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 63359308656e4..27351b4903192 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/periodic/periodic.8,v 1.33 2007/09/07 21:54:45 gabor Exp $
 .\"
 .Dd August 30, 2007
 .Os
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index ca954ea1f0260..c67997b6bbd69 100644
--- a/usr.sbin/periodic/periodic.sh
+++ b/usr.sbin/periodic/periodic.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/periodic/periodic.sh,v 1.21 2007/06/22 10:04:05 dwmalone Exp $
 #
 # Run nightly periodic scripts
 #
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index d4a0baf10478d..5547c85b81a1e 100644
--- a/usr.sbin/pkg_install/Makefile
+++ b/usr.sbin/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.17 2006/03/17 18:54:42 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index bff3474278894..5b9c9cc4d91d5 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile.inc,v 1.14 2006/03/17 18:54:42 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 89988e78b2201..335ce89fa9f27 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.21 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_add
 SRCS=	main.c perform.c futil.c extract.c
diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h
index 37c4ce4554ed4..92ee6bf621e65 100644
--- a/usr.sbin/pkg_install/add/add.h
+++ b/usr.sbin/pkg_install/add/add.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/add/add.h,v 1.14 2006/03/09 14:49:19 phk Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index 732a13fea441e..8330f9557e18f 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/extract.c,v 1.45 2007/08/23 13:05:10 krion Exp $");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
index e0971408fbe8d..b4d4af18919bf 100644
--- a/usr.sbin/pkg_install/add/futil.c
+++ b/usr.sbin/pkg_install/add/futil.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/futil.c,v 1.14 2004/06/29 19:06:41 eik Exp $");
 
 #include <err.h>
 #include "lib.h"
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index e1d9cabbc197c..a7c0511d2a4ef 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.72.4.1 2007/12/22 13:45:15 kensmith Exp $");
 
 #include <err.h>
 #include <sys/param.h>
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index 2404e8186b49b..ed9348a76e226 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/perform.c,v 1.80 2006/03/09 14:49:19 phk Exp $");
 
 #include <err.h>
 #include <paths.h>
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 1e8ba7c8d99c6..a4422714b998d 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -13,7 +13,7 @@
 .\"
 .\" Jordan K. Hubbard
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.71 2006/03/09 14:49:19 phk Exp $
 .\"
 .Dd January 9, 2006
 .Dt PKG_ADD 1
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 42718c6f9273c..4ce9bb9165127 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/create/Makefile,v 1.22 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_create
 SRCS=	main.c perform.c pl.c
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
index 9450170be821b..e0dc7ef978dc1 100644
--- a/usr.sbin/pkg_install/create/create.h
+++ b/usr.sbin/pkg_install/create/create.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/create/create.h,v 1.26 2005/11/08 20:48:26 krion Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 8a16dd0f3a972..567707ba6b399 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -10,7 +10,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.40 2006/09/29 17:23:14 ru Exp $");
 
 #include <err.h>
 #include "lib.h"
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 77ec1f216a319..44ee887c867db 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.82 2006/01/07 22:10:57 krion Exp $");
 
 #include "lib.h"
 #include "create.h"
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 6fb6d58640ea4..7b148158a0ac3 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.70 2006/01/07 22:10:57 krion Exp $
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 18bbaf24734b6..e140c51ad8c4f 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/pl.c,v 1.28 2006/01/07 22:10:57 krion Exp $");
 
 #include "lib.h"
 #include "create.h"
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index c346ea705d796..077738fd5dc40 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/delete/Makefile,v 1.22 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_delete
 SRCS=	main.c perform.c
diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h
index e0aeca52b1547..cc6d6427353f1 100644
--- a/usr.sbin/pkg_install/delete/delete.h
+++ b/usr.sbin/pkg_install/delete/delete.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/delete/delete.h,v 1.8 2004/06/29 19:06:41 eik Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index b81b79a91d92f..cf0fb14283802 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.28 2006/06/12 22:39:31 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index 1e40db6d2f6a2..2f31fe1746cbf 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/perform.c,v 1.41 2004/06/29 19:06:41 eik Exp $");
 
 #include <err.h>
 #include "lib.h"
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 3f10b9c88998c..e79b72a755257 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.31 2005/02/13 22:25:30 ru Exp $
 .\"
 .Dd June 29, 2004
 .Dt PKG_DELETE 1
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 675f7ca454acf..4327075381479 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/info/Makefile,v 1.20 2004/08/12 20:06:00 ru Exp $
 
 PROG=	pkg_info
 SRCS=	main.c perform.c show.c
diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h
index 46e29b1202dd9..062018fba38e6 100644
--- a/usr.sbin/pkg_install/info/info.h
+++ b/usr.sbin/pkg_install/info/info.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/info/info.h,v 1.29 2006/01/09 18:27:21 flz Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index 90351b2383650..7582de4a2d0c6 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.50 2006/06/12 22:39:31 obrien Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index 3f3ceb0d5094b..2b9475c2fe9b0 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/perform.c,v 1.54 2006/01/09 18:27:21 flz Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 17c0bba4dca9f..42947459dac3c 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.60 2007/03/04 13:30:02 ru Exp $
 .\"
 .Dd January 9, 2006
 .Dt PKG_INFO 1
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index c65c312a5062a..58b08290d3408 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/show.c,v 1.41 2007/02/07 19:44:44 pav Exp $");
 
 #include "lib.h"
 #include "info.h"
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index 84a41b8d7f156..2c578ff67dd85 100644
--- a/usr.sbin/pkg_install/lib/Makefile
+++ b/usr.sbin/pkg_install/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/lib/Makefile,v 1.18 2004/10/24 15:33:07 ru Exp $
 
 LIB=	install
 INTERNALLIB=
diff --git a/usr.sbin/pkg_install/lib/deps.c b/usr.sbin/pkg_install/lib/deps.c
index 66f44a9c6fea2..42973cc2dbfca 100644
--- a/usr.sbin/pkg_install/lib/deps.c
+++ b/usr.sbin/pkg_install/lib/deps.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/deps.c,v 1.12 2007/06/18 22:49:13 pav Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index fc8220c5f399f..8da2001d477ad 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/exec.c,v 1.11 2007/03/28 05:33:52 njl Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index e406caa89704d..4c5a2d178f739 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/file.c,v 1.68 2004/07/28 16:03:13 stefanf Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
index e136ec86a6f2c..261bd8438b7a3 100644
--- a/usr.sbin/pkg_install/lib/global.c
+++ b/usr.sbin/pkg_install/lib/global.c
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/global.c,v 1.11 2006/06/12 22:39:32 obrien Exp $");
 
 #include "lib.h"
 
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index 5cda81faedb89..bcfde14b9ec0a 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.60 2007/03/28 05:33:52 njl Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pkg_install/lib/match.c b/usr.sbin/pkg_install/lib/match.c
index 2de0dc72476e4..e72d8cd4d669d 100644
--- a/usr.sbin/pkg_install/lib/match.c
+++ b/usr.sbin/pkg_install/lib/match.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/match.c,v 1.20 2005/09/24 21:41:47 krion Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index 5b17624016d0e..0ceab99328b61 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/msg.c,v 1.16 2002/04/01 09:39:07 obrien Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c
index 06379b69c7f96..b2a66e4009478 100644
--- a/usr.sbin/pkg_install/lib/pen.c
+++ b/usr.sbin/pkg_install/lib/pen.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/pen.c,v 1.42 2004/07/28 16:03:13 stefanf Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/pkgwrap.c b/usr.sbin/pkg_install/lib/pkgwrap.c
index cbd15cd7b445c..94783515bfcf6 100644
--- a/usr.sbin/pkg_install/lib/pkgwrap.c
+++ b/usr.sbin/pkg_install/lib/pkgwrap.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/pkgwrap.c,v 1.1 2002/09/09 19:43:30 sobomax Exp $");
 
 #include "lib.h"
 #include <ctype.h>
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index 283b87f9c1b1f..165865b9cbaf4 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.52 2007/03/28 05:33:52 njl Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
index 0d9e288b75794..c877a32617a2a 100644
--- a/usr.sbin/pkg_install/lib/str.c
+++ b/usr.sbin/pkg_install/lib/str.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/str.c,v 1.15 2003/05/26 17:12:22 lioux Exp $");
 
 #include "lib.h"
 
diff --git a/usr.sbin/pkg_install/lib/url.c b/usr.sbin/pkg_install/lib/url.c
index 29e9bebda69cb..6ec780f098ec3 100644
--- a/usr.sbin/pkg_install/lib/url.c
+++ b/usr.sbin/pkg_install/lib/url.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/url.c,v 1.9 2007/03/28 05:33:52 njl Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/lib/version.c b/usr.sbin/pkg_install/lib/version.c
index d9c4fe7e070c7..8b5aab9f3734a 100644
--- a/usr.sbin/pkg_install/lib/version.c
+++ b/usr.sbin/pkg_install/lib/version.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/version.c,v 1.5 2004/06/29 18:52:12 eik Exp $");
 
 #include "lib.h"
 #include <err.h>
diff --git a/usr.sbin/pkg_install/sign/Makefile b/usr.sbin/pkg_install/sign/Makefile
index 35fe7ec83d570..414aa85a3a4ef 100644
--- a/usr.sbin/pkg_install/sign/Makefile
+++ b/usr.sbin/pkg_install/sign/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/sign/Makefile,v 1.10 2004/08/12 20:06:00 ru Exp $
 # $OpenBSD: Makefile.bsd-wrapper,v 1.2 1999/10/07 16:30:32 espie Exp $
 
 PROG=	pkg_sign
diff --git a/usr.sbin/pkg_install/sign/README b/usr.sbin/pkg_install/sign/README
index 8e81fcdf052b4..081515b8aff43 100644
--- a/usr.sbin/pkg_install/sign/README
+++ b/usr.sbin/pkg_install/sign/README
@@ -52,4 +52,4 @@ libraries on OpenBSD 2.7 and FreeBSD 5.0, your mileage may vary.
 --
 
 	Wes Peters, Dec 2000
-	$FreeBSD$
+	$FreeBSD: src/usr.sbin/pkg_install/sign/README,v 1.1 2001/02/06 06:46:42 wes Exp $
diff --git a/usr.sbin/pkg_install/sign/check.c b/usr.sbin/pkg_install/sign/check.c
index cfc3bfa17f060..469fe73c57d72 100644
--- a/usr.sbin/pkg_install/sign/check.c
+++ b/usr.sbin/pkg_install/sign/check.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/check.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 /* Simple code for a stand-alone package checker */
 #include <sys/types.h>
diff --git a/usr.sbin/pkg_install/sign/common.c b/usr.sbin/pkg_install/sign/common.c
index ec3235755ee4a..3d4d0f090c574 100644
--- a/usr.sbin/pkg_install/sign/common.c
+++ b/usr.sbin/pkg_install/sign/common.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/common.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h
index e7c00766f33ff..577236ad36ee6 100644
--- a/usr.sbin/pkg_install/sign/extern.h
+++ b/usr.sbin/pkg_install/sign/extern.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/extern.h,v 1.2 2001/05/17 10:12:45 sobomax Exp $ */
 /* $OpenBSD: extern.h,v 1.3 1999/10/07 16:30:32 espie Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.sbin/pkg_install/sign/gzip.c b/usr.sbin/pkg_install/sign/gzip.c
index 33d9baebc0743..fe582bf0f5082 100644
--- a/usr.sbin/pkg_install/sign/gzip.c
+++ b/usr.sbin/pkg_install/sign/gzip.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/gzip.c,v 1.3 2002/04/01 09:39:07 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h
index 238010fe7709a..b7c97274414e4 100644
--- a/usr.sbin/pkg_install/sign/gzip.h
+++ b/usr.sbin/pkg_install/sign/gzip.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/gzip.h,v 1.2 2001/05/17 10:12:45 sobomax Exp $ */
 /* $OpenBSD: gzip.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.sbin/pkg_install/sign/main.c b/usr.sbin/pkg_install/sign/main.c
index 0161efe6c400e..b89e9233e6dbd 100644
--- a/usr.sbin/pkg_install/sign/main.c
+++ b/usr.sbin/pkg_install/sign/main.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/main.c,v 1.3 2007/01/30 15:09:30 ru Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h
index 99476f2f68114..77020f3424277 100644
--- a/usr.sbin/pkg_install/sign/pgp.h
+++ b/usr.sbin/pkg_install/sign/pgp.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/pgp.h,v 1.1 2001/02/06 06:46:42 wes Exp $ */
 /* $OpenBSD: pgp.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */
 /* Estimate size of pgp signature */
 #define MAXPGPSIGNSIZE	1024
diff --git a/usr.sbin/pkg_install/sign/pgp_check.c b/usr.sbin/pkg_install/sign/pgp_check.c
index 52b0345b48ac9..0d0f890e76aec 100644
--- a/usr.sbin/pkg_install/sign/pgp_check.c
+++ b/usr.sbin/pkg_install/sign/pgp_check.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/pgp_check.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/usr.sbin/pkg_install/sign/pgp_sign.c b/usr.sbin/pkg_install/sign/pgp_sign.c
index 78992ff9d2020..173b05e93e76c 100644
--- a/usr.sbin/pkg_install/sign/pgp_sign.c
+++ b/usr.sbin/pkg_install/sign/pgp_sign.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/pgp_sign.c,v 1.5 2004/06/29 19:06:42 eik Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/usr.sbin/pkg_install/sign/pkg_sign.1 b/usr.sbin/pkg_install/sign/pkg_sign.1
index 661d20e3eab98..86aa3f255eacc 100644
--- a/usr.sbin/pkg_install/sign/pkg_sign.1
+++ b/usr.sbin/pkg_install/sign/pkg_sign.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/sign/pkg_sign.1,v 1.10 2005/02/13 22:25:31 ru Exp $
 .\" $OpenBSD: pkg_sign.1,v 1.6 2000/04/15 02:15:20 aaron Exp $
 .\"
 .\" Copyright (c) 1999 Marc Espie.
diff --git a/usr.sbin/pkg_install/sign/sha1.c b/usr.sbin/pkg_install/sign/sha1.c
index 272ae310fb316..15ad9d834760c 100644
--- a/usr.sbin/pkg_install/sign/sha1.c
+++ b/usr.sbin/pkg_install/sign/sha1.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/sha1.c,v 1.5 2004/06/29 19:06:42 eik Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/sign/sign.c b/usr.sbin/pkg_install/sign/sign.c
index 33fc3513cfa0d..aee8eee4c1ea8 100644
--- a/usr.sbin/pkg_install/sign/sign.c
+++ b/usr.sbin/pkg_install/sign/sign.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/sign.c,v 1.5 2006/03/15 01:19:23 krion Exp $");
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/usr.sbin/pkg_install/sign/stand.c b/usr.sbin/pkg_install/sign/stand.c
index 98e4b4753fad1..db18d699c68b4 100644
--- a/usr.sbin/pkg_install/sign/stand.c
+++ b/usr.sbin/pkg_install/sign/stand.c
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/stand.c,v 1.3 2007/01/30 15:09:30 ru Exp $");
 
 #include "stand.h"
 
diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h
index dbc3d693dbeb3..ddc9e44160494 100644
--- a/usr.sbin/pkg_install/sign/stand.h
+++ b/usr.sbin/pkg_install/sign/stand.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/sign/stand.h,v 1.2 2004/06/29 19:06:42 eik Exp $ */
 /* $OpenBSD: stand.h,v 1.2 1999/10/04 21:46:30 espie Exp $ */
 
 /* provided to cater for BSD idiosyncrasies */
diff --git a/usr.sbin/pkg_install/sign/x509.c b/usr.sbin/pkg_install/sign/x509.c
index 5ecbd7c1a0069..1afd4cb9c2feb 100644
--- a/usr.sbin/pkg_install/sign/x509.c
+++ b/usr.sbin/pkg_install/sign/x509.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/x509.c,v 1.5 2006/03/15 01:19:23 krion Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg
index 9071155a289de..208993c55da7a 100755
--- a/usr.sbin/pkg_install/tkpkg
+++ b/usr.sbin/pkg_install/tkpkg
@@ -1,5 +1,5 @@
 #!/usr/local/bin/wish -f
-#$FreeBSD$
+#$FreeBSD: src/usr.sbin/pkg_install/tkpkg,v 1.7 1999/08/29 15:54:49 peter Exp $
 #
 #$Log: tkpkg,v $
 #Revision 1.2  1994/12/06 00:51:21  jkh
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index 71168ee3d23fc..bf4355f727304 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/Makefile,v 1.16 2004/08/12 20:06:01 ru Exp $
 
 PROG=	pkg_version
 SRCS=	main.c perform.c
diff --git a/usr.sbin/pkg_install/version/main.c b/usr.sbin/pkg_install/version/main.c
index 362bd75af5de8..b3b8a7654fa43 100644
--- a/usr.sbin/pkg_install/version/main.c
+++ b/usr.sbin/pkg_install/version/main.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/main.c,v 1.7 2006/06/12 22:39:32 obrien Exp $");
 
 #include "lib.h"
 #include "version.h"
diff --git a/usr.sbin/pkg_install/version/perform.c b/usr.sbin/pkg_install/version/perform.c
index e39adaf50e66b..9fe4b9eef486a 100644
--- a/usr.sbin/pkg_install/version/perform.c
+++ b/usr.sbin/pkg_install/version/perform.c
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.16.2.1 2007/11/06 18:15:21 simon Exp $");
 
 #include "lib.h"
 #include "version.h"
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index c8ecf4a2e7ba7..db9c4c7ce4503 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.36.4.1 2008/01/04 13:22:09 gabor Exp $
 .\"
 .Dd July 27, 2005
 .Dt PKG_VERSION 1
diff --git a/usr.sbin/pkg_install/version/test-pkg_version.sh b/usr.sbin/pkg_install/version/test-pkg_version.sh
index 95486c1f7bdf7..cd10ee0a648d8 100755
--- a/usr.sbin/pkg_install/version/test-pkg_version.sh
+++ b/usr.sbin/pkg_install/version/test-pkg_version.sh
@@ -29,7 +29,7 @@
 # Regression testing for pkg_version
 # Originally from an idea by "Akinori MUSHA" <knu@iDaemons.org>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pkg_install/version/test-pkg_version.sh,v 1.6 2005/10/10 12:35:31 krion Exp $
 #
 
 ECHO=echo
diff --git a/usr.sbin/pkg_install/version/version.h b/usr.sbin/pkg_install/version/version.h
index c93d503bfc90a..394f9d4be46aa 100644
--- a/usr.sbin/pkg_install/version/version.h
+++ b/usr.sbin/pkg_install/version/version.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pkg_install/version/version.h,v 1.5 2005/07/27 07:55:12 krion Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff --git a/usr.sbin/pmccontrol/Makefile b/usr.sbin/pmccontrol/Makefile
index 9dafe1c3fbd55..dedd330887c06 100644
--- a/usr.sbin/pmccontrol/Makefile
+++ b/usr.sbin/pmccontrol/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pmccontrol/Makefile,v 1.2 2005/04/19 14:43:59 jkoshy Exp $
 #
 
 PROG=	pmccontrol
diff --git a/usr.sbin/pmccontrol/pmccontrol.8 b/usr.sbin/pmccontrol/pmccontrol.8
index cff96296770a2..a3b55a1f66fc5 100644
--- a/usr.sbin/pmccontrol/pmccontrol.8
+++ b/usr.sbin/pmccontrol/pmccontrol.8
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pmccontrol/pmccontrol.8,v 1.2 2005/06/24 16:19:46 ru Exp $
 .\"
 .Dd December 15, 2003
 .Os
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index 49a1de710707a..acd93fce03ded 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pmccontrol/pmccontrol.c,v 1.6 2006/02/27 14:25:32 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile
index 819a0c0f3ca1c..0fb268037073f 100644
--- a/usr.sbin/pmcstat/Makefile
+++ b/usr.sbin/pmcstat/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pmcstat/Makefile,v 1.5 2007/10/01 18:15:11 ru Exp $
 #
 
 PROG=	pmcstat
diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8
index 951dba6dce0c9..b15efbb665eeb 100644
--- a/usr.sbin/pmcstat/pmcstat.8
+++ b/usr.sbin/pmcstat/pmcstat.8
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pmcstat/pmcstat.8,v 1.12 2007/04/27 12:09:31 jkoshy Exp $
 .\"
 .Dd April 23, 2007
 .Os
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index b0c260069df83..9f33bb43ff858 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pmcstat/pmcstat.c,v 1.17 2007/04/27 12:09:31 jkoshy Exp $");
 
 #include <sys/types.h>
 #include <sys/event.h>
diff --git a/usr.sbin/pmcstat/pmcstat.h b/usr.sbin/pmcstat/pmcstat.h
index 5b062a948d476..e69785f9e5662 100644
--- a/usr.sbin/pmcstat/pmcstat.h
+++ b/usr.sbin/pmcstat/pmcstat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pmcstat/pmcstat.h,v 1.5 2007/04/27 12:09:31 jkoshy Exp $
  */
 
 #ifndef	_PMCSTAT_H_
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index be81082d74188..6aa37d9d154b7 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pmcstat/pmcstat_log.c,v 1.10 2006/04/05 15:12:25 jkoshy Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 294b4f758d4f8..b350672c8d0d3 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pnpinfo/Makefile,v 1.12 2006/08/22 07:51:09 ru Exp $
 
 .PATH: ${.CURDIR}/../../contrib/pnpinfo
 
diff --git a/usr.sbin/portsnap/Makefile b/usr.sbin/portsnap/Makefile
index 0f77bcb048724..c2967636a294e 100644
--- a/usr.sbin/portsnap/Makefile
+++ b/usr.sbin/portsnap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/Makefile,v 1.1 2005/08/08 20:10:05 cperciva Exp $
 
 SUBDIR=	portsnap make_index phttpget
 
diff --git a/usr.sbin/portsnap/Makefile.inc b/usr.sbin/portsnap/Makefile.inc
index 5f6527edb373b..f82f88223318f 100644
--- a/usr.sbin/portsnap/Makefile.inc
+++ b/usr.sbin/portsnap/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/Makefile.inc,v 1.1 2005/08/08 20:10:05 cperciva Exp $
 
 LIBEXECDIR?=	/usr/libexec
 
diff --git a/usr.sbin/portsnap/make_index/Makefile b/usr.sbin/portsnap/make_index/Makefile
index 65b1a8e61063a..e8d6462ec2d1d 100644
--- a/usr.sbin/portsnap/make_index/Makefile
+++ b/usr.sbin/portsnap/make_index/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/make_index/Makefile,v 1.1 2005/08/08 20:10:06 cperciva Exp $
 
 PROG=	make_index
 NO_MAN=
diff --git a/usr.sbin/portsnap/make_index/make_index.c b/usr.sbin/portsnap/make_index/make_index.c
index c15ce1070b711..4ecc48cfbe587 100644
--- a/usr.sbin/portsnap/make_index/make_index.c
+++ b/usr.sbin/portsnap/make_index/make_index.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/portsnap/make_index/make_index.c,v 1.5 2005/12/01 22:14:44 cperciva Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/portsnap/phttpget/Makefile b/usr.sbin/portsnap/phttpget/Makefile
index 154ff15f95203..aa16c268c2e66 100644
--- a/usr.sbin/portsnap/phttpget/Makefile
+++ b/usr.sbin/portsnap/phttpget/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/phttpget/Makefile,v 1.1 2005/08/08 20:10:06 cperciva Exp $
 
 PROG=	phttpget
 NO_MAN=
diff --git a/usr.sbin/portsnap/phttpget/phttpget.c b/usr.sbin/portsnap/phttpget/phttpget.c
index e10912493a212..6b4cfd482fd91 100644
--- a/usr.sbin/portsnap/phttpget/phttpget.c
+++ b/usr.sbin/portsnap/phttpget/phttpget.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/portsnap/phttpget/phttpget.c,v 1.12.4.1 2008/02/15 16:17:28 cperciva Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.sbin/portsnap/portsnap/Makefile b/usr.sbin/portsnap/portsnap/Makefile
index e8f42b85f1b08..45574b306d43b 100644
--- a/usr.sbin/portsnap/portsnap/Makefile
+++ b/usr.sbin/portsnap/portsnap/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/portsnap/Makefile,v 1.2 2006/09/01 09:49:09 cperciva Exp $
 
 SCRIPTS=portsnap.sh
 MAN=	portsnap.8
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8
index 1d7a82bbd4124..7bd90ddd8edfb 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.8
+++ b/usr.sbin/portsnap/portsnap/portsnap.8
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.8,v 1.10 2006/09/29 17:57:04 ru Exp $
 .\"
 .Dd August 13, 2005
 .Dt PORTSNAP 8
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index 7d7a2d14cb103..1f95615ac5eb4 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -25,7 +25,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.27 2007/08/02 02:05:23 cperciva Exp $
 
 #### Usage function -- called from command-line handling code.
 
diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile
index 6adb188608aa1..6ebff14fee633 100644
--- a/usr.sbin/powerd/Makefile
+++ b/usr.sbin/powerd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/powerd/Makefile,v 1.5 2006/01/03 21:32:02 des Exp $
 
 PROG=	powerd
 MAN=	powerd.8
diff --git a/usr.sbin/powerd/powerd.8 b/usr.sbin/powerd/powerd.8
index af5f299dc41df..ff7ea4f3f9504 100644
--- a/usr.sbin/powerd/powerd.8
+++ b/usr.sbin/powerd/powerd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/powerd/powerd.8,v 1.10 2005/11/24 09:25:08 joel Exp $
 .\"
 .Dd November 6, 2005
 .Dt POWERD 8
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 1f114d427ddbf..c3478fb77bcb1 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/powerd/powerd.c,v 1.21 2007/06/13 19:05:11 marck Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index ea8a4628e2076..c4994f23ca39b 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.110 2006/03/17 18:54:42 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/ppp/README.changes b/usr.sbin/ppp/README.changes
index bf626e3010b93..85828b3520e11 100644
--- a/usr.sbin/ppp/README.changes
+++ b/usr.sbin/ppp/README.changes
@@ -23,7 +23,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.changes,v 1.24 2004/11/19 03:56:47 obrien Exp $
 
 This file summarises changes made to ppp that effect
 its configuration.
diff --git a/usr.sbin/ppp/README.nat b/usr.sbin/ppp/README.nat
index 9ff240a9f37cd..2336f49e090fc 100644
--- a/usr.sbin/ppp/README.nat
+++ b/usr.sbin/ppp/README.nat
@@ -22,7 +22,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/ppp/README.nat,v 1.7 2002/06/15 08:03:29 brian Exp $
 
 User PPP NAT (Packet Aliasing)
 
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index 6c3ec05834860..5736dd513ccf9 100644
--- a/usr.sbin/ppp/acf.c
+++ b/usr.sbin/ppp/acf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.c,v 1.7 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index e32adbc1661cd..6b0fc6131ccb2 100644
--- a/usr.sbin/ppp/acf.h
+++ b/usr.sbin/ppp/acf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/acf.h,v 1.2 1999/08/28 01:18:14 peter Exp $
  */
 
 struct lcp;
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 02dce51ab5049..8f6660df84558 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/arp.c,v 1.46 2004/09/05 01:46:51 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index 81e3fa6e9db2d..f624e1286e6fe 100644
--- a/usr.sbin/ppp/arp.h
+++ b/usr.sbin/ppp/arp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/arp.h,v 1.12 2004/09/05 01:46:51 brian Exp $
  */
 
 struct sockaddr_dl;
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index a2a8e04429564..bf002d0f4c555 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ppp/async.c,v 1.29 2004/09/05 01:46:51 brian Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 309f597841e6c..460cb80a57d36 100644
--- a/usr.sbin/ppp/async.h
+++ b/usr.sbin/ppp/async.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/async.h,v 1.8 2002/03/30 12:30:08 brian Exp $
  */
 
 #define HDLCSIZE	(MAX_MRU*2+6)
diff --git a/usr.sbin/ppp/atm.c b/usr.sbin/ppp/atm.c
index 6e0ce754c6f7e..3f78c6153b65b 100644
--- a/usr.sbin/ppp/atm.c
+++ b/usr.sbin/ppp/atm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/atm.c,v 1.10 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/atm.h b/usr.sbin/ppp/atm.h
index ccfad8d9fea70..f418674784a54 100644
--- a/usr.sbin/ppp/atm.h
+++ b/usr.sbin/ppp/atm.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/atm.h,v 1.2 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index b5038edfa215e..58d729810a9e5 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.c,v 1.58 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index 3e1047d551a7e..bd962eb9b51bd 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/auth.h,v 1.21 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 912f8558ed0fc..9a1d81b2f3c4c 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/bundle.c,v 1.136 2004/11/29 17:11:14 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index e2f9e7fb34009..3bc4246827cad 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/bundle.h,v 1.52 2004/11/29 17:11:14 brian Exp $
  */
 
 #define	PHASE_DEAD		0	/* Link is dead */
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index be68e484d17ef..665df7d2dfb2f 100644
--- a/usr.sbin/ppp/cbcp.c
+++ b/usr.sbin/ppp/cbcp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.c,v 1.26 2005/02/15 10:59:54 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 46bf274f21c9d..424085db92b13 100644
--- a/usr.sbin/ppp/cbcp.h
+++ b/usr.sbin/ppp/cbcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/cbcp.h,v 1.3 1999/08/28 01:18:19 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index f5bbf0c39c24b..d484598bc9751 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.c,v 1.78 2004/10/11 09:45:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index bc867b63ddbb5..2283e102d7fbb 100644
--- a/usr.sbin/ppp/ccp.h
+++ b/usr.sbin/ppp/ccp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ccp.h,v 1.31 2002/06/12 00:33:17 brian Exp $
  */
 
 #define	CCP_MAXCODE	CODE_RESETACK
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 75de650c6ba5d..0401ad718ccd7 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.c,v 1.86 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 617555d82d442..e341ca1c109bd 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap.h,v 1.22 2002/06/17 01:12:38 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index 24e959cb453e9..3c014a0bbc684 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap_ms.c,v 1.20 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 8a69f93f215b7..4a57f9f3b3632 100644
--- a/usr.sbin/ppp/chap_ms.h
+++ b/usr.sbin/ppp/chap_ms.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chap_ms.h,v 1.9 2004/09/05 01:46:51 brian Exp $
  */
 
 /* Max # of (Unicode) chars in an NT password */
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 04b267929780f..648b4114d54d3 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chat.c,v 1.80 2004/10/11 09:45:57 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index b8162bfd33dd9..13385679e640d 100644
--- a/usr.sbin/ppp/chat.h
+++ b/usr.sbin/ppp/chat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/chat.h,v 1.16 2000/03/14 01:46:05 brian Exp $
  */
 
 #define CHAT_EXPECT 0
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 04ad0801b7263..ed4866c1eb869 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.c,v 1.307 2007/05/25 13:45:48 novel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index 8eb1e38d243d0..44d6829f1c60c 100644
--- a/usr.sbin/ppp/command.h
+++ b/usr.sbin/ppp/command.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/command.h,v 1.23 2001/11/03 21:45:31 brian Exp $
  */
 
 struct cmdtab;
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index d47b11aa2154a..321240db4f284 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/datalink.c,v 1.77 2004/10/11 09:45:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 6fd7e9b878fe9..f54fcb4b6622c 100644
--- a/usr.sbin/ppp/datalink.h
+++ b/usr.sbin/ppp/datalink.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/datalink.h,v 1.16 2004/10/11 09:45:58 brian Exp $
  */
 
 #define DATALINK_CLOSED  (0)
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 57c90047b7535..70971db2df1d8 100644
--- a/usr.sbin/ppp/deflate.c
+++ b/usr.sbin/ppp/deflate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.c,v 1.26 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index a478b24cb1def..2cdc38e62a145 100644
--- a/usr.sbin/ppp/deflate.h
+++ b/usr.sbin/ppp/deflate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/deflate.h,v 1.4 1999/08/28 01:18:23 peter Exp $
  */
 
 extern const struct ccp_algorithm PppdDeflateAlgorithm;
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index dcd9e47e1a196..43435dddacb0c 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.c,v 1.48 2004/09/05 01:46:51 brian Exp $
  */
 
 
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index f56ee326698e7..ea917988a05b1 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/defs.h,v 1.68 2004/11/19 03:56:47 obrien Exp $
  */
 
 /* Check the following definitions for your machine environment */
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index a3c1b1075406a..460b998247774 100644
--- a/usr.sbin/ppp/descriptor.h
+++ b/usr.sbin/ppp/descriptor.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/descriptor.h,v 1.8 2000/03/14 01:46:06 brian Exp $
  */
 
 #define PHYSICAL_DESCRIPTOR (1)
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index e4e154ad7f3ef..979bcb2d92fa0 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ether.c,v 1.30 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index 94511bdab1044..1d4e057b63414 100644
--- a/usr.sbin/ppp/ether.h
+++ b/usr.sbin/ppp/ether.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ether.h,v 1.3 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index 7c80034a6acde..d36e772f11ace 100644
--- a/usr.sbin/ppp/exec.c
+++ b/usr.sbin/ppp/exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.c,v 1.29 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index d4b338767fb39..34542c6d4f78f 100644
--- a/usr.sbin/ppp/exec.h
+++ b/usr.sbin/ppp/exec.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/exec.h,v 1.5 1999/11/06 22:50:53 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index f59848e0d1d68..ea720ab39b82e 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.c,v 1.52 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index ce67420d8cde4..de86c9ab86121 100644
--- a/usr.sbin/ppp/filter.h
+++ b/usr.sbin/ppp/filter.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/filter.h,v 1.29 2004/09/05 01:46:51 brian Exp $
  */
 
 /* Operations - f_srcop, f_dstop */
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 78530b979ac40..dfc6fe9da20a6 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.c,v 1.71 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index d233899e9203a..ecb40cdcf5eb2 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/fsm.h,v 1.29 2007/01/05 00:33:00 ticso Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 517c3c5132ec1..e0444fb4723f1 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.c,v 1.51 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index b9211a654a756..d266f0fc7f9ad 100644
--- a/usr.sbin/ppp/hdlc.h
+++ b/usr.sbin/ppp/hdlc.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/hdlc.h,v 1.24 2004/09/05 01:46:51 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c
index f07962509d259..8158cd7ccb09d 100644
--- a/usr.sbin/ppp/i4b.c
+++ b/usr.sbin/ppp/i4b.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/i4b.c,v 1.16 2007/07/06 07:19:47 bz Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index 3545c8485aa5e..bb2cba2ce83ed 100644
--- a/usr.sbin/ppp/i4b.h
+++ b/usr.sbin/ppp/i4b.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/i4b.h,v 1.5 2004/09/05 01:46:51 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 440d460e53015..85e9f03f75b37 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/id.c,v 1.23 2002/06/15 08:03:29 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 6125ab5057541..dbdcfc8a1330f 100644
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/id.h,v 1.16 2004/09/07 06:28:00 marcel Exp $
  */
 
 #ifndef NOSUID
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 5c7f7d0640b43..4606cbb5882e8 100644
--- a/usr.sbin/ppp/iface.c
+++ b/usr.sbin/ppp/iface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iface.c,v 1.38 2005/01/10 11:12:10 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index 1fd0a70b17b45..f1fba9b3993a7 100644
--- a/usr.sbin/ppp/iface.h
+++ b/usr.sbin/ppp/iface.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iface.h,v 1.8 2004/09/05 01:46:51 brian Exp $
  */
 
 struct ifa_msghdr;
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 5cd2272ff8307..f0232e759178c 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ip.c,v 1.104 2004/09/06 23:54:54 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index a4c417912f9fd..07aeb5fbaa260 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ip.h,v 1.18 2001/08/14 16:05:51 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index e2da0e58526f0..598d3618a10a9 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.c,v 1.123 2005/01/27 14:09:33 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index dc1ed9e193e62..19d6288f91413 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipcp.h,v 1.35 2001/08/14 16:05:51 brian Exp $
  */
 
 #define	IPCP_MAXCODE	CODE_CODEREJ
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index a7fae6e54b323..cb2b99364b11e 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.c,v 1.10 2004/09/05 01:46:51 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/iplist.h b/usr.sbin/ppp/iplist.h
index 5805a2cfbb77a..7cc8ab8c2fc2c 100644
--- a/usr.sbin/ppp/iplist.h
+++ b/usr.sbin/ppp/iplist.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/iplist.h,v 1.4 1999/08/28 01:18:31 peter Exp $
  */
 
 struct iplist_cur {
diff --git a/usr.sbin/ppp/ipv6cp.c b/usr.sbin/ppp/ipv6cp.c
index 06b003b93fbda..57e1b3244d381 100644
--- a/usr.sbin/ppp/ipv6cp.c
+++ b/usr.sbin/ppp/ipv6cp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipv6cp.c,v 1.17 2005/01/27 14:09:33 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ipv6cp.h b/usr.sbin/ppp/ipv6cp.h
index 53f7153157eab..def454a78504f 100644
--- a/usr.sbin/ppp/ipv6cp.h
+++ b/usr.sbin/ppp/ipv6cp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ipv6cp.h,v 1.2 2002/08/29 02:44:58 brian Exp $
  */
 
 #ifndef NOINET6
diff --git a/usr.sbin/ppp/layer.h b/usr.sbin/ppp/layer.h
index 4ee59a10a6f2d..919d8ab0fb9ba 100644
--- a/usr.sbin/ppp/layer.h
+++ b/usr.sbin/ppp/layer.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/layer.h,v 1.3 1999/08/28 01:18:31 peter Exp $
  */
 
 #define	LAYER_ASYNC	2
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index cf757186d311c..693d01a2bb9ea 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.c,v 1.110 2006/09/06 06:23:55 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index e0382a8406ba0..56518e2f214b0 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lcp.h,v 1.31 2004/12/13 12:51:19 brian Exp $
  */
 
 /* callback::opmask values */
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index dc5507d7278d7..d8a6dc55573c5 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/link.c,v 1.21 2004/09/05 01:46:51 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index 822474b789920..e3450ae604480 100644
--- a/usr.sbin/ppp/link.h
+++ b/usr.sbin/ppp/link.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/link.h,v 1.11 2004/06/30 12:24:56 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index c90720b9724ba..6f4d6ab837afa 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/log.c,v 1.53 2004/07/17 01:07:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 0da4b8c268482..95f239974fc37 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/log.h,v 1.34 2004/07/17 01:07:52 brian Exp $
  */
 
 #define LogLOG		(0)
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index cb04741638203..ea03788b61815 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.c,v 1.49 2004/12/13 12:51:19 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 13d378ffbe777..91a08eedd32f3 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/lqr.h,v 1.18 2004/06/30 12:24:56 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 694b744eaa1ea..53c9cda135c6f 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/main.c,v 1.193 2004/12/21 11:12:05 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index 0c7399ae7ad83..479cfef63aae4 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/main.h,v 1.13 2004/09/05 01:46:52 brian Exp $
  */
 
 extern void Cleanup(void);
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 4773224ea3ef7..5291665dd402a 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.c,v 1.46 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 980d649c25c96..a24e989f22a36 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mbuf.h,v 1.29 2004/09/05 01:46:52 brian Exp $
  */
 
 struct mbuf {
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 095f9bbc0780c..bedc0da73c458 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mp.c,v 1.55 2004/09/06 00:07:58 marcel Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 7cf5a8e850173..f2fa0c6a53da1 100644
--- a/usr.sbin/ppp/mp.h
+++ b/usr.sbin/ppp/mp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mp.h,v 1.12 2004/09/05 01:46:52 brian Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index 141574ff275e5..700ccec5d7cf3 100644
--- a/usr.sbin/ppp/mppe.c
+++ b/usr.sbin/ppp/mppe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mppe.c,v 1.28 2004/09/07 15:48:27 phk Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/mppe.h b/usr.sbin/ppp/mppe.h
index c70a60906ba1d..a31eb5d05e41c 100644
--- a/usr.sbin/ppp/mppe.h
+++ b/usr.sbin/ppp/mppe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/mppe.h,v 1.2 2000/11/07 23:19:11 brian Exp $
  */
 
 #define MPPE_KEY_LEN	16
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index 4e764641e4cb6..048c067367877 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.c,v 1.62 2004/10/11 09:45:58 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index f4c3655f2c8cc..f267f4c000986 100644
--- a/usr.sbin/ppp/nat_cmd.h
+++ b/usr.sbin/ppp/nat_cmd.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/nat_cmd.h,v 1.20 2003/09/23 07:41:54 marcus Exp $
  */
 
 struct cmdargs;
diff --git a/usr.sbin/ppp/ncp.c b/usr.sbin/ppp/ncp.c
index 1c12fc5ca6061..a07ac51a32056 100644
--- a/usr.sbin/ppp/ncp.c
+++ b/usr.sbin/ppp/ncp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncp.c,v 1.8 2004/10/11 10:21:53 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h
index 99580cfc63195..186987c9afebc 100644
--- a/usr.sbin/ppp/ncp.h
+++ b/usr.sbin/ppp/ncp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncp.h,v 1.2 2004/09/05 01:46:52 brian Exp $
  */
 
 struct port_range {
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c
index 0b1699939a9ca..8b7c3e75908a0 100644
--- a/usr.sbin/ppp/ncpaddr.c
+++ b/usr.sbin/ppp/ncpaddr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncpaddr.c,v 1.16 2005/05/13 16:31:11 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/ncpaddr.h b/usr.sbin/ppp/ncpaddr.h
index 8c6b886123266..8c3ff77fad02d 100644
--- a/usr.sbin/ppp/ncpaddr.h
+++ b/usr.sbin/ppp/ncpaddr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ncpaddr.h,v 1.3 2001/11/23 12:39:20 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/netgraph.c b/usr.sbin/ppp/netgraph.c
index 471dc0d15f596..bc1e01e263c47 100644
--- a/usr.sbin/ppp/netgraph.c
+++ b/usr.sbin/ppp/netgraph.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/netgraph.c,v 1.6 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/netgraph.h b/usr.sbin/ppp/netgraph.h
index a5b4082ed402b..841455238d8d5 100644
--- a/usr.sbin/ppp/netgraph.h
+++ b/usr.sbin/ppp/netgraph.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/netgraph.h,v 1.3 2004/09/05 01:46:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 8eda02041a2ea..638a5df38504a 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.c,v 1.51 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index 8e8d45734a881..db1b7912c82a4 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pap.h,v 1.12 2001/06/13 21:52:19 brian Exp $
  */
 
 #define	PAP_REQUEST	1
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index a96c1bace79a9..a0ea902afc0d9 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.59 2004/10/11 09:45:58 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/physical.h b/usr.sbin/ppp/physical.h
index f16e1a16139ad..ac750c5359406 100644
--- a/usr.sbin/ppp/physical.h
+++ b/usr.sbin/ppp/physical.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/physical.h,v 1.28 2004/09/05 01:46:52 brian Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index 705e366eab461..50be2609ac1dd 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -25,7 +25,7 @@ changecom(,)dnl
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8.m4,v 1.327 2007/05/25 16:05:17 brueffer Exp $
 .\"
 .Dd May 24, 2007
 .Dt PPP 8
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 43d5d9491434e..f93383b96815d 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.c,v 1.35 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 1afb77a9a57fa..d071971a3fb80 100644
--- a/usr.sbin/ppp/pred.h
+++ b/usr.sbin/ppp/pred.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/pred.h,v 1.9 2001/06/13 21:52:19 brian Exp $
  */
 
 extern const struct ccp_algorithm Pred1Algorithm;
diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c
index a33734cb5b166..06970655fab08 100644
--- a/usr.sbin/ppp/probe.c
+++ b/usr.sbin/ppp/probe.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/probe.c,v 1.6 2002/01/16 14:03:51 brian Exp $
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/ppp/probe.h b/usr.sbin/ppp/probe.h
index 5a7dce9e20d26..2a92cc0aeface 100644
--- a/usr.sbin/ppp/probe.h
+++ b/usr.sbin/ppp/probe.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/probe.h,v 1.3 2001/08/15 13:53:38 brian Exp $
  */
 
 struct probe {
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index de331eff54361..532d4a9febca4 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/prompt.c,v 1.31 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 0489338257900..6f9c0af5e3417 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/prompt.h,v 1.10 2002/08/27 20:11:58 brian Exp $
  */
 
 #define LOCAL_AUTH	0x01
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 2c2c26db91a82..08c0270c349c7 100644
--- a/usr.sbin/ppp/proto.c
+++ b/usr.sbin/ppp/proto.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.c,v 1.7 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index 8c93327698575..4fd0ef60abb94 100644
--- a/usr.sbin/ppp/proto.h
+++ b/usr.sbin/ppp/proto.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/proto.h,v 1.5 2001/12/09 01:29:12 brian Exp $
  */
 
 /*
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 6b1d685ee3e15..8190c4df93d46 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/radius.c,v 1.54 2007/05/25 13:45:49 novel Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index ab144a5e171ef..4741d26d87733 100644
--- a/usr.sbin/ppp/radius.h
+++ b/usr.sbin/ppp/radius.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/radius.h,v 1.22 2007/05/25 13:45:49 novel Exp $
  */
 
 #define	MPPE_POLICY_ALLOWED	1
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index fdc60020e5dc3..9dea497d2c450 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/route.c,v 1.94 2005/01/10 11:12:36 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index edf66045e564a..e83ae4c35ec7a 100644
--- a/usr.sbin/ppp/route.h
+++ b/usr.sbin/ppp/route.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/route.h,v 1.19 2001/08/16 02:01:05 brian Exp $
  */
 
 struct bundle;
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 864c62742aa9f..09081d96737dc 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/server.c,v 1.44 2006/09/18 03:50:30 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index 9fdc52c6b8731..f010653622dfe 100644
--- a/usr.sbin/ppp/server.h
+++ b/usr.sbin/ppp/server.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/server.h,v 1.9 2001/03/08 23:51:50 brian Exp $
  */
 
 struct bundle;
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index a42194be0c71d..13db583bd0b2c 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.c,v 1.18 2002/05/22 21:08:58 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 27d264c19370a..f5893fa20dc66 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sig.h,v 1.14 1999/08/28 01:18:44 peter Exp $
  */
 
 typedef void (*sig_type)(int);
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 48928c77fc2aa..5489699aa1fb6 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -36,7 +36,7 @@
  * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/slcompress.c,v 1.39 2005/01/10 11:47:17 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index 9c415cb25fa82..17ca3526e4a06 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -31,7 +31,7 @@
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/slcompress.h,v 1.17 2005/01/10 11:47:17 brian Exp $
  */
 
 #define MIN_VJ_STATES 3
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index 712e036cf10a8..8b8bce3f4effe 100644
--- a/usr.sbin/ppp/sync.c
+++ b/usr.sbin/ppp/sync.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.c,v 1.8 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index 4f5bfee0805f5..0305212033120 100644
--- a/usr.sbin/ppp/sync.h
+++ b/usr.sbin/ppp/sync.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/sync.h,v 1.2 1999/08/28 01:18:45 peter Exp $
  */
 
 extern struct layer synclayer;
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 36cb4e9afa3a5..77f06a1fac01f 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/systems.c,v 1.68 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 9091e730b1a7c..6ce98d62b383d 100644
--- a/usr.sbin/ppp/systems.h
+++ b/usr.sbin/ppp/systems.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/systems.h,v 1.17 2001/11/03 21:45:32 brian Exp $
  */
 
 struct prompt;
diff --git a/usr.sbin/ppp/tcp.c b/usr.sbin/ppp/tcp.c
index 4ace8821e88c0..1ca49d1f44781 100644
--- a/usr.sbin/ppp/tcp.c
+++ b/usr.sbin/ppp/tcp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.c,v 1.19 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index f6a823529e9e4..ad4493547291f 100644
--- a/usr.sbin/ppp/tcp.h
+++ b/usr.sbin/ppp/tcp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcp.h,v 1.5 1999/11/06 22:50:58 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/tcpmss.c b/usr.sbin/ppp/tcpmss.c
index 38d2920f13fe3..f3ae5901e2aae 100644
--- a/usr.sbin/ppp/tcpmss.c
+++ b/usr.sbin/ppp/tcpmss.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcpmss.c,v 1.8 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tcpmss.h b/usr.sbin/ppp/tcpmss.h
index ffd7b827963dc..be0224b1da371 100644
--- a/usr.sbin/ppp/tcpmss.h
+++ b/usr.sbin/ppp/tcpmss.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tcpmss.h,v 1.1 2000/11/28 13:18:35 brian Exp $
  */
 
 extern struct layer tcpmsslayer;
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index f6bc9b57d1d3a..595c5e341e755 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/throughput.c,v 1.18 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/throughput.h b/usr.sbin/ppp/throughput.h
index 21e5450fa005c..9cb4de806dcd9 100644
--- a/usr.sbin/ppp/throughput.h
+++ b/usr.sbin/ppp/throughput.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/throughput.h,v 1.10 2000/08/28 22:44:54 brian Exp $
  */
 
 #define SAMPLE_PERIOD 5		/* Default sample period */
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 77b2af7e4f441..2811179ef4343 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.c,v 1.47 2002/08/27 20:11:58 brian Exp $
  */
 
 #include <errno.h>
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index 02fcdd1b4bd1f..439f47beb61a6 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/timer.h,v 1.10 2001/06/13 21:52:19 brian Exp $
  */
 
 #define	TICKUNIT	100000			/* usec's per Unit */
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index 8d5d58bac28e8..a57cef2abace4 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tty.c,v 1.32 2004/09/13 19:04:03 ru Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index 0991c81208620..515676b13c621 100644
--- a/usr.sbin/ppp/tty.h
+++ b/usr.sbin/ppp/tty.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tty.h,v 1.7 2004/09/05 01:46:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 883cd5c4052e4..7916e243c40b6 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tun.c,v 1.28 2002/06/15 08:03:30 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index 1bb07122a1ac4..9167239e9f07b 100644
--- a/usr.sbin/ppp/tun.h
+++ b/usr.sbin/ppp/tun.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/tun.h,v 1.10 2000/11/28 13:18:35 brian Exp $
  */
 
 struct tun_data {
diff --git a/usr.sbin/ppp/ua.h b/usr.sbin/ppp/ua.h
index dbd89e5be6184..f3e299f08e86f 100644
--- a/usr.sbin/ppp/ua.h
+++ b/usr.sbin/ppp/ua.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/ua.h,v 1.3 1999/08/28 01:18:49 peter Exp $
  */
 
 #ifdef __i386__		/* Do any other archs not care about alignment ? */
diff --git a/usr.sbin/ppp/udp.c b/usr.sbin/ppp/udp.c
index d9f3252e7205d..809e5d8c8d159 100644
--- a/usr.sbin/ppp/udp.c
+++ b/usr.sbin/ppp/udp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/udp.c,v 1.20 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index c89e276b7e2e8..49acfee6b57f7 100644
--- a/usr.sbin/ppp/udp.h
+++ b/usr.sbin/ppp/udp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/udp.h,v 1.5 2004/09/05 01:46:52 brian Exp $
  */
 
 struct physical;
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index f3c6b7124fb6e..6181cbe3884be 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.c,v 1.40 2004/09/05 01:46:52 brian Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 2956122fd0616..34457439857c4 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ppp/vjcomp.h,v 1.8 1999/08/28 01:18:51 peter Exp $
  */
 
 struct mbuf;
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 6cdcc3dc6cfb2..156869082dbd2 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppctl/Makefile,v 1.16 2004/01/31 17:28:09 marcel Exp $
 
 PROG=	pppctl
 MAN=	pppctl.8
diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8
index 245690f17f1f7..c131dbb0f310f 100644
--- a/usr.sbin/pppctl/pppctl.8
+++ b/usr.sbin/pppctl/pppctl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pppctl/pppctl.8,v 1.24 2005/02/13 22:25:31 ru Exp $
 .Dd June 26, 1997
 .Os
 .Dt PPPCTL 8
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index d8e7b42ca7fa7..aeeb27589b2f3 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pppctl/pppctl.c,v 1.33 2004/12/13 14:50:13 brian Exp $");
 
 #include <sys/types.h>
 
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index 2df0330337cd8..8417165288c0b 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/Makefile,v 1.31 2006/11/12 17:36:58 ume Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/pppd/RELNOTES b/usr.sbin/pppd/RELNOTES
index 1c1e392266f27..0359edee1374d 100644
--- a/usr.sbin/pppd/RELNOTES
+++ b/usr.sbin/pppd/RELNOTES
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppd/RELNOTES,v 1.7 2003/01/01 18:49:02 schweikh Exp $
 
 This is the README file for ppp-2.3, a package which implements the
 Point-to-Point Protocol (PPP) to provide Internet connections over
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 5375aa49929b8..4f3074c504703 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.29 2007/03/15 09:16:54 kevlo Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index 27b88659ba1bf..834cb572cf458 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/cbcp.c,v 1.7 2004/12/06 15:49:52 delphij Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index fb21cfda3587b..360fb5f3cede6 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ccp.c,v 1.10 1999/08/28 01:19:00 peter Exp $";
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/pppd/ccp.h b/usr.sbin/pppd/ccp.h
index a03ac4d4961e2..8405ad345b4d5 100644
--- a/usr.sbin/pppd/ccp.h
+++ b/usr.sbin/pppd/ccp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ccp.h,v 1.8 1999/08/28 01:19:00 peter Exp $
  */
 
 typedef struct ccp_options {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index c3acafbe8392f..711b6808964bf 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap.c,v 1.10 1999/08/28 01:19:01 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h
index 4a4f38383a349..4a7cd9c9a0214 100644
--- a/usr.sbin/pppd/chap.h
+++ b/usr.sbin/pppd/chap.h
@@ -30,7 +30,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap.h,v 1.7 1999/08/28 01:19:01 peter Exp $
  */
 
 #ifndef __CHAP_INCLUDE__
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index c3e1f6ee44d1e..9d3be9d6e2374 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/chap_ms.c,v 1.8 2000/02/24 21:10:28 markm Exp $";
 #endif
 
 #ifdef CHAPMS
diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h
index 7c0088308aa67..31f48732d8ca1 100644
--- a/usr.sbin/pppd/chap_ms.h
+++ b/usr.sbin/pppd/chap_ms.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/chap_ms.h,v 1.5 1999/08/28 01:19:02 peter Exp $
  */
 
 #ifndef __CHAPMS_INCLUDE__
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index 59c0281e16a0f..e0eb980299d79 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/demand.c,v 1.5 1999/08/28 01:19:02 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/eui64.c b/usr.sbin/pppd/eui64.c
index 28335a3797ff6..46c81b5240e80 100644
--- a/usr.sbin/pppd/eui64.c
+++ b/usr.sbin/pppd/eui64.c
@@ -22,7 +22,7 @@
 #define RCSID	"$Id: eui64.c,v 1.3 1999/08/25 04:15:51 paulus Exp $"
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pppd/eui64.c,v 1.2 2006/11/12 17:36:58 ume Exp $");
 
 #include "pppd.h"
 
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index 0c49c7092d868..2af5d807f9b2c 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/fsm.c,v 1.10 2002/12/30 21:18:14 schweikh Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h
index 7b43b7a08be28..67cb1c4d734fe 100644
--- a/usr.sbin/pppd/fsm.h
+++ b/usr.sbin/pppd/fsm.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/fsm.h,v 1.7 1999/08/28 01:19:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 576b2006ab582..eb9d57d150789 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipcp.c,v 1.12 1999/08/28 01:19:03 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h
index 2bc795d9a5046..693e16b536b9a 100644
--- a/usr.sbin/pppd/ipcp.h
+++ b/usr.sbin/pppd/ipcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipcp.h,v 1.10 1999/08/28 01:19:03 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipv6cp.c b/usr.sbin/pppd/ipv6cp.c
index 0be6dc4e116e6..9ca61a95b2f9f 100644
--- a/usr.sbin/pppd/ipv6cp.c
+++ b/usr.sbin/pppd/ipv6cp.c
@@ -97,7 +97,7 @@
 #define RCSID	"$Id: ipv6cp.c,v 1.7 1999/10/08 01:08:18 masputra Exp $"
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pppd/ipv6cp.c,v 1.2 2006/11/12 17:36:58 ume Exp $");
 
 /*
  * TODO: 
diff --git a/usr.sbin/pppd/ipv6cp.h b/usr.sbin/pppd/ipv6cp.h
index 2641008e99ada..6d7bb7eb94615 100644
--- a/usr.sbin/pppd/ipv6cp.h
+++ b/usr.sbin/pppd/ipv6cp.h
@@ -91,7 +91,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $Id: ipv6cp.h,v 1.3 1999/09/30 19:57:45 masputra Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipv6cp.h,v 1.2 2006/11/12 17:36:58 ume Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index bdf24d1193df0..203707d39a93d 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -19,7 +19,7 @@
 
 #ifdef IPX_CHANGE
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/ipxcp.c,v 1.6 2003/01/01 18:49:02 schweikh Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/ipxcp.h b/usr.sbin/pppd/ipxcp.h
index 0890181af7ec9..6e825664b272a 100644
--- a/usr.sbin/pppd/ipxcp.h
+++ b/usr.sbin/pppd/ipxcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/ipxcp.h,v 1.4 1999/08/28 01:19:04 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 74009872011f4..a4d0e29ac5087 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/lcp.c,v 1.11 2003/04/07 13:34:00 fjoe Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h
index 2a19e2611b59c..139b8d7ec33d5 100644
--- a/usr.sbin/pppd/lcp.h
+++ b/usr.sbin/pppd/lcp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/lcp.h,v 1.7 1999/08/28 01:19:05 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 1e13d02dd3719..bc7de4308313a 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/magic.c,v 1.8 1999/08/28 01:19:05 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h
index 82f65cf55d4e2..39496e6cdcfce 100644
--- a/usr.sbin/pppd/magic.h
+++ b/usr.sbin/pppd/magic.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/magic.h,v 1.7 1999/08/28 01:19:05 peter Exp $
  */
 
 void magic_init __P((void));	/* Initialize the magic number generator */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 7bb104dde65aa..33f299b6160bc 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/main.c,v 1.22 2006/11/12 17:36:58 ume Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 00ad006ef4d14..9c8b58a092ef7 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/options.c,v 1.25 2006/11/12 17:36:58 ume Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/pppd/patchlevel.h b/usr.sbin/pppd/patchlevel.h
index bc49c5879a249..7c9d9c07db846 100644
--- a/usr.sbin/pppd/patchlevel.h
+++ b/usr.sbin/pppd/patchlevel.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/pppd/patchlevel.h,v 1.10 1999/08/28 01:19:07 peter Exp $ */
 #define	PATCHLEVEL	5
 
 #define VERSION		"2.3"
diff --git a/usr.sbin/pppd/pathnames.h b/usr.sbin/pppd/pathnames.h
index 5d09b0b2fa18b..4e20e97afdf1c 100644
--- a/usr.sbin/pppd/pathnames.h
+++ b/usr.sbin/pppd/pathnames.h
@@ -1,7 +1,7 @@
 /*
  * define path names
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pathnames.h,v 1.11 2006/11/12 17:36:58 ume Exp $
  */
 
 #ifdef HAVE_PATHS_H
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index ba55f2119d1f0..8cec7d91d3376 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.27 2006/11/12 17:36:58 ume Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index 48e2eb01eaccb..413faa0191a53 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/pppd.h,v 1.14 2006/11/12 17:36:58 ume Exp $
  */
 
 /*
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index ccb13c8cc0016..424e74896c8b2 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/sys-bsd.c,v 1.21 2006/11/12 17:36:58 ume Exp $";
 #endif
 /*	$NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $	*/
 
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 627c7d03d5dbe..2cda3ac14ea3a 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/upap.c,v 1.8 1999/08/28 01:19:08 peter Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h
index 2cfd86c8077f6..7d1eaa38e9856 100644
--- a/usr.sbin/pppd/upap.h
+++ b/usr.sbin/pppd/upap.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pppd/upap.h,v 1.7 1999/08/28 01:19:09 peter Exp $
  */
 
 /*
diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile
index da34dc9ae6ce7..ab4da3dacf139 100644
--- a/usr.sbin/pppstats/Makefile
+++ b/usr.sbin/pppstats/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pppstats/Makefile,v 1.11 2005/06/03 15:25:13 imp Exp $
 
 PROG=	pppstats
 MAN=	pppstats.8
diff --git a/usr.sbin/pppstats/pppstats.8 b/usr.sbin/pppstats/pppstats.8
index 5b28ea0a8f8dc..3483b7fc64cce 100644
--- a/usr.sbin/pppstats/pppstats.8
+++ b/usr.sbin/pppstats/pppstats.8
@@ -1,4 +1,4 @@
-.\"	@(#) $FreeBSD$
+.\"	@(#) $FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.10 2000/03/03 09:11:28 sheldonh Exp $
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index d3b7b3d2ca160..efd30dafcbb00 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppstats/pppstats.c,v 1.14 2002/04/22 13:44:46 des Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index 81fd4d1a11ac5..1accd82e950d2 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 9/21/96
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/praliases/Makefile,v 1.11 2005/06/10 06:12:53 des Exp $
 
 SENDMAIL_DIR=	${.CURDIR}/../../contrib/sendmail
 .PATH: ${SENDMAIL_DIR}/praliases
diff --git a/usr.sbin/praudit/Makefile b/usr.sbin/praudit/Makefile
index 4ff08fdfb164f..db032533197a9 100644
--- a/usr.sbin/praudit/Makefile
+++ b/usr.sbin/praudit/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/praudit/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $
 #
 
 OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 5cb35e7073711..b9f385273be52 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/procctl/Makefile,v 1.8 2001/07/20 06:20:15 obrien Exp $
 
 PROG=	procctl
 MAN=	procctl.8
diff --git a/usr.sbin/procctl/procctl.8 b/usr.sbin/procctl/procctl.8
index 1add286472f41..91ed25fc6627d 100644
--- a/usr.sbin/procctl/procctl.8
+++ b/usr.sbin/procctl/procctl.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.10 2002/07/14 14:45:06 charnier Exp $
 .Dd November 23, 1997
 .Dt PROCCTL 8
 .Os
diff --git a/usr.sbin/procctl/procctl.c b/usr.sbin/procctl/procctl.c
index 5bd1f21954c6c..8ec932e2a7f4f 100644
--- a/usr.sbin/procctl/procctl.c
+++ b/usr.sbin/procctl/procctl.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/procctl/procctl.c,v 1.7 2003/05/03 21:06:38 obrien Exp $");
 
 /*
  * procctl -- clear the event mask, and continue, any specified processes.
diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile
index 8fd2ced9f38cd..8ac6863dcd9fd 100644
--- a/usr.sbin/pstat/Makefile
+++ b/usr.sbin/pstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pstat/Makefile,v 1.14 2005/03/21 18:11:31 keramida Exp $
 
 PROG=	pstat
 LINKS=	${BINDIR}/pstat ${BINDIR}/swapinfo
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 3dd67a6b90489..8f574f619185c 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.49 2007/04/03 08:16:05 ru Exp $
 .\"
 .Dd April 1, 2007
 .Dt PSTAT 8
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 15163652921cd..98c1e0853d435 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.102 2007/07/04 00:00:40 scf Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index 8937124f22f4f..605cc9b371f9d 100644
--- a/usr.sbin/pw/Makefile
+++ b/usr.sbin/pw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pw/Makefile,v 1.18 2003/04/04 17:49:17 obrien Exp $
 
 PROG=	pw
 MAN=	pw.conf.5 pw.8
diff --git a/usr.sbin/pw/README b/usr.sbin/pw/README
index bbb153988366d..849946d8ab06d 100644
--- a/usr.sbin/pw/README
+++ b/usr.sbin/pw/README
@@ -18,5 +18,5 @@ other bsd4.4 variants.
 
 Author and maintainer: David L. Nugent, <davidn@blaze.net.au>
 
-$FreeBSD$
+$FreeBSD: src/usr.sbin/pw/README,v 1.6 2001/01/02 04:01:59 peter Exp $
 
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index bcfea7e2c8874..01d8551a2f5d4 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/bitmap.c,v 1.5 1999/08/28 01:19:15 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h
index 4d6cfe43c18a0..c9328a167c190 100644
--- a/usr.sbin/pw/bitmap.h
+++ b/usr.sbin/pw/bitmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/bitmap.h,v 1.5 2002/07/11 19:07:35 alfred Exp $
  */
 
 #ifndef _BITMAP_H_
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index f370421657761..df4bd47d22dc2 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/cpdir.c,v 1.8 2007/03/30 13:18:52 le Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/edgroup.c b/usr.sbin/pw/edgroup.c
index 1cc46b4bdb487..f17a4226ae210 100644
--- a/usr.sbin/pw/edgroup.c
+++ b/usr.sbin/pw/edgroup.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/edgroup.c,v 1.9 2004/03/08 20:31:37 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/fileupd.c b/usr.sbin/pw/fileupd.c
index b88f4fa8539f5..59ca3ad18a4d1 100644
--- a/usr.sbin/pw/fileupd.c
+++ b/usr.sbin/pw/fileupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/fileupd.c,v 1.10 2004/03/08 20:31:37 kensmith Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index edff76d1285c8..36201105da182 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/grupd.c,v 1.10 2001/08/30 06:32:17 dd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 3f4c0105b75b9..c49728c592c66 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/psdate.c,v 1.8 2004/06/17 14:07:16 robert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h
index a1e99d4645310..56a74453f5d2f 100644
--- a/usr.sbin/pw/psdate.h
+++ b/usr.sbin/pw/psdate.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/psdate.h,v 1.5 2002/07/11 19:07:35 alfred Exp $
  */
 
 #ifndef _PSDATE_H_
diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8
index ae416e8ce5c70..d72010aa15090 100644
--- a/usr.sbin/pw/pw.8
+++ b/usr.sbin/pw/pw.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.41 2007/03/30 11:23:10 le Exp $
 .\"
 .Dd March 30, 2007
 .Dt PW 8
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index c5ebe423d2ef3..68997ca2b6cc1 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw.c,v 1.31 2007/03/30 11:23:10 le Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index 3f023aa2ca5a6..88c8572bc0c03 100644
--- a/usr.sbin/pw/pw.conf.5
+++ b/usr.sbin/pw/pw.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pw/pw.conf.5,v 1.16 2007/03/30 11:23:10 le Exp $
 .\"
 .Dd March 30, 2007
 .Dt PW.CONF 5
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index 7568c2236e3d9..3488e9bbedc83 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/pw.h,v 1.15 2007/03/30 11:23:10 le Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index 51672b9ae4932..5750c475abda9 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_conf.c,v 1.15 2007/03/30 11:23:10 le Exp $";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 1c63a11722b26..0f2a2f93f6057 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_group.c,v 1.14 2004/01/11 18:28:08 iedowse Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index fc85828b5bbfe..e3a4849009262 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_log.c,v 1.6 2000/06/22 16:48:41 ache Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 74a3ed09a7a97..8e570738cfddf 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_nis.c,v 1.6 1999/08/28 01:19:20 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 0eb1b53716951..905dc26fe2389 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.61 2007/03/30 12:57:25 le Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 473cbb6c0c646..3b36c98769359 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pw_vpw.c,v 1.4 2004/06/17 14:07:16 robert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 7e0e3cfb0c2a9..1f3b89cea703f 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/pwupd.c,v 1.20 2004/10/03 14:40:27 stefanf Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 728906500f417..0669e924720da 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/pw/pwupd.h,v 1.8 2002/07/11 19:07:35 alfred Exp $
  */
 
 #ifndef _PWUPD_H_
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 4ad590bc1aa25..9a0717daa401e 100644
--- a/usr.sbin/pw/rm_r.c
+++ b/usr.sbin/pw/rm_r.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/pw/rm_r.c,v 1.6 2001/06/24 20:25:20 dd Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index c3aaeb3398d8d..1317452379b35 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/pwd_mkdb/Makefile,v 1.10 2003/04/04 17:49:17 obrien Exp $
 
 .PATH: ${.CURDIR}/../../lib/libc/gen		# for pw_scan.c
 
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 1265c595681de..102f5be053e4d 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.26 2005/02/28 21:05:30 ru Exp $
 .\"
 .Dd February 28, 2005
 .Dt PWD_MKDB 8
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 3c8ca252a0c84..3001ac29535a4 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.51 2005/06/15 10:13:04 dd Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index 07bcc7eff1cf1..6f2466b659097 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/quot/Makefile,v 1.10 2003/04/04 17:49:17 obrien Exp $
 
 PROG=	quot
 MAN=	quot.8
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index 5451f63e15c57..e718b6fae8d08 100644
--- a/usr.sbin/quot/quot.8
+++ b/usr.sbin/quot/quot.8
@@ -27,7 +27,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/quot/quot.8,v 1.22 2005/01/18 20:02:41 ru Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 84892b0644826..d297c41844eb2 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/quot/quot.c,v 1.25 2006/09/30 07:34:20 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 3f88bd9da33cf..ad283168eaf68 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/quotaon/Makefile,v 1.6 2002/07/11 21:23:33 alfred Exp $
 
 PROG=	quotaon
 LINKS=	${BINDIR}/quotaon ${BINDIR}/quotaoff
diff --git a/usr.sbin/quotaon/quotaon.8 b/usr.sbin/quotaon/quotaon.8
index 08e8d11bda25d..e9fed91cc4973 100644
--- a/usr.sbin/quotaon/quotaon.8
+++ b/usr.sbin/quotaon/quotaon.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotaon.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/quotaon/quotaon.8,v 1.11 2004/08/07 04:28:54 imp Exp $
 .\"
 .Dd December 11, 1993
 .Dt QUOTAON 8
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 03df4e228c82c..7e6bc2f5902d6 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.12 2007/02/04 06:33:14 mpp Exp $");
 
 /*
  * Turn quota on/off for a filesystem.
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index 7f34457697e35..1c0df6b01510a 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rarpd/Makefile,v 1.14 2003/07/11 17:15:19 mux Exp $
 
 PROG=	rarpd
 MAN=	rarpd.8
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 8552b69689a89..20d8b8cca3cd1 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -14,7 +14,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rarpd/rarpd.8,v 1.22 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd November 16, 2001
 .Dt RARPD 8
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index a500dd512a13c..c16aca1b5de0c 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -22,7 +22,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.41 2004/08/07 04:28:54 imp Exp $");
 
 /*
  * rarpd - Reverse ARP Daemon
diff --git a/usr.sbin/raycontrol/Makefile b/usr.sbin/raycontrol/Makefile
index 50e747277f803..d7857a5405c20 100644
--- a/usr.sbin/raycontrol/Makefile
+++ b/usr.sbin/raycontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/raycontrol/Makefile,v 1.4 2001/07/20 06:20:31 obrien Exp $
 
 PROG=	raycontrol
 MAN=	raycontrol.8
diff --git a/usr.sbin/raycontrol/raycontrol.8 b/usr.sbin/raycontrol/raycontrol.8
index 26a910a141d42..ae3865962333c 100644
--- a/usr.sbin/raycontrol/raycontrol.8
+++ b/usr.sbin/raycontrol/raycontrol.8
@@ -58,7 +58,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/raycontrol/raycontrol.8,v 1.13 2005/02/13 22:25:31 ru Exp $
 .\"
 .Dd March 21, 2000
 .Dt RAYCONTROL 8
diff --git a/usr.sbin/raycontrol/raycontrol.c b/usr.sbin/raycontrol/raycontrol.c
index 006fedabbb453..ef9cb2846a662 100644
--- a/usr.sbin/raycontrol/raycontrol.c
+++ b/usr.sbin/raycontrol/raycontrol.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/raycontrol/raycontrol.c,v 1.7 2004/04/04 19:38:08 charnier Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index 087e890ed3560..ace069b099989 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/repquota/Makefile,v 1.8 2003/04/04 17:49:18 obrien Exp $
 
 PROG=	repquota
 MAN=	repquota.8
diff --git a/usr.sbin/repquota/repquota.8 b/usr.sbin/repquota/repquota.8
index b669fdf8266a3..7e49cd882623f 100644
--- a/usr.sbin/repquota/repquota.8
+++ b/usr.sbin/repquota/repquota.8
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/repquota/repquota.8,v 1.12 2005/01/18 20:02:42 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 4f88bff5f5ae2..f15da0d0340eb 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)repquota.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.21 2007/09/19 01:10:31 mpp Exp $");
 
 /*
  * Quota report
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index e0ea62130bcc3..a044525a4bfa5 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$FreeBSD: src/usr.sbin/rip6query/Makefile,v 1.7 2006/07/27 15:31:12 yar Exp $
 
 PROG=	rip6query
 MAN=	rip6query.8
diff --git a/usr.sbin/rip6query/rip6query.8 b/usr.sbin/rip6query/rip6query.8
index 9bcd4a508e385..ecfaef32132fa 100644
--- a/usr.sbin/rip6query/rip6query.8
+++ b/usr.sbin/rip6query/rip6query.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: rip6query.8,v 1.2 2000/01/19 06:24:55 itojun Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rip6query/rip6query.8,v 1.7 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd October 7, 1999
 .Dt RIP6QUERY 8
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index fa8795c7dab71..0daf9fe215840 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rip6query/rip6query.c,v 1.8 2006/09/21 01:41:03 kan Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile
index 579a02bb66890..5fa44ddaf0b77 100644
--- a/usr.sbin/rmt/Makefile
+++ b/usr.sbin/rmt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rmt/Makefile,v 1.10 2003/04/04 17:49:18 obrien Exp $
 
 PROG=	rmt
 MAN=	rmt.8
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index 8dfe24526995d..b016c490f60c9 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmt.8	8.3 (Berkeley) 6/1/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rmt/rmt.8,v 1.17 2005/06/10 20:52:35 nectar Exp $
 .\"
 .Dd June 1, 1994
 .Dt RMT 8
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index af4f954e07b93..b06e9cc6e43c6 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rmt.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rmt/rmt.c,v 1.13 2004/08/07 04:28:54 imp Exp $");
 
 /*
  * rmt
diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile
index b8a52dd4d57a3..9a98f85dab921 100644
--- a/usr.sbin/rndc-confgen/Makefile
+++ b/usr.sbin/rndc-confgen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rndc-confgen/Makefile,v 1.6 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index 2ca76976e5a92..4d0b6e68aaa2e 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rndc/Makefile,v 1.7 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 308aad7613378..75dd1cc29ceba 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/route6d/Makefile,v 1.12 2006/07/27 15:31:12 yar Exp $
 
 PROG=	route6d
 MAN=	route6d.8
diff --git a/usr.sbin/route6d/misc/chkrt b/usr.sbin/route6d/misc/chkrt
index 6ae01f37be04c..4552e72ed4c74 100755
--- a/usr.sbin/route6d/misc/chkrt
+++ b/usr.sbin/route6d/misc/chkrt
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/route6d/misc/chkrt,v 1.2 2003/11/14 16:57:04 ume Exp $
 #
 $dump="/var/tmp/route6d_dump";
 $pidfile="/var/run/route6d.pid";
diff --git a/usr.sbin/route6d/misc/cksum.c b/usr.sbin/route6d/misc/cksum.c
index bff7e2d5f7f4a..96682b7a5b5ab 100644
--- a/usr.sbin/route6d/misc/cksum.c
+++ b/usr.sbin/route6d/misc/cksum.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/route6d/misc/cksum.c,v 1.1 1999/12/28 02:37:10 shin Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 121f5f2dc2efd..1e2a9669d4a10 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -14,7 +14,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/route6d/route6d.8,v 1.9 2005/02/09 18:04:41 ru Exp $
 .\"
 .Dd January 31, 1997
 .Dt ROUTE6D 8
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 69381d98267f2..56f646cd18385 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/route6d/route6d.c,v 1.35 2006/11/16 19:03:03 suz Exp $	*/
 /*	$KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index 49a7d5a93760f..f5152f5eec850 100644
--- a/usr.sbin/route6d/route6d.h
+++ b/usr.sbin/route6d/route6d.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/route6d/route6d.h,v 1.5 2003/11/14 17:16:12 ume Exp $	*/
 /*	$KAME: route6d.h,v 1.8 2003/05/28 09:11:13 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 961ad17d4bf95..d9881685d76d1 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.12 2000/08/07 16:23:31 thorpej Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.lockd/Makefile,v 1.19 2003/10/26 06:10:44 peter Exp $
 
 PROG=	rpc.lockd
 MAN=	rpc.lockd.8
diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c
index bf0fc92986b47..5163fd601f8b6 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.21 2006/08/17 05:55:20 maxim Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 044966486d223..8f5e82239a842 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lock_proc.c,v 1.18 2005/02/03 22:21:19 kuriyama Exp $ */
 /*
  * Copyright (c) 1995
  *	A.R. Gordon (andrew.gordon@net-tel.co.uk).  All rights reserved.
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 15c9d69fb9eef..bbe498e799331 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.20 2007/04/03 20:58:28 matteo Exp $ */
 
 /*
  * Copyright (c) 1995
diff --git a/usr.sbin/rpc.lockd/lockd.h b/usr.sbin/rpc.lockd/lockd.h
index 0a8e2e60b6167..b47eb7d03e7ae 100644
--- a/usr.sbin/rpc.lockd/lockd.h
+++ b/usr.sbin/rpc.lockd/lockd.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd.h,v 1.2 2000/06/07 14:34:40 bouyer Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd.h,v 1.5 2001/11/29 17:36:45 alfred Exp $ */
 
 /*
  * Copyright (c) 1995
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 5d37c32839f54..f7c5c996e0f3a 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.22 2007/04/12 02:07:12 kuriyama Exp $");
 
 #define LOCKD_DEBUG
 
diff --git a/usr.sbin/rpc.lockd/lockd_lock.h b/usr.sbin/rpc.lockd/lockd_lock.h
index 62f6981151ed5..e978f9206799d 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.h
+++ b/usr.sbin/rpc.lockd/lockd_lock.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd_lock.h,v 1.2 2000/06/09 14:00:54 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.h,v 1.4 2002/03/21 22:52:45 alfred Exp $ */
 
 /* Headers and function declarations for file-locking utilities */
 
diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8
index 0b5d3486e6733..63028f219fb91 100644
--- a/usr.sbin/rpc.lockd/rpc.lockd.8
+++ b/usr.sbin/rpc.lockd/rpc.lockd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.lockd/rpc.lockd.8,v 1.17 2007/04/03 20:58:28 matteo Exp $
 .\"
 .Dd April 3, 2007
 .Dt RPC.LOCKD 8
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index a751e5c6f4e4a..b15cf45b09637 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -9,7 +9,7 @@ static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";
 static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";
 #else
 __RCSID("$NetBSD: test.c,v 1.2 1997/10/18 04:01:21 lukem Exp $");
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.sbin/rpc.lockd/test.c,v 1.5 2001/03/19 12:50:09 alfred Exp $";
 #endif
 #endif				/* not lint */
 
diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile
index 6d8053c29bedd..ab2f301dcff90 100644
--- a/usr.sbin/rpc.statd/Makefile
+++ b/usr.sbin/rpc.statd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.statd/Makefile,v 1.16 2003/10/26 06:14:10 peter Exp $
 
 PROG=	rpc.statd
 MAN=	rpc.statd.8
diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c
index efcaaaf537b47..8843bbad4a500 100644
--- a/usr.sbin/rpc.statd/file.c
+++ b/usr.sbin/rpc.statd/file.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.statd/file.c,v 1.8 2007/08/13 15:04:39 truckman Exp $
  *
  */
 
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index f6067e7acb70e..cd2b93c1b5052 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.17 2007/04/02 18:59:48 matteo Exp $");
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/rpc.statd/rpc.statd.8 b/usr.sbin/rpc.statd/rpc.statd.8
index 14d06e10b1612..3c1b88e07efd6 100644
--- a/usr.sbin/rpc.statd/rpc.statd.8
+++ b/usr.sbin/rpc.statd/rpc.statd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.statd/rpc.statd.8,v 1.14 2007/04/03 21:15:00 matteo Exp $
 .\"
 .Dd April 3, 2007
 .Dt RPC.STATD 8
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index 4348865ea891c..9d7b2cb4ce90b 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -36,7 +36,7 @@
 /* The actual program logic is in the file procs.c			*/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.statd/statd.c,v 1.15 2007/08/05 16:33:06 truckman Exp $");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.sbin/rpc.statd/statd.h b/usr.sbin/rpc.statd/statd.h
index a82d760f96f27..53032df1c22f7 100644
--- a/usr.sbin/rpc.statd/statd.h
+++ b/usr.sbin/rpc.statd/statd.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/rpc.statd/statd.h,v 1.5 2002/07/11 17:55:14 alfred Exp $
  */
 
 
diff --git a/usr.sbin/rpc.statd/test.c b/usr.sbin/rpc.statd/test.c
index 6df15011db3b3..8bf5affa636a3 100644
--- a/usr.sbin/rpc.statd/test.c
+++ b/usr.sbin/rpc.statd/test.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.statd/test.c,v 1.3 1999/08/28 01:19:39 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile
index 0a829c301cb5d..7544fc42a1c61 100644
--- a/usr.sbin/rpc.umntall/Makefile
+++ b/usr.sbin/rpc.umntall/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 6/22/95
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.umntall/Makefile,v 1.5 2003/10/26 06:14:10 peter Exp $
 
 PROG=	rpc.umntall
 MAN=	rpc.umntall.8
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index b81334e1b272c..0e5551b3ea7fb 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.umntall/mounttab.c,v 1.6 2003/05/03 21:06:39 obrien Exp $");
 
 #include <sys/syslog.h>
 
diff --git a/usr.sbin/rpc.umntall/mounttab.h b/usr.sbin/rpc.umntall/mounttab.h
index acf6c79683112..5095f8b99af45 100644
--- a/usr.sbin/rpc.umntall/mounttab.h
+++ b/usr.sbin/rpc.umntall/mounttab.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.umntall/mounttab.h,v 1.2 2001/07/22 12:17:51 iedowse Exp $
  */
 
 #define STRSIZ  (RPCMNT_NAMELEN+RPCMNT_PATHLEN+100)
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.8 b/usr.sbin/rpc.umntall/rpc.umntall.8
index 6236635755326..1d79589ca7002 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.8
+++ b/usr.sbin/rpc.umntall/rpc.umntall.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.8,v 1.12 2005/02/13 22:25:32 ru Exp $
 .\"
 .Dd November 17, 1999
 .Dt RPC.UMNTALL 8
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.c b/usr.sbin/rpc.umntall/rpc.umntall.c
index b79e4788a9885..68e5d31fdc7ec 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.c
+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.c,v 1.13 2005/05/27 00:05:16 mux Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 1b76da46de893..94b8a74ba2f07 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.21 2004/10/18 21:29:20 ru Exp $
 
 RPCDIR=	${DESTDIR}/usr/include/rpcsvc
 
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index 376390866a844..c75b9dc615dff 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.25 2005/02/13 23:45:53 ru Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
index a1d6be51f3697..c696de8705bb6 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x
+++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
@@ -32,7 +32,7 @@
 
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD$");
+%__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswd_private.x,v 1.7 2003/05/03 21:06:39 obrien Exp $");
 #endif
 
 #ifdef RPC_HDR
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
index db15be228a6dc..d0a9907829fc5 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.14 2002/07/11 21:28:16 alfred Exp $
  */
 
 #ifndef _YPPASSWDD_EXTERN_H
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index e4170bd0e471b..959eae53bbc31 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_main.c,v 1.26 2005/05/02 14:02:43 delphij Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 04adf31ed85f9..49dbab340e7e3 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c,v 1.29 2003/06/15 21:24:45 mbr Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppwupdate b/usr.sbin/rpc.yppasswdd/yppwupdate
index a9db8f7e5b6c3..6e7671b6a5502 100644
--- a/usr.sbin/rpc.yppasswdd/yppwupdate
+++ b/usr.sbin/rpc.yppasswdd/yppwupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppwupdate,v 1.7 1999/08/28 01:19:42 peter Exp $
 #
 
 PATH=/bin:/usr/bin; export PATH
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index 4fe19c9c9cab1..ca565b2e71f9d 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/Makefile,v 1.10 2004/12/21 08:47:34 ru Exp $
 
 .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
 
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 72a7128beb219..9bac94ea94074 100644
--- a/usr.sbin/rpc.ypupdated/update.c
+++ b/usr.sbin/rpc.ypupdated/update.c
@@ -33,7 +33,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/rpc.ypupdated/update.c,v 1.8 2007/02/15 02:45:14 trhodes Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 0552aab9d3ea7..62ba0dc5d5f6b 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbdelete.c,v 1.6 2003/05/03 21:06:39 obrien Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index 453ed2be06b38..1693b470befd0 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/yp_dbupdate.c,v 1.9 2004/10/17 19:33:32 stefanf Exp $");
 
 #include <sys/fcntl.h>
 
diff --git a/usr.sbin/rpc.ypupdated/ypupdate b/usr.sbin/rpc.ypupdated/ypupdate
index 4a26f4b6d72ba..c779bb70bfe9c 100755
--- a/usr.sbin/rpc.ypupdated/ypupdate
+++ b/usr.sbin/rpc.ypupdated/ypupdate
@@ -8,7 +8,7 @@
 #
 # Comment out the LOG=yes line to disable logging.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdate,v 1.2 1999/08/28 01:19:44 peter Exp $
 #
 
 LOG=yes
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_extern.h b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
index 2cacb9511e1ff..976c75efd2c79 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_extern.h
+++ b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_extern.h,v 1.4 2002/02/15 00:46:32 des Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index c13af7df43407..adb5057fbbaab 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_main.c,v 1.10 2004/05/24 12:28:27 stefanf Exp $");
 
 #include "ypupdate_prot.h"
 #include <stdio.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index c9a50dd36e0c0..99436f8ef60af 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_server.c,v 1.7 2003/05/03 21:06:40 obrien Exp $");
 
 #include <stdio.h>
 #include <rpc/rpc.h>
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index 70729b12e67d0..11dac4f809aa9 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpc.ypxfrd/Makefile,v 1.11 2001/07/20 06:20:18 obrien Exp $
 
 .PATH: ${.CURDIR}/../../usr.sbin/ypserv
 
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index b1bcbcc4ff520..89b0f46e070c7 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.17 2006/11/02 07:36:33 maxim Exp $
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
index 5aba934a6ec44..59d497c844c6f 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_extern.h,v 1.5 2002/02/06 13:30:28 des Exp $
  */
 
 #ifndef MAX_CHILDREN
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 8fa3e2205b439..4407ccb0c12a5 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_main.c,v 1.14 2004/05/24 12:28:27 stefanf Exp $");
 
 #include "ypxfrd.h"
 #include <err.h>
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index 5f60712e9fefe..4463379fc0396 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.ypxfrd/ypxfrd_server.c,v 1.11 2003/05/03 21:06:40 obrien Exp $");
 
 #include "ypxfrd.h"
 
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index 3251378651a6c..2c08e2fbff540 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.8 2006/03/17 18:54:43 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index 192c9cac62555..fb15e9d7f8252 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: check_bound.c,v 1.2 2000/06/22 08:09:26 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/check_bound.c,v 1.4 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index d74b369d180a4..3957d763aa028 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: pmap_svc.c,v 1.2 2000/10/20 11:49:40 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/pmap_svc.c,v 1.4 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c
index b10ed508b0bd3..c8080d0f76f69 100644
--- a/usr.sbin/rpcbind/rpcb_stat.c
+++ b/usr.sbin/rpcbind/rpcb_stat.c
@@ -1,6 +1,6 @@
 /*
  * $NetBSD: rpcb_stat.c,v 1.2 2000/07/04 20:27:40 matt Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpcbind/rpcb_stat.c,v 1.4 2003/10/29 09:29:23 mbr Exp $
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c
index dc3cf05f27f5b..5e7e57615b30e 100644
--- a/usr.sbin/rpcbind/rpcb_svc.c
+++ b/usr.sbin/rpcbind/rpcb_svc.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcb_svc.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcb_svc.c,v 1.2 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c
index 8e2ed102b428e..a47c4b479c724 100644
--- a/usr.sbin/rpcbind/rpcb_svc_4.c
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c
@@ -1,6 +1,6 @@
 /*
  * $NetBSD: rpcb_svc_4.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpcbind/rpcb_svc_4.c,v 1.4 2002/10/07 02:56:59 alfred Exp $
  */
 
 /*
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 0a72b662e43cc..9c18a3f955005 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcb_svc_com.c,v 1.9 2002/11/08 00:16:39 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcb_svc_com.c,v 1.11 2003/10/29 09:30:37 mbr Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcbind.8 b/usr.sbin/rpcbind/rpcbind.8
index 0ecf895ea8003..4c18337706b84 100644
--- a/usr.sbin/rpcbind/rpcbind.8
+++ b/usr.sbin/rpcbind/rpcbind.8
@@ -1,7 +1,7 @@
 .\" @(#)rpcbind.1m 1.19 92/09/14 SMI; from SVr4
 .\" Copyright 1989 AT&T
 .\" Copyright 1991 Sun Microsystems, Inc.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rpcbind/rpcbind.8,v 1.10 2007/04/23 07:09:25 matteo Exp $
 .Dd April 23, 2007
 .Dt RPCBIND 8
 .Os
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index 2fe3c41f4a34b..fdf36e786cc13 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcbind.c,v 1.3 2002/11/08 00:16:40 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcbind.c,v 1.17 2007/06/09 09:20:22 matteo Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index 2d52be359469e..594bb20a3f2f2 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: rpcbind.h,v 1.1 2000/06/03 00:47:21 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/rpcbind.h,v 1.2 2002/10/07 02:56:59 alfred Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.sbin/rpcbind/security.c b/usr.sbin/rpcbind/security.c
index 8657247f60ac2..3be6e35cbf9d8 100644
--- a/usr.sbin/rpcbind/security.c
+++ b/usr.sbin/rpcbind/security.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: security.c,v 1.5 2000/06/08 09:01:05 fvdl Exp $	*/
-/*	$FreeBSD$ */
+/*	$FreeBSD: src/usr.sbin/rpcbind/security.c,v 1.6 2002/12/16 22:24:26 mbr Exp $ */
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index 4137ce2f003f7..0e7ac5e56f818 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -1,6 +1,6 @@
 /*
  * $NetBSD: util.c,v 1.4 2000/08/03 00:04:30 fvdl Exp $
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rpcbind/util.c,v 1.5 2002/10/07 02:56:59 alfred Exp $
  */
 
 /*-
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index 1962e1c422d7a..fc2260b5f5e4f 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -35,7 +35,7 @@
 
 /*
  * #ident	"@(#)warmstart.c	1.7	93/07/05 SMI"
- * $FreeBSD$/
+ * $FreeBSD: src/usr.sbin/rpcbind/warmstart.c,v 1.3 2003/01/01 18:49:03 schweikh Exp $/
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index c31a7c7ce9324..b0b0f6a67de1d 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rrenumd/Makefile,v 1.11 2007/07/05 08:56:46 bz Exp $
 
 PROG=	rrenumd
 MAN=	rrenumd.conf.5 rrenumd.8
diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index 6ad995341670b..8fca588607d42 100644
--- a/usr.sbin/rrenumd/lexer.l
+++ b/usr.sbin/rrenumd/lexer.l
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/lexer.l,v 1.3 2001/06/11 12:39:20 ume Exp $
  */
 
 %{
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index d7c15abeb74f5..e3b92754357a2 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/parser.y,v 1.4 2002/10/27 17:46:53 wollman Exp $
  */
 
 %{
diff --git a/usr.sbin/rrenumd/rrenumd.8 b/usr.sbin/rrenumd/rrenumd.8
index 887c0e6934c38..0a7542fd2b396 100644
--- a/usr.sbin/rrenumd/rrenumd.8
+++ b/usr.sbin/rrenumd/rrenumd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rrenumd/rrenumd.8,v 1.8 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd September 7, 1998
 .Dt RRENUMD 8
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index fddd6a11c0f0c..6efea6bfffc18 100644
--- a/usr.sbin/rrenumd/rrenumd.c
+++ b/usr.sbin/rrenumd/rrenumd.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/rrenumd.c,v 1.9 2007/07/01 12:08:08 gnn Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5
index 9ce2306cc51ff..ba550d53a49b0 100644
--- a/usr.sbin/rrenumd/rrenumd.conf.5
+++ b/usr.sbin/rrenumd/rrenumd.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rrenumd/rrenumd.conf.5,v 1.19 2005/02/15 09:27:00 ru Exp $
 .\"
 .Dd November 5, 1998
 .Dt RRENUMD.CONF 5
diff --git a/usr.sbin/rrenumd/rrenumd.h b/usr.sbin/rrenumd/rrenumd.h
index df0280b2591ed..fa3a9ce660b6a 100644
--- a/usr.sbin/rrenumd/rrenumd.h
+++ b/usr.sbin/rrenumd/rrenumd.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rrenumd/rrenumd.h,v 1.3 2001/06/11 12:39:21 ume Exp $
  */
 
 struct dst_list {
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index f7e2021cd1fe8..fa542b577b557 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtadvd/Makefile,v 1.10 2006/07/27 15:31:12 yar Exp $
 
 PROG=	rtadvd
 MAN=	rtadvd.conf.5 rtadvd.8
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index a6c5f80319a44..dea3542e76b9b 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/advcap.c,v 1.11 2004/08/07 04:28:54 imp Exp $	*/
 /*	$KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 372387130c422..b746055ec1f7a 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/advcap.h,v 1.5 2003/08/11 15:46:37 ume Exp $	*/
 /*	$KAME: advcap.h,v 1.5 2003/06/09 05:40:54 t-momose Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 4682e9843da9d..5580e8c8232ac 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/config.c,v 1.27 2006/03/23 14:39:38 suz Exp $	*/
 /*	$KAME: config.c,v 1.84 2003/08/05 12:34:23 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index aeb1c2c9d457f..ae4e86e661aef 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/config.h,v 1.6 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: config.h,v 1.8 2003/06/17 08:26:22 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c
index 7b9a2748d6ca4..4c67ff884c018 100644
--- a/usr.sbin/rtadvd/dump.c
+++ b/usr.sbin/rtadvd/dump.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/dump.c,v 1.12 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: dump.c,v 1.32 2003/05/19 09:46:50 keiichi Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h
index cc3b472e47507..8defe60419985 100644
--- a/usr.sbin/rtadvd/dump.h
+++ b/usr.sbin/rtadvd/dump.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/dump.h,v 1.3 2001/06/11 12:39:22 ume Exp $	*/
 /*	$KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 07d9e1f74b2c6..f5a3e96c4af4c 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/if.c,v 1.10 2003/09/20 09:41:13 suz Exp $	*/
 /*	$KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 07bb6eeb4b970..da7a887f0f140 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/if.h,v 1.5 2003/08/11 15:51:54 ume Exp $	*/
 /*	$KAME: if.h,v 1.10 2003/02/24 11:29:10 ono Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/pathnames.h b/usr.sbin/rtadvd/pathnames.h
index 3afee55fcc72a..126c0cdc4d2a1 100644
--- a/usr.sbin/rtadvd/pathnames.h
+++ b/usr.sbin/rtadvd/pathnames.h
@@ -1,4 +1,4 @@
 /*	$KAME: pathnames.h,v 1.2 2000/05/16 13:34:13 itojun Exp $	*/
-/* 	$FreeBSD$	*/
+/* 	$FreeBSD: src/usr.sbin/rtadvd/pathnames.h,v 1.5 2001/06/11 12:39:22 ume Exp $	*/
 
 #define _PATH_RTADVDCONF "/etc/rtadvd.conf"
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index 14a8ab9bdcc4c..36e9a93011509 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rrenum.c,v 1.9 2004/03/10 08:46:39 bde Exp $	*/
 /*	$KAME: rrenum.c,v 1.12 2002/06/10 19:59:47 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index ce94015c2dcfd..2109a85eb9452 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rrenum.h,v 1.4 2001/06/11 12:39:22 ume Exp $	*/
 /*	$KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index d5c7061c5b929..d849254fc4c14 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.15 2005/02/09 18:04:42 ru Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD 8
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index aa7c5d3a3b658..f6133266fa149 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.c,v 1.26 2007/01/20 08:24:02 maxim Exp $	*/
 /*	$KAME: rtadvd.c,v 1.82 2003/08/05 12:34:23 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/rtadvd.conf b/usr.sbin/rtadvd/rtadvd.conf
index 33ab7f3e46bce..bb0751f772afb 100644
--- a/usr.sbin/rtadvd/rtadvd.conf
+++ b/usr.sbin/rtadvd/rtadvd.conf
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.conf,v 1.4 2003/08/15 19:13:53 ume Exp $
 #	$KAME: rtadvd.conf,v 1.13 2003/06/25 03:45:21 itojun Exp $
 #
 # Note: All of the following parameters have default values defined
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index dcc73cce95cfa..7113fb47e819d 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtadvd/rtadvd.conf.5,v 1.16 2005/08/10 17:09:08 ume Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD.CONF 5
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index b1c505dd75aa7..8b6041997c622 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.h,v 1.9 2003/08/15 19:13:53 ume Exp $	*/
 /*	$KAME: rtadvd.h,v 1.26 2003/08/05 12:34:23 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 238bd8d5b7226..c3d3a3acf8ed0 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/timer.c,v 1.9 2004/10/22 07:31:12 suz Exp $	*/
 /*	$KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $	*/
 
 /*
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index d435bde5ab188..4bd30bef5f319 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtadvd/timer.h,v 1.6 2003/08/08 16:56:01 ume Exp $	*/
 /*	$KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $	*/
 
 /*
diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile
index ebc7bd1a37cc3..37db3b4b32b8f 100644
--- a/usr.sbin/rtprio/Makefile
+++ b/usr.sbin/rtprio/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtprio/Makefile,v 1.8 2001/03/26 14:41:52 ru Exp $
 
 PROG=	rtprio
 LINKS=  ${BINDIR}/rtprio ${BINDIR}/idprio
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 3141fba384e31..863768ba0c8b6 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.29 2005/01/18 20:02:43 ru Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 245f714fe9fe7..1e4dccc804674 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rtprio/rtprio.c,v 1.10 2003/07/06 12:44:10 charnier Exp $");
 
 #include <sys/param.h>
 #include <sys/rtprio.h>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 1afa0f6f4545c..c7624851d3b09 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -12,7 +12,7 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rtsold/Makefile,v 1.12 2006/07/27 15:31:12 yar Exp $
 
 PROG=	rtsold
 MAN=	rtsold.8
diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index bdc8ec3b375db..62a0060c49441 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/dump.c,v 1.9 2004/01/14 17:16:19 ume Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index eb288052c2c78..de3b2ce73ee4f 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/if.c,v 1.15 2006/03/24 23:59:51 suz Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index b1cbc7985a41e..ec4bb47330b26 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/probe.c,v 1.11 2004/01/14 17:16:19 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index 09d6774be79bd..8f8f9ff5332fc 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -1,5 +1,5 @@
 /*	$KAME: rtsock.c,v 1.3 2000/10/10 08:46:45 itojun Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/rtsold/rtsock.c,v 1.4 2004/03/17 20:10:59 ru Exp $	*/
 
 /*
  * Copyright (C) 2000 WIDE Project.
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index dd9f4a1c8bddb..0d18668e9e990 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/rtsol.c,v 1.11 2004/01/14 17:16:19 ume Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index d6ab3d8144b43..629d132ac45cb 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.16 2006/08/14 08:49:08 dd Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTSOLD 8
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 7e73f384ef9dd..28bda616014d8 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/rtsold.c,v 1.21 2005/06/09 09:28:35 suz Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index e25ed955e98f5..7ad09ebc3895f 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/rtsold/rtsold.h,v 1.8 2004/01/14 17:42:03 ume Exp $
  */
 
 struct ifinfo {
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index def0e6e145913..c20fd9b4ec8b7 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/rwhod/Makefile,v 1.7 2003/04/04 17:49:19 obrien Exp $
 
 PROG=	rwhod
 MAN=	rwhod.8
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 642eeebcee087..7fb5dabc90e25 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwhod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.23 2005/02/13 22:25:32 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 96fd9ec42e580..70e9199dfa385 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/rwhod/rwhod.c,v 1.23 2005/06/03 17:38:33 ssouhlal Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 718cbc846efe9..0f9ea66ab600a 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sa/Makefile,v 1.12 2007/05/22 10:49:42 dds Exp $
 
 .PATH: ${.CURDIR}/../../usr.bin/lastcomm
 
diff --git a/usr.sbin/sa/db.c b/usr.sbin/sa/db.c
index d31cd7c1cbd1e..a92a3403f0288 100644
--- a/usr.sbin/sa/db.c
+++ b/usr.sbin/sa/db.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/db.c,v 1.1 2007/05/22 06:51:38 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/acct.h>
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index 70f97a7ff51be..12fa9713de999 100644
--- a/usr.sbin/sa/extern.h
+++ b/usr.sbin/sa/extern.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sa/extern.h,v 1.7 2007/05/22 06:51:38 dds Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index 7be13e5499153..9c9df1fa28a84 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -36,7 +36,7 @@ static const char copyright[] =
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/main.c,v 1.18 2007/05/22 06:51:38 dds Exp $");
 
 /*
  * sa:	system accounting
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 7a7edf68caf66..8cb7f44ad8a86 100644
--- a/usr.sbin/sa/pathnames.h
+++ b/usr.sbin/sa/pathnames.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sa/pathnames.h,v 1.4 1999/08/28 01:19:52 peter Exp $
  */
 
 #define	_PATH_ACCT	"/var/account/acct"
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index 38beb558f7057..d005bf6fc09f0 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/pdb.c,v 1.14 2007/05/22 06:51:38 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/acct.h>
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index e7630642a01af..1e9540c0d6b3c 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sa/sa.8,v 1.20 2007/05/18 12:36:10 dds Exp $
 .\"
 .Dd May 18, 2007
 .Dt SA 8
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 07a5033c398a3..048835b97753e 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sa/usrdb.c,v 1.16 2007/05/22 06:51:38 dds Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index c8dad4850beae..7ee7342c9cd40 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sade/Makefile,v 1.147 2006/08/09 11:25:10 netchild Exp $
 
 .if ${MACHINE_ARCH} != "ia64"
 _wizard=	wizard.c
diff --git a/usr.sbin/sade/command.c b/usr.sbin/sade/command.c
index b3968dfb2158f..b08e1e964e186 100644
--- a/usr.sbin/sade/command.c
+++ b/usr.sbin/sade/command.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/command.c,v 1.23 2006/08/08 13:45:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index b2a84f9a75234..4181732aadf57 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/config.c,v 1.240 2006/08/08 13:45:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index fec9bba010524..f525bced2f129 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/devices.c,v 1.170 2006/08/08 13:45:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index ef39f74951a8f..7c850d1511cf7 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/disks.c,v 1.161 2006/08/09 08:24:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 5b10b73613729..81078e950dcd7 100644
--- a/usr.sbin/sade/dispatch.c
+++ b/usr.sbin/sade/dispatch.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/dispatch.c,v 1.51 2006/08/08 13:45:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c
index 139f999e6ae17..ae84611094c72 100644
--- a/usr.sbin/sade/dmenu.c
+++ b/usr.sbin/sade/dmenu.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/dmenu.c,v 1.51 2006/08/09 11:25:10 netchild Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/globals.c b/usr.sbin/sade/globals.c
index 0b08da3303b13..5153b20d87f62 100644
--- a/usr.sbin/sade/globals.c
+++ b/usr.sbin/sade/globals.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/globals.c,v 1.29 2006/08/07 23:35:48 netchild Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 952ae93b56e5c..8aeed4c9d2cd7 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/install.c,v 1.371 2006/08/08 14:28:03 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 423de620d5ad2..4548e5189fbd6 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/label.c,v 1.155 2006/08/08 13:45:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/list.h b/usr.sbin/sade/list.h
index 8c5cf2aff0f5c..a8a8373662be0 100644
--- a/usr.sbin/sade/list.h
+++ b/usr.sbin/sade/list.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/list.h,v 1.4 2006/08/07 23:35:48 netchild Exp $
  *
  * Copyright (c) 1997 FreeBSD, Inc.
  * All rights reserved.
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index 5496e136c1bb5..34889a6587d15 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/main.c,v 1.80 2007/07/04 00:00:41 scf Exp $
  *
  * Copyright (c) 1995
  *     Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index f48c772d88e9a..36d20ea179cb2 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sade/menus.c,v 1.423 2006/08/09 05:33:45 delphij Exp $";
 #endif
 
 #include "sade.h"
diff --git a/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c
index 4730c7f75c8af..54377772e2b44 100644
--- a/usr.sbin/sade/misc.c
+++ b/usr.sbin/sade/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/misc.c,v 1.46 2006/08/08 14:28:03 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 4003b20abc437..6984165300851 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/msg.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/msg.c,v 1.62 2006/08/08 13:45:46 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 1c5dc12975e02..b65f591e55f6c 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sade/sade.8,v 1.77 2006/09/30 19:07:03 ru Exp $
 .\"
 .Dd August 8, 2006
 .Dt SADE 8
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 66ba39627de7d..dacc4da082648 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/sade.h,v 1.277 2006/08/09 11:25:10 netchild Exp $
  */
 
 #ifndef _SADE_H_INCLUDE
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index df6cf329780bd..b362da18a1ab2 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/system.c,v 1.131 2006/08/09 09:12:01 netchild Exp $
  *
  * Jordan Hubbard
  *
diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c
index 820d28dd346fa..171222b381f22 100644
--- a/usr.sbin/sade/termcap.c
+++ b/usr.sbin/sade/termcap.c
@@ -10,7 +10,7 @@
  * software, nor does the author assume any responsibility for damages
  * incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/termcap.c,v 1.35 2007/03/06 09:32:41 kevlo Exp $
  */
 
 #include "sade.h"
diff --git a/usr.sbin/sade/variable.c b/usr.sbin/sade/variable.c
index 7809deb003fa9..9f763d16e6f4d 100644
--- a/usr.sbin/sade/variable.c
+++ b/usr.sbin/sade/variable.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/variable.c,v 1.42 2007/07/04 00:00:41 scf Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c
index 5edd872ad99f8..79250cfd7135e 100644
--- a/usr.sbin/sade/wizard.c
+++ b/usr.sbin/sade/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sade/wizard.c,v 1.26 2006/08/07 23:35:49 netchild Exp $
  */
 
 #include "sade.h"
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 0b89297d8d9c7..7aff4680f43d1 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.55 2007/04/09 01:45:52 gshapiro Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile
index 34b979bdf1384..fd94c8e0a4fdf 100644
--- a/usr.sbin/setfmac/Makefile
+++ b/usr.sbin/setfmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setfmac/Makefile,v 1.7 2005/01/27 14:52:47 delphij Exp $
 
 PROG=   setfmac
 LINKS=	${BINDIR}/setfmac ${BINDIR}/setfsmac
diff --git a/usr.sbin/setfmac/setfmac.8 b/usr.sbin/setfmac/setfmac.8
index b541a4afe9e31..25e062bf4df54 100644
--- a/usr.sbin/setfmac/setfmac.8
+++ b/usr.sbin/setfmac/setfmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/setfmac/setfmac.8,v 1.10 2004/02/18 05:40:15 rwatson Exp $
 .Dd February 17, 2004
 .Dt SETFMAC 8
 .Os
diff --git a/usr.sbin/setfmac/setfmac.c b/usr.sbin/setfmac/setfmac.c
index 9655cf38a575e..b599f2e19f596 100644
--- a/usr.sbin/setfmac/setfmac.c
+++ b/usr.sbin/setfmac/setfmac.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/setfmac/setfmac.c,v 1.9 2007/02/09 09:23:10 kevlo Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/setfmac/setfsmac.8 b/usr.sbin/setfmac/setfsmac.8
index 7d4150f944766..fbc0d94e76a5b 100644
--- a/usr.sbin/setfmac/setfsmac.8
+++ b/usr.sbin/setfmac/setfsmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/setfmac/setfsmac.8,v 1.6 2005/01/18 20:02:43 ru Exp $
 .\"
 .Dd February 17, 2004
 .Os
diff --git a/usr.sbin/setpmac/Makefile b/usr.sbin/setpmac/Makefile
index ae7ee026e9fd7..3f63f477307d7 100644
--- a/usr.sbin/setpmac/Makefile
+++ b/usr.sbin/setpmac/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/setpmac/Makefile,v 1.5 2005/01/27 14:52:47 delphij Exp $
 
 PROG=   setpmac
 MAN=	setpmac.8
diff --git a/usr.sbin/setpmac/setpmac.8 b/usr.sbin/setpmac/setpmac.8
index e84a8bc632280..76c82484f6772 100644
--- a/usr.sbin/setpmac/setpmac.8
+++ b/usr.sbin/setpmac/setpmac.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/setpmac/setpmac.8,v 1.5 2004/07/02 23:12:56 ru Exp $
 .\"
 .Dd January 14, 2003
 .Os
diff --git a/usr.sbin/setpmac/setpmac.c b/usr.sbin/setpmac/setpmac.c
index bc096bbbc56a7..f9198ab5bb902 100644
--- a/usr.sbin/setpmac/setpmac.c
+++ b/usr.sbin/setpmac/setpmac.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/setpmac/setpmac.c,v 1.2 2005/01/27 14:44:39 delphij Exp $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile
index 2f3a8883ba41e..a3b73663dd225 100644
--- a/usr.sbin/sicontrol/Makefile
+++ b/usr.sbin/sicontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sicontrol/Makefile,v 1.7 2001/07/20 06:20:19 obrien Exp $
 
 PROG=	sicontrol
 MAN=	sicontrol.8
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index 5040d8ad093c6..ef5c9409253e0 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.20 2004/07/02 23:12:57 ru Exp $
 .\"
 .Dd September 26, 1995
 .Dt SICONTROL 8
diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c
index 84e9782abc44e..c093a94a35c12 100644
--- a/usr.sbin/sicontrol/sicontrol.c
+++ b/usr.sbin/sicontrol/sicontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sicontrol/sicontrol.c,v 1.15 2004/10/02 18:51:37 phk Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index 0236f1e8f4536..954463383e5e9 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sliplogin/Makefile,v 1.8 2004/11/03 18:01:21 ru Exp $
 
 PROG=	sliplogin
 MAN=	sliplogin.8
diff --git a/usr.sbin/sliplogin/pathnames.h b/usr.sbin/sliplogin/pathnames.h
index e318f92a3ed8c..17c154ca3b314 100644
--- a/usr.sbin/sliplogin/pathnames.h
+++ b/usr.sbin/sliplogin/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)pathnames.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/sliplogin/pathnames.h,v 1.4 2004/08/07 04:28:55 imp Exp $
  */
 
 #ifndef COMPAT
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index 1f6960ba89bf7..1cb1dd3970045 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.24 2005/01/18 20:02:43 ru Exp $
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index dafdfd4983b9b..a72015901c61a 100644
--- a/usr.sbin/sliplogin/sliplogin.c
+++ b/usr.sbin/sliplogin/sliplogin.c
@@ -35,7 +35,7 @@ static char copyright[] =
 
 #ifndef lint
 static char sccsid[] = "@(#)sliplogin.c	8.2 (Berkeley) 2/1/94";
-static char rscid[] = "@(#)$FreeBSD$";
+static char rscid[] = "@(#)$FreeBSD: src/usr.sbin/sliplogin/sliplogin.c,v 1.16 2005/04/09 15:00:51 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 650e2216aef05..99afcb44e5300 100644
--- a/usr.sbin/slstat/Makefile
+++ b/usr.sbin/slstat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 4/23/91
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/slstat/Makefile,v 1.11 2003/04/04 17:49:19 obrien Exp $
 
 PROG=	slstat
 MAN=	slstat.8
diff --git a/usr.sbin/slstat/slstat.8 b/usr.sbin/slstat/slstat.8
index e85e2a84f3076..44e22fd734aad 100644
--- a/usr.sbin/slstat/slstat.8
+++ b/usr.sbin/slstat/slstat.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.18 2005/11/29 16:33:44 jhb Exp $
 .\"
 .Dd October 11, 1996
 .Dt SLSTAT 8
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index ff017f4145e80..1bf6f27248304 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/slstat/slstat.c,v 1.19 2005/06/10 16:49:24 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/smbmsg/Makefile b/usr.sbin/smbmsg/Makefile
index a581b2cd35d28..60fae0502e5c0 100644
--- a/usr.sbin/smbmsg/Makefile
+++ b/usr.sbin/smbmsg/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/smbmsg/Makefile,v 1.2 2004/09/26 09:24:15 ru Exp $
 
 PROG=	smbmsg
 MAN=	smbmsg.8
diff --git a/usr.sbin/smbmsg/pathnames.h b/usr.sbin/smbmsg/pathnames.h
index aff7335fac660..f805ae9252b89 100644
--- a/usr.sbin/smbmsg/pathnames.h
+++ b/usr.sbin/smbmsg/pathnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/smbmsg/pathnames.h,v 1.1.1.1 2004/05/17 10:56:04 joerg Exp $
  */
 
 #define PATH_DEFAULTSMBDEV	"/dev/smb0"
diff --git a/usr.sbin/smbmsg/smbmsg.8 b/usr.sbin/smbmsg/smbmsg.8
index efc74518c9d3f..dd79ab76c7918 100644
--- a/usr.sbin/smbmsg/smbmsg.8
+++ b/usr.sbin/smbmsg/smbmsg.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/smbmsg/smbmsg.8,v 1.5 2006/10/25 10:44:59 ru Exp $
 .\"
 .Dd May 16, 2004
 .Dt SMBMSG 8
diff --git a/usr.sbin/smbmsg/smbmsg.c b/usr.sbin/smbmsg/smbmsg.c
index 425b782d2d331..31c472d59decc 100644
--- a/usr.sbin/smbmsg/smbmsg.c
+++ b/usr.sbin/smbmsg/smbmsg.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/smbmsg/smbmsg.c,v 1.3 2004/05/27 13:31:16 joerg Exp $
  */
 
 /*
diff --git a/usr.sbin/snapinfo/Makefile b/usr.sbin/snapinfo/Makefile
index c5175f15befc4..5820b64cf39db 100644
--- a/usr.sbin/snapinfo/Makefile
+++ b/usr.sbin/snapinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/snapinfo/Makefile,v 1.1 2005/07/20 18:59:25 marks Exp $
 #
 
 PROG=	snapinfo
diff --git a/usr.sbin/snapinfo/snapinfo.8 b/usr.sbin/snapinfo/snapinfo.8
index 9d402ea632cc9..d29bd5c126755 100644
--- a/usr.sbin/snapinfo/snapinfo.8
+++ b/usr.sbin/snapinfo/snapinfo.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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/snapinfo/snapinfo.8,v 1.2 2006/03/23 07:55:33 hrs Exp $
 .\"
 .Dd July 20, 2005
 .Dt SNAPINFO 8
diff --git a/usr.sbin/snapinfo/snapinfo.c b/usr.sbin/snapinfo/snapinfo.c
index 55b54a546b267..10f3657bb20b2 100644
--- a/usr.sbin/snapinfo/snapinfo.c
+++ b/usr.sbin/snapinfo/snapinfo.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/snapinfo/snapinfo.c,v 1.3 2007/03/16 12:36:54 pjd Exp $
  *
  */
 
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 8e9245aa753a7..ebacc4d5b5484 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/Makefile,v 1.11 2002/05/16 18:51:57 markm Exp $
 
 SCRIPTS=spkrtest.sh
 MAN=	spkrtest.8
diff --git a/usr.sbin/spkrtest/spkrtest.8 b/usr.sbin/spkrtest/spkrtest.8
index 58eced5be0dee..750eb06af8510 100644
--- a/usr.sbin/spkrtest/spkrtest.8
+++ b/usr.sbin/spkrtest/spkrtest.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/spkrtest/spkrtest.8,v 1.12 2002/07/14 14:46:16 charnier Exp $
 .Dd July 23, 1995
 .Dt SPKRTEST 8
 .Os
diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh
index c682b03f43acc..c3bc7ee7006ef 100644
--- a/usr.sbin/spkrtest/spkrtest.sh
+++ b/usr.sbin/spkrtest/spkrtest.sh
@@ -29,7 +29,7 @@
 #
 # Inspired on spkrtest.pl, rewritten from scratch to remove perl dependency
 # $VER: spkrtest 0.3 (9.5.2002) Riccardo "VIC" Torrini <riccardo@torrini.org>
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spkrtest/spkrtest.sh,v 1.3 2002/05/16 18:51:57 markm Exp $
 #
 
 cleanExit() {
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index c2515e0c117ef..1a5bb10fb788d 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/spray/Makefile,v 1.10 2001/07/20 06:20:19 obrien Exp $
 
 PROG=	spray
 MAN=	spray.8
diff --git a/usr.sbin/spray/spray.8 b/usr.sbin/spray/spray.8
index e10704886771f..c1d95a074844a 100644
--- a/usr.sbin/spray/spray.8
+++ b/usr.sbin/spray/spray.8
@@ -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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/spray/spray.8,v 1.10 2002/07/14 14:46:18 charnier Exp $
 .\"
 .Dd July 10, 1995
 .Dt SPRAY 8
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index 0e072e20ab279..b294c9c0d3440 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/spray/spray.c,v 1.10 2002/07/15 18:53:52 alfred Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index d9aeb5cb4e888..bd65cbc39dacc 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.143 2007/03/23 22:09:02 matteo Exp $
 
 .if ${MACHINE_ARCH} != "ia64"
 _wizard=	wizard.c
diff --git a/usr.sbin/sysinstall/acpi.c b/usr.sbin/sysinstall/acpi.c
index 4a375a1c0b8c6..d9c127fbe7954 100644
--- a/usr.sbin/sysinstall/acpi.c
+++ b/usr.sbin/sysinstall/acpi.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sysinstall/acpi.c,v 1.1 2006/03/08 18:02:31 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/usr.sbin/sysinstall/acpidump.h b/usr.sbin/sysinstall/acpidump.h
index 9c2b5b6e502d1..fb33815188c96 100644
--- a/usr.sbin/sysinstall/acpidump.h
+++ b/usr.sbin/sysinstall/acpidump.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/sysinstall/acpidump.h,v 1.1 2006/03/08 18:02:31 sam Exp $
  */
 
 #ifndef _ACPIDUMP_H_
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index 2eaf636a6a850..0f6219f33c1d8 100644
--- a/usr.sbin/sysinstall/anonFTP.c
+++ b/usr.sbin/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/anonFTP.c,v 1.39 2007/06/11 18:36:39 ceri Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
diff --git a/usr.sbin/sysinstall/biosmptable.c b/usr.sbin/sysinstall/biosmptable.c
index 5a507bd6bfddd..6202180dec18c 100644
--- a/usr.sbin/sysinstall/biosmptable.c
+++ b/usr.sbin/sysinstall/biosmptable.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/sysinstall/biosmptable.c,v 1.2 2007/03/23 19:57:27 matteo Exp $");
 
 #include <sys/types.h>
 #include <machine/mptable.h>
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 7264c47249f44..e4e2e1285afcc 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/cdrom.c,v 1.55 2007/02/22 20:29:53 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/command.c b/usr.sbin/sysinstall/command.c
index 33ebc352544a4..35938a144cc5a 100644
--- a/usr.sbin/sysinstall/command.c
+++ b/usr.sbin/sysinstall/command.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/command.c,v 1.20 2002/11/01 02:05:05 kuriyama Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index baca42a270ddf..d2b20062694ed 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.242.2.1 2007/11/01 13:07:28 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index e7a3316353949..9bda12c8471f1 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/devices.c,v 1.173 2007/03/19 16:36:34 brueffer Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dhcp.c b/usr.sbin/sysinstall/dhcp.c
index fa35580e12359..91ff5706b687f 100644
--- a/usr.sbin/sysinstall/dhcp.c
+++ b/usr.sbin/sysinstall/dhcp.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dhcp.c,v 1.5 2004/03/11 11:58:15 bde Exp $
  *
  * Copyright (c) 1999
  *	C. Stone.  All rights reserved.
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 576eeffd173cc..742fa897c3bf3 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/disks.c,v 1.158.4.1 2008/02/01 20:33:40 jkim Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index b1d0099b6803d..1fadb11cbef94 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dispatch.c,v 1.48 2006/01/27 21:00:31 jkim Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 61c7c23f3c279..787c705c3f7dd 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.249.2.4.2.1 2008/01/14 19:28:43 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 8fbe92521f249..2ec9619ade21d 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$  */
+/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.67.2.4.2.1 2008/01/14 19:28:43 kensmith Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index 1aef667fa4e74..d614b7eb0b8b7 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dmenu.c,v 1.47.2.1 2007/11/01 13:07:28 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c
index 5294972f09226..22935d515ece6 100644
--- a/usr.sbin/sysinstall/doc.c
+++ b/usr.sbin/sysinstall/doc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/doc.c,v 1.32 2004/01/02 09:19:13 obrien Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/dos.c b/usr.sbin/sysinstall/dos.c
index 564e33ff43747..0d812ca913fa9 100644
--- a/usr.sbin/sysinstall/dos.c
+++ b/usr.sbin/sysinstall/dos.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/dos.c,v 1.25 2001/06/01 12:16:08 ru Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index 0101bde3ce016..f9b4dc39b9a1f 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/floppy.c,v 1.39 2004/08/15 13:00:07 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c
index 14fd74ba13ea3..d8679cab07312 100644
--- a/usr.sbin/sysinstall/ftp.c
+++ b/usr.sbin/sysinstall/ftp.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/ftp.c,v 1.46 2005/12/08 12:43:20 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/globals.c b/usr.sbin/sysinstall/globals.c
index 892d8528bc8a6..ea59cb209e75a 100644
--- a/usr.sbin/sysinstall/globals.c
+++ b/usr.sbin/sysinstall/globals.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/globals.c,v 1.27 2004/08/07 01:19:54 marcel Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/http.c b/usr.sbin/sysinstall/http.c
index 1355f084db6a4..62198d251b97b 100644
--- a/usr.sbin/sysinstall/http.c
+++ b/usr.sbin/sysinstall/http.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/http.c,v 1.8 2006/02/28 21:49:32 jhb Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c
index a55b54113dbfb..eb2e8bde06867 100644
--- a/usr.sbin/sysinstall/index.c
+++ b/usr.sbin/sysinstall/index.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/index.c,v 1.115.4.2 2007/12/29 06:17:39 kensmith Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index cd44a7e5cb6a7..6b9acec7923eb 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.373 2007/06/25 16:37:16 philip Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/install.cfg b/usr.sbin/sysinstall/install.cfg
index d894f0619aed1..e06d7a3792912 100644
--- a/usr.sbin/sysinstall/install.cfg
+++ b/usr.sbin/sysinstall/install.cfg
@@ -2,7 +2,7 @@
 # crate.cdrom.com.
 # It is included here merely as a sort-of-documented example.
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/sysinstall/install.cfg,v 1.12 2007/02/18 22:41:41 ceri Exp $
 
 # Turn on extra debugging.
 debug=yes
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index 1844c3122c240..f101524ec389e 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/installUpgrade.c,v 1.96 2007/06/05 05:44:41 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/keymap.c b/usr.sbin/sysinstall/keymap.c
index b8f015d2d9958..b4c3ba24b49dc 100644
--- a/usr.sbin/sysinstall/keymap.c
+++ b/usr.sbin/sysinstall/keymap.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/keymap.c,v 1.10 2006/03/16 15:50:21 nyan Exp $
  *
  */
 
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index c9305616ce771..6484568751967 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/label.c,v 1.153 2006/11/28 11:48:34 nyan Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/list.h b/usr.sbin/sysinstall/list.h
index 8300173e0660a..5bb51bea4ec1e 100644
--- a/usr.sbin/sysinstall/list.h
+++ b/usr.sbin/sysinstall/list.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/list.h,v 1.2 1999/08/28 01:34:15 peter Exp $
  *
  * Copyright (c) 1997 FreeBSD, Inc.
  * All rights reserved.
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index dc02902d7edfc..5de2c5d4a2715 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/main.c,v 1.77.4.1 2007/12/29 06:17:04 kensmith Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 408a82abe9942..98f5903d206c9 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/media.c,v 1.123 2006/02/28 21:49:32 jhb Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 7c27221ab3649..f683e6467acba 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.425.2.3.2.2 2008/01/25 10:54:40 mnag Exp $";
 #endif
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c
index c978b76ea287a..cba2801d44334 100644
--- a/usr.sbin/sysinstall/misc.c
+++ b/usr.sbin/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/misc.c,v 1.44 2006/07/15 12:23:56 simon Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/modules.c b/usr.sbin/sysinstall/modules.c
index 859994a26e890..167272418d5ac 100644
--- a/usr.sbin/sysinstall/modules.c
+++ b/usr.sbin/sysinstall/modules.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/modules.c,v 1.7 2003/08/20 06:24:12 imp Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/mouse.c b/usr.sbin/sysinstall/mouse.c
index 574fd72359742..83166a7d7c1a2 100644
--- a/usr.sbin/sysinstall/mouse.c
+++ b/usr.sbin/sysinstall/mouse.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/mouse.c,v 1.9 2000/05/11 23:43:12 murray Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 4625ce2f77528..7b38f3b06b5d5 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/msg.c,v 1.59 2001/09/11 20:42:07 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c
index 20a043064b52e..5f63c92a690e6 100644
--- a/usr.sbin/sysinstall/network.c
+++ b/usr.sbin/sysinstall/network.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/network.c,v 1.53 2006/02/09 14:43:42 delphij Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index 87788eaced6f2..396e78981de31 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/usr.sbin/sysinstall/nfs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/nfs.c,v 1.25 2003/10/19 13:37:12 des Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 04876d622b173..55f190531f3cb 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/options.c,v 1.82 2006/02/28 21:49:32 jhb Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index 189906f2d5049..ded21831b649d 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/package.c,v 1.104 2006/02/28 21:49:32 jhb Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/pccard.c b/usr.sbin/sysinstall/pccard.c
index 0ddfad8b3d07a..fcdc31d1a33e9 100644
--- a/usr.sbin/sysinstall/pccard.c
+++ b/usr.sbin/sysinstall/pccard.c
@@ -1,7 +1,7 @@
 /*
  * PC Card support for sysinstall
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/pccard.c,v 1.19 2003/08/20 06:27:21 imp Exp $
  *
  * Copyright (c) 1997-1999
  *	Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>.  All rights reserved.
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index cb1de790a6e4d..330555da8b065 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/sysinstall/sysinstall.8,v 1.76 2007/06/25 16:37:16 philip Exp $
 .\"
 .Dd February 18, 2007
 .Dt SYSINSTALL 8
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 64ee7a78021b4..364fa8c6bc520 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.274.4.1 2008/01/14 19:28:43 kensmith Exp $
  */
 
 #ifndef _SYSINSTALL_H_INCLUDE
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index b7fae6aa8407b..163f7f158eead 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/system.c,v 1.129 2007/06/25 16:37:16 philip Exp $
  *
  * Jordan Hubbard
  *
diff --git a/usr.sbin/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c
index fd73da568e852..d52d834a95ccc 100644
--- a/usr.sbin/sysinstall/tape.c
+++ b/usr.sbin/sysinstall/tape.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/tape.c,v 1.24 2002/11/01 02:05:05 kuriyama Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index c1e0eed5b90f1..326ff21ab33e4 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/tcpip.c,v 1.137 2007/05/17 06:08:42 delphij Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c
index ca5905a2602f6..bcb149b396131 100644
--- a/usr.sbin/sysinstall/termcap.c
+++ b/usr.sbin/sysinstall/termcap.c
@@ -10,7 +10,7 @@
  * software, nor does the author assume any responsibility for damages
  * incurred with its use.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/termcap.c,v 1.31 2007/03/06 09:32:41 kevlo Exp $
  */
 
 #include "sysinstall.h"
diff --git a/usr.sbin/sysinstall/ttys.c b/usr.sbin/sysinstall/ttys.c
index 0de954cceb39c..c34521dffc857 100644
--- a/usr.sbin/sysinstall/ttys.c
+++ b/usr.sbin/sysinstall/ttys.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/ttys.c,v 1.4 2001/09/22 23:17:37 murray Exp $
  *
  * Copyright (c) 2001
  *      Andrey A. Chernov.  All rights reserved.
diff --git a/usr.sbin/sysinstall/ufs.c b/usr.sbin/sysinstall/ufs.c
index c9515ae82b28c..ce19099332bb5 100644
--- a/usr.sbin/sysinstall/ufs.c
+++ b/usr.sbin/sysinstall/ufs.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/ufs.c,v 1.15 1999/08/28 01:34:21 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/user.c b/usr.sbin/sysinstall/user.c
index 8bddc1f14a19f..46e6c58e34588 100644
--- a/usr.sbin/sysinstall/user.c
+++ b/usr.sbin/sysinstall/user.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/user.c,v 1.20 2006/02/28 21:49:32 jhb Exp $
  *
  * Copyright (c) 1996
  *      Jörg Wunsch. All rights reserved.
diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c
index 694b8be44fa26..219645058a3ac 100644
--- a/usr.sbin/sysinstall/variable.c
+++ b/usr.sbin/sysinstall/variable.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/variable.c,v 1.40 2007/07/04 00:00:41 scf Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c
index c221e5548fb18..39cc7ac2e040f 100644
--- a/usr.sbin/sysinstall/wizard.c
+++ b/usr.sbin/sysinstall/wizard.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/sysinstall/wizard.c,v 1.24 2006/02/28 21:49:33 jhb Exp $
  *
  */
 
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 96d85c2a2b359..05b9419db57d8 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/syslogd/Makefile,v 1.13 2006/07/27 14:52:12 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/syslogd/pathnames.h b/usr.sbin/syslogd/pathnames.h
index 24fbc4cfa0add..43dce0e935f99 100644
--- a/usr.sbin/syslogd/pathnames.h
+++ b/usr.sbin/syslogd/pathnames.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/syslogd/pathnames.h,v 1.2 2004/08/07 04:28:55 imp Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index 7275fe6607c39..c4c75776e6960 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.44 2006/10/12 01:59:34 trhodes Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index c9faa011943b1..926381c864a0c 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.61 2006/03/06 10:36:32 pjd Exp $
 .\"
 .Dd April 13, 2005
 .Dt SYSLOGD 8
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index f8d1949f27841..857e5fad87dc9 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/syslogd/syslogd.c,v 1.152 2006/09/29 17:36:38 ru Exp $");
 
 /*
  *  syslogd -- log system messages
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 2936984377a5a..38bb7c56b4740 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdchk/Makefile,v 1.12 2006/03/17 18:54:43 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index cbd61aa491e48..d88a4b76c6149 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdmatch/Makefile,v 1.10 2006/03/17 18:54:43 ru Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/tcpdrop/Makefile b/usr.sbin/tcpdrop/Makefile
index 44766eb9a0a37..8ce26733c912f 100644
--- a/usr.sbin/tcpdrop/Makefile
+++ b/usr.sbin/tcpdrop/Makefile
@@ -1,5 +1,5 @@
 # $OpenBSD: Makefile,v 1.1 2004/04/26 19:51:20 markus Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdrop/Makefile,v 1.1 2005/02/06 10:47:12 maxim Exp $
 
 PROG=	tcpdrop
 MAN=	tcpdrop.8
diff --git a/usr.sbin/tcpdrop/tcpdrop.8 b/usr.sbin/tcpdrop/tcpdrop.8
index 5fd3a43e95060..ec78d010a9884 100644
--- a/usr.sbin/tcpdrop/tcpdrop.8
+++ b/usr.sbin/tcpdrop/tcpdrop.8
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tcpdrop/tcpdrop.8,v 1.5 2005/07/14 20:29:08 brueffer Exp $
 .\"
 .Dd March 21, 2004
 .Dt TCPDROP 8
diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c
index 68ef0ef1604b4..3ab686bc93c6d 100644
--- a/usr.sbin/tcpdrop/tcpdrop.c
+++ b/usr.sbin/tcpdrop/tcpdrop.c
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/tcpdrop/tcpdrop.c,v 1.2 2005/02/14 07:37:51 maxim Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile
index d183febb134bc..0c01848a5010b 100644
--- a/usr.sbin/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	0.1 (RGrimes) 4/4/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/Makefile,v 1.3 2006/09/24 09:16:27 bms Exp $
 
 SUBDIR=	tcpdump
 
diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc
index 1e4d46f113a51..500683eb776a9 100644
--- a/usr.sbin/tcpdump/Makefile.inc
+++ b/usr.sbin/tcpdump/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	5.1 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/Makefile.inc,v 1.3 2001/07/20 06:20:21 obrien Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 9ea718abda6e9..7c436a379f997 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tcpdump/tcpdump/Makefile,v 1.45.2.1 2007/10/19 03:04:02 mlaier Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
index b7b85a56e8b24..b11ed8cf87898 100644
--- a/usr.sbin/tcpdump/tcpdump/config.h
+++ b/usr.sbin/tcpdump/tcpdump/config.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/tcpdump/tcpdump/config.h,v 1.7.10.1 2007/10/19 03:04:02 mlaier Exp $ */
 /* This is an edited copy of the config.h generated by configure. */
 
 /* config.h.  Generated by configure.  */
diff --git a/usr.sbin/timed/Makefile b/usr.sbin/timed/Makefile
index 2f56510bca1c5..aa6668c0d7dcd 100644
--- a/usr.sbin/timed/Makefile
+++ b/usr.sbin/timed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/Makefile,v 1.2 2001/07/20 06:20:23 obrien Exp $
 
 SUBDIR=	timed timedc
 
diff --git a/usr.sbin/timed/SMM.doc/timed/Makefile b/usr.sbin/timed/SMM.doc/timed/Makefile
index 9afa6c60d4d49..050b9f7326598 100644
--- a/usr.sbin/timed/SMM.doc/timed/Makefile
+++ b/usr.sbin/timed/SMM.doc/timed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/SMM.doc/timed/Makefile,v 1.2 2001/07/20 06:20:22 obrien Exp $
 
 DIR=	smm/12.timed
 SRCS=	timed.ms
diff --git a/usr.sbin/timed/SMM.doc/timed/timed.ms b/usr.sbin/timed/SMM.doc/timed/timed.ms
index 412399ae41b35..04e47ce25a89d 100644
--- a/usr.sbin/timed/SMM.doc/timed/timed.ms
+++ b/usr.sbin/timed/SMM.doc/timed/timed.ms
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/timed/SMM.doc/timed/timed.ms,v 1.3 2002/12/30 21:18:15 schweikh Exp $
 .\"
 .\" Copyright (c) 1986, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/timed/SMM.doc/timedop/Makefile b/usr.sbin/timed/SMM.doc/timedop/Makefile
index 7d52a32220c1e..3d09ba3d4e57c 100644
--- a/usr.sbin/timed/SMM.doc/timedop/Makefile
+++ b/usr.sbin/timed/SMM.doc/timedop/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/SMM.doc/timedop/Makefile,v 1.2 2001/07/20 06:20:22 obrien Exp $
 
 DIR=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/usr.sbin/timed/timed/CHANGES b/usr.sbin/timed/timed/CHANGES
index 424ead2a514ae..6da2d785e2ae4 100644
--- a/usr.sbin/timed/timed/CHANGES
+++ b/usr.sbin/timed/timed/CHANGES
@@ -1,5 +1,5 @@
 #	@(#)CHANGES	5.1 (Berkeley) 5/11/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/timed/CHANGES,v 1.2 2001/02/18 10:44:00 asmodai Exp $
 
 This new version is almost identical to the timed and timedc code
 that has been shipped for years by a workstation vendor.
diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile
index 6f73824fbd74a..1ad93386c90d3 100644
--- a/usr.sbin/timed/timed/Makefile
+++ b/usr.sbin/timed/timed/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/timed/Makefile,v 1.5 2001/07/20 06:20:23 obrien Exp $
 #
 # optional flags are: MEASURE TESTING DEBUG
 
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 8bde7438a556d..1557b8a5f4027 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acksend.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/acksend.c,v 1.4 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 038dd56bf8b5f..8e7d842591d18 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)byteorder.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/byteorder.c,v 1.4 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index 79f1f5ab19fa2..86395de59ff67 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)candidate.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/candidate.c,v 1.5 1999/08/28 01:20:16 peter Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 50a7da27161f8..23c75a60cd85d 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cksum.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/cksum.c,v 1.3 1999/08/28 01:20:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index c7204bd3aef4e..33790660c0188 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)correct.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/correct.c,v 1.7 2002/07/11 20:10:07 robert Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/globals.h b/usr.sbin/timed/timed/globals.h
index b6207fc7d2f50..c1a21ae9f9ef7 100644
--- a/usr.sbin/timed/timed/globals.h
+++ b/usr.sbin/timed/timed/globals.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)globals.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
+ *	$FreeBSD: src/usr.sbin/timed/timed/globals.h,v 1.7 2007/01/20 08:24:02 maxim Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 0713155a3f610..17a4f1abc1269 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)master.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/master.c,v 1.9 2002/07/11 20:01:36 robert Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index 3856a34c6faed..bd5c7b9309d87 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)measure.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/measure.c,v 1.7 2001/11/20 07:13:40 jhb Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index cbbde581e2a34..42f15156ecf46 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)networkdelta.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/networkdelta.c,v 1.4 2000/05/19 08:26:17 kris Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/pathnames.h b/usr.sbin/timed/timed/pathnames.h
index e5fdcdefb828a..6c8c47409d124 100644
--- a/usr.sbin/timed/timed/pathnames.h
+++ b/usr.sbin/timed/timed/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/timed/timed/pathnames.h,v 1.2 2001/11/20 07:13:40 jhb Exp $
  */
 
 #include <paths.h>
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 74a6f5f92600f..c50faac18da04 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)readmsg.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/readmsg.c,v 1.9 2001/11/20 07:13:40 jhb Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index db4d2dd0be4d2..2e3e796353c5c 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)slave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timed/slave.c,v 1.9 2001/11/20 07:13:40 jhb Exp $";
 #endif /* not lint */
 
 #include "globals.h"
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index f9fbd32256101..d08742d3b9f17 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timed.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.16.24.1 2008/02/14 21:48:24 remko Exp $
 .\"
 .Dd February 11, 2008
 .Dt TIMED 8
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 27344a3b9e05f..80087be1afead 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)timed.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/timed/timed/timed.c,v 1.11 2003/07/06 10:37:00 charnier Exp $");
 
 #define TSPTYPES
 #include "globals.h"
diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile
index 5262f46d805df..81db242873da0 100644
--- a/usr.sbin/timed/timedc/Makefile
+++ b/usr.sbin/timed/timedc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/timed/timedc/Makefile,v 1.7 2001/09/13 06:48:16 ru Exp $
 
 .PATH: ${.CURDIR}/../timed
 
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 5d30fe3703913..bd1a91a4a51bf 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/timed/timedc/cmds.c,v 1.13 2004/02/04 21:59:29 johan Exp $");
 
 #include "timedc.h"
 #include <sys/file.h>
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index 8e4c3d5a0767a..92faf1597768a 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/cmdtab.c,v 1.3 1999/08/28 01:20:21 peter Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 0f3fcea687473..bf5ac30a3d588 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timedc.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/timed/timedc/timedc.8,v 1.16 2005/01/18 20:02:44 ru Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIMEDC 8
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 368b460513afc..14d2e06a55ca0 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)timedc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/timed/timedc/timedc.c,v 1.5 2003/10/11 07:35:35 tjr Exp $";
 #endif /* not lint */
 
 #include "timedc.h"
diff --git a/usr.sbin/timed/timedc/timedc.h b/usr.sbin/timed/timedc/timedc.h
index f6ee8a6ae74a3..ab048f4021565 100644
--- a/usr.sbin/timed/timedc/timedc.h
+++ b/usr.sbin/timed/timedc/timedc.h
@@ -32,7 +32,7 @@
  *
  *	@(#)timedc.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/timed/timedc/timedc.h,v 1.3 2001/11/20 07:13:40 jhb Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 8b941e5e12bef..5e3c0dc59be1e 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute/Makefile,v 1.22 2006/08/22 07:51:10 ru Exp $
 
 TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index 6ff72d2bf0ca0..b25090cc5e30c 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -11,7 +11,7 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/traceroute6/Makefile,v 1.11 2007/07/05 08:56:46 bz Exp $
 
 PROG=	traceroute6
 MAN=	traceroute6.8
diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index 9d39e2b86d6ff..661c378c600e2 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/traceroute6/traceroute6.8,v 1.16 2006/01/10 16:03:37 pav Exp $
 .\"
 .Dd May 17, 1998
 .Dt TRACEROUTE6 8
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index edc8dc7f4906e..3de479eb665aa 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -76,7 +76,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)traceroute.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/traceroute6/traceroute6.c,v 1.19 2007/07/01 12:08:08 gnn Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index 5c62ce049a6a7..415f4cba97e2f 100644
--- a/usr.sbin/trpt/Makefile
+++ b/usr.sbin/trpt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/trpt/Makefile,v 1.9 2006/07/27 14:52:12 yar Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 19cae4773067c..9b7de7e71bf7a 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.17 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd December 11, 1993
 .Dt TRPT 8
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 6339776a59d59..2cb00f1dcb6ed 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)trpt.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/trpt/trpt.c,v 1.20 2006/07/27 14:49:51 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 0596967a07e2f..2285920b7e85d 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/tzsetup/Makefile,v 1.17 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	tzsetup
 MAN=	tzsetup.8
diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8
index 562744c6b686a..ecac2dc2a9320 100644
--- a/usr.sbin/tzsetup/tzsetup.8
+++ b/usr.sbin/tzsetup/tzsetup.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/tzsetup/tzsetup.8,v 1.19 2005/01/18 20:02:44 ru Exp $
 .Dd January 24, 1996
 .Dt TZSETUP 8
 .Os
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index 6b1caf8b3149d..876410840528e 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/tzsetup/tzsetup.c,v 1.26 2004/08/10 05:34:23 murray Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ugidfw/Makefile b/usr.sbin/ugidfw/Makefile
index d89bc857f5bfe..9246a7b1c9983 100644
--- a/usr.sbin/ugidfw/Makefile
+++ b/usr.sbin/ugidfw/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ugidfw/Makefile,v 1.4 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	ugidfw
 MAN=	ugidfw.8
diff --git a/usr.sbin/ugidfw/ugidfw.8 b/usr.sbin/ugidfw/ugidfw.8
index cdd4293eb79b4..df039b91d8f50 100644
--- a/usr.sbin/ugidfw/ugidfw.8
+++ b/usr.sbin/ugidfw/ugidfw.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.9 2006/04/23 17:06:18 dwmalone Exp $
 .\"
 .Dd February 24, 2004
 .Dt UGIDFW 8
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 24e022870d520..fee7f6831e6af 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.6 2006/04/23 17:06:18 dwmalone Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 985bc7a61ab50..a3c9860ac3d40 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1998/07/12 20:40:45 augustss Exp $
-#	FreeBSD $FreeBSD$
+#	FreeBSD $FreeBSD: src/usr.sbin/usbdevs/Makefile,v 1.10 2001/07/20 06:20:25 obrien Exp $
 
 PROG=	usbdevs
 MAN=	usbdevs.8
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index 3226dd5bd6589..e9c9955050fab 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/usbdevs/usbdevs.8,v 1.11 2004/05/24 13:22:00 le Exp $
 .\"
 .Dd May 24, 2004
 .Dt USBDEVS 8
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 640dd512f7f29..e64e84c15bcce 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: usbdevs.c,v 1.22 2003/11/12 13:31:08 grant Exp $	*/
-/*	$FreeBSD$	*/
+/*	$FreeBSD: src/usr.sbin/usbdevs/usbdevs.c,v 1.10 2004/05/24 13:22:00 le Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile
index 074f941d85b9c..fad3243cd0741 100644
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vidcontrol/Makefile,v 1.6 2005/01/13 03:59:44 delphij Exp $
 
 PROG=	vidcontrol
 SRCS=	vidcontrol.c decode.c
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c
index 27691d2cbc45f..81b92da38699e 100644
--- a/usr.sbin/vidcontrol/decode.c
+++ b/usr.sbin/vidcontrol/decode.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/decode.c,v 1.11 2005/01/13 03:59:44 delphij Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/vidcontrol/decode.h b/usr.sbin/vidcontrol/decode.h
index 1f1cba4a47207..8adff2617dfe0 100644
--- a/usr.sbin/vidcontrol/decode.h
+++ b/usr.sbin/vidcontrol/decode.h
@@ -1,3 +1,3 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/vidcontrol/decode.h,v 1.2 2001/04/09 17:24:29 sobomax Exp $ */
 
 int decode(FILE *fd, char *buffer, int len);
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index 2abaa1e199725..9bf5f0f1e85e4 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.58 2006/12/22 23:23:59 ru Exp $
 .\"
 .Dd December 23, 2006
 .Dt VIDCONTROL 1
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 847ff3e6e23e1..8527c81b3c9fc 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.c,v 1.54 2006/09/26 21:46:12 ru Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile
index 69a9df9c5ba9e..835ab3b0e432b 100644
--- a/usr.sbin/vipw/Makefile
+++ b/usr.sbin/vipw/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/vipw/Makefile,v 1.8 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	vipw
 MAN=	vipw.8
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index 7162baa5e4fcd..8881de485161a 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.16 2005/10/28 22:47:40 brooks Exp $
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 4a0a70080dcac..4a3750351384a 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)vipw.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/vipw/vipw.c,v 1.16 2004/08/07 04:28:56 imp Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index e8a8ea6ab6982..9b49766113a1d 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/watch/Makefile,v 1.16 2003/04/04 17:49:20 obrien Exp $
 
 PROG=	watch
 MAN=	watch.8
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index 99c6b6feab94a..ea802dac683ff 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watch/watch.8,v 1.30 2005/01/18 20:02:45 ru Exp $
 .\"
 .Dd November 24, 2001
 .Dt WATCH 8
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 732db3d27e54f..302cd5869d620 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/watch/watch.c,v 1.34 2005/09/21 14:30:14 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile
index 08880e1491687..bf4536c443d3f 100644
--- a/usr.sbin/watchdogd/Makefile
+++ b/usr.sbin/watchdogd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/watchdogd/Makefile,v 1.5 2005/08/24 19:28:33 pjd Exp $
 
 PROG=	watchdogd
 LINKS=	${BINDIR}/watchdogd ${BINDIR}/watchdog
diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8
index 9ca9fe0ef27fa..98efcffbfc456 100644
--- a/usr.sbin/watchdogd/watchdog.8
+++ b/usr.sbin/watchdogd/watchdog.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watchdogd/watchdog.8,v 1.8 2006/09/29 17:57:04 ru Exp $
 .\"
 .Dd September 2, 2006
 .Dt WATCHDOG 8
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index b00fef17cdbac..2fcde9e53317b 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/watchdogd/watchdogd.8,v 1.7 2006/09/29 17:57:04 ru Exp $
 .\"
 .Dd September 2, 2006
 .Dt WATCHDOGD 8
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 6f0e840e1dc2c..0697fbcfa7105 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/types.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/watchdogd/watchdogd.c,v 1.15 2006/12/15 22:47:36 n_hibma Exp $");
 
 #include <sys/param.h>
 #include <sys/rtprio.h>
diff --git a/usr.sbin/wlandebug/Makefile b/usr.sbin/wlandebug/Makefile
index 5284257d7f70e..d6963da393b2b 100644
--- a/usr.sbin/wlandebug/Makefile
+++ b/usr.sbin/wlandebug/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wlandebug/Makefile,v 1.5 2007/07/28 00:12:21 thompsa Exp $
 
 PROG=	wlandebug
 MAN=	wlandebug.8
diff --git a/usr.sbin/wlandebug/wlandebug.8 b/usr.sbin/wlandebug/wlandebug.8
index 2e105c3642d41..8ce3b15011ca9 100644
--- a/usr.sbin/wlandebug/wlandebug.8
+++ b/usr.sbin/wlandebug/wlandebug.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wlandebug/wlandebug.8,v 1.3 2007/07/28 00:05:25 thompsa Exp $
 .\"
 .Dd January 8, 2007
 .Dt WLANDEBUG 8
diff --git a/usr.sbin/wlandebug/wlandebug.c b/usr.sbin/wlandebug/wlandebug.c
index dbc99d72ad612..c202a54c88b06 100644
--- a/usr.sbin/wlandebug/wlandebug.c
+++ b/usr.sbin/wlandebug/wlandebug.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wlandebug/wlandebug.c,v 1.5 2007/07/28 00:05:25 thompsa Exp $
  */
 
 /*
diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile
index 8d3d0cc3e7972..cf745f6c40845 100644
--- a/usr.sbin/wlconfig/Makefile
+++ b/usr.sbin/wlconfig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wlconfig/Makefile,v 1.8 2004/01/21 14:01:29 ru Exp $
 
 PROG=	wlconfig
 MAN=	wlconfig.8
diff --git a/usr.sbin/wlconfig/wlconfig.8 b/usr.sbin/wlconfig/wlconfig.8
index 99a29422f0207..0471bc0f9286c 100644
--- a/usr.sbin/wlconfig/wlconfig.8
+++ b/usr.sbin/wlconfig/wlconfig.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wlconfig/wlconfig.8,v 1.19 2004/07/02 23:12:59 ru Exp $
 .\"
 .Dd December 26, 1996
 .Os
diff --git a/usr.sbin/wlconfig/wlconfig.c b/usr.sbin/wlconfig/wlconfig.c
index f361b2cb99fb2..2b8c8536f06a4 100644
--- a/usr.sbin/wlconfig/wlconfig.c
+++ b/usr.sbin/wlconfig/wlconfig.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/wlconfig/wlconfig.c,v 1.11 2000/11/26 23:51:07 dannyboy Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile
index 5d746e9753052..20513977859ce 100644
--- a/usr.sbin/wpa/Makefile
+++ b/usr.sbin/wpa/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/Makefile,v 1.4 2006/11/17 19:38:51 sam Exp $
 
 SUBDIR= wpa_supplicant wpa_cli wpa_passphrase
 SUBDIR+= hostapd hostapd_cli
diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index 8c6b79e955f77..8895c83cf4426 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/Makefile.inc,v 1.1 2005/06/05 21:18:53 sam Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index 2eb3e1f18f921..6df3a68b88ce5 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/hostapd/Makefile,v 1.4.2.1 2007/11/21 06:07:12 sam Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/wpa/hostapd/driver_freebsd.c b/usr.sbin/wpa/hostapd/driver_freebsd.c
index 2fe6a0ab0c613..58f0710fb6980 100644
--- a/usr.sbin/wpa/hostapd/driver_freebsd.c
+++ b/usr.sbin/wpa/hostapd/driver_freebsd.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/hostapd/driver_freebsd.c,v 1.6 2007/07/09 16:26:48 sam Exp $
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.sbin/wpa/hostapd/hostapd.8 b/usr.sbin/wpa/hostapd/hostapd.8
index 5cb5e1c132351..c5da554f9479b 100644
--- a/usr.sbin/wpa/hostapd/hostapd.8
+++ b/usr.sbin/wpa/hostapd/hostapd.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/hostapd/hostapd.8,v 1.2.10.1 2007/11/06 18:13:25 simon Exp $
 .\"
 .Dd October 26, 2007
 .Dt HOSTAPD 8
diff --git a/usr.sbin/wpa/hostapd/hostapd.conf.5 b/usr.sbin/wpa/hostapd/hostapd.conf.5
index 96c8ad3ac5ee3..a576e7bb57eef 100644
--- a/usr.sbin/wpa/hostapd/hostapd.conf.5
+++ b/usr.sbin/wpa/hostapd/hostapd.conf.5
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/hostapd/hostapd.conf.5,v 1.4 2006/09/29 17:57:04 ru Exp $
 .\"
 .Dd September 2, 2006
 .Dt HOSTAPD.CONF 5
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index 89d0a1117b8aa..ef720d6bd9fed 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/hostapd_cli/Makefile,v 1.4 2007/07/09 16:26:48 sam Exp $
 
 CONTRIB=	${.CURDIR}/../../../contrib
 HOSTAPD_DISTDIR?= ${CONTRIB}/hostapd
diff --git a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
index 4362f9f028488..62fd5ad1ae506 100644
--- a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
+++ b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/hostapd_cli/hostapd_cli.8,v 1.2 2005/06/27 06:40:43 ru Exp $
 .\"
 .Dd June 16, 2005
 .Dt HOSTAPD_CLI 8
diff --git a/usr.sbin/wpa/l2_packet.c b/usr.sbin/wpa/l2_packet.c
index 6c4c6b3cf41db..62ff0c1279c47 100644
--- a/usr.sbin/wpa/l2_packet.c
+++ b/usr.sbin/wpa/l2_packet.c
@@ -12,7 +12,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/l2_packet.c,v 1.4.2.1 2007/10/19 03:04:02 mlaier Exp $
  */
 
 /*
diff --git a/usr.sbin/wpa/ndis_events/Makefile b/usr.sbin/wpa/ndis_events/Makefile
index 07caf5a484655..1a604d7aa43d3 100644
--- a/usr.sbin/wpa/ndis_events/Makefile
+++ b/usr.sbin/wpa/ndis_events/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/ndis_events/Makefile,v 1.1 2005/10/10 17:51:12 wpaul Exp $
 
 PROG=	ndis_events
 SRCS+=	ndis_events.c
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.8 b/usr.sbin/wpa/ndis_events/ndis_events.8
index eacb017a0cb41..4b62c2a9499c3 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.8
+++ b/usr.sbin/wpa/ndis_events/ndis_events.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/ndis_events/ndis_events.8,v 1.7 2007/09/07 22:19:29 brueffer Exp $
 .\"
 .Dd August 30, 2007
 .Dt NDIS_EVENTS 8
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
index d2dedff779cd8..ab46968ec2d04 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ b/usr.sbin/wpa/ndis_events/ndis_events.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/wpa/ndis_events/ndis_events.c,v 1.4 2005/10/21 16:57:57 wpaul Exp $");
 
 /*
  * This program simulates the behavior of the ndis_events utility
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index af0d14c44b8a2..75c3c022fcfc0 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/wpa_cli/Makefile,v 1.3 2007/07/11 16:04:07 sam Exp $
 
 WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant
 .PATH: ${WPA_SUPPLICANT_DISTDIR}
diff --git a/usr.sbin/wpa/wpa_cli/wpa_cli.8 b/usr.sbin/wpa/wpa_cli/wpa_cli.8
index 27fc9434c4a7e..e9a22ee0d2ec5 100644
--- a/usr.sbin/wpa/wpa_cli/wpa_cli.8
+++ b/usr.sbin/wpa/wpa_cli/wpa_cli.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/wpa_cli/wpa_cli.8,v 1.3 2005/07/13 05:39:47 brueffer Exp $
 .\"
 .Dd June 16, 2005
 .Dt WPA_CLI 8
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile
index 002dee5468dc9..2a4a4116c648a 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/wpa_passphrase/Makefile,v 1.2 2007/07/11 16:04:08 sam Exp $
 
 WPA_SUPPLICANT_DISTDIR?= ${.CURDIR}/../../../contrib/wpa_supplicant
 .PATH: ${WPA_SUPPLICANT_DISTDIR}
diff --git a/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 b/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
index fc8ade1ef2dd6..2ce8f5e3686be 100644
--- a/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
+++ b/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8,v 1.2 2007/07/17 22:28:51 simon Exp $
 .\"
 .Dd July 17, 2007
 .Dt WPA_PASSPHRASE 8
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 9dd95362c7dc0..c13b68d1da359 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Makefile,v 1.11.2.2 2007/11/21 06:07:12 sam Exp $
 
 .include <bsd.own.mk>
 
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
index 73463950fc368..30bc858643150 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Packet32.c,v 1.4 2007/07/11 16:04:08 sam Exp $");
 
 /*
  * This file implements a small portion of the Winpcap API for the
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.h b/usr.sbin/wpa/wpa_supplicant/Packet32.h
index e0598e70d4fd7..bcd5c9af70ef0 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.h
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Packet32.h,v 1.2 2005/10/20 16:49:31 wpaul Exp $
  */
 
 #ifndef _PACKET32_H_
diff --git a/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c b/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
index 7769a8ed04ce7..c2070e4250a9c 100644
--- a/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
+++ b/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c
@@ -11,7 +11,7 @@
  *
  * See README and COPYING for more details.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c,v 1.14.2.1 2007/11/08 05:52:24 thompsa Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.sbin/wpa/wpa_supplicant/ntddndis.h b/usr.sbin/wpa/wpa_supplicant/ntddndis.h
index 42e403d7bb121..30dcca82f37db 100644
--- a/usr.sbin/wpa/wpa_supplicant/ntddndis.h
+++ b/usr.sbin/wpa/wpa_supplicant/ntddndis.h
@@ -2,7 +2,7 @@
 #define _NTDDNDIS_H_
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/ntddndis.h,v 1.2 2005/10/20 16:49:31 wpaul Exp $
  */
 
 /*
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
index 31adf2ff74294..1a754af0b43e4 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.3.4.1 2008/02/21 23:29:26 brueffer Exp $
 .\"
 .Dd February 21, 2008
 .Dt WPA_SUPPLICANT 8
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index 084176ccf6461..bd68c7a1513ff 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5,v 1.9 2007/07/11 16:04:08 sam Exp $
 .\"
 .Dd July 8, 2007
 .Dt WPA_SUPPLICANT.CONF 5
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 973da6ee0559a..66c29f6fa080f 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yp_mkdb/Makefile,v 1.9 2003/04/04 17:49:20 obrien Exp $
 
 .PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv
 
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 125123519c059..b28c4b20dd2a3 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.18 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index 6c3014bdfc9ca..cd0f130730500 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.c,v 1.16 2003/05/03 21:06:41 obrien Exp $");
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile
index 915d001be4dc5..7a22134c7b22a 100644
--- a/usr.sbin/ypbind/Makefile
+++ b/usr.sbin/ypbind/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypbind/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $
 
 PROG=	ypbind
 MAN=	ypbind.8
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index 1806c3c0f122f..c9e15c5f17b18 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -66,7 +66,7 @@ static char *sccsid = "@(#)from: clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypbind/yp_ping.c,v 1.16 2003/05/03 21:06:41 obrien Exp $");
 
 /*
  * clnt_udp.c, Implements a UDP/IP based, client side RPC.
diff --git a/usr.sbin/ypbind/yp_ping.h b/usr.sbin/ypbind/yp_ping.h
index 80e6a78730114..6f820c2b8ef1a 100644
--- a/usr.sbin/ypbind/yp_ping.h
+++ b/usr.sbin/ypbind/yp_ping.h
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ypbind/yp_ping.h,v 1.2 2002/02/06 13:30:29 des Exp $
  */
 
 extern int __yp_ping(struct in_addr *, int, char *, short *);
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 4608814d86408..922dbd552dbb3 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.23 2005/02/13 22:25:33 ru Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index a3a7dc37587e5..e8279bd5c03a3 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypbind/ypbind.c,v 1.40 2004/10/17 19:33:33 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile
index 63763316ef8cb..1b3c9d67135e5 100644
--- a/usr.sbin/yppoll/Makefile
+++ b/usr.sbin/yppoll/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppoll/Makefile,v 1.7 2001/03/26 14:42:18 ru Exp $
 
 PROG=	yppoll
 MAN=	yppoll.8
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index ad90d902e146b..4c09185f2d004 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yppoll/yppoll.8,v 1.7 2002/07/14 14:47:06 charnier Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPPOLL 8
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index e35087c6baaf1..0dff2638071b4 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/yppoll/yppoll.c,v 1.12 2004/05/24 16:10:57 stefanf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index 7ce1c612e0e0b..100b350c8de2d 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $
 
 RPCDIR=	${.CURDIR}/../../include/rpcsvc
 .PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 1acac3f7fc970..8c2d5600b41ac 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.18 2005/01/18 20:02:45 ru Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
diff --git a/usr.sbin/yppush/yppush_extern.h b/usr.sbin/yppush/yppush_extern.h
index 2a4fbccee2c62..32c667d98c897 100644
--- a/usr.sbin/yppush/yppush_extern.h
+++ b/usr.sbin/yppush/yppush_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/yppush/yppush_extern.h,v 1.5 2002/02/06 13:30:30 des Exp $
  */
 
 /* Privately defined error codes. */
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index ceb63bcae411d..fdbc0f762a1d5 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.22 2006/08/16 12:58:41 thomas Exp $");
 
 #include <errno.h>
 #include <signal.h>
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index c1b2df30478b5..8b4cf012406b4 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.24 2004/10/18 21:42:15 ru Exp $
 
 RPCDIR=	${.CURDIR}/../../include/rpcsvc
 .PATH: ${RPCDIR}
diff --git a/usr.sbin/ypserv/Makefile.yp b/usr.sbin/ypserv/Makefile.yp
index 407663d2dae68..9ab0a0452eb1a 100644
--- a/usr.sbin/ypserv/Makefile.yp
+++ b/usr.sbin/ypserv/Makefile.yp
@@ -1,7 +1,7 @@
 #
 # Makefile for the NIS databases
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/Makefile.yp,v 1.38 2006/06/08 09:12:07 maxim Exp $
 #
 # This Makefile should only be run on the NIS master server of a domain.
 # All updated maps will be pushed to all NIS slave servers listed in the
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index 30ce7407c6e5e..117d85f1acff2 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_access.c,v 1.23 2006/05/31 22:31:08 cperciva Exp $");
 
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 61944dc44bbe9..6122981df8cec 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_dblookup.c,v 1.25 2003/05/03 21:06:42 obrien Exp $");
 
 #include <db.h>
 #include <errno.h>
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index 4ea6a13a7e59f..cfdc04889ba8f 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_dnslookup.c,v 1.27 2005/05/20 13:04:10 charnier Exp $");
 
 /*
  * Do standard and reverse DNS lookups using the resolver library.
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index 8d488f3bdb6ab..3a1e549fdd8ef 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_error.c,v 1.10 2003/05/03 21:06:42 obrien Exp $");
 
 /*
  * error logging/reporting facilities
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index 2e574b6c3bfe7..a7b93fed83774 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/ypserv/yp_extern.h,v 1.17 2005/05/02 09:34:07 ume Exp $
  */
 
 #include <db.h>
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index cfa45e4a3e3f3..cd98c49d001ed 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_main.c,v 1.28 2005/05/20 13:04:10 charnier Exp $");
 
 /*
  * ypserv startup function.
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 86c7d00d1c5d9..98229787bd5d5 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_server.c,v 1.40 2006/06/09 14:01:07 maxim Exp $");
 
 #include "yp.h"
 #include "yp_extern.h"
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 33d058ef9b879..4680c6af0fad1 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypserv/yp_svc_udp.c,v 1.8 2003/05/03 21:06:42 obrien Exp $");
 
 #include <rpc/rpc.h>
 #include <rpc/svc_dg.h>
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index b99a9453f7dbd..0d99ea0841a51 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.17 2006/06/08 14:49:38 maxim Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
diff --git a/usr.sbin/ypserv/ypinit.sh b/usr.sbin/ypserv/ypinit.sh
index 1be7e0e3e1864..a9fa9a55baa02 100644
--- a/usr.sbin/ypserv/ypinit.sh
+++ b/usr.sbin/ypserv/ypinit.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypserv/ypinit.sh,v 1.4 2002/12/30 21:18:15 schweikh Exp $
 #
 # ypinit.sh - setup a master or slave server.
 # (Taken from OpenBSD and modified for FreeBSD.)
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 608b2028c57dd..6dd08ddc6290d 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.41 2005/02/13 23:45:54 ru Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index 10ed5f88fd780..c93e897491c1d 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/ypset/Makefile,v 1.4 2001/03/26 14:42:19 ru Exp $
 
 PROG=	ypset
 MAN=	ypset.8
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 49ad6e0b67aeb..21db3b6f9245f 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/ypset/ypset.8,v 1.10 2002/07/14 14:47:13 charnier Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPSET 8
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index b63578ac3addd..515e2c4207def 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/usr.sbin/ypset/ypset.c,v 1.16 2007/02/28 22:49:12 jmallett Exp $");
 
 #include <err.h>
 #include <netdb.h>
diff --git a/usr.sbin/zic/Arts.htm b/usr.sbin/zic/Arts.htm
index baa84ed77431b..e8f95394f0d5d 100644
--- a/usr.sbin/zic/Arts.htm
+++ b/usr.sbin/zic/Arts.htm
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: src/usr.sbin/zic/Arts.htm,v 1.2 2000/05/29 20:23:04 charnier Exp $ -->
 <HTML>
 <HEAD>
 <TITLE>Time and the Arts</TITLE>
diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile
index 2496e821159b2..41f4ee993f8ff 100644
--- a/usr.sbin/zic/Makefile
+++ b/usr.sbin/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile,v 1.6 2001/07/18 11:30:46 dd Exp $
 
 # Vendor contact: tz@elsie.nci.nih.gov
 MAINTAINER=	wollman@FreeBSD.org
diff --git a/usr.sbin/zic/Makefile.inc b/usr.sbin/zic/Makefile.inc
index b915adff92abc..137bf6a1a2059 100644
--- a/usr.sbin/zic/Makefile.inc
+++ b/usr.sbin/zic/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/Makefile.inc,v 1.4 1999/08/28 01:21:18 peter Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/zic/ialloc.c b/usr.sbin/zic/ialloc.c
index a069032eda51c..c81ef8b9f5ac0 100644
--- a/usr.sbin/zic/ialloc.c
+++ b/usr.sbin/zic/ialloc.c
@@ -6,7 +6,7 @@ static const char	elsieid[] = "@(#)ialloc.c	8.29";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/ialloc.c,v 1.6 2000/11/28 18:18:56 charnier Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/private.h b/usr.sbin/zic/private.h
index 315f33a4a2f1c..47d9cb2b314bb 100644
--- a/usr.sbin/zic/private.h
+++ b/usr.sbin/zic/private.h
@@ -13,7 +13,7 @@
  * I have removed all of the ifdef spaghetti which is not relevant to
  * zic from this file.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.sbin/zic/private.h,v 1.7 2004/06/20 21:41:11 stefanf Exp $
  */
 
 /*
diff --git a/usr.sbin/zic/scheck.c b/usr.sbin/zic/scheck.c
index 692bf1a07934b..009ef1ec82003 100644
--- a/usr.sbin/zic/scheck.c
+++ b/usr.sbin/zic/scheck.c
@@ -6,7 +6,7 @@ static const char	elsieid[] = "@(#)scheck.c	8.15";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/scheck.c,v 1.7 2001/07/18 11:27:04 dd Exp $";
 #endif /* not lint */
 
 /*LINTLIBRARY*/
diff --git a/usr.sbin/zic/zdump.8 b/usr.sbin/zic/zdump.8
index 3a685fd7ea0d5..065a1d645ce9d 100644
--- a/usr.sbin/zic/zdump.8
+++ b/usr.sbin/zic/zdump.8
@@ -1,6 +1,6 @@
 .\"
 .\"	@(#)zdump.8	7.3
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zic/zdump.8,v 1.10 2004/06/20 21:41:11 stefanf Exp $
 .\"
 .Dd June 20, 2004
 .Dt ZDUMP 8
diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c
index e63e943988347..f98d1177dd86a 100644
--- a/usr.sbin/zic/zdump.c
+++ b/usr.sbin/zic/zdump.c
@@ -2,7 +2,7 @@ static const char	elsieid[] = "@(#)zdump.c	7.31";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.9 2004/06/20 21:41:11 stefanf Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index 3443b158e6d5d..cfc7cf2b1be0f 100644
--- a/usr.sbin/zic/zdump/Makefile
+++ b/usr.sbin/zic/zdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/zdump/Makefile,v 1.11 2006/10/18 12:35:23 ru Exp $
 
 .PATH: ${.CURDIR}/..
 
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index c293cefb6e5a4..b2a60aa6c6fa9 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zic/zic.8,v 1.19 2005/02/13 23:45:54 ru Exp $
 .Dd June 20, 2004
 .Dt ZIC 8
 .Os
diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c
index 10d79a898a2cb..ba7d18c94bda0 100644
--- a/usr.sbin/zic/zic.c
+++ b/usr.sbin/zic/zic.c
@@ -2,7 +2,7 @@ static const char	elsieid[] = "@(#)zic.c	7.116";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.sbin/zic/zic.c,v 1.17.10.1 2007/12/07 05:13:20 kevlo Exp $";
 #endif /* not lint */
 
 #include "private.h"
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index 3f3bc70aa55c5..4bec21c71ae5e 100644
--- a/usr.sbin/zic/zic/Makefile
+++ b/usr.sbin/zic/zic/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zic/zic/Makefile,v 1.12 2006/10/18 12:35:24 ru Exp $
 
 .PATH: ${.CURDIR}/..
 
diff --git a/usr.sbin/zzz/Makefile b/usr.sbin/zzz/Makefile
index 8c4a9beb763af..45011a38e53af 100644
--- a/usr.sbin/zzz/Makefile
+++ b/usr.sbin/zzz/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zzz/Makefile,v 1.1 2003/07/14 16:31:34 njl Exp $
 
 SCRIPTS=zzz.sh
 MAN=	zzz.8
diff --git a/usr.sbin/zzz/zzz.8 b/usr.sbin/zzz/zzz.8
index 583d5fd963aef..c70efb7a887c1 100644
--- a/usr.sbin/zzz/zzz.8
+++ b/usr.sbin/zzz/zzz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/zzz/zzz.8,v 1.4 2004/06/13 18:03:44 ru Exp $
 .\"
 .Dd July 13, 2003
 .Dt ZZZ 8
diff --git a/usr.sbin/zzz/zzz.sh b/usr.sbin/zzz/zzz.sh
index ef9527bb76b3c..9bd25001bb22f 100644
--- a/usr.sbin/zzz/zzz.sh
+++ b/usr.sbin/zzz/zzz.sh
@@ -7,7 +7,7 @@
 #
 # Mark Santcroos <marks@ripe.net>
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/zzz/zzz.sh,v 1.2 2003/07/25 17:11:15 njl Exp $
 
 PATH=/sbin:/usr/sbin:/usr/bin:/bin